diff --git a/__mocks__/@sayem314/react-native-keep-awake/index.ts b/__mocks__/@sayem314/react-native-keep-awake/index.ts
deleted file mode 100644
index 521381b66..000000000
--- a/__mocks__/@sayem314/react-native-keep-awake/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-module.exports = jest.mock('@sayem314/react-native-keep-awake');
diff --git a/__tests__/todos.ts b/__tests__/todos.ts
index 0b6281bda..d80edcb19 100644
--- a/__tests__/todos.ts
+++ b/__tests__/todos.ts
@@ -17,6 +17,10 @@ import {
 	slashtagsProfileTodo,
 	transferPendingTodo,
 	transferClosingChannelTodo,
+	supportTodo,
+	inviteTodo,
+	// fastpayTodo,
+	// discountTodo,
 } from '../src/store/shapes/todos';
 import { createNewWallet } from '../src/utils/startup';
 import { EAvailableNetwork } from '../src/utils/networks';
@@ -40,8 +44,12 @@ describe('Todos selector', () => {
 			backupSeedPhraseTodo,
 			lightningTodo,
 			pinTodo,
-			slashtagsProfileTodo,
 			buyBitcoinTodo,
+			supportTodo,
+			inviteTodo,
+			// fastpayTodo,
+			slashtagsProfileTodo,
+			// discountTodo,
 		]);
 	});
 
@@ -90,9 +98,11 @@ describe('Todos selector', () => {
 			backupSeedPhrase: +new Date(),
 			btFailed: +new Date(),
 			buyBitcoin: +new Date(),
+			invite: +new Date(),
 			lightning: +new Date(),
 			pin: +new Date(),
 			slashtagsProfile: +new Date(),
+			support: +new Date(),
 		};
 
 		assert.deepEqual(todosFullSelector(state), []);
@@ -128,7 +138,7 @@ describe('Todos selector', () => {
 		);
 	});
 
-	it('should return transferPendingTodo for addtional pending transfers to spending', () => {
+	it('should return lightningSettingUpTodo for addtional pending transfers to spending', () => {
 		const state = cloneDeep(s);
 		const channel1 = {
 			channel_id: 'channel1',
@@ -144,7 +154,7 @@ describe('Todos selector', () => {
 			orderId: 'order1',
 		});
 		expect(todosFullSelector(state)).toEqual(
-			expect.arrayContaining([{ ...transferPendingTodo, duration: 10 }]),
+			expect.arrayContaining([lightningSettingUpTodo]),
 		);
 	});
 
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index f910a5e28..0b9cdc576 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -23,8 +23,8 @@
   <application
     android:name=".MainApplication"
     android:label="@string/app_name"
-    android:icon="@mipmap/ic_launcher"
-    android:roundIcon="@mipmap/ic_launcher_round"
+    android:icon="@mipmap/ic_launcher_orange"
+    android:roundIcon="@mipmap/ic_launcher_orange_round"
     android:allowBackup="false"
     android:usesCleartextTraffic="true"
     android:theme="@style/AppTheme">
@@ -35,7 +35,8 @@
       android:launchMode="singleTask"
       android:screenOrientation="portrait"
       android:windowSoftInputMode="adjustPan"
-      android:exported="true">
+      android:exported="true"
+      android:theme="@style/SplashTheme">
       <intent-filter>
         <action android:name="android.intent.action.MAIN" />
         <category android:name="android.intent.category.LAUNCHER" />
diff --git a/android/app/src/main/assets/fonts/Damion-Regular.ttf b/android/app/src/main/assets/fonts/Damion-Regular.ttf
new file mode 100644
index 000000000..d0548dd38
Binary files /dev/null and b/android/app/src/main/assets/fonts/Damion-Regular.ttf differ
diff --git a/android/app/src/main/assets/fonts/InterTight-Black.ttf b/android/app/src/main/assets/fonts/InterTight-Black.ttf
new file mode 100644
index 000000000..0ff7521b9
Binary files /dev/null and b/android/app/src/main/assets/fonts/InterTight-Black.ttf differ
diff --git a/android/app/src/main/assets/fonts/InterTight-ExtraBold.ttf b/android/app/src/main/assets/fonts/InterTight-ExtraBold.ttf
new file mode 100644
index 000000000..9bd8adedf
Binary files /dev/null and b/android/app/src/main/assets/fonts/InterTight-ExtraBold.ttf differ
diff --git a/android/app/src/main/assets/fonts/Roboto-Black.ttf b/android/app/src/main/assets/fonts/Roboto-Black.ttf
deleted file mode 100644
index 0112e7da6..000000000
Binary files a/android/app/src/main/assets/fonts/Roboto-Black.ttf and /dev/null differ
diff --git a/android/app/src/main/assets/fonts/Roboto-Bold.ttf b/android/app/src/main/assets/fonts/Roboto-Bold.ttf
deleted file mode 100644
index 43da14d84..000000000
Binary files a/android/app/src/main/assets/fonts/Roboto-Bold.ttf and /dev/null differ
diff --git a/android/app/src/main/assets/fonts/Roboto-Light.ttf b/android/app/src/main/assets/fonts/Roboto-Light.ttf
deleted file mode 100644
index e7307e72c..000000000
Binary files a/android/app/src/main/assets/fonts/Roboto-Light.ttf and /dev/null differ
diff --git a/android/app/src/main/assets/fonts/Roboto-Medium.ttf b/android/app/src/main/assets/fonts/Roboto-Medium.ttf
deleted file mode 100644
index ac0f908b9..000000000
Binary files a/android/app/src/main/assets/fonts/Roboto-Medium.ttf and /dev/null differ
diff --git a/android/app/src/main/assets/fonts/Roboto-Regular.ttf b/android/app/src/main/assets/fonts/Roboto-Regular.ttf
deleted file mode 100644
index ddf4bfacb..000000000
Binary files a/android/app/src/main/assets/fonts/Roboto-Regular.ttf and /dev/null differ
diff --git a/android/app/src/main/ic_launcher_black-playstore.png b/android/app/src/main/ic_launcher_black-playstore.png
new file mode 100644
index 000000000..ea65b684e
Binary files /dev/null and b/android/app/src/main/ic_launcher_black-playstore.png differ
diff --git a/android/app/src/main/ic_launcher_orange-playstore.png b/android/app/src/main/ic_launcher_orange-playstore.png
new file mode 100644
index 000000000..2be46b78c
Binary files /dev/null and b/android/app/src/main/ic_launcher_orange-playstore.png differ
diff --git a/android/app/src/main/res/drawable-hdpi/splash.png b/android/app/src/main/res/drawable-hdpi/splash.png
deleted file mode 100644
index a3b0c0978..000000000
Binary files a/android/app/src/main/res/drawable-hdpi/splash.png and /dev/null differ
diff --git a/android/app/src/main/res/drawable-hdpi/splash_logo.png b/android/app/src/main/res/drawable-hdpi/splash_logo.png
new file mode 100644
index 000000000..4d44f0611
Binary files /dev/null and b/android/app/src/main/res/drawable-hdpi/splash_logo.png differ
diff --git a/android/app/src/main/res/drawable-mdpi/splash.png b/android/app/src/main/res/drawable-mdpi/splash.png
deleted file mode 100644
index e8f5b731f..000000000
Binary files a/android/app/src/main/res/drawable-mdpi/splash.png and /dev/null differ
diff --git a/android/app/src/main/res/drawable-mdpi/splash_logo.png b/android/app/src/main/res/drawable-mdpi/splash_logo.png
new file mode 100644
index 000000000..ac7adbd56
Binary files /dev/null and b/android/app/src/main/res/drawable-mdpi/splash_logo.png differ
diff --git a/android/app/src/main/res/drawable-xhdpi/splash.png b/android/app/src/main/res/drawable-xhdpi/splash.png
deleted file mode 100644
index d002c09b4..000000000
Binary files a/android/app/src/main/res/drawable-xhdpi/splash.png and /dev/null differ
diff --git a/android/app/src/main/res/drawable-xhdpi/splash_logo.png b/android/app/src/main/res/drawable-xhdpi/splash_logo.png
new file mode 100644
index 000000000..2db7cc24d
Binary files /dev/null and b/android/app/src/main/res/drawable-xhdpi/splash_logo.png differ
diff --git a/android/app/src/main/res/drawable-xxhdpi/splash.png b/android/app/src/main/res/drawable-xxhdpi/splash.png
deleted file mode 100644
index 1e3541b34..000000000
Binary files a/android/app/src/main/res/drawable-xxhdpi/splash.png and /dev/null differ
diff --git a/android/app/src/main/res/drawable-xxhdpi/splash_logo.png b/android/app/src/main/res/drawable-xxhdpi/splash_logo.png
new file mode 100644
index 000000000..6df93f0f6
Binary files /dev/null and b/android/app/src/main/res/drawable-xxhdpi/splash_logo.png differ
diff --git a/android/app/src/main/res/drawable-xxxhdpi/splash.png b/android/app/src/main/res/drawable-xxxhdpi/splash.png
deleted file mode 100644
index 09a651a55..000000000
Binary files a/android/app/src/main/res/drawable-xxxhdpi/splash.png and /dev/null differ
diff --git a/android/app/src/main/res/drawable-xxxhdpi/splash_logo.png b/android/app/src/main/res/drawable-xxxhdpi/splash_logo.png
new file mode 100644
index 000000000..1bb915756
Binary files /dev/null and b/android/app/src/main/res/drawable-xxxhdpi/splash_logo.png differ
diff --git a/android/app/src/main/res/drawable/ic_launcher_foreground.xml b/android/app/src/main/res/drawable/ic_launcher_foreground.xml
deleted file mode 100644
index b0604dcd4..000000000
--- a/android/app/src/main/res/drawable/ic_launcher_foreground.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-    <group android:scaleX="0.9"
-        android:scaleY="0.9"
-        android:translateX="5.4"
-        android:translateY="5.4">
-        <path
-            android:pathData="M66.0207 61.0711L75.001 52.0907C80.2731 46.8186 80.2731 38.2709 75.001 32.9988C69.7289 27.7267 61.1812 27.7267 55.9091 32.9988L46.9289 41.979C48.6421 46.1432 51.19 50.0446 54.5728 53.4274C57.9554 56.81 61.8567 59.3579 66.0207 61.0711Z"
-            android:fillColor="#FFFFFF" />
-        <path
-            android:pathData="M61.9298 65.1622C57.8887 63.2317 54.1014 60.5929 50.7543 57.2458C47.4071 53.8987 44.7683 50.1114 42.8379 46.0703L32.9989 55.9094C27.7268 61.1814 27.7268 69.7292 32.9988 75.0012C38.2709 80.2733 46.8187 80.2733 52.0907 75.0012L61.9298 65.1622Z"
-            android:fillColor="#FF6600" />
-    </group>
-</vector>
-    
\ No newline at end of file
diff --git a/android/app/src/main/res/drawable/ic_launcher_monochrome.xml b/android/app/src/main/res/drawable/ic_launcher_monochrome.xml
new file mode 100644
index 000000000..689b81dbb
--- /dev/null
+++ b/android/app/src/main/res/drawable/ic_launcher_monochrome.xml
@@ -0,0 +1,14 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="192"
+    android:viewportHeight="176">
+  <group android:scaleX="0.43"
+      android:scaleY="0.39416668"
+      android:translateX="54.72"
+      android:translateY="53.31333">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M182.7,74.8c0.7,-0.9 1.3,-1.8 1.9,-2.8c5.4,-8.7 7.2,-18.7 7.2,-28.1c0,-25.3 -22.1,-43.9 -46.5,-43.9H79.7L69,39.6c-0.3,0 -0.6,0 -0.8,0c-37.6,0 -68.1,30.5 -68.1,68.1c0,37.6 30.5,68.1 68.1,68.1c21.2,0 40.1,-9.7 52.6,-24.8h21c13.3,0 25.2,-4.3 34,-12.6c8.7,-8.2 13.3,-19.1 14.4,-30.4c1,-10.1 -0.1,-20.6 -5.3,-29.9C184.1,76.9 183.4,75.8 182.7,74.8zM155.1,74.3C155.1,74.3 155.1,74.3 155.1,74.3C155.1,74.3 155.1,74.3 155.1,74.3c0.1,0 0.2,0.1 0.2,0.1l0,0c5.8,1.8 10.2,4.7 13.3,8.5c0.7,0.8 1.3,1.7 1.8,2.6c3.4,5.5 4.5,12.6 3.7,21c-1.5,15.7 -12.2,27.9 -31,28.4c-0.4,0 -0.8,0 -1.3,0h-15.5c1.5,-5.1 2.4,-10.5 2.5,-16.1c0,-0.3 0,-0.7 0,-1c0,-30.4 -19.2,-53.2 -46.8,-59.7c21.8,6 37.7,26 37.7,49.7c0,12.7 -4.6,24.3 -12.1,33.2c-9.5,11.2 -23.6,18.3 -39.4,18.3c-28.5,0 -51.6,-23.1 -51.6,-51.6c0,-27.2 21.1,-49.5 47.9,-51.4c1.2,-0.1 2.4,-0.1 3.7,-0.1c4.4,0 8.6,0.6 12.7,1.6l11.2,-41.6h53.2c16.8,0 30.4,12.6 30.4,27.8c0,7.7 -1.5,14.6 -4.9,19.8c-0.5,0.8 -1.1,1.6 -1.8,2.4c-3.2,3.8 -7.7,6.5 -13.8,7.9l0,0l0,0c0,0 0,0 0,0c0,0 -0.1,0 -0.1,0c0,0 0,0.1 0,0.1C155,74.3 155,74.3 155.1,74.3z"/>
+  </group>
+</vector>
diff --git a/android/app/src/main/res/drawable/launch_screen.xml b/android/app/src/main/res/drawable/splash_screen.xml
similarity index 56%
rename from android/app/src/main/res/drawable/launch_screen.xml
rename to android/app/src/main/res/drawable/splash_screen.xml
index 5c3869818..e3a16de3f 100644
--- a/android/app/src/main/res/drawable/launch_screen.xml
+++ b/android/app/src/main/res/drawable/splash_screen.xml
@@ -2,8 +2,8 @@
 <layer-list
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:opacity="opaque">
-    <item android:drawable="@color/black" />
+    <item android:drawable="@color/brand" />
     <item>
-        <bitmap android:src="@drawable/splash" android:gravity="center|clip_horizontal" />
+        <bitmap android:src="@drawable/splash_logo" android:gravity="center|clip_horizontal" />
     </item>
 </layer-list>
\ No newline at end of file
diff --git a/android/app/src/main/res/layout/splash_screen.xml b/android/app/src/main/res/layout/splash_screen.xml
index bad166146..da391f5f9 100644
--- a/android/app/src/main/res/layout/splash_screen.xml
+++ b/android/app/src/main/res/layout/splash_screen.xml
@@ -4,4 +4,4 @@
   android:orientation="vertical"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
-  android:background="@drawable/launch_screen"/>
+  android:background="@drawable/splash_screen"/>
diff --git a/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_black.xml
similarity index 56%
rename from android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
rename to android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_black.xml
index 74d50b2a5..226dc8bb9 100644
--- a/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_black.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@color/black" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground" />
+    <monochrome android:drawable="@drawable/ic_launcher_monochrome" />
 </adaptive-icon>
\ No newline at end of file
diff --git a/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_black_round.xml
similarity index 56%
rename from android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
rename to android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_black_round.xml
index 74d50b2a5..226dc8bb9 100644
--- a/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_black_round.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@color/black" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground" />
+    <monochrome android:drawable="@drawable/ic_launcher_monochrome" />
 </adaptive-icon>
\ No newline at end of file
diff --git a/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_orange.xml b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_orange.xml
new file mode 100644
index 000000000..f5588bef1
--- /dev/null
+++ b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_orange.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/brand" />
+    <foreground android:drawable="@mipmap/ic_launcher_foreground" />
+    <monochrome android:drawable="@drawable/ic_launcher_monochrome" />
+</adaptive-icon>
\ No newline at end of file
diff --git a/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_orange_round.xml b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_orange_round.xml
new file mode 100644
index 000000000..f5588bef1
--- /dev/null
+++ b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_orange_round.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/brand" />
+    <foreground android:drawable="@mipmap/ic_launcher_foreground" />
+    <monochrome android:drawable="@drawable/ic_launcher_monochrome" />
+</adaptive-icon>
\ No newline at end of file
diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png
deleted file mode 100644
index 5a5fa9a21..000000000
Binary files a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png and /dev/null differ
diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher_black.webp b/android/app/src/main/res/mipmap-hdpi/ic_launcher_black.webp
new file mode 100644
index 000000000..1db101b7b
Binary files /dev/null and b/android/app/src/main/res/mipmap-hdpi/ic_launcher_black.webp differ
diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher_black_round.webp b/android/app/src/main/res/mipmap-hdpi/ic_launcher_black_round.webp
new file mode 100644
index 000000000..1db101b7b
Binary files /dev/null and b/android/app/src/main/res/mipmap-hdpi/ic_launcher_black_round.webp differ
diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
deleted file mode 100644
index f43a86de4..000000000
Binary files a/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png and /dev/null differ
diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp b/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp
new file mode 100644
index 000000000..d2951a821
Binary files /dev/null and b/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp differ
diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher_orange.webp b/android/app/src/main/res/mipmap-hdpi/ic_launcher_orange.webp
new file mode 100644
index 000000000..6b7a2baa7
Binary files /dev/null and b/android/app/src/main/res/mipmap-hdpi/ic_launcher_orange.webp differ
diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher_orange_round.webp b/android/app/src/main/res/mipmap-hdpi/ic_launcher_orange_round.webp
new file mode 100644
index 000000000..6b7a2baa7
Binary files /dev/null and b/android/app/src/main/res/mipmap-hdpi/ic_launcher_orange_round.webp differ
diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
deleted file mode 100644
index 4d9b3cde1..000000000
Binary files a/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png and /dev/null differ
diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png
deleted file mode 100644
index 8d705ebc2..000000000
Binary files a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png and /dev/null differ
diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher_black.webp b/android/app/src/main/res/mipmap-mdpi/ic_launcher_black.webp
new file mode 100644
index 000000000..56f224ed9
Binary files /dev/null and b/android/app/src/main/res/mipmap-mdpi/ic_launcher_black.webp differ
diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher_black_round.webp b/android/app/src/main/res/mipmap-mdpi/ic_launcher_black_round.webp
new file mode 100644
index 000000000..56f224ed9
Binary files /dev/null and b/android/app/src/main/res/mipmap-mdpi/ic_launcher_black_round.webp differ
diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
deleted file mode 100644
index 9332f20b6..000000000
Binary files a/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png and /dev/null differ
diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp b/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp
new file mode 100644
index 000000000..4228a854e
Binary files /dev/null and b/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp differ
diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher_orange.webp b/android/app/src/main/res/mipmap-mdpi/ic_launcher_orange.webp
new file mode 100644
index 000000000..cef6d8894
Binary files /dev/null and b/android/app/src/main/res/mipmap-mdpi/ic_launcher_orange.webp differ
diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher_orange_round.webp b/android/app/src/main/res/mipmap-mdpi/ic_launcher_orange_round.webp
new file mode 100644
index 000000000..cef6d8894
Binary files /dev/null and b/android/app/src/main/res/mipmap-mdpi/ic_launcher_orange_round.webp differ
diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
deleted file mode 100644
index 2f7db2d52..000000000
Binary files a/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png and /dev/null differ
diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
deleted file mode 100644
index e5298d2d5..000000000
Binary files a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png and /dev/null differ
diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_black.webp b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_black.webp
new file mode 100644
index 000000000..75c39c855
Binary files /dev/null and b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_black.webp differ
diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_black_round.webp b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_black_round.webp
new file mode 100644
index 000000000..75c39c855
Binary files /dev/null and b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_black_round.webp differ
diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
deleted file mode 100644
index e9d4bfe0a..000000000
Binary files a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png and /dev/null differ
diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp
new file mode 100644
index 000000000..3a9ff36be
Binary files /dev/null and b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp differ
diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_orange.webp b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_orange.webp
new file mode 100644
index 000000000..d68cbe83f
Binary files /dev/null and b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_orange.webp differ
diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_orange_round.webp b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_orange_round.webp
new file mode 100644
index 000000000..d68cbe83f
Binary files /dev/null and b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_orange_round.webp differ
diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
deleted file mode 100644
index bd2e68046..000000000
Binary files a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png and /dev/null differ
diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
deleted file mode 100644
index 6cbc12453..000000000
Binary files a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and /dev/null differ
diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_black.webp b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_black.webp
new file mode 100644
index 000000000..6ffea2482
Binary files /dev/null and b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_black.webp differ
diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_black_round.webp b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_black_round.webp
new file mode 100644
index 000000000..6ffea2482
Binary files /dev/null and b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_black_round.webp differ
diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
deleted file mode 100644
index 537f5d305..000000000
Binary files a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png and /dev/null differ
diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp
new file mode 100644
index 000000000..f7accd244
Binary files /dev/null and b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp differ
diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_orange.webp b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_orange.webp
new file mode 100644
index 000000000..3d47ecaf9
Binary files /dev/null and b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_orange.webp differ
diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_orange_round.webp b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_orange_round.webp
new file mode 100644
index 000000000..3d47ecaf9
Binary files /dev/null and b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_orange_round.webp differ
diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
deleted file mode 100644
index 8f8cdc8e9..000000000
Binary files a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png and /dev/null differ
diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
deleted file mode 100644
index 74b6d0267..000000000
Binary files a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and /dev/null differ
diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_black.webp b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_black.webp
new file mode 100644
index 000000000..c6d24faa3
Binary files /dev/null and b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_black.webp differ
diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_black_round.webp b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_black_round.webp
new file mode 100644
index 000000000..c6d24faa3
Binary files /dev/null and b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_black_round.webp differ
diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
deleted file mode 100644
index 4cc42d68f..000000000
Binary files a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png and /dev/null differ
diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp
new file mode 100644
index 000000000..977fcd7fa
Binary files /dev/null and b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp differ
diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_orange.webp b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_orange.webp
new file mode 100644
index 000000000..030f984f5
Binary files /dev/null and b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_orange.webp differ
diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_orange_round.webp b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_orange_round.webp
new file mode 100644
index 000000000..030f984f5
Binary files /dev/null and b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_orange_round.webp differ
diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
deleted file mode 100644
index 32a631614..000000000
Binary files a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png and /dev/null differ
diff --git a/android/app/src/main/res/playstore-icon.png b/android/app/src/main/res/playstore-icon.png
deleted file mode 100644
index 8facad4e3..000000000
Binary files a/android/app/src/main/res/playstore-icon.png and /dev/null differ
diff --git a/android/app/src/main/res/values/colors.xml b/android/app/src/main/res/values/colors.xml
index 0e79eeebc..fa452eb45 100644
--- a/android/app/src/main/res/values/colors.xml
+++ b/android/app/src/main/res/values/colors.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="black">#000</color>
-    <color name="white">#fff</color>
-</resources>
\ No newline at end of file
+    <color name="black">#000000</color>
+    <color name="brand">#FF4400</color>
+</resources>
diff --git a/android/app/src/main/res/values/styles.xml b/android/app/src/main/res/values/styles.xml
index 589150403..d02fb7716 100644
--- a/android/app/src/main/res/values/styles.xml
+++ b/android/app/src/main/res/values/styles.xml
@@ -1,14 +1,15 @@
-<resources>
-    <!-- Base application theme. -->
+<resources xmlns:tools="http://schemas.android.com/tools">
     <style name="AppTheme" parent="Theme.AppCompat.DayNight.NoActionBar">
-        <!-- Customize your theme here. -->
         <item name="android:editTextBackground">@drawable/rn_edit_text_material</item>
         <item name="android:windowBackground">@color/black</item>
-        <item name="android:navigationBarColor">@color/black</item>
+        <item name="android:navigationBarColor">@color/brand</item>
     </style>
-
-    <style name="AppTheme.Launcher">
-        <item name="android:windowBackground">@drawable/launch_screen</item>
+    
+    <style name="SplashTheme" parent="AppTheme">
+        <item name="android:windowBackground">@drawable/splash_screen</item>
+        <item name="android:statusBarColor" tools:targetApi="m">@color/brand</item>
+        <item name="android:windowLightStatusBar" tools:targetApi="m">true</item>
+        <item name="android:navigationBarColor">@color/black</item>
     </style>
 
     <style name="WindowExitFadeOut">
diff --git a/commitlint.config.js b/commitlint.config.js
index 2619f3682..4748253d4 100644
--- a/commitlint.config.js
+++ b/commitlint.config.js
@@ -7,7 +7,6 @@ module.exports = {
 			[
 				'accounts',
 				'activity',
-				'assets',
 				'backup',
 				'boost',
 				'contacts',
diff --git a/e2e/backup.e2e.js b/e2e/backup.e2e.js
index 7fe560179..358a9ba8d 100644
--- a/e2e/backup.e2e.js
+++ b/e2e/backup.e2e.js
@@ -57,7 +57,6 @@ d('Backup', () => {
 		}
 		// recieve bitcoin
 		await element(by.id('Receive')).tap();
-		await element(by.id('UnderstoodButton')).tap();
 		await sleep(1000); // animation
 		// get address from qrcode
 		await waitFor(element(by.id('QRCode'))).toBeVisible();
@@ -77,7 +76,7 @@ d('Backup', () => {
 
 		// set tag to new tx
 		const tag = 'testtag';
-		await element(by.id('BitcoinAsset')).tap();
+		await element(by.id('ActivitySavings')).tap();
 		await element(by.id('Activity-1')).tap();
 		await element(by.id('ActivityTag')).tap();
 		await element(by.id('TagInput')).replaceText(tag);
@@ -110,7 +109,7 @@ d('Backup', () => {
 		}
 
 		await sleep(1000); // animation
-		await element(by.id('AssetsTitle')).swipe('up');
+		await element(by.id('TransferButton')).swipe('up');
 
 		// add headlines widget
 		await element(by.id('WidgetsAdd')).tap();
@@ -158,7 +157,7 @@ d('Backup', () => {
 		await waitFor(element(by.id('SkipIntro'))).toBeVisible();
 		await element(by.id('SkipIntro')).tap();
 		await element(by.id('RestoreWallet')).tap();
-		await element(by.id('MultipleButton')).tap();
+		await element(by.id('MultipleDevices-button')).tap();
 		await element(by.id('Word-0')).replaceText(seed);
 		await element(by.id('WordIndex-4')).swipe('up');
 		await element(by.id('RestoreButton')).tap();
@@ -168,11 +167,11 @@ d('Backup', () => {
 			.withTimeout(300000); // 5 min
 		await element(by.id('GetStartedButton')).tap();
 
-		// wait for AssetsTitle to appear and be accessible
+		// wait for SuggestionsLabel to appear and be accessible
 		for (let i = 0; i < 60; i++) {
 			await sleep(1000);
 			try {
-				await element(by.id('AssetsTitle')).tap();
+				await element(by.id('SuggestionsLabel')).tap();
 				break;
 			} catch (e) {}
 		}
@@ -183,7 +182,7 @@ d('Backup', () => {
 		).toHaveText('£');
 
 		// check metadata
-		await element(by.id('BitcoinAsset')).tap();
+		await element(by.id('ActivitySavings')).tap();
 		await element(by.id('Activity-1')).tap();
 		await expect(
 			element(by.id(`Tag-${tag}`).withAncestor(by.id('ActivityTags'))),
diff --git a/e2e/channels.e2e.js b/e2e/channels.e2e.js
index 6c37ef39a..265b0d870 100644
--- a/e2e/channels.e2e.js
+++ b/e2e/channels.e2e.js
@@ -68,7 +68,6 @@ d('LN Channel Onboarding', () => {
 
 			// receive BTC
 			await element(by.id('Receive')).tap();
-			await element(by.id('UnderstoodButton')).tap();
 			// get address from qrcode
 			await waitFor(element(by.id('QRCode'))).toBeVisible();
 			await sleep(100); // wait for qr code to render
@@ -85,7 +84,8 @@ d('LN Channel Onboarding', () => {
 			await element(by.id('NewTxPrompt')).swipe('down'); // close Receive screen
 
 			await element(by.id('Suggestion-lightning')).tap();
-			await element(by.id('QuickSetupButton')).tap();
+			await element(by.id('LnIntroduction-button')).tap();
+			await element(by.id('FundTransfer')).tap();
 			// set spending balance to zero
 			await element(by.id('SliderHandle')).swipe('left');
 			const button = element(by.id('QuickSetupContinue'));
@@ -142,9 +142,8 @@ d('LN Channel Onboarding', () => {
 			await waitFor(element(by.id('Suggestion-lightningSettingUp')))
 				.toBeVisible()
 				.withTimeout(10000);
-			await element(by.id('BitcoinAsset')).tap();
 			await element(by.id('TransferButton')).tap();
-			await element(by.id('CustomSetupButton')).tap();
+			await element(by.id('QuickSetupAdvanced')).tap();
 
 			// NumberPad
 			await element(by.id('CustomSetupCustomAmount')).tap();
diff --git a/e2e/helpers.js b/e2e/helpers.js
index 80bc4b0f2..4887a535e 100644
--- a/e2e/helpers.js
+++ b/e2e/helpers.js
@@ -74,20 +74,20 @@ export const completeOnboarding = async () => {
 	await element(by.id('NewWallet')).tap();
 
 	// wait for wallet to be created
-	await waitFor(element(by.id('ToGetStartedClose'))).toBeVisible();
+	await waitFor(element(by.id('WalletOnboardingClose'))).toBeVisible();
 	await sleep(1000); // take app some time to load
 
 	// try for 3min before fail
 	for (let i = 0; i < 180; i++) {
 		await sleep(1000);
 		try {
-			await element(by.id('ToGetStartedClose')).tap();
+			await element(by.id('WalletOnboardingClose')).tap();
 			await sleep(3000); // wait for redux-persist to save state
 			return;
 		} catch (e) {}
 	}
 
-	throw new Error('Tapping "ToGetStartedClose" timeout');
+	throw new Error('Tapping "WalletOnboardingClose" timeout');
 };
 
 export const launchAndWait = async () => {
@@ -97,13 +97,13 @@ export const launchAndWait = async () => {
 		permissions: { faceid: 'YES', camera: 'YES' },
 	});
 
-	// wait for AssetsTitle to appear and be accessible
-	await waitFor(element(by.id('AssetsTitle')))
+	// wait for SuggestionsLabel to appear and be accessible
+	await waitFor(element(by.id('SuggestionsLabel')))
 		.toBeVisible()
 		.withTimeout(300000); // 5 min
 	for (let i = 0; i < 60; i++) {
 		try {
-			await element(by.id('AssetsTitle')).tap();
+			await element(by.id('SuggestionsLabel')).tap();
 			await sleep(1000);
 			break;
 		} catch (e) {
diff --git a/e2e/lightning.e2e.js b/e2e/lightning.e2e.js
index b69ef8854..3e125c1e8 100644
--- a/e2e/lightning.e2e.js
+++ b/e2e/lightning.e2e.js
@@ -153,9 +153,6 @@ d('Lightning', () => {
 
 			// send funds to LDK, 0 invoice
 			await element(by.id('Receive')).tap();
-			try {
-				await element(by.id('UnderstoodButton')).tap();
-			} catch (e) {}
 			let { label: invoice1 } = await element(by.id('QRCode')).getAttributes();
 			invoice1 = invoice1.replaceAll(/bitcoin.*=/gi, '').toLowerCase();
 			await lnd.sendPaymentSync({ paymentRequest: invoice1, amt: 50000 });
@@ -253,7 +250,7 @@ d('Lightning', () => {
 				.withTimeout(10000);
 
 			// check tx history
-			await element(by.id('AssetsTitle')).swipe('up');
+			await element(by.id('TransferButton')).swipe('up');
 			await expect(
 				element(by.text('1 000').withAncestor(by.id('ActivityShort-1'))),
 			).toBeVisible();
@@ -360,7 +357,7 @@ d('Lightning', () => {
 			await waitFor(element(by.id('SkipIntro'))).toBeVisible();
 			await element(by.id('SkipIntro')).tap();
 			await element(by.id('RestoreWallet')).tap();
-			await element(by.id('MultipleButton')).tap();
+			await element(by.id('MultipleDevices-button')).tap();
 			await element(by.id('Word-0')).replaceText(seed);
 			await element(by.id('WordIndex-4')).swipe('up');
 			await element(by.id('RestoreButton')).tap();
@@ -370,11 +367,11 @@ d('Lightning', () => {
 				.withTimeout(300000); // 5 min
 			await element(by.id('GetStartedButton')).tap();
 
-			// wait for AssetsTitle to appear and be accessible
+			// wait for SuggestionsLabel to appear and be accessible
 			for (let i = 0; i < 60; i++) {
 				await sleep(1000);
 				try {
-					await element(by.id('AssetsTitle')).tap();
+					await element(by.id('SuggestionsLabel')).tap();
 					break;
 				} catch (e) {}
 			}
@@ -387,7 +384,7 @@ d('Lightning', () => {
 				.withTimeout(10000);
 
 			// check tx history
-			await element(by.id('AssetsTitle')).swipe('up');
+			await element(by.id('TransferButton')).swipe('up');
 			await expect(
 				element(by.text('111').withAncestor(by.id('ActivityShort-2'))),
 			).toBeVisible();
diff --git a/e2e/numberpad.e2e.js b/e2e/numberpad.e2e.js
index 471b8b9a1..dc406ffad 100644
--- a/e2e/numberpad.e2e.js
+++ b/e2e/numberpad.e2e.js
@@ -3,7 +3,6 @@ import {
 	markComplete,
 	completeOnboarding,
 	launchAndWait,
-	isVisible,
 } from './helpers';
 
 const d = checkComplete(['numberpad-modern', 'numberpad-classic'])
@@ -39,7 +38,6 @@ d('NumberPad', () => {
 		}
 
 		await element(by.id('Receive')).tap();
-		await element(by.id('UnderstoodButton')).tap();
 		await element(by.id('SpecifyInvoiceButton')).tap();
 		await element(by.id('ReceiveNumberPadTextField')).tap();
 
@@ -94,9 +92,6 @@ d('NumberPad', () => {
 		await element(by.id('NavigationClose')).tap();
 
 		await element(by.id('Receive')).tap();
-		if (await isVisible('UnderstoodButton')) {
-			await element(by.id('UnderstoodButton')).tap();
-		}
 		await element(by.id('SpecifyInvoiceButton')).tap();
 		await element(by.id('ReceiveNumberPadTextField')).tap();
 
diff --git a/e2e/onboarding.e2e.js b/e2e/onboarding.e2e.js
index f19782cdc..22e2bf80a 100644
--- a/e2e/onboarding.e2e.js
+++ b/e2e/onboarding.e2e.js
@@ -22,13 +22,12 @@ d('Onboarding', () => {
 		await waitFor(element(by.id('Check1'))).toBeVisible();
 		await element(by.id('Check1')).tap();
 		await element(by.id('Check2')).tap();
-		// await element(by.id('TOS')).scrollTo('bottom'); // taking too long
 		await element(by.id('Continue')).tap();
 		await element(by.id('GetStarted')).tap();
+		await element(by.id('Slide0')).swipe('left');
 		await element(by.id('Slide1')).swipe('left');
 		await element(by.id('Slide2')).swipe('left');
 		await element(by.id('Slide3')).swipe('right');
-		await element(by.id('Slide2')).swipe('left');
 		await element(by.id('SkipButton')).tap();
 
 		// create new wallet with passphrase
@@ -38,20 +37,20 @@ d('Onboarding', () => {
 		await element(by.id('CreateNewWallet')).tap();
 
 		// wait for wallet to be created
-		await waitFor(element(by.id('ToGetStartedClose'))).toBeVisible();
+		await waitFor(element(by.id('WalletOnboardingClose'))).toBeVisible();
 		await sleep(1000); // take app some time to load
 
 		// try for 3min before fail
 		for (let i = 0; i < 180; i++) {
 			await sleep(1000);
 			try {
-				await element(by.id('ToGetStartedClose')).tap();
+				await element(by.id('WalletOnboardingClose')).tap();
 				await sleep(3000); // wait for redux-persist to save state
 				break;
 			} catch (e) {}
 
 			if (i === 179) {
-				throw new Error('Tapping "ToGetStartedClose" timeout');
+				throw new Error('Tapping "WalletOnboardingClose" timeout');
 			}
 		}
 
@@ -70,7 +69,6 @@ d('Onboarding', () => {
 
 		// get receing address
 		await element(by.id('Receive')).tap();
-		await element(by.id('UnderstoodButton')).tap();
 		await waitFor(element(by.id('QRCode')))
 			.toBeVisible()
 			.withTimeout(30000);
@@ -87,7 +85,7 @@ d('Onboarding', () => {
 		await waitFor(element(by.id('SkipIntro'))).toBeVisible();
 		await element(by.id('SkipIntro')).tap();
 		await element(by.id('RestoreWallet')).tap();
-		await element(by.id('MultipleButton')).tap();
+		await element(by.id('MultipleDevices-button')).tap();
 		await element(by.id('Word-0')).replaceText(seed);
 		await element(by.id('WordIndex-4')).swipe('up');
 		await element(by.id('AdvancedButton')).tap();
@@ -100,20 +98,17 @@ d('Onboarding', () => {
 			.withTimeout(300000); // 5 min
 		await element(by.id('GetStartedButton')).tap();
 
-		// wait for AssetsTitle to appear and be accessible
+		// wait for SuggestionsLabel to appear and be accessible
 		for (let i = 0; i < 60; i++) {
 			await sleep(1000);
 			try {
-				await element(by.id('AssetsTitle')).tap();
+				await element(by.id('SuggestionsLabel')).tap();
 				break;
 			} catch (e) {}
 		}
 
 		// get receing address
 		await element(by.id('Receive')).tap();
-		try {
-			await element(by.id('UnderstoodButton')).tap();
-		} catch (e) {}
 		await waitFor(element(by.id('QRCode')))
 			.toBeVisible()
 			.withTimeout(30000);
diff --git a/e2e/onchain.e2e.js b/e2e/onchain.e2e.js
index f5372a047..c6466c7fc 100644
--- a/e2e/onchain.e2e.js
+++ b/e2e/onchain.e2e.js
@@ -61,11 +61,6 @@ d('Onchain', () => {
 
 			for (let i = 0; i < 2; i++) {
 				await element(by.id('Receive')).tap();
-				if (i === 0) {
-					try {
-						await element(by.id('UnderstoodButton')).tap();
-					} catch (e) {}
-				}
 				await sleep(1000); // animation
 				// get address from qrcode
 				let { label: wAddress } = await element(
@@ -149,7 +144,7 @@ d('Onchain', () => {
 			).toHaveText('0');
 
 			// check Activity
-			await element(by.id('AssetsTitle')).swipe('up');
+			await element(by.id('TransferButton')).swipe('up');
 			await expect(element(by.id('ActivityShort-1'))).toBeVisible();
 			await expect(element(by.id('ActivityShort-2'))).toBeVisible();
 			await expect(element(by.id('ActivityShort-3'))).toBeVisible();
@@ -235,9 +230,6 @@ d('Onchain', () => {
 			}
 
 			await element(by.id('Receive')).tap();
-			try {
-				await element(by.id('UnderstoodButton')).tap();
-			} catch (e) {}
 			await sleep(1000); // animation
 			// get address from qrcode
 			await waitFor(element(by.id('QRCode'))).toBeVisible();
@@ -318,7 +310,7 @@ d('Onchain', () => {
 			).toHaveText('0');
 
 			// check number of outputs for send tx
-			await element(by.id('AssetsTitle')).swipe('up');
+			await element(by.id('TransferButton')).swipe('up');
 			await expect(element(by.id('ActivityShort-1'))).toBeVisible();
 			await expect(element(by.id('ActivityShort-2'))).toBeVisible();
 			await element(by.id('ActivityShowAll')).tap();
diff --git a/e2e/receive.e2e.js b/e2e/receive.e2e.js
index 0475ee9b3..cc126d578 100644
--- a/e2e/receive.e2e.js
+++ b/e2e/receive.e2e.js
@@ -44,7 +44,6 @@ d('Receive', () => {
 		}
 
 		await element(by.id('Receive')).tap();
-		await element(by.id('UnderstoodButton')).tap();
 		await sleep(1000); // animation
 		// await element(by.id('ReceiveCopyQR')).tap();
 		// await waitFor(element(by.id('ReceiveTooltip1')))
diff --git a/e2e/security.e2e.js b/e2e/security.e2e.js
index c40d3b599..d615f351b 100644
--- a/e2e/security.e2e.js
+++ b/e2e/security.e2e.js
@@ -121,9 +121,6 @@ d('Settings Security And Privacy', () => {
 
 		// receive
 		await element(by.id('Receive')).tap();
-		try {
-			await element(by.id('UnderstoodButton')).tap();
-		} catch (e) {}
 		await sleep(100);
 		// get address from qrcode
 		await waitFor(element(by.id('QRCode'))).toBeVisible();
diff --git a/e2e/settings.e2e.js b/e2e/settings.e2e.js
index a876ef5ed..4a9433c77 100644
--- a/e2e/settings.e2e.js
+++ b/e2e/settings.e2e.js
@@ -173,7 +173,6 @@ d('Settings', () => {
 			// open receive tags, add a tag
 			const tag = 'test123';
 			await element(by.id('Receive')).tap();
-			await element(by.id('UnderstoodButton')).tap();
 			await element(by.id('SpecifyInvoiceButton')).tap();
 			await expect(element(by.text(tag))).not.toBeVisible();
 			await element(by.id('TagsAdd')).tap();
@@ -203,16 +202,14 @@ d('Settings', () => {
 		});
 
 		d('About', () => {
-			it('Can show EasterEgg screen', async () => {
+			it('Can show About screen', async () => {
 				if (checkComplete('settings-about')) {
 					return;
 				}
 
-				// no tags, menu entry should be hidden
 				await element(by.id('Settings')).tap();
 				await element(by.id('About')).tap();
-				await element(by.id('Logo')).tap();
-				await expect(element(by.id('EasterEgg'))).toBeVisible();
+				await expect(element(by.id('AboutLogo'))).toBeVisible();
 
 				markComplete('settings-about');
 			});
@@ -310,9 +307,6 @@ d('Settings', () => {
 			// wallet be in regtest mode by default
 			// at first check if it is Native segwit by default
 			await element(by.id('Receive')).tap();
-			try {
-				await element(by.id('UnderstoodButton')).tap();
-			} catch (e) {}
 			await waitFor(element(by.id('QRCode')))
 				.toBeVisible()
 				.withTimeout(30000);
@@ -443,7 +437,7 @@ d('Settings', () => {
 			// enter wrong electrum server address
 			await element(by.id('HostInput')).replaceText('google.com');
 			await element(by.id('PortInput')).replaceText('31337');
-			await element(by.id('Status')).tap(); // close keyboard
+			await element(by.id('ElectrumStatus')).tap(); // close keyboard
 			await element(by.id('ConnectToHost')).tap();
 
 			// disconnected warning should appear
@@ -534,7 +528,7 @@ d('Settings', () => {
 
 			const alteredRelay = origRelay + '/';
 			await element(by.id('UrlInput')).replaceText(alteredRelay);
-			await element(by.id('Status')).tap(); // close keyboard
+			await element(by.id('WebRelayStatus')).tap(); // close keyboard
 			await element(by.id('ConnectToUrl')).tap();
 			await sleep(1000);
 
@@ -547,7 +541,7 @@ d('Settings', () => {
 
 			// now change it back
 			await element(by.id('UrlInput')).replaceText(origRelay);
-			await element(by.id('Status')).tap(); // close keyboard
+			await element(by.id('WebRelayStatus')).tap(); // close keyboard
 			await element(by.id('ConnectToUrl')).tap();
 
 			markComplete('settings-webrelay');
diff --git a/e2e/slashtags.e2e.js b/e2e/slashtags.e2e.js
index 4c9ecebcc..40f38e297 100644
--- a/e2e/slashtags.e2e.js
+++ b/e2e/slashtags.e2e.js
@@ -102,7 +102,7 @@ d('Profile and Contacts', () => {
 
 			await element(by.id('ProfileSaveButton')).tap();
 			await element(by.id('OnboardingContinue')).tap();
-			await expect(element(by.text('TestName'))).toExist();
+			await expect(element(by.text('TESTNAME'))).toExist();
 			await expect(element(by.text('Testing Bitkit for sats'))).toExist();
 			await element(by.id('CopyButton')).tap();
 			const { label: slashtagsUrl } = await element(
@@ -116,13 +116,13 @@ d('Profile and Contacts', () => {
 			await element(by.id('BioInput')).tapReturnKey();
 			await element(by.id('RemoveLinkButton')).atIndex(0).tap();
 			await element(by.id('ProfileSaveButton')).tap();
-			await expect(element(by.text('NewTestName'))).toExist();
+			await expect(element(by.text('NEWTESTNAME'))).toExist();
 			await expect(element(by.text('Still testing Bitkit'))).toExist();
 			await element(by.id('NavigationClose')).tap();
 
 			// ADD CONTACTS
 			await element(by.id('HeaderContactsButton')).tap();
-			await element(by.id('ContactsOnboardingButton')).tap();
+			await element(by.id('ContactsOnboarding-button')).tap();
 
 			// self
 			await element(by.id('AddContact')).tap();
@@ -158,7 +158,7 @@ d('Profile and Contacts', () => {
 			await expect(element(by.text(hal.name1))).toExist();
 			await element(by.id('NameInput')).replaceText(hal.name2);
 			await element(by.id('SaveContactButton')).tap();
-			await expect(element(by.text(hal.name2))).toExist();
+			await expect(element(by.text(hal.name2.toUpperCase()))).toExist();
 			await element(by.id('NavigationClose')).tap();
 
 			// FILTER CONTACTS
@@ -182,7 +182,6 @@ d('Profile and Contacts', () => {
 
 			// RECEIVE MONEY AND ATTACH CONTACT TO THE TRANSACTION
 			await element(by.id('Receive')).tap();
-			await element(by.id('UnderstoodButton')).tap();
 			await sleep(1000);
 			await waitFor(element(by.id('QRCode'))).toBeVisible();
 			await sleep(100); // wait for qr code to render
@@ -195,7 +194,7 @@ d('Profile and Contacts', () => {
 				.toBeVisible()
 				.withTimeout(10000);
 			await element(by.id('NewTxPrompt')).swipe('down');
-			await element(by.id('BitcoinAsset')).tap();
+			await element(by.id('ActivitySavings')).tap();
 			await element(by.id('Activity-1')).tap();
 			await element(by.id('ActivityAssign')).tap();
 			await element(by.text(satoshi.name)).tap();
@@ -230,7 +229,7 @@ d('Profile and Contacts', () => {
 			await waitFor(element(by.id('SkipIntro'))).toBeVisible();
 			await element(by.id('SkipIntro')).tap();
 			await element(by.id('RestoreWallet')).tap();
-			await element(by.id('MultipleButton')).tap();
+			await element(by.id('MultipleDevices-button')).tap();
 			await element(by.id('Word-0')).replaceText(seed);
 			await element(by.id('WordIndex-4')).swipe('up');
 			await element(by.id('RestoreButton')).tap();
@@ -240,11 +239,11 @@ d('Profile and Contacts', () => {
 				.withTimeout(300000); // 5 min
 			await element(by.id('GetStartedButton')).tap();
 
-			// wait for AssetsTitle to appear and be accessible
+			// wait for SuggestionsLabel to appear and be accessible
 			for (let i = 0; i < 60; i++) {
 				await sleep(1000);
 				try {
-					await element(by.id('AssetsTitle')).tap();
+					await element(by.id('SuggestionsLabel')).tap();
 					break;
 				} catch (e) {}
 			}
@@ -258,7 +257,7 @@ d('Profile and Contacts', () => {
 			await expect(element(by.text(satoshi.name))).toBeVisible();
 			await element(by.id('NavigationClose')).tap();
 
-			await element(by.id('BitcoinAsset')).tap();
+			await element(by.id('ActivitySavings')).tap();
 			await element(by.id('Activity-1')).tap();
 			await expect(
 				element(by.text(satoshi.name).withAncestor(by.id('ContactSmall'))),
diff --git a/ios/Podfile.lock b/ios/Podfile.lock
index 92c6dba3a..863387e43 100644
--- a/ios/Podfile.lock
+++ b/ios/Podfile.lock
@@ -969,8 +969,6 @@ PODS:
     - glog
     - RCT-Folly (= 2022.05.16.00)
     - React-Core
-  - react-native-keep-awake (1.2.3):
-    - React-Core
   - react-native-ldk (0.0.137):
     - React
   - react-native-mmkv (2.12.2):
@@ -1290,7 +1288,6 @@ DEPENDENCIES:
   - "react-native-blur (from `../node_modules/@react-native-community/blur`)"
   - react-native-flipper (from `../node_modules/react-native-flipper`)
   - react-native-image-picker (from `../node_modules/react-native-image-picker`)
-  - "react-native-keep-awake (from `../node_modules/@sayem314/react-native-keep-awake`)"
   - "react-native-ldk (from `../node_modules/@synonymdev/react-native-ldk`)"
   - react-native-mmkv (from `../node_modules/react-native-mmkv`)
   - "react-native-netinfo (from `../node_modules/@react-native-community/netinfo`)"
@@ -1431,8 +1428,6 @@ EXTERNAL SOURCES:
     :path: "../node_modules/react-native-flipper"
   react-native-image-picker:
     :path: "../node_modules/react-native-image-picker"
-  react-native-keep-awake:
-    :path: "../node_modules/@sayem314/react-native-keep-awake"
   react-native-ldk:
     :path: "../node_modules/@synonymdev/react-native-ldk"
   react-native-mmkv:
@@ -1583,7 +1578,6 @@ SPEC CHECKSUMS:
   react-native-blur: 799045500f56146afc46245148080e7b7623cb75
   react-native-flipper: 9c1957af24b76493ba74f46d000a5c1d485e7731
   react-native-image-picker: d3db110a3ded6e48c93aef7e8e51afdde8b16ed0
-  react-native-keep-awake: 5cfb49d1b2ee4321b2ffbc651e2d6d64d6f66772
   react-native-ldk: a292b13294c179e89a922ae7b357ace4f34b3a7f
   react-native-mmkv: 1fdc81aa70c1aba09370718e6a63a09cbbbac8d2
   react-native-netinfo: bdb108d340cdb41875c9ced535977cac6d2ff321
diff --git a/ios/bitkit.xcodeproj/project.pbxproj b/ios/bitkit.xcodeproj/project.pbxproj
index efe31552d..ff4e3a5ac 100644
--- a/ios/bitkit.xcodeproj/project.pbxproj
+++ b/ios/bitkit.xcodeproj/project.pbxproj
@@ -8,16 +8,19 @@
 
 /* Begin PBXBuildFile section */
 		00E356F31AD99517003FC87E /* bitkitTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 00E356F21AD99517003FC87E /* bitkitTests.m */; };
-		0C3BE42B6E57212AE3790E47 /* libPods-bitkit-bitkitTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 9CB5FA599FAB3F15AE54641A /* libPods-bitkit-bitkitTests.a */; };
 		13B07FBC1A68108700A75B9A /* AppDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.mm */; };
 		13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; };
 		13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
-		3F36804C40B472512FE81062 /* libPods-bitkit.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 9B423FBD5B1457FDEBCFD285 /* libPods-bitkit.a */; };
-		777F5BE129EDEB75005E0E4B /* InterTight-Bold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 777F5BDD29EDEB75005E0E4B /* InterTight-Bold.ttf */; };
-		777F5BE229EDEB75005E0E4B /* InterTight-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 777F5BDE29EDEB75005E0E4B /* InterTight-Regular.ttf */; };
-		777F5BE329EDEB75005E0E4B /* InterTight-SemiBold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 777F5BDF29EDEB75005E0E4B /* InterTight-SemiBold.ttf */; };
-		777F5BE429EDEB75005E0E4B /* InterTight-Medium.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 777F5BE029EDEB75005E0E4B /* InterTight-Medium.ttf */; };
+		17074219BB5847259EAFC7A6 /* InterTight-Black.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 3815D562618543E7A9BC191E /* InterTight-Black.ttf */; };
+		25C94F90770CE34661BE3B9B /* libPods-bitkit.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 8FABDE698598D7C0B49C15F6 /* libPods-bitkit.a */; };
+		45040963F6F2299E644A4858 /* libPods-bitkit-bitkitTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 0F0FD89E4FBED1EFC6F3996C /* libPods-bitkit-bitkitTests.a */; };
+		57072143CA0F49089AE64F61 /* InterTight-ExtraBold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = A223BA795CEB4CB2B344FBAF /* InterTight-ExtraBold.ttf */; };
+		6980B602E6DC4429841BE5EE /* InterTight-Medium.ttf in Resources */ = {isa = PBXBuildFile; fileRef = D67AECF5F543462F90EC89AD /* InterTight-Medium.ttf */; };
 		81AB9BB82411601600AC10FF /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */; };
+		8BD8301E3A1B44DDA3C8A10D /* Damion-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = DEC74C5375A34FFCAEBA0781 /* Damion-Regular.ttf */; };
+		925570EA7B1D43CC8AD07B91 /* InterTight-Bold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = CA37793F82F144678099A00D /* InterTight-Bold.ttf */; };
+		9952E811473D46FB9003A56D /* InterTight-SemiBold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 50A8DA09F2974D05A3C58E87 /* InterTight-SemiBold.ttf */; };
+		B3BE07A9843E4B7DA375B877 /* InterTight-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 79DFAC55B0D745DE815EC2E0 /* InterTight-Regular.ttf */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -34,23 +37,26 @@
 		00E356EE1AD99517003FC87E /* bitkitTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = bitkitTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
 		00E356F11AD99517003FC87E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		00E356F21AD99517003FC87E /* bitkitTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = bitkitTests.m; sourceTree = "<group>"; };
-		08DBBB8A007C1DF53754E440 /* Pods-bitkit-bitkitTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-bitkit-bitkitTests.debug.xcconfig"; path = "Target Support Files/Pods-bitkit-bitkitTests/Pods-bitkit-bitkitTests.debug.xcconfig"; sourceTree = "<group>"; };
-		0D170AD7FD6D2BF3E391284F /* Pods-bitkit.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-bitkit.release.xcconfig"; path = "Target Support Files/Pods-bitkit/Pods-bitkit.release.xcconfig"; sourceTree = "<group>"; };
+		0397659F08BB3516D5CB0030 /* Pods-bitkit.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-bitkit.release.xcconfig"; path = "Target Support Files/Pods-bitkit/Pods-bitkit.release.xcconfig"; sourceTree = "<group>"; };
+		0F0FD89E4FBED1EFC6F3996C /* libPods-bitkit-bitkitTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-bitkit-bitkitTests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
 		13B07F961A680F5B00A75B9A /* bitkit.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = bitkit.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		13B07FAF1A68108700A75B9A /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = bitkit/AppDelegate.h; sourceTree = "<group>"; };
 		13B07FB01A68108700A75B9A /* AppDelegate.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = AppDelegate.mm; path = bitkit/AppDelegate.mm; sourceTree = "<group>"; };
 		13B07FB51A68108700A75B9A /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = bitkit/Images.xcassets; sourceTree = "<group>"; };
 		13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = bitkit/Info.plist; sourceTree = "<group>"; };
 		13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = bitkit/main.m; sourceTree = "<group>"; };
-		1D30294C57A498108B9A3E67 /* Pods-bitkit.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-bitkit.debug.xcconfig"; path = "Target Support Files/Pods-bitkit/Pods-bitkit.debug.xcconfig"; sourceTree = "<group>"; };
-		777F5BDD29EDEB75005E0E4B /* InterTight-Bold.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "InterTight-Bold.ttf"; sourceTree = "<group>"; };
-		777F5BDE29EDEB75005E0E4B /* InterTight-Regular.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "InterTight-Regular.ttf"; sourceTree = "<group>"; };
-		777F5BDF29EDEB75005E0E4B /* InterTight-SemiBold.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "InterTight-SemiBold.ttf"; sourceTree = "<group>"; };
-		777F5BE029EDEB75005E0E4B /* InterTight-Medium.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "InterTight-Medium.ttf"; sourceTree = "<group>"; };
+		3698153164D8DFAFA76D38DD /* Pods-bitkit-bitkitTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-bitkit-bitkitTests.debug.xcconfig"; path = "Target Support Files/Pods-bitkit-bitkitTests/Pods-bitkit-bitkitTests.debug.xcconfig"; sourceTree = "<group>"; };
+		3815D562618543E7A9BC191E /* InterTight-Black.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "InterTight-Black.ttf"; path = "../src/assets/fonts/InterTight-Black.ttf"; sourceTree = "<group>"; };
+		50A8DA09F2974D05A3C58E87 /* InterTight-SemiBold.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "InterTight-SemiBold.ttf"; path = "../src/assets/fonts/InterTight-SemiBold.ttf"; sourceTree = "<group>"; };
+		5F085106A897CC7123F2F45D /* Pods-bitkit-bitkitTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-bitkit-bitkitTests.release.xcconfig"; path = "Target Support Files/Pods-bitkit-bitkitTests/Pods-bitkit-bitkitTests.release.xcconfig"; sourceTree = "<group>"; };
+		79DFAC55B0D745DE815EC2E0 /* InterTight-Regular.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "InterTight-Regular.ttf"; path = "../src/assets/fonts/InterTight-Regular.ttf"; sourceTree = "<group>"; };
+		7B577893483C4F5E28AA0989 /* Pods-bitkit.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-bitkit.debug.xcconfig"; path = "Target Support Files/Pods-bitkit/Pods-bitkit.debug.xcconfig"; sourceTree = "<group>"; };
 		81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = LaunchScreen.storyboard; path = bitkit/LaunchScreen.storyboard; sourceTree = "<group>"; };
-		9B423FBD5B1457FDEBCFD285 /* libPods-bitkit.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-bitkit.a"; sourceTree = BUILT_PRODUCTS_DIR; };
-		9CB5FA599FAB3F15AE54641A /* libPods-bitkit-bitkitTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-bitkit-bitkitTests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
-		BE8D0D5953F4B99400147E43 /* Pods-bitkit-bitkitTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-bitkit-bitkitTests.release.xcconfig"; path = "Target Support Files/Pods-bitkit-bitkitTests/Pods-bitkit-bitkitTests.release.xcconfig"; sourceTree = "<group>"; };
+		8FABDE698598D7C0B49C15F6 /* libPods-bitkit.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-bitkit.a"; sourceTree = BUILT_PRODUCTS_DIR; };
+		A223BA795CEB4CB2B344FBAF /* InterTight-ExtraBold.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "InterTight-ExtraBold.ttf"; path = "../src/assets/fonts/InterTight-ExtraBold.ttf"; sourceTree = "<group>"; };
+		CA37793F82F144678099A00D /* InterTight-Bold.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "InterTight-Bold.ttf"; path = "../src/assets/fonts/InterTight-Bold.ttf"; sourceTree = "<group>"; };
+		D67AECF5F543462F90EC89AD /* InterTight-Medium.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "InterTight-Medium.ttf"; path = "../src/assets/fonts/InterTight-Medium.ttf"; sourceTree = "<group>"; };
+		DEC74C5375A34FFCAEBA0781 /* Damion-Regular.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "Damion-Regular.ttf"; path = "../src/assets/fonts/Damion-Regular.ttf"; sourceTree = "<group>"; };
 		ED297162215061F000B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; };
 /* End PBXFileReference section */
 
@@ -59,7 +65,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				0C3BE42B6E57212AE3790E47 /* libPods-bitkit-bitkitTests.a in Frameworks */,
+				45040963F6F2299E644A4858 /* libPods-bitkit-bitkitTests.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -67,7 +73,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				3F36804C40B472512FE81062 /* libPods-bitkit.a in Frameworks */,
+				25C94F90770CE34661BE3B9B /* libPods-bitkit.a in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -108,8 +114,8 @@
 			isa = PBXGroup;
 			children = (
 				ED297162215061F000B7C4FE /* JavaScriptCore.framework */,
-				9B423FBD5B1457FDEBCFD285 /* libPods-bitkit.a */,
-				9CB5FA599FAB3F15AE54641A /* libPods-bitkit-bitkitTests.a */,
+				8FABDE698598D7C0B49C15F6 /* libPods-bitkit.a */,
+				0F0FD89E4FBED1EFC6F3996C /* libPods-bitkit-bitkitTests.a */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";
@@ -117,10 +123,6 @@
 		77BFF90929C3932F000E7921 /* fonts */ = {
 			isa = PBXGroup;
 			children = (
-				777F5BDD29EDEB75005E0E4B /* InterTight-Bold.ttf */,
-				777F5BE029EDEB75005E0E4B /* InterTight-Medium.ttf */,
-				777F5BDE29EDEB75005E0E4B /* InterTight-Regular.ttf */,
-				777F5BDF29EDEB75005E0E4B /* InterTight-SemiBold.ttf */,
 			);
 			name = fonts;
 			path = ../src/assets/fonts;
@@ -143,6 +145,7 @@
 				83CBBA001A601CBA00E9B192 /* Products */,
 				2D16E6871FA4F8E400B85C8A /* Frameworks */,
 				BBD78D7AC51CEA395F1C20DB /* Pods */,
+				ABDF0989A32947C490AA709C /* Resources */,
 			);
 			indentWidth = 2;
 			sourceTree = "<group>";
@@ -158,13 +161,27 @@
 			name = Products;
 			sourceTree = "<group>";
 		};
+		ABDF0989A32947C490AA709C /* Resources */ = {
+			isa = PBXGroup;
+			children = (
+				DEC74C5375A34FFCAEBA0781 /* Damion-Regular.ttf */,
+				3815D562618543E7A9BC191E /* InterTight-Black.ttf */,
+				CA37793F82F144678099A00D /* InterTight-Bold.ttf */,
+				A223BA795CEB4CB2B344FBAF /* InterTight-ExtraBold.ttf */,
+				D67AECF5F543462F90EC89AD /* InterTight-Medium.ttf */,
+				79DFAC55B0D745DE815EC2E0 /* InterTight-Regular.ttf */,
+				50A8DA09F2974D05A3C58E87 /* InterTight-SemiBold.ttf */,
+			);
+			name = Resources;
+			sourceTree = "<group>";
+		};
 		BBD78D7AC51CEA395F1C20DB /* Pods */ = {
 			isa = PBXGroup;
 			children = (
-				1D30294C57A498108B9A3E67 /* Pods-bitkit.debug.xcconfig */,
-				0D170AD7FD6D2BF3E391284F /* Pods-bitkit.release.xcconfig */,
-				08DBBB8A007C1DF53754E440 /* Pods-bitkit-bitkitTests.debug.xcconfig */,
-				BE8D0D5953F4B99400147E43 /* Pods-bitkit-bitkitTests.release.xcconfig */,
+				7B577893483C4F5E28AA0989 /* Pods-bitkit.debug.xcconfig */,
+				0397659F08BB3516D5CB0030 /* Pods-bitkit.release.xcconfig */,
+				3698153164D8DFAFA76D38DD /* Pods-bitkit-bitkitTests.debug.xcconfig */,
+				5F085106A897CC7123F2F45D /* Pods-bitkit-bitkitTests.release.xcconfig */,
 			);
 			path = Pods;
 			sourceTree = "<group>";
@@ -176,12 +193,12 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 00E357021AD99517003FC87E /* Build configuration list for PBXNativeTarget "bitkitTests" */;
 			buildPhases = (
-				30FC021FFE00FC292533FB19 /* [CP] Check Pods Manifest.lock */,
+				93BF275B8EF686A65E1965A8 /* [CP] Check Pods Manifest.lock */,
 				00E356EA1AD99517003FC87E /* Sources */,
 				00E356EB1AD99517003FC87E /* Frameworks */,
 				00E356EC1AD99517003FC87E /* Resources */,
-				E72ED9E13109D01AC94F17BC /* [CP] Embed Pods Frameworks */,
-				1E2E04047525F36159E70A51 /* [CP] Copy Pods Resources */,
+				E2631D5480A724D7D95AAF06 /* [CP] Embed Pods Frameworks */,
+				DFD90A321FB9228E397ACF43 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -197,13 +214,13 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 13B07F931A680F5B00A75B9A /* Build configuration list for PBXNativeTarget "bitkit" */;
 			buildPhases = (
-				8BEF0EDB7500F21D8EAAE02F /* [CP] Check Pods Manifest.lock */,
+				70807D8D4548EFBE92EF6943 /* [CP] Check Pods Manifest.lock */,
 				13B07F871A680F5B00A75B9A /* Sources */,
 				13B07F8C1A680F5B00A75B9A /* Frameworks */,
 				13B07F8E1A680F5B00A75B9A /* Resources */,
 				00DD1BFF1BD5951E006B06BC /* Bundle React Native code and images */,
-				83053CBEACF036754DFBB943 /* [CP] Embed Pods Frameworks */,
-				8BF85E0181BDC12D10C9859C /* [CP] Copy Pods Resources */,
+				896233BCF3A1B1C96A72868F /* [CP] Embed Pods Frameworks */,
+				697A1C78FD271B5747EC1875 /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -262,12 +279,15 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				777F5BE329EDEB75005E0E4B /* InterTight-SemiBold.ttf in Resources */,
 				81AB9BB82411601600AC10FF /* LaunchScreen.storyboard in Resources */,
-				777F5BE229EDEB75005E0E4B /* InterTight-Regular.ttf in Resources */,
-				777F5BE129EDEB75005E0E4B /* InterTight-Bold.ttf in Resources */,
 				13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */,
-				777F5BE429EDEB75005E0E4B /* InterTight-Medium.ttf in Resources */,
+				8BD8301E3A1B44DDA3C8A10D /* Damion-Regular.ttf in Resources */,
+				17074219BB5847259EAFC7A6 /* InterTight-Black.ttf in Resources */,
+				925570EA7B1D43CC8AD07B91 /* InterTight-Bold.ttf in Resources */,
+				57072143CA0F49089AE64F61 /* InterTight-ExtraBold.ttf in Resources */,
+				6980B602E6DC4429841BE5EE /* InterTight-Medium.ttf in Resources */,
+				B3BE07A9843E4B7DA375B877 /* InterTight-Regular.ttf in Resources */,
+				9952E811473D46FB9003A56D /* InterTight-SemiBold.ttf in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -290,24 +310,24 @@
 			shellPath = /bin/sh;
 			shellScript = "set -e\n\nWITH_ENVIRONMENT=\"../node_modules/react-native/scripts/xcode/with-environment.sh\"\nREACT_NATIVE_XCODE=\"../node_modules/react-native/scripts/react-native-xcode.sh\"\n\n/bin/sh -c \"$WITH_ENVIRONMENT $REACT_NATIVE_XCODE\"\n";
 		};
-		1E2E04047525F36159E70A51 /* [CP] Copy Pods Resources */ = {
+		697A1C78FD271B5747EC1875 /* [CP] Copy Pods Resources */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-bitkit-bitkitTests/Pods-bitkit-bitkitTests-resources-${CONFIGURATION}-input-files.xcfilelist",
+				"${PODS_ROOT}/Target Support Files/Pods-bitkit/Pods-bitkit-resources-${CONFIGURATION}-input-files.xcfilelist",
 			);
 			name = "[CP] Copy Pods Resources";
 			outputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-bitkit-bitkitTests/Pods-bitkit-bitkitTests-resources-${CONFIGURATION}-output-files.xcfilelist",
+				"${PODS_ROOT}/Target Support Files/Pods-bitkit/Pods-bitkit-resources-${CONFIGURATION}-output-files.xcfilelist",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-bitkit-bitkitTests/Pods-bitkit-bitkitTests-resources.sh\"\n";
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-bitkit/Pods-bitkit-resources.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		30FC021FFE00FC292533FB19 /* [CP] Check Pods Manifest.lock */ = {
+		70807D8D4548EFBE92EF6943 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -322,14 +342,14 @@
 			outputFileListPaths = (
 			);
 			outputPaths = (
-				"$(DERIVED_FILE_DIR)/Pods-bitkit-bitkitTests-checkManifestLockResult.txt",
+				"$(DERIVED_FILE_DIR)/Pods-bitkit-checkManifestLockResult.txt",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
-		83053CBEACF036754DFBB943 /* [CP] Embed Pods Frameworks */ = {
+		896233BCF3A1B1C96A72868F /* [CP] Embed Pods Frameworks */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -346,7 +366,7 @@
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-bitkit/Pods-bitkit-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		8BEF0EDB7500F21D8EAAE02F /* [CP] Check Pods Manifest.lock */ = {
+		93BF275B8EF686A65E1965A8 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -361,31 +381,31 @@
 			outputFileListPaths = (
 			);
 			outputPaths = (
-				"$(DERIVED_FILE_DIR)/Pods-bitkit-checkManifestLockResult.txt",
+				"$(DERIVED_FILE_DIR)/Pods-bitkit-bitkitTests-checkManifestLockResult.txt",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
-		8BF85E0181BDC12D10C9859C /* [CP] Copy Pods Resources */ = {
+		DFD90A321FB9228E397ACF43 /* [CP] Copy Pods Resources */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-bitkit/Pods-bitkit-resources-${CONFIGURATION}-input-files.xcfilelist",
+				"${PODS_ROOT}/Target Support Files/Pods-bitkit-bitkitTests/Pods-bitkit-bitkitTests-resources-${CONFIGURATION}-input-files.xcfilelist",
 			);
 			name = "[CP] Copy Pods Resources";
 			outputFileListPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-bitkit/Pods-bitkit-resources-${CONFIGURATION}-output-files.xcfilelist",
+				"${PODS_ROOT}/Target Support Files/Pods-bitkit-bitkitTests/Pods-bitkit-bitkitTests-resources-${CONFIGURATION}-output-files.xcfilelist",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-bitkit/Pods-bitkit-resources.sh\"\n";
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-bitkit-bitkitTests/Pods-bitkit-bitkitTests-resources.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
-		E72ED9E13109D01AC94F17BC /* [CP] Embed Pods Frameworks */ = {
+		E2631D5480A724D7D95AAF06 /* [CP] Embed Pods Frameworks */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -435,7 +455,7 @@
 /* Begin XCBuildConfiguration section */
 		00E356F61AD99517003FC87E /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 08DBBB8A007C1DF53754E440 /* Pods-bitkit-bitkitTests.debug.xcconfig */;
+			baseConfigurationReference = 3698153164D8DFAFA76D38DD /* Pods-bitkit-bitkitTests.debug.xcconfig */;
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				BUNDLE_LOADER = "$(TEST_HOST)";
@@ -463,7 +483,7 @@
 		};
 		00E356F71AD99517003FC87E /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = BE8D0D5953F4B99400147E43 /* Pods-bitkit-bitkitTests.release.xcconfig */;
+			baseConfigurationReference = 5F085106A897CC7123F2F45D /* Pods-bitkit-bitkitTests.release.xcconfig */;
 			buildSettings = {
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				BUNDLE_LOADER = "$(TEST_HOST)";
@@ -488,9 +508,10 @@
 		};
 		13B07F941A680F5B00A75B9A /* Debug */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 1D30294C57A498108B9A3E67 /* Pods-bitkit.debug.xcconfig */;
+			baseConfigurationReference = 7B577893483C4F5E28AA0989 /* Pods-bitkit.debug.xcconfig */;
 			buildSettings = {
-				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				ASSETCATALOG_COMPILER_APPICON_NAME = AppIconOrange;
+				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
 				CLANG_ENABLE_MODULES = YES;
 				CURRENT_PROJECT_VERSION = 111;
 				DEVELOPMENT_TEAM = KYH47R284B;
@@ -519,9 +540,10 @@
 		};
 		13B07F951A680F5B00A75B9A /* Release */ = {
 			isa = XCBuildConfiguration;
-			baseConfigurationReference = 0D170AD7FD6D2BF3E391284F /* Pods-bitkit.release.xcconfig */;
+			baseConfigurationReference = 0397659F08BB3516D5CB0030 /* Pods-bitkit.release.xcconfig */;
 			buildSettings = {
-				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				ASSETCATALOG_COMPILER_APPICON_NAME = AppIconOrange;
+				ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = YES;
 				CLANG_ENABLE_MODULES = YES;
 				CURRENT_PROJECT_VERSION = 111;
 				DEVELOPMENT_TEAM = KYH47R284B;
diff --git a/ios/bitkit/Images.xcassets/AppIcon.appiconset/Contents.json b/ios/bitkit/Images.xcassets/AppIcon.appiconset/Contents.json
deleted file mode 100755
index 669adf92c..000000000
--- a/ios/bitkit/Images.xcassets/AppIcon.appiconset/Contents.json
+++ /dev/null
@@ -1,128 +0,0 @@
-{
-    "images":[
-        {
-            "idiom":"iphone",
-            "size":"20x20",
-            "scale":"2x",
-            "filename":"Icon-App-20x20@2x.png"
-        },
-        {
-            "idiom":"iphone",
-            "size":"20x20",
-            "scale":"3x",
-            "filename":"Icon-App-20x20@3x.png"
-        },
-        {
-            "idiom":"iphone",
-            "size":"29x29",
-            "scale":"1x",
-            "filename":"Icon-App-29x29@1x.png"
-        },
-        {
-            "idiom":"iphone",
-            "size":"29x29",
-            "scale":"2x",
-            "filename":"Icon-App-29x29@2x.png"
-        },
-        {
-            "idiom":"iphone",
-            "size":"29x29",
-            "scale":"3x",
-            "filename":"Icon-App-29x29@3x.png"
-        },
-        {
-            "idiom":"iphone",
-            "size":"40x40",
-            "scale":"2x",
-            "filename":"Icon-App-40x40@2x.png"
-        },
-        {
-            "idiom":"iphone",
-            "size":"40x40",
-            "scale":"3x",
-            "filename":"Icon-App-40x40@3x.png"
-        },
-        {
-            "idiom":"iphone",
-            "size":"60x60",
-            "scale":"2x",
-            "filename":"Icon-App-60x60@2x.png"
-        },
-        {
-            "idiom":"iphone",
-            "size":"60x60",
-            "scale":"3x",
-            "filename":"Icon-App-60x60@3x.png"
-        },
-        {
-            "idiom":"iphone",
-            "size":"76x76",
-            "scale":"2x",
-            "filename":"Icon-App-76x76@2x.png"
-        },
-        {
-            "idiom":"ipad",
-            "size":"20x20",
-            "scale":"1x",
-            "filename":"Icon-App-20x20@1x.png"
-        },
-        {
-            "idiom":"ipad",
-            "size":"20x20",
-            "scale":"2x",
-            "filename":"Icon-App-20x20@2x.png"
-        },
-        {
-            "idiom":"ipad",
-            "size":"29x29",
-            "scale":"1x",
-            "filename":"Icon-App-29x29@1x.png"
-        },
-        {
-            "idiom":"ipad",
-            "size":"29x29",
-            "scale":"2x",
-            "filename":"Icon-App-29x29@2x.png"
-        },
-        {
-            "idiom":"ipad",
-            "size":"40x40",
-            "scale":"1x",
-            "filename":"Icon-App-40x40@1x.png"
-        },
-        {
-            "idiom":"ipad",
-            "size":"40x40",
-            "scale":"2x",
-            "filename":"Icon-App-40x40@2x.png"
-        },
-        {
-            "idiom":"ipad",
-            "size":"76x76",
-            "scale":"1x",
-            "filename":"Icon-App-76x76@1x.png"
-        },
-        {
-            "idiom":"ipad",
-            "size":"76x76",
-            "scale":"2x",
-            "filename":"Icon-App-76x76@2x.png"
-        },
-        {
-            "idiom":"ipad",
-            "size":"83.5x83.5",
-            "scale":"2x",
-            "filename":"Icon-App-83.5x83.5@2x.png"
-        },
-        {
-          "size" : "1024x1024",
-          "idiom" : "ios-marketing",
-          "scale" : "1x",
-          "filename" : "ItunesArtwork@2x.png"
-        }
-    ],
-    "info":{
-        "version":1,
-        "author":"Synonym"
-    }
-}
diff --git a/ios/bitkit/Images.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png b/ios/bitkit/Images.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png
deleted file mode 100644
index 9189aad39..000000000
Binary files a/ios/bitkit/Images.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png and /dev/null differ
diff --git a/ios/bitkit/Images.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png b/ios/bitkit/Images.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png
deleted file mode 100644
index e27f25eb3..000000000
Binary files a/ios/bitkit/Images.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png and /dev/null differ
diff --git a/ios/bitkit/Images.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png b/ios/bitkit/Images.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png
deleted file mode 100644
index 901ba54ae..000000000
Binary files a/ios/bitkit/Images.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png and /dev/null differ
diff --git a/ios/bitkit/Images.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png b/ios/bitkit/Images.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png
deleted file mode 100644
index 1a1cbe43a..000000000
Binary files a/ios/bitkit/Images.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png and /dev/null differ
diff --git a/ios/bitkit/Images.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png b/ios/bitkit/Images.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png
deleted file mode 100644
index 64e5a1263..000000000
Binary files a/ios/bitkit/Images.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png and /dev/null differ
diff --git a/ios/bitkit/Images.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png b/ios/bitkit/Images.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png
deleted file mode 100644
index 7cefb9415..000000000
Binary files a/ios/bitkit/Images.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png and /dev/null differ
diff --git a/ios/bitkit/Images.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png b/ios/bitkit/Images.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png
deleted file mode 100644
index e27f25eb3..000000000
Binary files a/ios/bitkit/Images.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png and /dev/null differ
diff --git a/ios/bitkit/Images.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png b/ios/bitkit/Images.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png
deleted file mode 100644
index ca34670a1..000000000
Binary files a/ios/bitkit/Images.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png and /dev/null differ
diff --git a/ios/bitkit/Images.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png b/ios/bitkit/Images.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png
deleted file mode 100644
index 2397dce5a..000000000
Binary files a/ios/bitkit/Images.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png and /dev/null differ
diff --git a/ios/bitkit/Images.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png b/ios/bitkit/Images.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png
deleted file mode 100644
index 2397dce5a..000000000
Binary files a/ios/bitkit/Images.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png and /dev/null differ
diff --git a/ios/bitkit/Images.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png b/ios/bitkit/Images.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png
deleted file mode 100644
index 0d262419c..000000000
Binary files a/ios/bitkit/Images.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png and /dev/null differ
diff --git a/ios/bitkit/Images.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png b/ios/bitkit/Images.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png
deleted file mode 100644
index 3ec61c604..000000000
Binary files a/ios/bitkit/Images.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png and /dev/null differ
diff --git a/ios/bitkit/Images.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png b/ios/bitkit/Images.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png
deleted file mode 100644
index e9a4925cc..000000000
Binary files a/ios/bitkit/Images.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png and /dev/null differ
diff --git a/ios/bitkit/Images.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png b/ios/bitkit/Images.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png
deleted file mode 100644
index ccea29ad8..000000000
Binary files a/ios/bitkit/Images.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png and /dev/null differ
diff --git a/ios/bitkit/Images.xcassets/AppIcon.appiconset/ItunesArtwork@2x.png b/ios/bitkit/Images.xcassets/AppIcon.appiconset/ItunesArtwork@2x.png
deleted file mode 100644
index 040c32f59..000000000
Binary files a/ios/bitkit/Images.xcassets/AppIcon.appiconset/ItunesArtwork@2x.png and /dev/null differ
diff --git a/ios/bitkit/Images.xcassets/AppIconBlack.appiconset/1024.png b/ios/bitkit/Images.xcassets/AppIconBlack.appiconset/1024.png
new file mode 100644
index 000000000..ba1d5b15b
Binary files /dev/null and b/ios/bitkit/Images.xcassets/AppIconBlack.appiconset/1024.png differ
diff --git a/ios/bitkit/Images.xcassets/AppIconBlack.appiconset/114.png b/ios/bitkit/Images.xcassets/AppIconBlack.appiconset/114.png
new file mode 100644
index 000000000..3f9aa7ec7
Binary files /dev/null and b/ios/bitkit/Images.xcassets/AppIconBlack.appiconset/114.png differ
diff --git a/ios/bitkit/Images.xcassets/AppIconBlack.appiconset/120.png b/ios/bitkit/Images.xcassets/AppIconBlack.appiconset/120.png
new file mode 100644
index 000000000..98193af8b
Binary files /dev/null and b/ios/bitkit/Images.xcassets/AppIconBlack.appiconset/120.png differ
diff --git a/ios/bitkit/Images.xcassets/AppIconBlack.appiconset/180.png b/ios/bitkit/Images.xcassets/AppIconBlack.appiconset/180.png
new file mode 100644
index 000000000..1ec543ac2
Binary files /dev/null and b/ios/bitkit/Images.xcassets/AppIconBlack.appiconset/180.png differ
diff --git a/ios/bitkit/Images.xcassets/AppIconBlack.appiconset/29.png b/ios/bitkit/Images.xcassets/AppIconBlack.appiconset/29.png
new file mode 100644
index 000000000..6ceb3f286
Binary files /dev/null and b/ios/bitkit/Images.xcassets/AppIconBlack.appiconset/29.png differ
diff --git a/ios/bitkit/Images.xcassets/AppIconBlack.appiconset/40.png b/ios/bitkit/Images.xcassets/AppIconBlack.appiconset/40.png
new file mode 100644
index 000000000..55c2b5b22
Binary files /dev/null and b/ios/bitkit/Images.xcassets/AppIconBlack.appiconset/40.png differ
diff --git a/ios/bitkit/Images.xcassets/AppIconBlack.appiconset/57.png b/ios/bitkit/Images.xcassets/AppIconBlack.appiconset/57.png
new file mode 100644
index 000000000..e7dcd1a83
Binary files /dev/null and b/ios/bitkit/Images.xcassets/AppIconBlack.appiconset/57.png differ
diff --git a/ios/bitkit/Images.xcassets/AppIconBlack.appiconset/58.png b/ios/bitkit/Images.xcassets/AppIconBlack.appiconset/58.png
new file mode 100644
index 000000000..e0abc8f91
Binary files /dev/null and b/ios/bitkit/Images.xcassets/AppIconBlack.appiconset/58.png differ
diff --git a/ios/bitkit/Images.xcassets/AppIconBlack.appiconset/60.png b/ios/bitkit/Images.xcassets/AppIconBlack.appiconset/60.png
new file mode 100644
index 000000000..34586ffe7
Binary files /dev/null and b/ios/bitkit/Images.xcassets/AppIconBlack.appiconset/60.png differ
diff --git a/ios/bitkit/Images.xcassets/AppIconBlack.appiconset/80.png b/ios/bitkit/Images.xcassets/AppIconBlack.appiconset/80.png
new file mode 100644
index 000000000..bd3053a94
Binary files /dev/null and b/ios/bitkit/Images.xcassets/AppIconBlack.appiconset/80.png differ
diff --git a/ios/bitkit/Images.xcassets/AppIconBlack.appiconset/87.png b/ios/bitkit/Images.xcassets/AppIconBlack.appiconset/87.png
new file mode 100644
index 000000000..648cf7373
Binary files /dev/null and b/ios/bitkit/Images.xcassets/AppIconBlack.appiconset/87.png differ
diff --git a/ios/bitkit/Images.xcassets/AppIconBlack.appiconset/Contents.json b/ios/bitkit/Images.xcassets/AppIconBlack.appiconset/Contents.json
new file mode 100644
index 000000000..677395de2
--- /dev/null
+++ b/ios/bitkit/Images.xcassets/AppIconBlack.appiconset/Contents.json
@@ -0,0 +1,100 @@
+{
+  "images": [
+    {
+      "size": "60x60",
+      "expected-size": "180",
+      "filename": "180.png",
+      "folder": "Images.xcassets/AppIconBlack.appiconset/",
+      "idiom": "iphone",
+      "scale": "3x"
+    },
+    {
+      "size": "40x40",
+      "expected-size": "80",
+      "filename": "80.png",
+      "folder": "Images.xcassets/AppIconBlack.appiconset/",
+      "idiom": "iphone",
+      "scale": "2x"
+    },
+    {
+      "size": "40x40",
+      "expected-size": "120",
+      "filename": "120.png",
+      "folder": "Images.xcassets/AppIconBlack.appiconset/",
+      "idiom": "iphone",
+      "scale": "3x"
+    },
+    {
+      "size": "60x60",
+      "expected-size": "120",
+      "filename": "120.png",
+      "folder": "Images.xcassets/AppIconBlack.appiconset/",
+      "idiom": "iphone",
+      "scale": "2x"
+    },
+    {
+      "size": "57x57",
+      "expected-size": "57",
+      "filename": "57.png",
+      "folder": "Images.xcassets/AppIconBlack.appiconset/",
+      "idiom": "iphone",
+      "scale": "1x"
+    },
+    {
+      "size": "29x29",
+      "expected-size": "58",
+      "filename": "58.png",
+      "folder": "Images.xcassets/AppIconBlack.appiconset/",
+      "idiom": "iphone",
+      "scale": "2x"
+    },
+    {
+      "size": "29x29",
+      "expected-size": "29",
+      "filename": "29.png",
+      "folder": "Images.xcassets/AppIconBlack.appiconset/",
+      "idiom": "iphone",
+      "scale": "1x"
+    },
+    {
+      "size": "29x29",
+      "expected-size": "87",
+      "filename": "87.png",
+      "folder": "Images.xcassets/AppIconBlack.appiconset/",
+      "idiom": "iphone",
+      "scale": "3x"
+    },
+    {
+      "size": "57x57",
+      "expected-size": "114",
+      "filename": "114.png",
+      "folder": "Images.xcassets/AppIconBlack.appiconset/",
+      "idiom": "iphone",
+      "scale": "2x"
+    },
+    {
+      "size": "20x20",
+      "expected-size": "40",
+      "filename": "40.png",
+      "folder": "Images.xcassets/AppIconBlack.appiconset/",
+      "idiom": "iphone",
+      "scale": "2x"
+    },
+    {
+      "size": "20x20",
+      "expected-size": "60",
+      "filename": "60.png",
+      "folder": "Images.xcassets/AppIconBlack.appiconset/",
+      "idiom": "iphone",
+      "scale": "3x"
+    },
+    {
+      "size": "1024x1024",
+      "filename": "1024.png",
+      "expected-size": "1024",
+      "idiom": "ios-marketing",
+      "folder": "Images.xcassets/AppIconBlack.appiconset/",
+      "scale": "1x"
+    }
+  ]
+}
diff --git a/ios/bitkit/Images.xcassets/AppIconOrange.appiconset/1024.png b/ios/bitkit/Images.xcassets/AppIconOrange.appiconset/1024.png
new file mode 100644
index 000000000..ce7ccd94c
Binary files /dev/null and b/ios/bitkit/Images.xcassets/AppIconOrange.appiconset/1024.png differ
diff --git a/ios/bitkit/Images.xcassets/AppIconOrange.appiconset/114.png b/ios/bitkit/Images.xcassets/AppIconOrange.appiconset/114.png
new file mode 100644
index 000000000..9e00f6bfd
Binary files /dev/null and b/ios/bitkit/Images.xcassets/AppIconOrange.appiconset/114.png differ
diff --git a/ios/bitkit/Images.xcassets/AppIconOrange.appiconset/120.png b/ios/bitkit/Images.xcassets/AppIconOrange.appiconset/120.png
new file mode 100644
index 000000000..ef93fd9f5
Binary files /dev/null and b/ios/bitkit/Images.xcassets/AppIconOrange.appiconset/120.png differ
diff --git a/ios/bitkit/Images.xcassets/AppIconOrange.appiconset/180.png b/ios/bitkit/Images.xcassets/AppIconOrange.appiconset/180.png
new file mode 100644
index 000000000..f70ab29b6
Binary files /dev/null and b/ios/bitkit/Images.xcassets/AppIconOrange.appiconset/180.png differ
diff --git a/ios/bitkit/Images.xcassets/AppIconOrange.appiconset/29.png b/ios/bitkit/Images.xcassets/AppIconOrange.appiconset/29.png
new file mode 100644
index 000000000..849d2c89c
Binary files /dev/null and b/ios/bitkit/Images.xcassets/AppIconOrange.appiconset/29.png differ
diff --git a/ios/bitkit/Images.xcassets/AppIconOrange.appiconset/40.png b/ios/bitkit/Images.xcassets/AppIconOrange.appiconset/40.png
new file mode 100644
index 000000000..0e321b91f
Binary files /dev/null and b/ios/bitkit/Images.xcassets/AppIconOrange.appiconset/40.png differ
diff --git a/ios/bitkit/Images.xcassets/AppIconOrange.appiconset/57.png b/ios/bitkit/Images.xcassets/AppIconOrange.appiconset/57.png
new file mode 100644
index 000000000..2ca96e583
Binary files /dev/null and b/ios/bitkit/Images.xcassets/AppIconOrange.appiconset/57.png differ
diff --git a/ios/bitkit/Images.xcassets/AppIconOrange.appiconset/58.png b/ios/bitkit/Images.xcassets/AppIconOrange.appiconset/58.png
new file mode 100644
index 000000000..61b49bf31
Binary files /dev/null and b/ios/bitkit/Images.xcassets/AppIconOrange.appiconset/58.png differ
diff --git a/ios/bitkit/Images.xcassets/AppIconOrange.appiconset/60.png b/ios/bitkit/Images.xcassets/AppIconOrange.appiconset/60.png
new file mode 100644
index 000000000..93cb1ff31
Binary files /dev/null and b/ios/bitkit/Images.xcassets/AppIconOrange.appiconset/60.png differ
diff --git a/ios/bitkit/Images.xcassets/AppIconOrange.appiconset/80.png b/ios/bitkit/Images.xcassets/AppIconOrange.appiconset/80.png
new file mode 100644
index 000000000..23834ece4
Binary files /dev/null and b/ios/bitkit/Images.xcassets/AppIconOrange.appiconset/80.png differ
diff --git a/ios/bitkit/Images.xcassets/AppIconOrange.appiconset/87.png b/ios/bitkit/Images.xcassets/AppIconOrange.appiconset/87.png
new file mode 100644
index 000000000..807ac98a0
Binary files /dev/null and b/ios/bitkit/Images.xcassets/AppIconOrange.appiconset/87.png differ
diff --git a/ios/bitkit/Images.xcassets/AppIconOrange.appiconset/Contents.json b/ios/bitkit/Images.xcassets/AppIconOrange.appiconset/Contents.json
new file mode 100644
index 000000000..645d5415d
--- /dev/null
+++ b/ios/bitkit/Images.xcassets/AppIconOrange.appiconset/Contents.json
@@ -0,0 +1,100 @@
+{
+  "images": [
+    {
+      "size": "60x60",
+      "expected-size": "180",
+      "filename": "180.png",
+      "folder": "Images.xcassets/AppIconOrange.appiconset/",
+      "idiom": "iphone",
+      "scale": "3x"
+    },
+    {
+      "size": "40x40",
+      "expected-size": "80",
+      "filename": "80.png",
+      "folder": "Images.xcassets/AppIconOrange.appiconset/",
+      "idiom": "iphone",
+      "scale": "2x"
+    },
+    {
+      "size": "40x40",
+      "expected-size": "120",
+      "filename": "120.png",
+      "folder": "Images.xcassets/AppIconOrange.appiconset/",
+      "idiom": "iphone",
+      "scale": "3x"
+    },
+    {
+      "size": "60x60",
+      "expected-size": "120",
+      "filename": "120.png",
+      "folder": "Images.xcassets/AppIconOrange.appiconset/",
+      "idiom": "iphone",
+      "scale": "2x"
+    },
+    {
+      "size": "57x57",
+      "expected-size": "57",
+      "filename": "57.png",
+      "folder": "Images.xcassets/AppIconOrange.appiconset/",
+      "idiom": "iphone",
+      "scale": "1x"
+    },
+    {
+      "size": "29x29",
+      "expected-size": "58",
+      "filename": "58.png",
+      "folder": "Images.xcassets/AppIconOrange.appiconset/",
+      "idiom": "iphone",
+      "scale": "2x"
+    },
+    {
+      "size": "29x29",
+      "expected-size": "29",
+      "filename": "29.png",
+      "folder": "Images.xcassets/AppIconOrange.appiconset/",
+      "idiom": "iphone",
+      "scale": "1x"
+    },
+    {
+      "size": "29x29",
+      "expected-size": "87",
+      "filename": "87.png",
+      "folder": "Images.xcassets/AppIconOrange.appiconset/",
+      "idiom": "iphone",
+      "scale": "3x"
+    },
+    {
+      "size": "57x57",
+      "expected-size": "114",
+      "filename": "114.png",
+      "folder": "Images.xcassets/AppIconOrange.appiconset/",
+      "idiom": "iphone",
+      "scale": "2x"
+    },
+    {
+      "size": "20x20",
+      "expected-size": "40",
+      "filename": "40.png",
+      "folder": "Images.xcassets/AppIconOrange.appiconset/",
+      "idiom": "iphone",
+      "scale": "2x"
+    },
+    {
+      "size": "20x20",
+      "expected-size": "60",
+      "filename": "60.png",
+      "folder": "Images.xcassets/AppIconOrange.appiconset/",
+      "idiom": "iphone",
+      "scale": "3x"
+    },
+    {
+      "size": "1024x1024",
+      "filename": "1024.png",
+      "expected-size": "1024",
+      "idiom": "ios-marketing",
+      "folder": "Images.xcassets/AppIconOrange.appiconset/",
+      "scale": "1x"
+    }
+  ]
+}
diff --git a/ios/bitkit/Images.xcassets/Splash.imageset/Splash.png b/ios/bitkit/Images.xcassets/Splash.imageset/Splash.png
index 7f3a0c1f3..27b579aef 100644
Binary files a/ios/bitkit/Images.xcassets/Splash.imageset/Splash.png and b/ios/bitkit/Images.xcassets/Splash.imageset/Splash.png differ
diff --git a/ios/bitkit/Images.xcassets/Splash.imageset/Splash@2x.png b/ios/bitkit/Images.xcassets/Splash.imageset/Splash@2x.png
index 07f81e6e3..e6a53e303 100644
Binary files a/ios/bitkit/Images.xcassets/Splash.imageset/Splash@2x.png and b/ios/bitkit/Images.xcassets/Splash.imageset/Splash@2x.png differ
diff --git a/ios/bitkit/Images.xcassets/Splash.imageset/Splash@3x.png b/ios/bitkit/Images.xcassets/Splash.imageset/Splash@3x.png
index 1b4c40bb2..bc8978560 100644
Binary files a/ios/bitkit/Images.xcassets/Splash.imageset/Splash@3x.png and b/ios/bitkit/Images.xcassets/Splash.imageset/Splash@3x.png differ
diff --git a/ios/bitkit/Info.plist b/ios/bitkit/Info.plist
index c03e585f9..47ea487b5 100644
--- a/ios/bitkit/Info.plist
+++ b/ios/bitkit/Info.plist
@@ -12,6 +12,43 @@
 	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
+	<key>CFBundleIcons</key>
+	<dict>
+		<key>CFBundlePrimaryIcon</key>
+		<dict>
+			<key>CFBundleIconName</key>
+			<string></string>
+			<key>CFBundleIconFiles</key>
+			<array>
+				<string>AppIconOrange</string>
+			</array>
+			<key>UIPrerenderedIcon</key>
+			<false/>
+		</dict>
+		<key>CFBundleAlternateIcons</key>
+		<dict>
+			<key>Black</key>
+			<dict>
+				<key>CFBundleIconFiles</key>
+				<array>
+					<string>AppIconBlack</string>
+				</array>
+				<key>UIPrerenderedIcon</key>
+				<false/>
+			</dict>
+		</dict>
+		<key>UINewsstandIcon</key>
+		<dict>
+			<key>CFBundleIconFiles</key>
+			<array>
+				<string>AppIconOrange</string>
+			</array>
+			<key>UINewsstandBindingType</key>
+			<string>UINewsstandBindingTypeMagazine</string>
+			<key>UINewsstandBindingEdge</key>
+			<string>UINewsstandBindingEdgeLeft</string>
+		</dict>
+	</dict>
 	<key>CFBundleName</key>
 	<string>$(PRODUCT_NAME)</string>
 	<key>CFBundlePackageType</key>
@@ -68,10 +105,13 @@
 	<string>The photo library is used to scan qrcodes in order to import or send Bitcoin and assets.</string>
 	<key>UIAppFonts</key>
 	<array>
-		<string>InterTight-Bold.ttf</string>
-		<string>InterTight-Medium.ttf</string>
+		<string>Damion-Regular.ttf</string>
 		<string>InterTight-Regular.ttf</string>
+		<string>InterTight-Medium.ttf</string>
 		<string>InterTight-SemiBold.ttf</string>
+		<string>InterTight-Bold.ttf</string>
+		<string>InterTight-ExtraBold.ttf</string>
+		<string>InterTight-Black.ttf</string>
 	</array>
 	<key>UILaunchStoryboardName</key>
 	<string>LaunchScreen.storyboard</string>
diff --git a/package.json b/package.json
index 5d6b71a30..847022eda 100644
--- a/package.json
+++ b/package.json
@@ -46,7 +46,6 @@
     "@react-navigation/native-stack": "6.9.26",
     "@react-navigation/stack": "6.3.29",
     "@reduxjs/toolkit": "2.2.3",
-    "@sayem314/react-native-keep-awake": "1.2.3",
     "@shopify/react-native-skia": "1.2.1",
     "@synonymdev/blocktank-client": "0.0.50",
     "@synonymdev/blocktank-lsp-http-client": "0.13.1",
diff --git a/src/assets/bitcoin-logo.png b/src/assets/bitcoin-logo.png
deleted file mode 100644
index e6e76cc2c..000000000
Binary files a/src/assets/bitcoin-logo.png and /dev/null differ
diff --git a/src/assets/bitkit-logo.svg b/src/assets/bitkit-logo.svg
index 5db2eb556..a15919dbf 100644
--- a/src/assets/bitkit-logo.svg
+++ b/src/assets/bitkit-logo.svg
@@ -1,11 +1,10 @@
-<svg width="288" height="100" viewBox="0 0 288 100" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M61.1301 56.5473L69.4453 48.2321C74.3268 43.3506 74.3268 35.436 69.4453 30.5544C64.5637 25.6729 56.6492 25.6729 51.7676 30.5544L43.4526 38.8694C45.0388 42.7251 47.3981 46.3376 50.5303 49.4698C53.6623 52.6019 57.2746 54.961 61.1301 56.5473Z" fill="white"/>
-<path d="M57.3422 60.3353C53.6005 58.5478 50.0938 56.1045 46.9945 53.0053C43.8953 49.9061 41.452 46.3994 39.6646 42.6576L30.5543 51.7678C25.6728 56.6494 25.6728 64.564 30.5543 69.4455C35.4359 74.3271 43.3504 74.3271 48.232 69.4455L57.3422 60.3353Z" fill="#FF6600"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M55.2623 0.281921C82.7525 3.1867 102.623 27.8142 99.7181 55.2623C96.8133 82.7525 72.1858 102.623 44.7377 99.7181C17.2475 96.8133 -2.62286 72.1858 0.281921 44.7377C3.1867 17.2475 27.8142 -2.62286 55.2623 0.281921ZM54.1677 10.7223C32.5713 8.40689 12.9956 24.2358 10.7223 45.8323C8.40689 67.4287 24.2358 87.0044 45.8323 89.2777C67.4287 91.5931 87.0044 75.7642 89.2777 54.1677C91.5931 32.5713 75.7642 12.9956 54.1677 10.7223Z" fill="#FF6600"/>
-<path d="M133.561 72.7554V28.1299H155.093C159.545 28.1299 163.02 29.1493 165.516 31.1881C168.096 33.3102 169.386 36.1604 169.386 39.7388C169.386 43.9829 167.305 46.8955 163.144 48.4766V48.6639C165.599 49.4128 167.534 50.7651 168.949 52.7207C170.405 54.6763 171.133 56.9648 171.133 59.5862C171.133 63.9135 169.615 67.2422 166.577 69.5723C163.873 71.6944 160.211 72.7554 155.592 72.7554H133.561ZM144.483 63.8927H154.344C156.133 63.8927 157.548 63.4142 158.588 62.4572C159.67 61.5002 160.211 60.2311 160.211 58.65C160.211 56.944 159.649 55.6334 158.526 54.718C157.402 53.761 155.967 53.2824 154.219 53.2824H144.483V63.8927ZM144.483 45.7929H153.47C155.093 45.7929 156.383 45.3976 157.34 44.607C158.339 43.8164 158.838 42.7138 158.838 41.2991C158.838 39.926 158.359 38.8442 157.402 38.0536C156.445 37.263 155.156 36.8677 153.533 36.8677H144.483V45.7929Z" fill="white"/>
-<path d="M174.809 72.7554V40.7998H184.983V72.7554H174.809ZM174.809 36.3684V28.1299H184.983V36.3684H174.809Z" fill="white"/>
-<path d="M202.534 73.1299C199.289 73.1299 196.771 72.4849 194.982 71.1951C193.234 69.8636 192.361 67.5751 192.361 64.3296V47.1659H188.117V40.7998H192.361V30.6888H202.284V40.7998H208.089V47.1659H202.284V62.1451C202.284 63.3102 202.576 64.1216 203.158 64.5793C203.782 65.037 204.677 65.2658 205.842 65.2658C206.175 65.2658 206.612 65.2658 207.153 65.2658C207.694 65.2242 208.006 65.2034 208.089 65.2034V72.6306C206.924 72.9634 205.072 73.1299 202.534 73.1299Z" fill="white"/>
-<path d="M211.745 72.7554V28.1299H221.794V51.5973L231.281 40.7998H243.014L231.78 52.7831L244.325 72.7554H232.529L224.852 59.711L221.794 62.9565V72.7554H211.745Z" fill="white"/>
-<path d="M246.67 72.7554V40.7998H256.843V72.7554H246.67ZM246.67 36.3684V28.1299H256.843V36.3684H246.67Z" fill="white"/>
-<path d="M274.395 73.1299C271.149 73.1299 268.632 72.4849 266.843 71.1951C265.095 69.8636 264.221 67.5751 264.221 64.3296V47.1659H259.977V40.7998H264.221V30.6888H274.145V40.7998H279.949V47.1659H274.145V62.1451C274.145 63.3102 274.436 64.1216 275.019 64.5793C275.643 65.037 276.538 65.2658 277.703 65.2658C278.035 65.2658 278.472 65.2658 279.013 65.2658C279.554 65.2242 279.866 65.2034 279.949 65.2034V72.6306C278.784 72.9634 276.933 73.1299 274.395 73.1299Z" fill="white"/>
+<svg width="279" height="82" viewBox="0 0 279 82" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path fill-rule="evenodd" clip-rule="evenodd"
+        d="M278.964 0.000732422L85.5409 0.000744551L83.7312 6.70683C79.6587 2.52735 73.8303 0.000744551 67.6894 0.000744551H37.0797L32.0676 18.6293C31.9107 18.627 31.7536 18.6259 31.5962 18.6259C14.1461 18.6259 0 32.772 0 50.2221C0 67.6721 14.1461 81.8182 31.5962 81.8182C41.2542 81.8182 49.9002 77.5728 55.6958 70.7443H165.042L166.039 66.7643L169.095 70.7443H246.914L256.719 31.5969H270.97L278.964 0.000732422ZM60.4551 63.1052H66.0642C66.2622 63.1052 66.4583 63.1025 66.6526 63.0971C67.307 63.0791 67.9403 63.031 68.5521 62.9544C69.8645 62.79 71.0786 62.4942 72.1927 62.0822C73.7659 61.5005 75.1396 60.6872 76.3091 59.6849C76.7713 59.2889 77.2015 58.8634 77.5996 58.411L76.3091 63.1931H94.3668L105.758 17.6323L107.972 24.0456H119.463L108.899 63.1931H126.957L136.761 24.0456L157.484 24.0449L150.13 27.4887L141.091 63.1927H159.149L162.557 49.5864L172.862 63.1924L199.019 63.1931L178.721 37.6576L207.806 7.55134H185.579L169.109 24.0449L173.085 7.55134H91.3245L83.5009 36.5431C83.5283 36.6462 83.5551 36.7501 83.5811 36.8547C84.0149 38.5966 84.2565 40.5323 84.2565 42.5712C84.2565 43.0663 84.2423 43.5552 84.2145 44.0368C84.198 44.3227 84.1767 44.606 84.1509 44.8864C84.1485 44.9122 84.1461 44.9379 84.1436 44.9637C84.1101 45.3148 84.0693 45.6613 84.0215 46.0027C84.0178 46.0294 84.014 46.0561 84.0102 46.0828C83.969 46.3698 83.923 46.6532 83.8721 46.9326C83.7412 47.6527 83.5786 48.3465 83.3876 49.0084C82.6315 51.6277 81.4283 53.7489 79.9638 55.0324C80.6709 53.2223 81.1309 51.1341 81.2579 48.8879C81.2992 48.1592 81.3038 47.4409 81.2743 46.7375C81.2541 46.2559 81.2179 45.7814 81.1664 45.3153L81.1651 45.3037C81.1624 45.279 81.1596 45.2543 81.1568 45.2296L81.1359 45.3071C81.133 45.2823 81.1302 45.2576 81.1272 45.233L81.1258 45.2212C81.0671 44.7295 80.9881 44.2516 80.8883 43.7878C80.7985 43.3707 80.692 42.9651 80.5684 42.5712C80.2784 41.6466 79.8943 40.7866 79.4128 39.9951C79.1589 39.5778 78.8779 39.1795 78.5693 38.8008C78.3537 38.5364 78.1247 38.2815 77.8821 38.0363C77.2576 37.4054 76.5426 36.839 75.7342 36.3404C74.7544 35.7362 73.6374 35.2315 72.3778 34.8322L72.3764 34.8318C72.352 34.8241 72.3276 34.8164 72.3032 34.8088L72.2732 34.7994C72.2411 34.7965 72.2164 34.7697 72.2164 34.7376C72.2164 34.721 72.2231 34.7058 72.2339 34.6946C72.2438 34.6841 72.2577 34.6772 72.2732 34.6757L72.2849 34.6731L72.3145 34.6664C74.0239 34.2766 75.4724 33.6491 76.6847 32.8183C77.469 32.2808 78.1544 31.6581 78.7474 30.9596C79.048 30.6056 79.3249 30.2321 79.5789 29.8403C81.1803 27.3702 81.8732 24.1737 81.8732 20.5538C81.8732 19.1032 81.6075 17.7021 81.1178 16.3909C79.2134 11.2915 73.9207 7.55134 67.6894 7.55134H42.8678L39.6123 19.6517C53.1805 23.1998 63.1923 35.5417 63.1923 50.2221C63.1923 54.8106 62.2142 59.1707 60.4551 63.1052ZM30.0231 26.2278L28.3643 32.3932L35.7094 34.3243C45.5927 36.9228 52.4615 45.4243 52.4615 55.0907C52.4615 57.1268 52.1631 59.0862 51.6083 60.9393L50.2883 65.3482C45.88 70.789 39.1442 74.2669 31.5962 74.2669C18.3165 74.2669 7.55128 63.5017 7.55128 50.2221C7.55128 37.4709 17.4767 27.038 30.0231 26.2278ZM207.83 7.55134H269.264L265.091 24.0456H250.826L241.021 63.1931H222.963L233.527 24.0456H221.67L219.583 17.6323L208.232 63.1931H199.12L193.834 49.6334L202.486 17.5724L207.83 7.55134Z"
+        fill="black" />
+    <path fill-rule="evenodd" clip-rule="evenodd"
+        d="M169.109 24.0457L185.579 7.55127H207.806L178.721 37.6582L192.359 54.8925L199.019 63.1923L172.862 63.1922L162.557 49.5869L159.149 63.1923H141.091L150.13 27.4892L157.484 24.0457L136.761 24.0462L126.957 63.1923H108.899L119.463 24.0462H107.972L105.758 17.6329L94.3669 63.1923H76.3091L77.5996 58.4116C75.0494 61.3096 71.1786 63.1923 66.0642 63.1923H58.8423C59.6046 60.6462 60.0128 57.8709 60.0128 55.0912C60.0128 41.6965 50.5343 30.4146 37.6295 27.0218L42.8679 7.55127H67.6895C75.5229 7.55127 81.8732 13.4625 81.8732 20.5544C81.8732 27.6462 79.2138 33.1129 72.2732 34.6763C72.2577 34.6777 72.2439 34.6847 72.2339 34.6951C72.2231 34.7063 72.2164 34.7215 72.2164 34.7381C72.2164 34.7702 72.2411 34.797 72.2732 34.8C77.7366 36.4958 80.5682 40.075 81.1568 45.2301C81.2912 46.4028 81.3291 47.6301 81.258 48.8885C81.131 51.1346 80.6709 53.2229 79.9638 55.0329C82.5031 52.8075 84.2566 48.064 84.2566 42.5717C84.2566 40.4105 83.985 38.3652 83.501 36.5436L91.3245 7.55127H173.085L169.109 24.0457ZM199.12 63.1923H208.232L219.583 17.6329L221.67 24.0462H233.527L222.963 63.1923H241.021L250.826 24.0462H265.091L269.264 7.55127H269.561H207.83L202.486 17.573L193.834 49.6339L199.12 63.1923Z"
+        fill="white" />
+    <ellipse cx="31.5961" cy="50.2214" rx="24.0449" ry="24.0449" fill="#FF4400" />
 </svg>
+    
\ No newline at end of file
diff --git a/src/assets/bitkit_logo_readme.png b/src/assets/bitkit_logo_readme.png
deleted file mode 100644
index 3d74b5ab0..000000000
Binary files a/src/assets/bitkit_logo_readme.png and /dev/null differ
diff --git a/src/assets/dotted-arrow.svg b/src/assets/dotted-arrow.svg
index 54fbb6e55..074d532ef 100644
--- a/src/assets/dotted-arrow.svg
+++ b/src/assets/dotted-arrow.svg
@@ -1,3 +1,6 @@
-<svg width="43" height="236" viewBox="0 0 43 236" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M34.2028 235.694C34.5861 236.092 35.2191 236.103 35.6167 235.72L42.0966 229.474C42.4943 229.091 42.5059 228.458 42.1227 228.06C41.7394 227.663 41.1063 227.651 40.7087 228.034L34.9488 233.586L29.3969 227.826C29.0136 227.428 28.3805 227.417 27.9829 227.8C27.5853 228.183 27.5736 228.816 27.9569 229.214L34.2028 235.694ZM0.0386031 1.27517C0.298093 2.18179 0.563071 3.11847 0.833161 4.08436L2.75927 3.54576C2.48813 2.57611 2.22205 1.63552 1.9614 0.724834L0.0386031 1.27517ZM2.40655 9.83014C2.89575 11.6524 3.39761 13.5542 3.9103 15.5316L5.84629 15.0297C5.33221 13.0469 4.82889 11.1395 4.33816 9.31159L2.40655 9.83014ZM5.37262 21.2622C5.84028 23.1236 6.31498 25.0405 6.79546 27.0101L8.73848 26.5361C8.25693 24.5621 7.78113 22.6408 7.31234 20.7748L5.37262 21.2622ZM8.18109 32.7706C8.62776 34.6537 9.07823 36.5782 9.53156 38.5421L11.4803 38.0923C11.0261 36.1245 10.5747 34.196 10.1271 32.309L8.18109 32.7706ZM10.8486 44.3247C11.2755 46.2242 11.704 48.1561 12.1335 50.1186L14.0872 49.6911C13.657 47.7248 13.2276 45.7893 12.7999 43.8862L10.8486 44.3247ZM13.383 55.9052C13.7886 57.8086 14.1943 59.7379 14.5996 61.6914L16.5579 61.2852C16.1519 59.3281 15.7454 57.3953 15.3391 55.4884L13.383 55.9052ZM15.7863 67.4908C16.1733 69.4079 16.5592 71.346 16.9435 73.3038L18.9061 72.9186C18.5211 70.9572 18.1345 69.0156 17.7468 67.0951L15.7863 67.4908ZM18.0709 79.1301C18.438 81.0546 18.803 82.9964 19.1656 84.9542L21.1321 84.59C20.769 82.6287 20.4033 80.6834 20.0355 78.7554L18.0709 79.1301ZM20.2266 90.7723C20.5734 92.703 20.9172 94.6479 21.2578 96.6058L23.2282 96.2631C22.887 94.3015 22.5425 92.3531 22.1952 90.4188L20.2266 90.7723ZM22.2581 102.453C22.5839 104.39 22.9062 106.339 23.2244 108.298L25.1985 107.977C24.8797 106.014 24.5568 104.062 24.2304 102.121L22.2581 102.453ZM24.1563 114.141C24.4605 116.085 24.7604 118.037 25.0556 119.998L27.0333 119.701C26.7375 117.736 26.437 115.779 26.1322 113.832L24.1563 114.141ZM25.9208 125.866C26.2018 127.812 26.4778 129.765 26.7484 131.725L28.7296 131.451C28.4584 129.488 28.1818 127.53 27.9003 125.58L25.9208 125.866ZM27.5402 137.594C27.7975 139.549 28.0492 141.509 28.2948 143.473L30.2793 143.225C30.0332 141.256 29.781 139.292 29.5231 137.333L27.5402 137.594ZM29.01 149.351C29.2415 151.309 29.4666 153.27 29.685 155.234L31.6728 155.013C31.4538 153.045 31.2282 151.079 30.9961 149.116L29.01 149.351ZM30.3188 161.124C30.5228 163.087 30.7198 165.051 30.9094 167.017L32.9001 166.825C32.7101 164.854 32.5126 162.885 32.3081 160.917L30.3188 161.124ZM31.4553 172.914C31.6297 174.881 31.7963 176.848 31.9547 178.815L33.9483 178.654C33.7894 176.682 33.6223 174.709 33.4475 172.737L31.4553 172.914ZM32.4055 184.716C32.5478 186.688 32.6814 188.658 32.8061 190.626L34.8021 190.5C34.677 188.526 34.543 186.55 34.4003 184.572L32.4055 184.716ZM33.1536 196.538C33.2605 198.511 33.3579 200.481 33.4454 202.446L35.4435 202.357C35.3556 200.385 35.2579 198.409 35.1507 196.43L33.1536 196.538ZM33.6794 208.364C33.7475 210.342 33.8052 212.316 33.8521 214.284L35.8515 214.236C35.8045 212.261 35.7466 210.281 35.6782 208.295L33.6794 208.364ZM33.96 220.198C33.985 222.176 33.9984 224.148 33.9999 226.111L35.9999 226.11C35.9984 224.138 35.9849 222.159 35.9599 220.173L33.96 220.198ZM33.9674 232.036C33.9558 233.02 33.9409 234.002 33.9229 234.982L35.9226 235.018C35.9407 234.034 35.9556 233.048 35.9673 232.059L33.9674 232.036Z" fill="#8E8E93"/>
+<svg width="63" height="146" viewBox="0 0 63 146" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path
+        d="M54.1702 145.707C54.5607 146.098 55.1939 146.098 55.5844 145.707L61.9484 139.343C62.3389 138.953 62.3389 138.319 61.9484 137.929C61.5579 137.538 60.9247 137.538 60.5342 137.929L54.8773 143.586L49.2205 137.929C48.83 137.538 48.1968 137.538 47.8063 137.929C47.4157 138.319 47.4157 138.953 47.8063 139.343L54.1702 145.707ZM1 1C0.389773 1.79223 0.389718 1.79218 0.389667 1.79215C0.389654 1.79214 0.389606 1.7921 0.389581 1.79208C0.389529 1.79204 0.389491 1.79201 0.389465 1.79199C0.389414 1.79195 0.389413 1.79195 0.389464 1.79199C0.389565 1.79207 0.389871 1.7923 0.390379 1.7927C0.391397 1.79348 0.393227 1.7949 0.395864 1.79695C0.401138 1.80106 0.409639 1.80769 0.421315 1.81686C0.444667 1.8352 0.48072 1.86369 0.529066 1.90241C0.625758 1.97985 0.771617 2.0982 0.963373 2.25805C1.34689 2.57775 1.91397 3.06342 2.63845 3.71979L3.98127 2.23762C3.23576 1.5622 2.6479 1.05852 2.24399 0.721814C2.04203 0.553459 1.88605 0.426843 1.77933 0.34137C1.72597 0.298633 1.68492 0.266182 1.6566 0.243941C1.64244 0.23282 1.63146 0.224252 1.62372 0.218227C1.61984 0.215215 1.61678 0.212838 1.61453 0.211096C1.6134 0.210225 1.61248 0.209513 1.61176 0.208959C1.61141 0.208682 1.6111 0.208445 1.61084 0.208248C1.61071 0.208149 1.6106 0.20806 1.6105 0.207981C1.61044 0.207941 1.61038 0.207889 1.61035 0.20787C1.61029 0.20782 1.61023 0.207773 1 1ZM6.94444 7.9158C8.17165 9.18997 9.53447 10.6692 11.0005 12.3594L12.5114 11.0489C11.0218 9.33162 9.63547 7.82674 8.38494 6.52838L6.94444 7.9158ZM14.8607 17.026C16.0334 18.5109 17.2462 20.1094 18.4868 21.8238L20.1071 20.6513C18.8497 18.9137 17.6199 17.2928 16.4303 15.7865L14.8607 17.026ZM21.947 26.8143C23.0182 28.4265 24.1009 30.1211 25.1878 31.8996L26.8943 30.8565C25.794 29.0563 24.6977 27.3403 23.6128 25.7075L21.947 26.8143ZM28.2435 37.1111C29.2044 38.8203 30.1635 40.5957 31.1157 42.4383L32.8924 41.5201C31.9294 39.6564 30.9592 37.8603 29.9868 36.1309L28.2435 37.1111ZM33.8028 47.8646C34.6478 49.6464 35.4834 51.4839 36.3058 53.3777L38.1402 52.581C37.309 50.6668 36.4643 48.8092 35.6099 47.0076L33.8028 47.8646ZM38.6266 58.968C39.3556 60.8064 40.0705 62.6928 40.7684 64.6278L42.6498 63.9491C41.9447 61.9944 41.2224 60.0885 40.4858 58.2308L38.6266 58.968ZM42.7345 70.351C43.3502 72.2358 43.949 74.163 44.5285 76.1329L46.4472 75.5684C45.8621 73.5795 45.2575 71.6335 44.6357 69.7299L42.7345 70.351ZM46.1542 81.9698C46.6607 83.8949 47.1484 85.8579 47.6153 87.8592L49.563 87.4048C49.0918 85.3852 48.5997 83.404 48.0884 81.4609L46.1542 81.9698ZM48.915 93.7977C49.3124 95.7395 49.69 97.7152 50.0464 99.725L52.0157 99.3758C51.6562 97.3487 51.2753 95.3558 50.8744 93.3967L48.915 93.7977ZM51.0254 105.694C51.3232 107.666 51.6003 109.67 51.8556 111.705L53.8401 111.456C53.5827 109.404 53.3033 107.384 53.003 105.395L51.0254 105.694ZM52.5397 117.756C52.7386 119.73 52.9169 121.732 53.0736 123.761L55.0677 123.607C54.9098 121.562 54.7301 119.545 54.5296 117.555L52.5397 117.756ZM53.4707 129.808C53.5794 131.812 53.6672 133.842 53.733 135.899L55.732 135.835C55.6657 133.764 55.5773 131.718 55.4677 129.699L53.4707 129.808ZM53.8611 141.929C53.8719 142.947 53.8773 143.97 53.8773 145H55.8773C55.8773 143.963 55.8718 142.933 55.861 141.908L53.8611 141.929Z"
+        fill="white" fill-opacity="0.5" />
 </svg>
+    
\ No newline at end of file
diff --git a/src/assets/fonts/InterTight-Black.ttf b/src/assets/fonts/InterTight-Black.ttf
new file mode 100644
index 000000000..0ff7521b9
Binary files /dev/null and b/src/assets/fonts/InterTight-Black.ttf differ
diff --git a/src/assets/fonts/InterTight-ExtraBold.ttf b/src/assets/fonts/InterTight-ExtraBold.ttf
new file mode 100644
index 000000000..9bd8adedf
Binary files /dev/null and b/src/assets/fonts/InterTight-ExtraBold.ttf differ
diff --git a/src/assets/icons/chevron-down.svg b/src/assets/icons/chevron-down.svg
deleted file mode 100644
index 8d142d9dc..000000000
--- a/src/assets/icons/chevron-down.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-chevron-down" viewBox="0 0 16 16">
-    <path fill-rule="evenodd" d="M1.646 4.646a.5.5 0 0 1 .708 0L8 10.293l5.646-5.647a.5.5 0 0 1 .708.708l-6 6a.5.5 0 0 1-.708 0l-6-6a.5.5 0 0 1 0-.708z"/>
-</svg>
diff --git a/src/assets/icons/chevron-up.svg b/src/assets/icons/chevron-up.svg
deleted file mode 100644
index 71e68af57..000000000
--- a/src/assets/icons/chevron-up.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-chevron-up" viewBox="0 0 16 16">
-    <path fill-rule="evenodd" d="M7.646 4.646a.5.5 0 0 1 .708 0l6 6a.5.5 0 0 1-.708.708L8 5.707l-5.646 5.647a.5.5 0 0 1-.708-.708l6-6z"/>
-</svg>
diff --git a/src/assets/icons/lightning-purple.svg b/src/assets/icons/lightning-purple.svg
deleted file mode 100644
index 13c9be099..000000000
--- a/src/assets/icons/lightning-purple.svg
+++ /dev/null
@@ -1,9 +0,0 @@
-<svg width="20" height="30" viewBox="0 0 20 30" fill="none" xmlns="http://www.w3.org/2000/svg">
-    <path d="M1.49414 17.5998H9.03516L5.08691 28.1242C4.52832 29.5715 6.03906 30.3459 7.00391 29.1653L19.166 14.2483C19.3945 13.9563 19.5215 13.677 19.5215 13.3596C19.5215 12.801 19.0898 12.3947 18.5059 12.3947H10.9648L14.9131 1.87033C15.459 0.423063 13.9609 -0.338656 12.9961 0.829313L0.833984 15.7463C0.592773 16.0383 0.478516 16.3176 0.478516 16.635C0.478516 17.1936 0.910156 17.5998 1.49414 17.5998Z" fill="url(#paint0_linear_3809_5045)"/>
-    <defs>
-        <linearGradient id="paint0_linear_3809_5045" x1="2.14478" y1="5.78648" x2="22.0344" y2="15.8659" gradientUnits="userSpaceOnUse">
-            <stop stop-color="#9400DF"/>
-            <stop offset="1" stop-color="#B95CE8" stop-opacity="0.84"/>
-        </linearGradient>
-    </defs>
-</svg>
diff --git a/src/assets/icons/settings.ts b/src/assets/icons/settings.ts
index 49977bacc..b5f91d892 100644
--- a/src/assets/icons/settings.ts
+++ b/src/assets/icons/settings.ts
@@ -33,9 +33,6 @@ export const faceIdIcon = (color = 'white'): string =>
 export const touchIdIcon = (color = 'white'): string =>
 	`<svg fill="none" height="134" viewBox="0 0 133 134" width="133" xmlns="http://www.w3.org/2000/svg"><g fill="${color}"><path d="m80.6475 1.96924c-9.3584-2.334352-19.2059-2.667918-28.788-.59934-.7405.15987-1.2112.88978-1.0514 1.6303.1599.74053.8898 1.21125 1.6303 1.05138 9.1765-1.98102 18.6294-1.65438 27.6208.59918 21.5028 5.38924 39.4008 21.55604 46.2168 42.67424 2.637 8.1671 3.757 16.8634 3.981 25.9774.019.7573.648 1.3562 1.405 1.3376.757-.0187 1.356-.6477 1.338-1.4051-.228-9.239-1.361-18.1591-4.062-26.5957-7.08-22.1092-25.786-39.05642-48.2905-44.66996z"/><path d="m44.8983 6.11948c.7303-.20147 1.159-.95682.9575-1.68713-.2014-.7303-.9568-1.15901-1.6871-.95754-10.0209 2.76448-24.1174 12.31669-32.8292 25.07779-.0033.005-.0067.01-.01.015-7.64953 11.5278-12.44468 26.0146-11.105886 40.0719.001275.0134.002746.0267.004414.0401.320853 2.5668.859492 5.1289 1.398762 7.6939 1.1358 5.4025 2.27441 10.8183 1.38693 16.3202-.12065.7479.38786 1.452 1.13577 1.5726.74792.1207 1.45203-.3878 1.57267-1.1357.92771-5.7512-.22422-11.361-1.37637-16.9718-.53284-2.5949-1.06573-5.19-1.39299-7.7995-1.25916-13.2831 3.27626-27.1404 10.6576-38.2673 8.3804-12.2713 21.9508-21.3967 31.2879-23.97252z"/><path d="m62.8989 9.18423c17.222-1.05167 34.4405 5.97687 46.0041 19.44217.494.5748.428 1.4408-.147 1.9344-.575.4935-1.441.4277-1.934-.147-10.9968-12.805-27.3818-19.4937-43.7642-18.4907-.0058.0004-.0117.0007-.0175.001-20.7176 1.0024-40.1198 15.0569-47.2563 34.7508-.2581.7122-1.0447 1.0804-1.757.8223-.7122-.2581-1.0804-1.0447-.8223-1.757 7.518-20.7467 27.8915-35.4973 49.6942-36.55597z"/><path d="m113.082 34.6191c-.422-.6289-1.275-.7963-1.903-.3739-.629.4223-.797 1.2746-.374 1.9035 6.41 9.5453 9.061 19.9324 10.108 32.2588.065.7549.729 1.3148 1.483 1.2506.755-.0641 1.315-.7281 1.251-1.483-1.071-12.5958-3.804-23.489-10.565-33.556z"/><path d="m122.73 73.999c.756-.0472 1.407.5274 1.455 1.2835.517 8.2715.521 17.6299-.394 24.5458-.099.7507-.788 1.2797-1.539 1.1797-.751-.099-1.28-.789-1.18-1.5396.882-6.6656.886-15.8256.375-24.0148-.048-.7561.527-1.4073 1.283-1.4546z"/><path d="m13.7126 53.3189c.1778-.7365-.2751-1.4776-1.0115-1.6554s-1.4775.275-1.6553 1.0115c-1.0069 4.1699-1.52953 8.4537-1.55024 12.7414-.02134 4.4194.80264 8.7332 1.62704 13.0486.6743 3.5302 1.3489 7.0615 1.5611 10.6526.2787 4.7173-.7135 9.4414-2.4281 13.9374-.26996.708.085 1.501.7929 1.771s1.5005-.085 1.7705-.793c1.8123-4.7528 2.9109-9.8722 2.6034-15.0772-.2108-3.5665-.8853-7.0773-1.5595-10.5867-.8227-4.2823-1.6451-8.5625-1.6239-12.9394.0197-4.0742.5164-8.1464 1.4736-12.1108z"/><path d="m49.7062 22.8362c.2824.703-.0587 1.5018-.7617 1.7841-14.221 5.7109-24.9001 18.5985-27.0787 33.7958-.9102 6.3492.0732 12.6385 1.0562 18.926.5536 3.5409 1.1072 7.0812 1.3224 10.6314.4667 7.6982-.4102 16.1535-5.4202 23.8475-.4134.635-1.2632.814-1.898.401-.6349-.413-.8144-1.263-.401-1.898 4.5647-7.01 5.4287-14.7955 4.9808-22.1844-.2184-3.6022-.7685-7.1836-1.3182-10.7626-.9863-6.4216-1.9716-12.8358-1.0377-19.3502 2.3261-16.2266 13.6996-29.8995 28.772-35.9524.703-.2823 1.5018.0588 1.7841.7618z"/><path d="m97.8619 30.6459c-11.219-10.5079-27.4795-14.1754-42.2575-10.934-.74.1623-1.2083.8938-1.046 1.6338s.8938 1.2083 1.6338 1.046c13.9937-3.0694 29.3049.4319 39.7943 10.2565 8.8415 8.2808 13.9755 20.33 15.3195 33.4761.077.7536.75 1.3021 1.504 1.2251.753-.0771 1.302-.7505 1.225-1.5041-1.396-13.6506-6.746-26.3702-16.1731-35.1994z"/><path d="m113.748 72.378c.754-.0774 1.427.4708 1.505 1.2244 1.302 12.6843.741 26.3846-1.226 39.6376-.111.75-.809 1.267-1.558 1.156s-1.267-.809-1.156-1.558c1.94-13.0695 2.486-26.537 1.21-38.9553-.077-.7536.471-1.4273 1.225-1.5047z"/><path d="m65.9242 27.8778c-21.0201 0-38.099 16.7699-38.099 37.5034 0 2.2147.1965 4.3848.5712 6.4949.1324.7459.8444 1.2432 1.5904 1.1108.7459-.1325 1.2432-.8445 1.1108-1.5904-.3469-1.9537-.529-3.9632-.529-6.0153 0-19.1762 15.8082-34.7599 35.3556-34.7599 8.8336 0 16.9044 3.1838 23.0991 8.4446.5775.4904 1.4431.4199 1.9335-.1576.4904-.5774.4199-1.4431-.1576-1.9335-6.6755-5.6691-15.3713-9.097-24.875-9.097z"/><path d="m93.8726 42.0893c.5468-.5244 1.4152-.5062 1.9395.0406 6.0539 6.3128 7.9919 16.2346 9.2739 24.5611 1.444 9.3792 1.665 18.5291 1.665 22.7716 0 .7575-.615 1.3717-1.372 1.3717-.758 0-1.372-.6142-1.372-1.3717 0-4.1738-.218-13.1689-1.633-22.354-1.19-7.7302-2.906-17.2026-8.542-23.0799-.5244-.5468-.5062-1.4151.0406-1.9394z"/><path d="m106.402 97.3184c.061-.7552-.503-1.4162-1.258-1.4764s-1.416.5032-1.476 1.2584c-.674 8.4496-1.554 16.8896-3.341 24.6866-.169.738.293 1.474 1.031 1.643.739.169 1.475-.292 1.644-1.03 1.833-8.003 2.725-16.609 3.4-25.0816z"/><path d="m30.6043 76.9248c.7433-.1464 1.4646.3375 1.6109 1.0808 2.9004 14.7285.8968 28.1084-6.7838 39.8284-.4153.633-1.2656.811-1.8992.395-.6337-.415-.8107-1.265-.3955-1.899 7.2267-11.027 9.1716-23.6527 6.3868-37.7943-.1464-.7433.3375-1.4646 1.0808-1.6109z"/><path d="m65.9242 36.803c-13.6449 0-27.0305 10.5622-28.3968 23.8366-.5981 5.8116.2421 11.536 1.0827 17.2628.734 5.0005 1.4682 10.0028 1.2453 15.0663-.5102 11.5883-3.9104 21.1543-9.7528 29.0333-.4513.609-.3238 1.468.2848 1.919.6085.451 1.4676.324 1.9189-.285 6.1966-8.356 9.7578-18.46 10.2899-30.5466.2219-5.0407-.5146-10.0271-1.2506-15.0102-.8416-5.6984-1.6826-11.3925-1.0892-17.1587 1.2003-11.6614 13.2032-21.3741 25.6678-21.3741 5.8136 0 20.8553 3.148 25.64 18.7347 2.9985 9.7676 3.8163 22.9866 3.09 35.8289-.7261 12.841-2.9851 25.122-6.0227 32.997-.2727.707.0793 1.501.7861 1.774.7069.273 1.5009-.079 1.7735-.786 3.178-8.24 5.4671-20.832 6.2022-33.8301.735-12.9965-.0729-26.5814-3.2064-36.7889-5.3112-17.3018-21.9605-20.673-28.2627-20.673z"/><path d="m44.8144 117.836c.6346.414.8135 1.264.3996 1.898-.8506 1.304-1.5989 2.669-2.3472 4.034-.7483 1.364-1.4968 2.729-2.3476 4.033-.4138.635-1.2637.814-1.8983.4-.6345-.414-.8134-1.264-.3995-1.898.8506-1.305 1.5989-2.669 2.3472-4.034.7483-1.364 1.4967-2.729 2.3475-4.033.4139-.635 1.2638-.814 1.8983-.4z"/><path d="m56.5601 51.0421c.6297-.4212.7987-1.2731.3775-1.9028s-1.2731-.7987-1.9028-.3776c-5.4318 3.6332-8.7644 8.6292-8.7644 15.948 0 4.3581.7721 7.9203 1.564 11.5739 1.1849 5.4674 1.9886 10.923 1.8442 16.5387-.1754 6.8193-1.5097 13.0507-4.0744 18.9867-.3005.696.0197 1.503.7151 1.803.6955.301 1.5028-.019 1.8033-.715 2.7118-6.276 4.1147-12.855 4.2985-20.0041.1501-5.8355-.6759-11.507-1.9049-17.1894-.7937-3.6696-1.5023-6.9459-1.5023-10.9938 0-6.2708 2.7587-10.4654 7.5462-13.6676z"/><path d="m61.914 46.2225c5.6921-1.1604 11.8175.2735 16.3261 3.9227 8.0533 6.5183 9.1243 18.4055 9.9922 28.0381l.0443.4907c1.1215 12.4168-.1623 24.477-2.7484 36.589-.1582.741-.887 1.213-1.6279 1.055s-1.2133-.887-1.0551-1.628c2.5474-11.93 3.7889-23.7035 2.6991-35.7692-.0361-.3995-.072-.8046-.1083-1.2146l-.0006-.006c-.7709-8.7048-1.7364-19.6072-8.9213-25.4225-3.8546-3.1199-9.1413-4.3682-14.0521-3.367-.7423.1513-1.4668-.3278-1.6181-1.0701s.3277-1.4668 1.0701-1.6181z"/><path d="m83.5894 122.089c.187-.734-.2567-1.481-.9909-1.668-.7341-.187-1.4808.257-1.6677.991-.8293 3.257-2.1071 6.197-3.7273 8.904-.3891.65-.1775 1.493.4725 1.882.6501.389 1.4925.177 1.8815-.473 1.7461-2.917 3.1322-6.102 4.0319-9.636z"/><path d="m76.8816 102.183c.7523.089 1.2901.771 1.201 1.523-1.2955 10.948-4.2203 20.712-8.9133 29.18-.3672.663-1.2021.902-1.8647.535-.6627-.367-.9022-1.202-.535-1.865 4.4914-8.104 7.3272-17.513 8.5886-28.172.089-.753.7711-1.291 1.5234-1.201z"/><path d="m76.5989 63.9903c-.951-5.0814-5.3122-8.9684-10.6068-8.9684-7.1695 0-12.1997 7.2267-10.4271 13.9503 2.9993 11.8683 3.4917 23.3068 1.4613 34.3238l-.0015.008c-1.762 9.891-5.1456 18.79-9.7611 26.33-.3955.646-.1923 1.49.4538 1.886.6462.395 1.4906.192 1.8861-.454 4.8043-7.849 8.303-17.071 10.1214-27.277 2.1082-11.4419 1.5858-23.2814-1.502-35.4961l-.0037-.0144c-1.3296-5.0294 2.3765-10.5131 7.7728-10.5131 3.8943 0 7.1824 2.8648 7.9084 6.7203 1.9967 11.5814 3.0366 22.3211 2.2962 31.5679-.0605.7552.5026 1.4164 1.2578 1.4769.7552.0604 1.4164-.5027 1.4769-1.2579.7675-9.5844-.3159-20.5885-2.329-32.263-.0011-.0065-.0023-.0129-.0035-.0193z"/><path d="m61.899 123.401c.6738.346.9393 1.173.5931 1.847l-3.6348 7.073c-.3462.674-1.1732.94-1.847.593-.6738-.346-.9394-1.173-.5931-1.847l3.6347-7.073c.3463-.674 1.1732-.939 1.8471-.593z"/><path d="m67.0123 65.313c-.1732-.7375-.9115-1.1949-1.649-1.0216-.7376.1732-1.195.9115-1.0217 1.649 4.6258 19.6913 3.9905 36.9816-1.644 51.7116-.2707.707.0835 1.5.7911 1.771s1.5006-.083 1.7712-.791c5.875-15.358 6.4722-33.228 1.7524-53.319z"/></g></svg>`;
 
-export const bitkitIcon = (color = 'white'): string =>
-	`<svg width="184" height="64" viewBox="0 0 184 64" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M39.0553 36.1907L44.3677 30.869C47.4865 27.7448 47.4865 22.6795 44.3677 19.5553C41.249 16.4311 36.1924 16.4311 33.0737 19.5553L27.7613 24.8769C28.7747 27.3445 30.282 29.6565 32.2831 31.6611C34.2842 33.6656 36.592 35.1755 39.0553 36.1907Z" fill="white"/><path d="M36.6349 38.6155C34.2443 37.4715 32.0039 35.9078 30.0239 33.9243C28.0438 31.9408 26.4828 29.6965 25.3408 27.3018L19.5204 33.1323C16.4016 36.2565 16.4016 41.3218 19.5204 44.446C22.6392 47.5702 27.6957 47.5702 30.8145 44.446L36.6349 38.6155Z" fill="${color}"/><path fill-rule="evenodd" clip-rule="evenodd" d="M35.3065 0.18043C52.8696 2.03949 65.5646 17.8011 63.7088 35.3679C61.8529 52.9616 46.1187 65.6786 28.5824 63.8196C11.0193 61.9605 -1.67572 46.1989 0.180116 28.6321C2.03595 11.0384 17.7702 -1.67863 35.3065 0.18043ZM34.6072 6.86227C20.8094 5.38041 8.30275 15.5109 6.85036 29.3327C5.37107 43.1544 15.484 55.6828 29.2817 57.1377C43.0794 58.6196 55.5861 48.4891 57.0385 34.6673C58.5178 20.8456 48.4049 8.31719 34.6072 6.86227Z" fill="${color}"/><path d="M85.3301 46.5633V18.0029H99.087C101.931 18.0029 104.151 18.6554 105.746 19.9602C107.394 21.3183 108.218 23.1425 108.218 25.4326C108.218 28.1488 106.889 30.0129 104.231 31.0248V31.1447C105.799 31.624 107.035 32.4895 107.939 33.7411C108.87 34.9927 109.335 36.4573 109.335 38.135C109.335 40.9045 108.365 43.0348 106.424 44.5261C104.696 45.8842 102.357 46.5633 99.406 46.5633H85.3301ZM92.3082 40.8911H98.6085C99.7516 40.8911 100.655 40.5849 101.32 39.9724C102.011 39.3599 102.357 38.5477 102.357 37.5358C102.357 36.444 101.998 35.6051 101.28 35.0193C100.562 34.4068 99.6453 34.1006 98.5288 34.1006H92.3082V40.8911ZM92.3082 29.3072H98.0503C99.087 29.3072 99.9111 29.0542 100.523 28.5483C101.161 28.0423 101.48 27.3366 101.48 26.4312C101.48 25.5524 101.174 24.8601 100.562 24.3541C99.951 23.8481 99.1269 23.5952 98.0901 23.5952H92.3082V29.3072Z" fill="white"/><path d="M111.684 46.5633V26.1117H118.183V46.5633H111.684ZM111.684 23.2756V18.0029H118.183V23.2756H111.684Z" fill="white"/><path d="M129.397 46.8029C127.323 46.8029 125.715 46.3902 124.572 45.5646C123.455 44.7125 122.897 43.2479 122.897 41.1708V30.186H120.185V26.1117H122.897V19.6407H129.237V26.1117H132.945V30.186H129.237V39.7727C129.237 40.5183 129.423 41.0376 129.795 41.3305C130.194 41.6235 130.766 41.7699 131.51 41.7699C131.723 41.7699 132.002 41.7699 132.347 41.7699C132.693 41.7433 132.892 41.73 132.945 41.73V46.4834C132.201 46.6964 131.018 46.8029 129.397 46.8029Z" fill="white"/><path d="M135.282 46.5633V18.0029H141.701V33.0221L147.762 26.1117H155.259L148.081 33.781L156.096 46.5633H148.56L143.655 38.2149L141.701 40.292V46.5633H135.282Z" fill="white"/><path d="M157.594 46.5633V26.1117H164.094V46.5633H157.594ZM157.594 23.2756V18.0029H164.094V23.2756H157.594Z" fill="white"/><path d="M175.307 46.8029C173.234 46.8029 171.626 46.3902 170.483 45.5646C169.366 44.7125 168.808 43.2479 168.808 41.1708V30.186H166.096V26.1117H168.808V19.6407H175.148V26.1117H178.856V30.186H175.148V39.7727C175.148 40.5183 175.334 41.0376 175.706 41.3305C176.105 41.6235 176.677 41.7699 177.421 41.7699C177.634 41.7699 177.913 41.7699 178.258 41.7699C178.604 41.7433 178.803 41.73 178.856 41.73V46.4834C178.112 46.6964 176.929 46.8029 175.307 46.8029Z" fill="white"/></svg>`;
-
 export const emailIcon = (color = 'white'): string =>
 	`<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg"><path opacity="0.2" d="M21 5.25L12 13.5L3 5.25H21Z" fill="${color}"/><path fill-rule="evenodd" clip-rule="evenodd" d="M2.25 5.25C2.25 4.83579 2.58579 4.5 3 4.5H21C21.4142 4.5 21.75 4.83579 21.75 5.25V18C21.75 18.3978 21.592 18.7794 21.3107 19.0607C21.0294 19.342 20.6478 19.5 20.25 19.5H3.75C3.35218 19.5 2.97065 19.342 2.68934 19.0607C2.40804 18.7794 2.25 18.3978 2.25 18V5.25ZM3.75 6V18H20.25V6H3.75Z" fill="${color}"/><path fill-rule="evenodd" clip-rule="evenodd" d="M2.44714 4.74321C2.72703 4.43787 3.20146 4.41724 3.5068 4.69714L12 12.4826L20.4932 4.69714C20.7985 4.41724 21.273 4.43787 21.5529 4.74321C21.8328 5.04855 21.8121 5.52298 21.5068 5.80287L12.5068 14.0529C12.2201 14.3157 11.78 14.3157 11.4932 14.0529L2.49321 5.80287C2.18787 5.52298 2.16724 5.04855 2.44714 4.74321Z" fill="${color}"/></svg>`;
 
diff --git a/src/assets/icons/wallet.ts b/src/assets/icons/wallet.ts
index 9e4995ff7..c551cd4b7 100644
--- a/src/assets/icons/wallet.ts
+++ b/src/assets/icons/wallet.ts
@@ -45,8 +45,18 @@ export const bitcoinSlantedIcon = (
 <path d="M11.0502 6.12831C11.2702 4.65705 10.1499 3.86646 8.61834 3.33888L9.11505 1.34618L7.90221 1.04385L7.41839 2.98404C7.09917 2.9045 6.77197 2.82957 6.4463 2.75541L6.93319 0.802329L5.72111 0.5L5.22378 2.49239C4.95984 2.4322 4.70081 2.37293 4.44915 2.31029L4.45038 2.30414L2.77767 1.8865L2.45492 3.18196C2.45492 3.18196 3.35485 3.38817 3.33581 3.40106C3.82715 3.52374 3.91574 3.8488 3.901 4.10644L3.33519 6.3766C3.36897 6.38535 3.41273 6.39748 3.46125 6.41713C3.42072 6.407 3.37757 6.39609 3.3332 6.38535L2.53999 9.56525C2.4798 9.71449 2.32733 9.93851 1.984 9.85345C1.99613 9.87095 1.10189 9.63342 1.10189 9.63342L0.5 11.0216L2.07843 11.4151C2.37186 11.4887 2.66006 11.5655 2.94319 11.6382L2.44157 13.6538L3.65318 13.9561L4.1502 11.9621C4.48155 12.0517 4.80277 12.1348 5.11723 12.213L4.62189 14.1977L5.83489 14.5L6.33698 12.4883C8.40568 12.8795 9.96124 12.7217 10.6156 10.851C11.1434 9.34476 10.5895 8.47585 9.50122 7.90912C10.2937 7.7264 10.8909 7.20497 11.0502 6.12831ZM8.27885 10.0147C7.90359 11.5211 5.36766 10.7067 4.54497 10.5023L5.21104 7.83235C6.03327 8.03733 8.67039 8.44361 8.27885 10.0147ZM8.6535 6.10666C8.31171 7.47689 6.20063 6.78057 5.51583 6.60983L6.11956 4.18813C6.80421 4.35887 9.00988 4.67747 8.6535 6.10666Z" fill="${color}"/>
 </svg>`;
 
-export const bitcoinCircleIcon = (color = 'white'): string =>
-	`<svg fill="none" height="32" viewBox="0 0 32 32" width="32" xmlns="http://www.w3.org/2000/svg"><rect fill="${color}" height="32" rx="16" width="32"/><path d="m21.966 13.9188c.2705-1.8086-1.1063-2.7805-2.9886-3.429l.6104-2.4496-1.4906-.37165-.5946 2.38505c-.3923-.09778-.7944-.18989-1.1947-.28106l.5984-2.40089-1.4896-.37165-.6112 2.44922c-.3244-.07399-.6427-.14685-.952-.22386l.0015-.00755-2.0558-.5134-.3966 1.59249s1.106.2535 1.0826.2693c.6038.1508.7127.5504.6946.8672l-.6954 2.7906c.0415.0108.0953.0257.1549.0498-.0498-.0124-.1028-.0258-.1573-.039l-.9749 3.909c-.0739.1834-.2613.4588-.6833.3543.0149.0215-1.08408-.2705-1.08408-.2705l-.73972 1.7065 1.9399.4837c.3606.0904.7148.1848 1.0628.2743l-.6165 2.4777 1.489.3716.6109-2.4512c.4072.1102.802.2123 1.1884.3084l-.6087 2.4398 1.4907.3716.6171-2.473c2.5424.4809 4.4542.2869 5.2584-2.0126.6486-1.8517-.0321-2.9198-1.3696-3.6165.9739-.2246 1.708-.8656 1.9036-2.1891zm-3.4059 4.7774c-.4612 1.8519-3.5778.8507-4.5889.5995l.8186-3.2822c1.0105.252 4.2515.7515 3.7703 2.6827zm.4605-4.804c-.4201 1.6844-3.0146.8284-3.8562.6185l.742-2.9769c.8414.2099 3.5521.6015 3.1142 2.3584z" fill="#fff"/></svg>`;
+export const bitcoinCircleIcon = (): string =>
+	`<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+		<g clip-path="url(#clip0_23675_21901)">
+			<path d="M31.5213 19.788C29.3833 28.3003 20.7014 33.4809 12.128 31.3583C3.55824 29.236 -1.6591 20.6141 0.479349 12.1023C2.6158 3.58919 11.2985 -1.59217 19.8689 0.530207C28.4411 2.65258 33.6582 11.2751 31.5213 19.788Z" fill="#F7931A"/>
+			<path d="M23.0523 13.681C23.3708 11.5664 21.7494 10.4301 19.5328 9.67176L20.2516 6.80765L18.4963 6.37311L17.7961 9.16175C17.3341 9.04743 16.8605 8.93973 16.3892 8.83314L17.0939 6.02597L15.3396 5.59143L14.6199 8.4551C14.2379 8.36859 13.863 8.2834 13.4988 8.19336L13.5005 8.18453L11.0796 7.58426L10.6125 9.44622C10.6125 9.44622 11.915 9.7426 11.8874 9.76114C12.5985 9.93747 12.7268 10.4047 12.7054 10.775L11.8865 14.0379C11.9354 14.0505 11.9988 14.0679 12.069 14.0961C12.0103 14.0816 11.9479 14.0659 11.8836 14.0505L10.7356 18.6209C10.6485 18.8355 10.4279 19.1574 9.93098 19.0352C9.94854 19.0603 8.65431 18.7189 8.65431 18.7189L7.7832 20.7142L10.0676 21.2798C10.4923 21.3855 10.9094 21.4959 11.3192 21.6005L10.5932 24.4975L12.3468 24.932L13.0661 22.0659C13.5456 22.1948 14.0105 22.3142 14.4656 22.4265L13.7488 25.2792L15.5043 25.7137L16.231 22.8222C19.225 23.3845 21.4763 23.1577 22.4234 20.469C23.1872 18.304 22.3856 17.0552 20.8105 16.2406C21.9574 15.978 22.8219 15.2285 23.0523 13.681ZM19.0414 19.2669C18.4983 21.4321 14.8281 20.2616 13.6374 19.9678L14.6014 16.1302C15.7914 16.4249 19.6081 17.0088 19.0414 19.2669ZM19.5836 13.6499C19.089 15.6193 16.0336 14.6185 15.0425 14.3731L15.9163 10.8924C16.9072 11.1378 20.0994 11.5957 19.5836 13.6499Z" fill="white"/>
+		</g>
+		<defs>
+		<clipPath id="clip0_23675_21901">
+			<rect width="32" height="32" fill="white"/>
+		</clipPath>
+		</defs>
+	</svg>`;
 
 export const lightningIcon = (
 	color = 'white',
@@ -242,9 +252,6 @@ export const savingsIcon = (
 	<path d="M10.875 7.10375C9.4075 4.445 5.6875 4.4375 5.6875 4.4375L6.47 9.9175C5.44679 11.0326 4.68799 12.3639 4.25 13.8125H1.9375V21.3125H5.05C5.69731 22.4474 6.54917 23.4527 7.5625 24.2775V27.875C7.5625 28.1236 7.66127 28.3621 7.83709 28.5379C8.0129 28.7137 8.25136 28.8125 8.5 28.8125H10.375C10.6236 28.8125 10.8621 28.7137 11.0379 28.5379C11.2137 28.3621 11.3125 28.1236 11.3125 27.875V26.3237C13.7455 27.1373 16.3765 27.1422 18.8125 26.3375V27.875C18.8125 28.1236 18.9113 28.3621 19.0871 28.5379C19.2629 28.7137 19.5014 28.8125 19.75 28.8125H21.625C21.8736 28.8125 22.1121 28.7137 22.2879 28.5379C22.4637 28.3621 22.5625 28.1236 22.5625 27.875V24.2962C23.719 23.3772 24.6558 22.2116 25.3045 20.8845C25.9533 19.5573 26.2976 18.1021 26.3125 16.625C26.3125 8.5075 17.5 4.88875 10.875 7.10375Z" stroke="${color}" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
 	</svg>`;
 
-export const bIcon = (color = 'white'): string =>
-	`<svg fill="none" height="42" viewBox="0 0 26 42" width="26" xmlns="http://www.w3.org/2000/svg"><path d="m0 37.761h6.14326v4.16h2.78139v-4.16h3.26515v4.16h2.7814v-4.16c6.8688-.2177 11.0288-3.7731 11.0288-9.481v-.0483c0-4.3052-3.2167-7.5703-7.7153-7.9331v-.3144c3.4344-.5321 6.119-3.6763 6.119-7.2558v-.0484c0-4.88555-3.6037-8.05392-9.4325-8.34415v-4.2567484h-2.7814v4.2325584h-3.26515v-4.2325584h-2.78139v4.2325584h-6.14326zm6.96558-19.4698v-8.70698l5.46602-.02419c3.3135 0 5.2 1.57207 5.2 4.23257v.0484c0 2.8055-2.1525 4.4502-5.9014 4.4502zm0 14.1972v-9.4567h5.56282c4.2567-.0242 6.2158 1.5962 6.2158 4.6437v.0484c0 3.1441-1.9107 4.7404-6.0465 4.7404z" fill="${color}"/></svg>`;
-
 export const cameraIcon = (color = 'white'): string =>
 	`<svg width="40" height="35" viewBox="0 0 40 40" fill="none" xmlns="http://www.w3.org/2000/svg"><path opacity=".2" d="M35 6h-6.001l-3-4.5h-12l-3 4.5H5a3 3 0 0 0-3 3v21a3 3 0 0 0 3 3h30a3 3 0 0 0 3-3V9a3 3 0 0 0-3-3ZM20 25.5A6.75 6.75 0 1 1 20 12a6.75 6.75 0 0 1 0 13.5Z" fill="${color}"/><path fill-rule="evenodd" clip-rule="evenodd" d="M12.75.668A1.5 1.5 0 0 1 14 0h12c.501 0 .97.25 1.248.668L29.802 4.5H35A4.5 4.5 0 0 1 39.5 9v21a4.5 4.5 0 0 1-4.5 4.5H5A4.5 4.5 0 0 1 .5 30V9A4.5 4.5 0 0 1 5 4.5h5.196L12.751.668ZM14.803 3l-2.555 3.832a1.5 1.5 0 0 1-1.248.668H5A1.5 1.5 0 0 0 3.5 9v21A1.5 1.5 0 0 0 5 31.5h30a1.5 1.5 0 0 0 1.5-1.5V9A1.5 1.5 0 0 0 35 7.5h-6.001a1.5 1.5 0 0 1-1.248-.668L25.196 3H14.802Z" fill="${color}"/><path fill-rule="evenodd" clip-rule="evenodd" d="M20 13.5A5.25 5.25 0 1 0 20 24a5.25 5.25 0 0 0 0-10.5Zm-8.25 5.25a8.25 8.25 0 1 1 16.5 0 8.25 8.25 0 0 1-16.5 0Z" fill="${color}"/></svg>`;
 
@@ -363,9 +370,25 @@ export const plusCircledIcon = (
 	<path fill-rule="evenodd" clip-rule="evenodd" d="M16 10C16.2761 10 16.5 10.2239 16.5 10.5V21.5C16.5 21.7761 16.2761 22 16 22C15.7239 22 15.5 21.7761 15.5 21.5V10.5C15.5 10.2239 15.7239 10 16 10Z" fill=${color}/>
 	</svg>`;
 
+export const qrIcon = (
+	color = 'white',
+): string => `<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+	<path opacity="0.2" d="M13.0005 6H7.00049C6.4482 6 6.00049 6.44772 6.00049 7V13C6.00049 13.5523 6.4482 14 7.00049 14H13.0005C13.5528 14 14.0005 13.5523 14.0005 13V7C14.0005 6.44772 13.5528 6 13.0005 6Z" fill="${color}"/>
+	<path opacity="0.2" d="M13.0005 18H7.00049C6.4482 18 6.00049 18.4477 6.00049 19V25C6.00049 25.5523 6.4482 26 7.00049 26H13.0005C13.5528 26 14.0005 25.5523 14.0005 25V19C14.0005 18.4477 13.5528 18 13.0005 18Z" fill="${color}"/>
+	<path opacity="0.2" d="M25.0005 6H19.0005C18.4482 6 18.0005 6.44772 18.0005 7V13C18.0005 13.5523 18.4482 14 19.0005 14H25.0005C25.5528 14 26.0005 13.5523 26.0005 13V7C26.0005 6.44772 25.5528 6 25.0005 6Z" fill="${color}"/>
+	<path fill-rule="evenodd" clip-rule="evenodd" d="M5.00049 7C5.00049 5.89543 5.89592 5 7.00049 5H13.0005C14.1051 5 15.0005 5.89543 15.0005 7V13C15.0005 14.1046 14.1051 15 13.0005 15H7.00049C5.89592 15 5.00049 14.1046 5.00049 13V7ZM13.0005 7H7.00049V13H13.0005V7Z" fill="${color}"/>
+	<path fill-rule="evenodd" clip-rule="evenodd" d="M5.00049 19C5.00049 17.8954 5.89592 17 7.00049 17H13.0005C14.1051 17 15.0005 17.8954 15.0005 19V25C15.0005 26.1046 14.1051 27 13.0005 27H7.00049C5.89592 27 5.00049 26.1046 5.00049 25V19ZM13.0005 19H7.00049V25H13.0005V19Z" fill="${color}"/>
+	<path fill-rule="evenodd" clip-rule="evenodd" d="M17.0005 7C17.0005 5.89543 17.8959 5 19.0005 5H25.0005C26.1051 5 27.0005 5.89543 27.0005 7V13C27.0005 14.1046 26.1051 15 25.0005 15H19.0005C17.8959 15 17.0005 14.1046 17.0005 13V7ZM25.0005 7H19.0005V13H25.0005V7Z" fill="${color}"/>
+	<path fill-rule="evenodd" clip-rule="evenodd" d="M18.0005 17C18.5528 17 19.0005 17.4477 19.0005 18V22C19.0005 22.5523 18.5528 23 18.0005 23C17.4482 23 17.0005 22.5523 17.0005 22V18C17.0005 17.4477 17.4482 17 18.0005 17Z" fill="${color}"/>
+	<path fill-rule="evenodd" clip-rule="evenodd" d="M22.0005 17C22.5528 17 23.0005 17.4477 23.0005 18V26C23.0005 26.5523 22.5528 27 22.0005 27H18.0005C17.4482 27 17.0005 26.5523 17.0005 26C17.0005 25.4477 17.4482 25 18.0005 25H21.0005V18C21.0005 17.4477 21.4482 17 22.0005 17Z" fill="${color}"/>
+	<path fill-rule="evenodd" clip-rule="evenodd" d="M21.0005 20C21.0005 19.4477 21.4482 19 22.0005 19H26.0005C26.5528 19 27.0005 19.4477 27.0005 20C27.0005 20.5523 26.5528 21 26.0005 21H22.0005C21.4482 21 21.0005 20.5523 21.0005 20Z" fill="${color}"/>
+	<path fill-rule="evenodd" clip-rule="evenodd" d="M26.0005 23C26.5528 23 27.0005 23.4477 27.0005 24V26C27.0005 26.5523 26.5528 27 26.0005 27C25.4482 27 25.0005 26.5523 25.0005 26V24C25.0005 23.4477 25.4482 23 26.0005 23Z" fill="${color}"/>
+	</svg>	
+`;
+
 export const questionMarkIcon =
 	(): string => `<svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
-<rect width="48" height="48" rx="8" fill="#FF6600"/>
+<rect width="48" height="48" rx="8" fill="#FF4400"/>
 <path opacity="0.2" d="M24 35.25C30.2132 35.25 35.25 30.2132 35.25 24C35.25 17.7868 30.2132 12.75 24 12.75C17.7868 12.75 12.75 17.7868 12.75 24C12.75 30.2132 17.7868 35.25 24 35.25Z" fill="white"/>
 <path fill-rule="evenodd" clip-rule="evenodd" d="M24 13.6875C18.3046 13.6875 13.6875 18.3046 13.6875 24C13.6875 29.6954 18.3046 34.3125 24 34.3125C29.6954 34.3125 34.3125 29.6954 34.3125 24C34.3125 18.3046 29.6954 13.6875 24 13.6875ZM11.8125 24C11.8125 17.269 17.269 11.8125 24 11.8125C30.731 11.8125 36.1875 17.269 36.1875 24C36.1875 30.731 30.731 36.1875 24 36.1875C17.269 36.1875 11.8125 30.731 11.8125 24Z" fill="white"/>
 <path d="M24 31.5C24.7767 31.5 25.4062 30.8704 25.4062 30.0938C25.4062 29.3171 24.7767 28.6875 24 28.6875C23.2233 28.6875 22.5938 29.3171 22.5938 30.0938C22.5938 30.8704 23.2233 31.5 24 31.5Z" fill="white"/>
@@ -402,7 +425,7 @@ export const mapPinLineIcon = (color = 'white'): string =>
 </svg>`;
 
 export const arrowLNfunds = (color = 'white'): string =>
-	`<svg width="87" height="42" viewBox="0 0 87 42" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M86.7072 34.7072C87.0977 34.3167 87.0977 33.6835 86.7072 33.293L80.3432 26.9291C79.9527 26.5385 79.3195 26.5385 78.929 26.9291C78.5385 27.3196 78.5385 27.9527 78.929 28.3433L84.5859 34.0001L78.929 39.657C78.5385 40.0475 78.5385 40.6807 78.929 41.0712C79.3195 41.4617 79.9527 41.4617 80.3432 41.0712L86.7072 34.7072ZM0.667972 1.55475C1.22416 2.38903 1.80547 3.20237 2.41025 3.99528L4.00048 2.78236C3.42088 2.02247 2.86426 1.24363 2.33207 0.445349L0.667972 1.55475ZM6.31833 8.52296C7.70409 9.95027 9.17047 11.2997 10.7043 12.5755L11.9832 11.0379C10.5006 9.80468 9.08672 8.50322 7.75328 7.12979L6.31833 8.52296ZM15.4593 16.1623C17.0906 17.2802 18.7752 18.331 20.5006 19.3189L21.4944 17.5833C19.8124 16.6203 18.1737 15.5979 16.5899 14.5125L15.4593 16.1623ZM25.754 22.0818C27.5345 22.9419 29.3438 23.7443 31.1699 24.4929L31.9286 22.6424C30.1375 21.9081 28.3654 21.1221 26.6239 20.2809L25.754 22.0818ZM36.7074 26.5888C38.583 27.2431 40.4643 27.8464 42.3388 28.4026L42.9077 26.4852C41.0614 25.9374 39.2102 25.3437 37.3662 24.7004L36.7074 26.5888ZM48.035 29.9604C49.9815 30.4495 51.9071 30.891 53.7974 31.2897L54.21 29.3327C52.3431 28.939 50.4426 28.5032 48.5224 28.0207L48.035 29.9604ZM59.5947 32.4046C61.6052 32.7551 63.5535 33.0582 65.4198 33.3203L65.698 31.3397C63.8521 31.0805 61.9256 30.7807 59.9381 30.4343L59.5947 32.4046ZM71.2778 34.0478C73.4279 34.2802 75.4042 34.4558 77.1636 34.5886L77.3141 32.5943C75.5745 32.463 73.6198 32.2892 71.4927 32.0594L71.2778 34.0478ZM83.0467 34.9279C83.9884 34.9639 84.7239 34.982 85.2254 34.991C85.4761 34.9955 85.6684 34.9978 85.7987 34.999C85.8638 34.9995 85.9134 34.9998 85.9471 35C85.964 35 85.9769 35.0001 85.9857 35.0001C85.9901 35.0001 85.9935 35.0001 85.9959 35.0001C85.9971 35.0001 85.9981 35.0001 85.9988 35.0001C85.9991 35.0001 85.9994 35.0001 85.9996 35.0001C85.9997 35.0001 85.9998 35.0001 85.9999 35.0001C85.9999 35.0001 86 35.0001 86 35.0001C86 35.0001 86.0001 35.0001 86.0001 34.0001C86.0001 33.0001 86.0001 33.0001 86.0001 33.0001C86.0001 33.0001 86.0001 33.0001 86.0002 33.0001C86.0002 33.0001 86.0002 33.0001 86.0001 33.0001C86.0001 33.0001 86 33.0001 85.9998 33.0001C85.9995 33.0001 85.9989 33.0001 85.9981 33.0001C85.9964 33.0001 85.9937 33.0001 85.99 33.0001C85.9826 33.0001 85.9712 33.0001 85.9558 33C85.925 32.9999 85.8783 32.9996 85.8162 32.999C85.6919 32.998 85.5058 32.9958 85.2614 32.9914C84.7726 32.9825 84.0506 32.9649 83.1231 32.9294L83.0467 34.9279Z" fill=${color}/>
+	`<svg width="45" height="20" viewBox="0 0 45 20" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M44.7397 10.2167C44.9468 9.70474 44.6996 9.12181 44.1876 8.91473L35.8443 5.54013C35.3323 5.33305 34.7493 5.58022 34.5423 6.09222C34.3352 6.60421 34.5824 7.18713 35.0943 7.39421L42.5107 10.3939L39.511 17.8102C39.304 18.3222 39.5511 18.9051 40.0631 19.1122C40.5751 19.3193 41.158 19.0721 41.3651 18.5601L44.7397 10.2167ZM0.464961 2.11909C0.774995 2.52592 1.09014 2.92026 1.41011 3.30242L2.9436 2.01852C2.6434 1.65997 2.34733 1.28953 2.0557 0.906837L0.464961 2.11909ZM3.44368 5.50954C4.1775 6.2323 4.93052 6.9004 5.6995 7.51719L6.95087 5.95704C6.23476 5.38266 5.5325 4.75969 4.84712 4.08464L3.44368 5.50954ZM8.14772 9.27937C9.00828 9.8328 9.88271 10.3302 10.7668 10.7761L11.6674 8.99029C10.844 8.57505 10.0301 8.11207 9.22953 7.5972L8.14772 9.27937ZM13.5246 11.9943C14.4741 12.3578 15.4291 12.6686 16.3847 12.9324L16.9168 11.0045C16.0203 10.757 15.1265 10.466 14.2395 10.1265L13.5246 11.9943ZM19.3112 13.599C20.3079 13.7801 21.2998 13.9156 22.2815 14.0116L22.4761 12.0211C21.5459 11.9301 20.6085 11.802 19.6689 11.6312L19.3112 13.599ZM25.265 14.1889C26.2777 14.2116 27.2731 14.197 28.2446 14.1522L28.1525 12.1544C27.2237 12.1971 26.274 12.211 25.3098 12.1894L25.265 14.1889ZM31.2162 13.9203C32.2389 13.8084 33.2239 13.6682 34.1624 13.5097L33.8293 11.5376C32.9264 11.6902 31.98 11.8248 30.9987 11.9321L31.2162 13.9203ZM37.0737 12.9341C38.1332 12.6941 39.101 12.4415 39.9583 12.1969L39.4096 10.2737C38.5847 10.509 37.6526 10.7523 36.6319 10.9835L37.0737 12.9341ZM42.7945 11.2962C43.2405 11.1386 43.5885 11.0069 43.827 10.9137C43.9463 10.8672 44.0383 10.8302 44.1014 10.8045C44.133 10.7916 44.1574 10.7815 44.1744 10.7745C44.1829 10.7709 44.1895 10.7681 44.1943 10.7661C44.1967 10.7651 44.1986 10.7643 44.2001 10.7637C44.2008 10.7634 44.2014 10.7631 44.2019 10.7629C44.2022 10.7628 44.2024 10.7627 44.2026 10.7626C44.2027 10.7626 44.2028 10.7626 44.2029 10.7625C44.2029 10.7625 44.2029 10.7625 44.203 10.7625C44.203 10.7624 44.2031 10.7624 43.8127 9.84177C43.4223 8.92112 43.4223 8.9211 43.4224 8.92108C43.4224 8.92108 43.4224 8.92106 43.4225 8.92105C43.4225 8.92103 43.4226 8.92101 43.4226 8.92099C43.4227 8.92096 43.4227 8.92095 43.4227 8.92094C43.4228 8.92093 43.4227 8.92097 43.4225 8.92105C43.422 8.92123 43.4212 8.9216 43.4198 8.92216C43.4171 8.92329 43.4126 8.92519 43.4063 8.92783C43.3936 8.93312 43.3735 8.94139 43.3464 8.95245C43.2921 8.97457 43.2094 9.00785 43.0996 9.05072C42.88 9.13647 42.5524 9.26053 42.1282 9.41042L42.7945 11.2962Z" fill="${color}" fill-opacity="0.5"/>
 </svg>
 `;
diff --git a/src/assets/illustrations/bitcoin-emboss.png b/src/assets/illustrations/bitcoin-emboss.png
new file mode 100644
index 000000000..b4abb3489
Binary files /dev/null and b/src/assets/illustrations/bitcoin-emboss.png differ
diff --git a/src/assets/illustrations/bitkit-logo.png b/src/assets/illustrations/bitkit-logo.png
deleted file mode 100644
index cea59c60e..000000000
Binary files a/src/assets/illustrations/bitkit-logo.png and /dev/null differ
diff --git a/src/assets/illustrations/book.png b/src/assets/illustrations/book.png
index d48725f06..6b9965449 100644
Binary files a/src/assets/illustrations/book.png and b/src/assets/illustrations/book.png differ
diff --git a/src/assets/illustrations/card.png b/src/assets/illustrations/card.png
new file mode 100644
index 000000000..40d207233
Binary files /dev/null and b/src/assets/illustrations/card.png differ
diff --git a/src/assets/illustrations/coin-stack.png b/src/assets/illustrations/coin-stack.png
new file mode 100644
index 000000000..ce6891875
Binary files /dev/null and b/src/assets/illustrations/coin-stack.png differ
diff --git a/src/assets/illustrations/email.png b/src/assets/illustrations/email.png
index 4ab1c0dc7..00659c980 100644
Binary files a/src/assets/illustrations/email.png and b/src/assets/illustrations/email.png differ
diff --git a/src/assets/illustrations/exclamation-mark.png b/src/assets/illustrations/exclamation-mark.png
index 9fab30078..a66566e14 100644
Binary files a/src/assets/illustrations/exclamation-mark.png and b/src/assets/illustrations/exclamation-mark.png differ
diff --git a/src/assets/illustrations/figures.png b/src/assets/illustrations/figures.png
index 3104df91c..13dc5f95c 100644
Binary files a/src/assets/illustrations/figures.png and b/src/assets/illustrations/figures.png differ
diff --git a/src/assets/illustrations/group.png b/src/assets/illustrations/group.png
new file mode 100644
index 000000000..97789d198
Binary files /dev/null and b/src/assets/illustrations/group.png differ
diff --git a/src/assets/illustrations/hourglass.png b/src/assets/illustrations/hourglass.png
index 1ddf606ae..3e9b579ad 100644
Binary files a/src/assets/illustrations/hourglass.png and b/src/assets/illustrations/hourglass.png differ
diff --git a/src/assets/illustrations/keyring.png b/src/assets/illustrations/keyring.png
index b7661f960..d7c6469e8 100644
Binary files a/src/assets/illustrations/keyring.png and b/src/assets/illustrations/keyring.png differ
diff --git a/src/assets/illustrations/light-bulb.png b/src/assets/illustrations/light-bulb.png
deleted file mode 100644
index 5182c1eca..000000000
Binary files a/src/assets/illustrations/light-bulb.png and /dev/null differ
diff --git a/src/assets/illustrations/lightbulb.png b/src/assets/illustrations/lightbulb.png
new file mode 100644
index 000000000..6f5838659
Binary files /dev/null and b/src/assets/illustrations/lightbulb.png differ
diff --git a/src/assets/illustrations/lightning.png b/src/assets/illustrations/lightning.png
index a3f20788a..80d8a7684 100644
Binary files a/src/assets/illustrations/lightning.png and b/src/assets/illustrations/lightning.png differ
diff --git a/src/assets/illustrations/ln-sync-large.png b/src/assets/illustrations/ln-sync-large.png
new file mode 100644
index 000000000..61410cda3
Binary files /dev/null and b/src/assets/illustrations/ln-sync-large.png differ
diff --git a/src/assets/illustrations/ln-sync-small.png b/src/assets/illustrations/ln-sync-small.png
new file mode 100644
index 000000000..869b783d6
Binary files /dev/null and b/src/assets/illustrations/ln-sync-small.png differ
diff --git a/src/assets/illustrations/loading-circle.png b/src/assets/illustrations/loading-circle.png
new file mode 100644
index 000000000..3cde74bc1
Binary files /dev/null and b/src/assets/illustrations/loading-circle.png differ
diff --git a/src/assets/illustrations/orange-pill.png b/src/assets/illustrations/orange-pill.png
deleted file mode 100644
index d8f7f6ec3..000000000
Binary files a/src/assets/illustrations/orange-pill.png and /dev/null differ
diff --git a/src/assets/illustrations/padlock.png b/src/assets/illustrations/padlock.png
index 1422da0d9..a4f072029 100644
Binary files a/src/assets/illustrations/padlock.png and b/src/assets/illustrations/padlock.png differ
diff --git a/src/assets/illustrations/padlock2.png b/src/assets/illustrations/padlock2.png
index 30648b5e7..ae28a9770 100644
Binary files a/src/assets/illustrations/padlock2.png and b/src/assets/illustrations/padlock2.png differ
diff --git a/src/assets/illustrations/phone.png b/src/assets/illustrations/phone.png
index eb27703e8..8e1310532 100644
Binary files a/src/assets/illustrations/phone.png and b/src/assets/illustrations/phone.png differ
diff --git a/src/assets/illustrations/puzzle.png b/src/assets/illustrations/puzzle.png
index 07dcce730..a9c4c8ef9 100644
Binary files a/src/assets/illustrations/puzzle.png and b/src/assets/illustrations/puzzle.png differ
diff --git a/src/assets/illustrations/safe.png b/src/assets/illustrations/safe.png
index e7f43eb22..1f2c42c0d 100644
Binary files a/src/assets/illustrations/safe.png and b/src/assets/illustrations/safe.png differ
diff --git a/src/assets/illustrations/shield-b.png b/src/assets/illustrations/shield-b.png
deleted file mode 100644
index a09c7c8e9..000000000
Binary files a/src/assets/illustrations/shield-b.png and /dev/null differ
diff --git a/src/assets/illustrations/shield.png b/src/assets/illustrations/shield.png
index 1d80d03c3..a690c9e9d 100644
Binary files a/src/assets/illustrations/shield.png and b/src/assets/illustrations/shield.png differ
diff --git a/src/assets/illustrations/spark.png b/src/assets/illustrations/spark.png
index 71fae87f0..5f515d318 100644
Binary files a/src/assets/illustrations/spark.png and b/src/assets/illustrations/spark.png differ
diff --git a/src/assets/illustrations/tag.png b/src/assets/illustrations/tag.png
deleted file mode 100644
index 8a7127b44..000000000
Binary files a/src/assets/illustrations/tag.png and /dev/null differ
diff --git a/src/assets/illustrations/user.png b/src/assets/illustrations/user.png
deleted file mode 100644
index e9a718d1c..000000000
Binary files a/src/assets/illustrations/user.png and /dev/null differ
diff --git a/src/assets/illustrations/wallet.png b/src/assets/illustrations/wallet.png
index 303196e26..63c89c732 100644
Binary files a/src/assets/illustrations/wallet.png and b/src/assets/illustrations/wallet.png differ
diff --git a/src/assets/illustrations/wand.png b/src/assets/illustrations/wand.png
new file mode 100644
index 000000000..7269c5fea
Binary files /dev/null and b/src/assets/illustrations/wand.png differ
diff --git a/src/assets/logo.png b/src/assets/logo.png
new file mode 100644
index 000000000..8529e4a35
Binary files /dev/null and b/src/assets/logo.png differ
diff --git a/src/assets/powered-by.png b/src/assets/powered-by.png
deleted file mode 100644
index 6d6315bd1..000000000
Binary files a/src/assets/powered-by.png and /dev/null differ
diff --git a/src/assets/synonym-logo.svg b/src/assets/synonym-logo.svg
deleted file mode 100644
index 82fd6a6eb..000000000
--- a/src/assets/synonym-logo.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg width="81" height="20" viewBox="0 0 81 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M32.1262 14.8773C30.9245 14.8773 29.9664 14.6163 29.2605 14.0943C28.5462 13.5723 28.1764 12.8314 28.1512 11.8547H30.3698C30.4623 12.7051 31.0421 13.126 32.1178 13.126C32.5128 13.126 32.849 13.0503 33.1263 12.8987C33.4036 12.7472 33.5465 12.5114 33.5465 12.1915C33.5465 11.981 33.4624 11.7957 33.286 11.6526C33.1095 11.5095 32.933 11.4 32.7565 11.3495C32.58 11.2906 32.2355 11.1979 31.7396 11.0716C31.7144 11.0632 31.6976 11.0548 31.6892 11.0548C31.6808 11.0464 31.6724 11.0464 31.6556 11.038C31.6388 11.038 31.622 11.038 31.6052 11.038C31.2186 10.9454 30.9077 10.8612 30.664 10.7938C30.4202 10.718 30.1429 10.6086 29.832 10.4654C29.521 10.3223 29.2689 10.1623 29.0924 9.98551C28.9076 9.8087 28.7479 9.58137 28.6218 9.2951C28.4958 9.00883 28.4285 8.68046 28.4285 8.32684C28.4285 7.4091 28.7563 6.7271 29.4034 6.27244C30.0589 5.80936 30.9077 5.58203 31.9666 5.58203C32.975 5.58203 33.807 5.81778 34.4457 6.28086C35.0928 6.74394 35.4373 7.42594 35.4794 8.32684H33.3196C33.2775 7.99005 33.1347 7.72062 32.8826 7.53539C32.6389 7.35016 32.3027 7.25754 31.8909 7.25754C31.5127 7.25754 31.2018 7.33332 30.9665 7.48487C30.7228 7.63643 30.6051 7.8385 30.6051 8.09109C30.6051 8.36894 30.748 8.57943 31.0337 8.70572C31.3111 8.84044 31.8489 8.99199 32.6221 9.16039C33.1179 9.27826 33.5213 9.39614 33.8322 9.50559C34.1515 9.61505 34.4709 9.77502 34.7986 9.98551C35.1264 10.196 35.3701 10.4654 35.5298 10.7938C35.6979 11.1222 35.7735 11.5095 35.7735 11.9726C35.7735 12.8735 35.4289 13.5891 34.7482 14.1027C34.0591 14.6163 33.1935 14.8773 32.1262 14.8773ZM36.5719 16.7718V15.1889H37.2694C37.824 15.1889 38.1013 14.9615 38.1013 14.5153C38.1013 14.2964 37.9753 13.8586 37.7148 13.1934L35.8407 8.27632H37.9753L38.8409 10.9959L39.2359 12.4693H39.2611C39.3787 11.9052 39.5048 11.4084 39.6308 10.9959L40.4712 8.27632H42.4965L40.2947 14.751C40.0342 15.5004 39.7317 16.0224 39.3787 16.3255C39.0258 16.6202 38.5299 16.7718 37.8913 16.7718H36.5719ZM42.9504 14.6668V8.27632H44.9V9.15197H44.9421C45.4295 8.44471 46.085 8.09109 46.9086 8.09109C47.5977 8.09109 48.1355 8.31 48.5305 8.75624C48.9255 9.20248 49.1188 9.78344 49.1188 10.5075V14.6668H47.0934V10.9201C47.0934 10.5749 47.0094 10.297 46.8413 10.095C46.6648 9.88448 46.4211 9.78344 46.0934 9.78344C45.7656 9.78344 45.4967 9.90974 45.2866 10.1623C45.0765 10.4065 44.9757 10.7349 44.9757 11.1306V14.6668H42.9504ZM52.161 12.8903C52.3963 13.2439 52.724 13.4123 53.1526 13.4123C53.5896 13.4123 53.9258 13.2439 54.1611 12.8903C54.3964 12.5451 54.514 12.0736 54.514 11.4842C54.514 10.8948 54.3964 10.4233 54.1611 10.0697C53.9258 9.71608 53.5896 9.53927 53.1526 9.53927C52.724 9.53927 52.3963 9.70766 52.161 10.0613C51.9256 10.4065 51.808 10.8864 51.808 11.4842C51.808 12.0736 51.9256 12.5451 52.161 12.8903ZM55.6233 13.9007C55.0014 14.5405 54.1779 14.8605 53.1694 14.8605C52.1525 14.8605 51.3374 14.5405 50.7071 13.9007C50.0684 13.2608 49.7575 12.4525 49.7575 11.4842C49.7575 10.5075 50.0684 9.69924 50.7071 9.05935C51.3374 8.41946 52.1525 8.09951 53.1694 8.09951C54.1779 8.09951 55.0014 8.41946 55.6233 9.05935C56.2536 9.69924 56.5646 10.5075 56.5646 11.4842C56.5646 12.4525 56.2536 13.2608 55.6233 13.9007ZM57.2537 14.6668V8.27632H59.2034V9.15197H59.2454C59.7328 8.44471 60.3883 8.09109 61.2119 8.09109C61.901 8.09109 62.4388 8.31 62.8338 8.75624C63.2288 9.20248 63.4305 9.78344 63.4305 10.5075V14.6668H61.3968V10.9201C61.3968 10.5749 61.3127 10.297 61.1446 10.095C60.9766 9.88448 60.7245 9.78344 60.4051 9.78344C60.069 9.78344 59.8 9.90974 59.5899 10.1623C59.3882 10.4065 59.279 10.7349 59.279 11.1306V14.6668H57.2537ZM64.4389 16.7718V15.1889H65.1365C65.6911 15.1889 65.9684 14.9615 65.9684 14.5153C65.9684 14.2964 65.8424 13.8586 65.5819 13.1934L63.6994 8.27632H65.8424L66.6996 10.9959L67.103 12.4693H67.1282C67.2374 11.9052 67.3635 11.4084 67.4979 10.9959L68.3299 8.27632H70.3636L68.1618 14.751C67.9013 15.5004 67.5988 16.0224 67.2458 16.3255C66.8929 16.6202 66.397 16.7718 65.7583 16.7718H64.4389ZM70.809 14.6668V8.27632H72.7503V9.18564H72.7924C73.2294 8.45313 73.8764 8.09109 74.7168 8.09109C75.5572 8.09109 76.1539 8.46155 76.5152 9.2109H76.5405C77.0195 8.46155 77.6834 8.09109 78.5406 8.09109C79.2465 8.09109 79.7843 8.31 80.1541 8.74782C80.5239 9.18564 80.7088 9.7666 80.7088 10.5075V14.6668H78.6834V10.8696C78.6834 10.1455 78.3809 9.78344 77.7842 9.78344C77.4649 9.78344 77.2212 9.90132 77.0447 10.1455C76.8598 10.3812 76.7758 10.6928 76.7758 11.0801V14.6668H74.742V10.8696C74.742 10.1455 74.4479 9.78344 73.8512 9.78344C73.5319 9.78344 73.2882 9.90132 73.1117 10.1455C72.9268 10.3812 72.8428 10.6928 72.8428 11.0801V14.6668H70.809Z" fill="white"/>
-<path d="M12.7784 7.54885H10.0388L10.8372 4.3999L7.39999 7.53201V9.46853L12.7784 9.47695V7.54885ZM9.34128 15.5475L12.7784 12.4154V10.4705H7.39999V12.3986H10.1312L9.34128 15.5475Z" fill="white"/>
-<path fill-rule="evenodd" clip-rule="evenodd" d="M11.0525 0.0563843C16.5505 0.637341 20.5246 5.56284 19.9436 11.0525C19.3627 16.5505 14.4372 20.5246 8.94754 19.9436C3.44951 19.3627 -0.524572 14.4372 0.0563843 8.94754C0.637341 3.44951 5.56284 -0.524572 11.0525 0.0563843ZM10.8335 2.14446C6.51426 1.68138 2.59912 4.84717 2.14446 9.16645C1.68138 13.4857 4.84717 17.4009 9.16645 17.8555C13.4857 18.3186 17.4009 15.1528 17.8555 10.8335C18.3186 6.51426 15.1528 2.59912 10.8335 2.14446Z" fill="#FF6600"/>
-</svg>
diff --git a/src/assets/tos.ts b/src/assets/tos.ts
index 7f7701ac1..78b6716b3 100644
--- a/src/assets/tos.ts
+++ b/src/assets/tos.ts
@@ -1,5 +1,4 @@
-const termsOfUse = `
-Effective date: October 29, 2022 
+const termsOfUse = `Effective date: October 29, 2022 
 
 IMPORTANT: THE BETA VERSION OF THE BITKIT WALLET SOFTWARE IS STILL IN ITS TESTING PHASE AND IS PROVIDED ON AN "AS IS" AND "AS AVAILABLE BASIS AND MAY CONTAIN DEFECTS. A PRIMARY PURPOSE OF THIS BETA TESTING PHASE IS TO OBTAIN FEEDBACK ON PERFORMANCE AND THE IDENTIFICATION OF DEFECTS. USERS ARE ADVISED TO SAFEGUARD IMPORTANT DATA, TO USE CAUTION AND NOT TO RELY IN ANY WAY ON THE CORRECT FUNCTIONING OR PERFORMANCE OF THE BETA PRODUCT. 
 
diff --git a/src/components/ActivityHeader.tsx b/src/components/ActivityHeader.tsx
new file mode 100644
index 000000000..98fafcf1e
--- /dev/null
+++ b/src/components/ActivityHeader.tsx
@@ -0,0 +1,82 @@
+import React, { memo, ReactElement } from 'react';
+import {
+	StyleProp,
+	StyleSheet,
+	TouchableOpacity,
+	View,
+	ViewStyle,
+} from 'react-native';
+
+import { Caption13Up } from '../styles/text';
+import { EyeIcon } from '../styles/icons';
+import Money from './Money';
+import DetectSwipe from './DetectSwipe';
+import { useSwitchUnitAnnounced } from '../hooks/wallet';
+import { useAppDispatch, useAppSelector } from '../hooks/redux';
+import { updateSettings } from '../store/slices/settings';
+import {
+	enableSwipeToHideBalanceSelector,
+	hideBalanceSelector,
+} from '../store/reselect/settings';
+
+const ActivityHeader = ({
+	balance,
+	label,
+	style,
+}: {
+	balance: number;
+	label?: string;
+	style?: StyleProp<ViewStyle>;
+}): ReactElement => {
+	const dispatch = useAppDispatch();
+	const onSwitchUnit = useSwitchUnitAnnounced();
+	const hideBalance = useAppSelector(hideBalanceSelector);
+	const enableHide = useAppSelector(enableSwipeToHideBalanceSelector);
+
+	const toggleHideBalance = (): void => {
+		dispatch(updateSettings({ hideBalance: !hideBalance }));
+	};
+
+	return (
+		<View style={style}>
+			<View style={styles.label}>
+				<Caption13Up color="white50">{label}</Caption13Up>
+			</View>
+
+			<DetectSwipe
+				enabled={enableHide}
+				onSwipeLeft={toggleHideBalance}
+				onSwipeRight={toggleHideBalance}>
+				<TouchableOpacity
+					style={styles.balance}
+					testID="TotalBalance"
+					onPress={onSwitchUnit}>
+					<Money sats={balance} enableHide={true} symbol={true} />
+					{hideBalance && (
+						<TouchableOpacity
+							hitSlop={{ top: 15, bottom: 15, left: 15, right: 15 }}
+							testID="ShowBalance"
+							onPress={toggleHideBalance}>
+							<EyeIcon />
+						</TouchableOpacity>
+					)}
+				</TouchableOpacity>
+			</DetectSwipe>
+		</View>
+	);
+};
+
+const styles = StyleSheet.create({
+	label: {
+		flexDirection: 'row',
+		alignItems: 'center',
+	},
+	balance: {
+		marginTop: 16,
+		flexDirection: 'row',
+		alignItems: 'center',
+		justifyContent: 'space-between',
+	},
+});
+
+export default memo(ActivityHeader);
diff --git a/src/components/AdjustValue.tsx b/src/components/AdjustValue.tsx
index 13e4a07bc..98fcfec74 100644
--- a/src/components/AdjustValue.tsx
+++ b/src/components/AdjustValue.tsx
@@ -6,7 +6,7 @@ import {
 	StyleProp,
 	ViewStyle,
 } from 'react-native';
-import { Text01M, Text02M } from '../styles/text';
+import { BodyMSB, BodySSB } from '../styles/text';
 import { MinusCircledIcon, PlusCircledIcon } from '../styles/icons';
 
 type AdjustValueProps = {
@@ -35,17 +35,17 @@ const AdjustValue = ({
 				disabled={decreaseDisabled}
 				onPress={decreaseValue}>
 				<MinusCircledIcon
-					color={decreaseDisabled ? 'gray' : 'red'}
+					color={decreaseDisabled ? 'gray2' : 'red'}
 					width={36}
 					height={36}
 				/>
 			</TouchableOpacity>
 			<View style={styles.text}>
-				<Text01M style={styles.title}>{value}</Text01M>
+				<BodyMSB style={styles.title}>{value}</BodyMSB>
 				{description && (
-					<Text02M style={styles.description} color="gray1">
+					<BodySSB style={styles.description} color="white50">
 						{description}
-					</Text02M>
+					</BodySSB>
 				)}
 			</View>
 			<TouchableOpacity
@@ -53,7 +53,7 @@ const AdjustValue = ({
 				disabled={increaseDisabled}
 				onPress={increaseValue}>
 				<PlusCircledIcon
-					color={increaseDisabled ? 'gray' : 'green'}
+					color={increaseDisabled ? 'gray2' : 'green'}
 					width={36}
 					height={36}
 				/>
diff --git a/src/components/Amount.tsx b/src/components/Amount.tsx
index a2f44da69..b7ff4b00a 100644
--- a/src/components/Amount.tsx
+++ b/src/components/Amount.tsx
@@ -2,8 +2,8 @@ import React, { ReactElement } from 'react';
 import { View, StyleSheet, StyleProp, ViewStyle } from 'react-native';
 
 import { Display } from '../styles/text';
+import { useCurrency } from '../hooks/displayValues';
 import { EUnit } from '../store/types/wallet';
-import MoneySymbol from './MoneySymbol';
 
 const Amount = ({
 	value,
@@ -13,14 +13,17 @@ const Amount = ({
 	value: number;
 	unit?: EUnit;
 	style?: StyleProp<ViewStyle>;
-}): ReactElement => (
-	<View style={[styles.row, style]}>
-		<MoneySymbol style={styles.symbol} unit={unit} />
-		<Display color={value ? 'text' : 'gray1'} lineHeight="57px">
-			{value}
-		</Display>
-	</View>
-);
+}): ReactElement => {
+	const { fiatSymbol } = useCurrency();
+	return (
+		<View style={[styles.row, style]}>
+			<Display style={styles.symbol} color="white50">
+				{unit === EUnit.BTC ? '₿' : fiatSymbol}
+			</Display>
+			<Display color={value ? 'text' : 'white50'}>{value}</Display>
+		</View>
+	);
+};
 
 const styles = StyleSheet.create({
 	row: {
@@ -28,7 +31,8 @@ const styles = StyleSheet.create({
 		alignItems: 'center',
 	},
 	symbol: {
-		marginRight: 4,
+		fontFamily: 'InterTight-Bold',
+		marginRight: 6,
 	},
 });
 
diff --git a/src/components/AmountToggle.tsx b/src/components/AmountToggle.tsx
index f96991b41..f96ea869c 100644
--- a/src/components/AmountToggle.tsx
+++ b/src/components/AmountToggle.tsx
@@ -1,5 +1,5 @@
-import React, { memo, ReactElement, useCallback, useMemo } from 'react';
-import { StyleProp, View, ViewStyle } from 'react-native';
+import React, { memo, ReactElement } from 'react';
+import { StyleProp, StyleSheet, ViewStyle } from 'react-native';
 
 import { Pressable } from '../styles/components';
 import Money from '../components/Money';
@@ -8,68 +8,47 @@ import Money from '../components/Money';
  * Displays the total amount of sats specified and it's corresponding fiat value.
  */
 const AmountToggle = ({
-	sats,
-	secondaryFont = 'caption13Up',
-	space = 0, // space between the rows
-	reverse = false,
-	disable = false,
+	amount,
 	decimalLength = 'long',
-	children,
 	style,
-	onPress,
 	testID,
+	onPress,
 }: {
-	sats: number;
-	secondaryFont?: 'text01m' | 'caption13Up';
-	reverse?: boolean;
-	space?: number;
-	disable?: boolean;
+	amount: number;
 	decimalLength?: 'long' | 'short'; // whether to show 5 or 8 decimals for BTC
-	children?: ReactElement;
 	style?: StyleProp<ViewStyle>;
 	testID?: string;
 	onPress?: () => void;
 }): ReactElement => {
-	const components = useMemo(() => {
-		const arr = [
+	return (
+		<Pressable
+			style={style}
+			color="transparent"
+			testID={testID}
+			onPress={onPress}>
 			<Money
-				key="primary"
-				sats={sats}
+				style={styles.secondary}
+				sats={amount}
+				size="caption13Up"
+				color="white50"
 				decimalLength={decimalLength}
-				unitType="primary"
+				unitType="secondary"
 				symbol={true}
-			/>,
-			<View key="space" style={{ height: space }} />,
+			/>
 			<Money
-				key="secondary"
-				sats={sats}
-				size={secondaryFont}
-				color="gray1"
+				sats={amount}
 				decimalLength={decimalLength}
-				unitType="secondary"
+				unitType="primary"
 				symbol={true}
-			/>,
-		];
-
-		return reverse ? arr.reverse() : arr;
-	}, [sats, reverse, space, decimalLength, secondaryFont]);
-
-	const _onPress = useCallback((): void => {
-		if (!disable && onPress) {
-			onPress();
-		}
-	}, [disable, onPress]);
-
-	return (
-		<Pressable
-			style={style}
-			color="transparent"
-			testID={testID}
-			onPress={_onPress}>
-			{components}
-			{children}
+			/>
 		</Pressable>
 	);
 };
 
+const styles = StyleSheet.create({
+	secondary: {
+		marginBottom: 16,
+	},
+});
+
 export default memo(AmountToggle);
diff --git a/src/components/AssetCard.tsx b/src/components/AssetCard.tsx
deleted file mode 100644
index f6aff9bc6..000000000
--- a/src/components/AssetCard.tsx
+++ /dev/null
@@ -1,103 +0,0 @@
-import React, { memo, ReactElement } from 'react';
-import { View, GestureResponderEvent, StyleSheet } from 'react-native';
-
-import { TransferIcon } from '../styles/icons';
-import { Text01M, Caption13M } from '../styles/text';
-import { TouchableOpacity } from '../styles/components';
-import { useBalance } from '../hooks/wallet';
-import Money from '../components/Money';
-
-const AssetCard = ({
-	name,
-	ticker,
-	icon,
-	satoshis,
-	testID,
-	onPress,
-}: {
-	name: string;
-	ticker: string;
-	icon: ReactElement;
-	satoshis: number;
-	testID?: string;
-	onPress: (event: GestureResponderEvent) => void;
-}): ReactElement => {
-	const { balanceInTransferToSpending, balanceInTransferToSavings } =
-		useBalance();
-
-	return (
-		<View style={styles.container}>
-			<TouchableOpacity
-				style={styles.pressable}
-				testID={testID}
-				onPress={onPress}>
-				<View style={styles.icon}>{icon}</View>
-				<View style={styles.text}>
-					<Text01M>{name}</Text01M>
-					<Caption13M color="gray1">{ticker}</Caption13M>
-				</View>
-
-				<View style={styles.amount}>
-					<View style={styles.primary}>
-						{balanceInTransferToSpending !== 0 && (
-							<TransferIcon color="purple" />
-						)}
-						{balanceInTransferToSavings !== 0 && (
-							<TransferIcon color="orange" />
-						)}
-						<Money
-							style={styles.primaryAmount}
-							sats={satoshis}
-							enableHide={true}
-							size="text01m"
-							unitType="primary"
-							symbol={true}
-						/>
-					</View>
-					<Money
-						sats={satoshis}
-						enableHide={true}
-						size="caption13M"
-						unitType="secondary"
-						color="gray1"
-					/>
-				</View>
-			</TouchableOpacity>
-		</View>
-	);
-};
-
-const styles = StyleSheet.create({
-	container: {
-		borderBottomColor: 'rgba(255, 255, 255, 0.1)',
-		borderBottomWidth: 1,
-	},
-	pressable: {
-		flexDirection: 'row',
-		justifyContent: 'space-between',
-		paddingBottom: 24,
-		minHeight: 65,
-	},
-	icon: {
-		justifyContent: 'center',
-		alignItems: 'center',
-		marginRight: 16,
-	},
-	text: {
-		justifyContent: 'space-between',
-	},
-	amount: {
-		justifyContent: 'space-between',
-		alignItems: 'flex-end',
-		marginLeft: 'auto',
-	},
-	primary: {
-		flexDirection: 'row',
-		alignItems: 'center',
-	},
-	primaryAmount: {
-		marginLeft: 8,
-	},
-});
-
-export default memo(AssetCard);
diff --git a/src/components/Assets.tsx b/src/components/Assets.tsx
deleted file mode 100644
index 3a8eba460..000000000
--- a/src/components/Assets.tsx
+++ /dev/null
@@ -1,45 +0,0 @@
-import React, { memo, ReactElement } from 'react';
-import { StyleSheet } from 'react-native';
-import { useNavigation } from '@react-navigation/native';
-import { useTranslation } from 'react-i18next';
-
-import { Caption13Up } from '../styles/text';
-import { BitcoinCircleIcon } from '../styles/icons';
-import { useBalance } from '../hooks/wallet';
-import AssetCard from './AssetCard';
-import type { WalletNavigationProp } from '../navigation/wallet/WalletNavigator';
-
-const Assets = (): ReactElement => {
-	const { t } = useTranslation('wallet');
-	const navigation = useNavigation<WalletNavigationProp>();
-	const { totalBalance } = useBalance();
-
-	return (
-		<>
-			<Caption13Up style={styles.title} color="gray1" testID="AssetsTitle">
-				{t('assets')}
-			</Caption13Up>
-			<AssetCard
-				name="Bitcoin"
-				ticker="BTC"
-				satoshis={totalBalance}
-				icon={<BitcoinCircleIcon color="bitcoin" />}
-				testID="BitcoinAsset"
-				onPress={(): void => {
-					navigation.navigate('WalletsDetail', {
-						assetType: 'bitcoin',
-					});
-				}}
-			/>
-		</>
-	);
-};
-
-const styles = StyleSheet.create({
-	title: {
-		marginTop: 26,
-		marginBottom: 23,
-	},
-});
-
-export default memo(Assets);
diff --git a/src/components/AuthCheck.tsx b/src/components/AuthCheck.tsx
index 8cfe83cb9..e0786304a 100644
--- a/src/components/AuthCheck.tsx
+++ b/src/components/AuthCheck.tsx
@@ -4,7 +4,7 @@ import { useAppSelector } from '../hooks/redux';
 import { RouteProp } from '@react-navigation/native';
 import Animated, { FadeOut } from 'react-native-reanimated';
 
-import GlowingBackground from './GlowingBackground';
+import { View as ThemedView } from '../styles/components';
 import Biometrics from './Biometrics';
 import PinPad from './PinPad';
 import { biometricsSelector } from '../store/reselect/settings';
@@ -34,12 +34,12 @@ const AuthCheck = ({
 	if (requireBiometrics && !requirePin) {
 		return (
 			<Animated.View style={StyleSheet.absoluteFillObject} exiting={FadeOut}>
-				<GlowingBackground topLeft="brand">
+				<ThemedView style={styles.root}>
 					<Biometrics
 						onSuccess={(): void => onSuccess?.()}
 						onFailure={(): void => setRequireBiometrics(false)}
 					/>
-				</GlowingBackground>
+				</ThemedView>
 			</Animated.View>
 		);
 	}
@@ -57,4 +57,10 @@ const AuthCheck = ({
 	);
 };
 
+const styles = StyleSheet.create({
+	root: {
+		flex: 1,
+	},
+});
+
 export default memo(AuthCheck);
diff --git a/src/components/AuthWidget.tsx b/src/components/AuthWidget.tsx
index 754b77b91..3c6802274 100644
--- a/src/components/AuthWidget.tsx
+++ b/src/components/AuthWidget.tsx
@@ -9,7 +9,7 @@ import { View, Linking, StyleSheet, StyleProp, ViewStyle } from 'react-native';
 import { Client } from '@synonymdev/slashtags-auth';
 import { useTranslation } from 'react-i18next';
 
-import { Text01M } from '../styles/text';
+import { BodyMSB } from '../styles/text';
 import { TouchableOpacity } from '../styles/components';
 import { KeyIcon, ListIcon, TrashIcon } from '../styles/icons';
 import { useAppDispatch } from '../hooks/redux';
@@ -99,9 +99,9 @@ const AuthWidget = ({
 							size={32}
 						/>
 
-						<Text01M style={styles.name} numberOfLines={1}>
+						<BodyMSB style={styles.name} numberOfLines={1}>
 							{profile?.name || ' '}
-						</Text01M>
+						</BodyMSB>
 					</View>
 
 					{!isEditing && widget.magiclink && (
@@ -121,12 +121,14 @@ const AuthWidget = ({
 							<TouchableOpacity
 								style={styles.actionButton}
 								color="transparent"
+								hitSlop={{ top: 30, bottom: 30 }}
 								onPress={onDelete}>
 								<TrashIcon width={22} />
 							</TouchableOpacity>
 							<TouchableOpacity
 								style={styles.actionButton}
 								color="transparent"
+								hitSlop={{ top: 30, bottom: 30 }}
 								activeOpacity={0.9}
 								onLongPress={onLongPress}
 								onPressIn={onPressIn}>
@@ -189,12 +191,6 @@ const styles = StyleSheet.create({
 		width: 32,
 		height: 32,
 		marginLeft: 8,
-
-		// increase hitbox
-		paddingTop: 30,
-		marginTop: -30,
-		paddingBottom: 30,
-		marginBottom: -30,
 	},
 	signInButton: {
 		height: 32,
diff --git a/src/components/BalanceHeader.tsx b/src/components/BalanceHeader.tsx
index 986b48d9b..ca37a4918 100644
--- a/src/components/BalanceHeader.tsx
+++ b/src/components/BalanceHeader.tsx
@@ -15,10 +15,9 @@ import { hideBalanceSelector } from '../store/reselect/settings';
  */
 const BalanceHeader = (): ReactElement => {
 	const { t } = useTranslation('wallet');
-	const onSwitchUnit = useSwitchUnitAnnounced();
-	const { totalBalance, pendingPaymentsBalance, balanceInTransfer } =
-		useBalance();
 	const dispatch = useAppDispatch();
+	const onSwitchUnit = useSwitchUnitAnnounced();
+	const { totalBalance, pendingPaymentsBalance } = useBalance();
 	const hideBalance = useAppSelector(hideBalanceSelector);
 
 	const toggleHideBalance = (): void => {
@@ -27,33 +26,16 @@ const BalanceHeader = (): ReactElement => {
 
 	return (
 		<View style={styles.container}>
-			<View style={styles.totalBalanceRow}>
-				{balanceInTransfer ? (
-					<Trans
-						t={t}
-						i18nKey="balance_total_transferring"
-						components={{
-							text: <Caption13Up color="gray1" />,
-							pending: (
-								<Money
-									color="gray1"
-									size="caption13Up"
-									sats={balanceInTransfer}
-									enableHide={true}
-									symbol={false}
-								/>
-							),
-						}}
-					/>
-				) : pendingPaymentsBalance ? (
+			<View style={styles.label}>
+				{pendingPaymentsBalance ? (
 					<Trans
 						t={t}
 						i18nKey="balance_total_pending"
 						components={{
-							text: <Caption13Up color="gray1" />,
+							text: <Caption13Up color="white50" />,
 							pending: (
 								<Money
-									color="gray1"
+									color="white50"
 									size="caption13Up"
 									sats={pendingPaymentsBalance}
 									enableHide={true}
@@ -63,18 +45,18 @@ const BalanceHeader = (): ReactElement => {
 						}}
 					/>
 				) : (
-					<Caption13Up color="gray1">{t('balance_total')}</Caption13Up>
+					<Caption13Up color="white50">{t('balance_total')}</Caption13Up>
 				)}
 			</View>
 
 			<TouchableOpacity
-				style={styles.row}
+				style={styles.balance}
 				testID="TotalBalance"
 				onPress={onSwitchUnit}>
 				<Money sats={totalBalance} enableHide={true} symbol={true} />
 				{hideBalance && (
 					<TouchableOpacity
-						style={styles.toggle}
+						hitSlop={{ top: 15, bottom: 15, left: 15, right: 15 }}
 						testID="ShowBalance"
 						onPress={toggleHideBalance}>
 						<EyeIcon />
@@ -89,21 +71,17 @@ const styles = StyleSheet.create({
 	container: {
 		flex: 1,
 		marginTop: 32,
-		paddingLeft: 16,
+		paddingHorizontal: 16,
 	},
-	row: {
-		marginTop: 6,
+	label: {
 		flexDirection: 'row',
 		alignItems: 'center',
-		justifyContent: 'space-between',
 	},
-	totalBalanceRow: {
+	balance: {
+		marginTop: 16,
 		flexDirection: 'row',
 		alignItems: 'center',
-	},
-	toggle: {
-		paddingTop: 7,
-		paddingRight: 16,
+		justifyContent: 'space-between',
 	},
 });
 
diff --git a/src/components/Balances.tsx b/src/components/Balances.tsx
new file mode 100644
index 000000000..fcf041d78
--- /dev/null
+++ b/src/components/Balances.tsx
@@ -0,0 +1,115 @@
+import React, { memo, ReactElement } from 'react';
+import { View, StyleSheet } from 'react-native';
+import { useNavigation } from '@react-navigation/native';
+import { useTranslation } from 'react-i18next';
+
+import { View as ThemedView, Pressable } from '../styles/components';
+import {
+	TransferIcon,
+	BitcoinCircleIcon,
+	LightningCircleIcon,
+} from '../styles/icons';
+import NetworkRow from './NetworkRow';
+import { useBalance } from '../hooks/wallet';
+import { useAppSelector } from '../hooks/redux';
+import { RootNavigationProp } from '../navigation/types';
+import { isGeoBlockedSelector } from '../store/reselect/user';
+import { accountVersionSelector } from '../store/reselect/lightning';
+import { showToast } from '../utils/notifications';
+
+const Balances = (): ReactElement => {
+	const { t } = useTranslation('wallet');
+	const navigation = useNavigation<RootNavigationProp>();
+	const isGeoBlocked = useAppSelector(isGeoBlockedSelector);
+	const accountVersion = useAppSelector(accountVersionSelector);
+	const {
+		onchainBalance,
+		spendingBalance,
+		balanceInTransferToSpending,
+		balanceInTransferToSavings,
+	} = useBalance();
+
+	const canTransfer = (onchainBalance || spendingBalance) && !isGeoBlocked;
+
+	const onSavingsPress = (): void => {
+		navigation.navigate('Wallet', { screen: 'ActivitySavings' });
+	};
+
+	const onSpendingPress = (): void => {
+		navigation.navigate('Wallet', { screen: 'ActivitySpending' });
+	};
+
+	const onTransfer = (): void => {
+		if (accountVersion < 2) {
+			showToast({
+				type: 'warning',
+				title: t('migrating_ldk_title'),
+				description: t('migrating_ldk_description'),
+			});
+			return;
+		}
+
+		if (canTransfer) {
+			navigation.navigate('LightningRoot', { screen: 'QuickSetup' });
+		}
+	};
+
+	return (
+		<View style={styles.root}>
+			<NetworkRow
+				title={t('details_savings_title')}
+				balance={onchainBalance}
+				pendingBalance={balanceInTransferToSavings}
+				icon={<BitcoinCircleIcon color="bitcoin" width={32} height={32} />}
+				testID="ActivitySavings"
+				onPress={onSavingsPress}
+			/>
+			<View style={styles.transferRow}>
+				<ThemedView style={styles.line} color="white16" />
+				<Pressable
+					style={styles.transferButton}
+					color="white16"
+					disabled={!canTransfer}
+					testID="TransferButton"
+					onPress={onTransfer}>
+					<TransferIcon color="white" />
+				</Pressable>
+				<ThemedView style={styles.line} color="white16" />
+			</View>
+			<NetworkRow
+				title={t('details_spending_title')}
+				balance={spendingBalance}
+				pendingBalance={balanceInTransferToSpending}
+				icon={<LightningCircleIcon width={32} height={32} />}
+				testID="ActivitySpending"
+				onPress={onSpendingPress}
+			/>
+		</View>
+	);
+};
+
+const styles = StyleSheet.create({
+	root: {
+		marginTop: 32,
+	},
+	transferRow: {
+		flexDirection: 'row',
+		alignItems: 'center',
+		paddingVertical: 10,
+	},
+	transferButton: {
+		paddingHorizontal: 15,
+		height: 40,
+		borderRadius: 54,
+		flexDirection: 'row',
+		justifyContent: 'center',
+		alignItems: 'center',
+		marginHorizontal: 16,
+	},
+	line: {
+		flex: 1,
+		height: 1,
+	},
+});
+
+export default memo(Balances);
diff --git a/src/screens/Lightning/Barrel.tsx b/src/components/Barrel.tsx
similarity index 83%
rename from src/screens/Lightning/Barrel.tsx
rename to src/components/Barrel.tsx
index 3c3944354..902628220 100644
--- a/src/screens/Lightning/Barrel.tsx
+++ b/src/components/Barrel.tsx
@@ -1,11 +1,11 @@
 import React, { memo, ReactElement } from 'react';
 import { Image, ImageSourcePropType, StyleSheet } from 'react-native';
 
-import useColors from '../../hooks/colors';
-import { useDisplayValues } from '../../hooks/displayValues';
-import { TouchableOpacity } from '../../styles/components';
-import { Subtitle } from '../../styles/text';
-import { TPackage } from './CustomSetup';
+import { Subtitle } from '../styles/text';
+import { TouchableOpacity } from '../styles/components';
+import useColors from '../hooks/colors';
+import { useDisplayValues } from '../hooks/displayValues';
+import { TPackage } from '../screens/Lightning/CustomSetup';
 
 const Barrel = ({
 	id,
@@ -65,7 +65,7 @@ const styles = StyleSheet.create({
 	},
 	image: {
 		margin: 8,
-		height: 100,
+		height: 85,
 		width: 100,
 		resizeMode: 'contain',
 	},
diff --git a/src/components/BaseFeedWidget.tsx b/src/components/BaseFeedWidget.tsx
index ceaae8e98..03d90087e 100644
--- a/src/components/BaseFeedWidget.tsx
+++ b/src/components/BaseFeedWidget.tsx
@@ -4,17 +4,18 @@ import { useTranslation } from 'react-i18next';
 
 import { rootNavigation } from '../navigation/root/RootNavigator';
 import { TouchableOpacity } from '../styles/components';
-import { Text01M } from '../styles/text';
+import { BodyMSB } from '../styles/text';
 import {
 	SettingsIcon,
 	ListIcon,
 	TrashIcon,
 	QuestionMarkIcon,
 } from '../styles/icons';
-import { useAppDispatch } from '../hooks/redux';
+import { useAppDispatch, useAppSelector } from '../hooks/redux';
 import { useSlashfeed } from '../hooks/widgets';
 import { truncate } from '../utils/helpers';
 import { deleteWidget } from '../store/slices/widgets';
+import { showWidgetTitlesSelector } from '../store/reselect/settings';
 import Dialog from './Dialog';
 import SvgImage from './SvgImage';
 import LoadingView from './LoadingView';
@@ -23,31 +24,30 @@ const BaseFeedWidget = ({
 	url,
 	name,
 	children,
-	showTitle,
 	isLoading,
 	isEditing,
 	style,
+	testID,
 	onPress,
 	onPressIn,
 	onLongPress,
-	testID,
 }: {
 	url: string;
 	name?: string;
 	children: ReactElement;
-	showTitle?: boolean;
 	isLoading?: boolean;
 	isEditing?: boolean;
 	style?: StyleProp<ViewStyle>;
+	testID?: string;
 	onPress?: () => void;
 	onPressIn?: () => void;
 	onLongPress?: () => void;
-	testID?: string;
 }): ReactElement => {
 	const { t } = useTranslation('slashtags');
 	const dispatch = useAppDispatch();
 	const { config, icon } = useSlashfeed({ url });
 	const [showDialog, setShowDialog] = useState(false);
+	const showTitle = useAppSelector(showWidgetTitlesSelector);
 
 	const widgetName = name ?? config?.name ?? url;
 
@@ -80,9 +80,9 @@ const BaseFeedWidget = ({
 								)}
 							</View>
 
-							<Text01M style={styles.name} numberOfLines={1}>
+							<BodyMSB style={styles.name} numberOfLines={1}>
 								{truncate(widgetName, 18)}
-							</Text01M>
+							</BodyMSB>
 						</View>
 
 						{isEditing && (
@@ -90,6 +90,7 @@ const BaseFeedWidget = ({
 								<TouchableOpacity
 									style={styles.actionButton}
 									color="transparent"
+									hitSlop={{ top: 15, bottom: 15 }}
 									testID="WidgetActionDelete"
 									onPress={onDelete}>
 									<TrashIcon width={22} />
@@ -97,6 +98,7 @@ const BaseFeedWidget = ({
 								<TouchableOpacity
 									style={styles.actionButton}
 									color="transparent"
+									hitSlop={{ top: 15, bottom: 15 }}
 									testID="WidgetActionEdit"
 									onPress={onEdit}>
 									<SettingsIcon width={22} />
@@ -104,6 +106,7 @@ const BaseFeedWidget = ({
 								<TouchableOpacity
 									style={styles.actionButton}
 									color="transparent"
+									hitSlop={{ top: 15, bottom: 15 }}
 									activeOpacity={0.9}
 									testID="WidgetActionDrag"
 									onLongPress={onLongPress}
@@ -179,12 +182,6 @@ const styles = StyleSheet.create({
 		width: 32,
 		height: 32,
 		marginLeft: 8,
-
-		// increase hitbox
-		paddingTop: 30,
-		marginTop: -30,
-		paddingBottom: 30,
-		marginBottom: -30,
 	},
 	spacer: {
 		height: 16,
diff --git a/src/components/BlocksWidget.tsx b/src/components/BlocksWidget.tsx
index 8c10136af..f8405eb46 100644
--- a/src/components/BlocksWidget.tsx
+++ b/src/components/BlocksWidget.tsx
@@ -3,7 +3,7 @@ import { View, StyleSheet, StyleProp, ViewStyle } from 'react-native';
 import { useTranslation } from 'react-i18next';
 import { Reader } from '@synonymdev/slashtags-widget-bitcoin-feed';
 
-import { Caption13M, Text01M, Text02M } from '../styles/text';
+import { CaptionB, BodyMSB, BodySSB } from '../styles/text';
 import BaseFeedWidget from './BaseFeedWidget';
 import { TFeedWidget } from '../store/types/widgets';
 import { useSlashfeed } from '../hooks/widgets';
@@ -104,7 +104,6 @@ const BlocksWidget = ({
 			style={style}
 			url={url}
 			name={t('widget_blocks')}
-			showTitle={widget.extras?.showTitle}
 			isLoading={loading}
 			isEditing={isEditing}
 			testID={testID}
@@ -114,14 +113,14 @@ const BlocksWidget = ({
 				{data.map((field) => (
 					<View key={field.name} style={styles.row}>
 						<View style={styles.columnLeft}>
-							<Text02M color="gray1" numberOfLines={1}>
+							<BodySSB color="white50" numberOfLines={1}>
 								{field.name}
-							</Text02M>
+							</BodySSB>
 						</View>
 						<View style={styles.columnRight}>
-							<Text01M numberOfLines={1} ellipsizeMode="middle">
+							<BodyMSB numberOfLines={1} ellipsizeMode="middle">
 								{field.value}
-							</Text01M>
+							</BodyMSB>
 						</View>
 					</View>
 				))}
@@ -129,14 +128,14 @@ const BlocksWidget = ({
 				{widget.extras?.showSource && config?.source && (
 					<View style={styles.source}>
 						<View style={styles.columnLeft}>
-							<Caption13M color="gray1" numberOfLines={1}>
+							<CaptionB color="white50" numberOfLines={1}>
 								{t('widget_source')}
-							</Caption13M>
+							</CaptionB>
 						</View>
 						<View style={styles.columnRight}>
-							<Caption13M color="gray1" numberOfLines={1}>
+							<CaptionB color="white50" numberOfLines={1}>
 								{config.source.name}
-							</Caption13M>
+							</CaptionB>
 						</View>
 					</View>
 				)}
diff --git a/src/components/BlurView.tsx b/src/components/BlurView.tsx
index 33a7600a2..d72f65f43 100644
--- a/src/components/BlurView.tsx
+++ b/src/components/BlurView.tsx
@@ -10,7 +10,7 @@ type BlurViewProps = {
 
 const BlurView = ({ style, ...props }: BlurViewProps): ReactElement => {
 	return Platform.OS === 'ios' ? (
-		<Blur {...props} style={[styles.containerIos, style]} />
+		<Blur {...props} style={[styles.containerIos, style]} blurAmount={4} />
 	) : (
 		<View {...props} style={[styles.containerAndroid, style]} />
 	);
diff --git a/src/components/Button.tsx b/src/components/Button.tsx
index 77e2edd10..d8ae4c6e4 100644
--- a/src/components/Button.tsx
+++ b/src/components/Button.tsx
@@ -6,7 +6,7 @@ import {
 	Platform,
 } from 'react-native';
 import { IThemeColors } from '../styles/themes';
-import { Caption13M, Text02M } from '../styles/text';
+import { CaptionB, BodySSB } from '../styles/text';
 import { View, TouchableOpacity } from '../styles/components';
 import useColors from '../hooks/colors';
 
@@ -33,7 +33,7 @@ const Button = ({
 	icon,
 	...props
 }: IButton): ReactElement => {
-	const { white16, white32 } = useColors();
+	const { white16, white32, white80 } = useColors();
 
 	const buttonStyle = useMemo(() => {
 		const borderColor = variant === 'transparent' ? undefined : white16;
@@ -65,6 +65,7 @@ const Button = ({
 		return {
 			...textStyle,
 			...(text && icon && { marginLeft: 8 }),
+			...(variant === 'primary' ? {} : { color: white80 }),
 			...(disabled && !icon && { color: white32 }),
 			...Platform.select({
 				android: {
@@ -72,9 +73,9 @@ const Button = ({
 				},
 			}),
 		};
-	}, [textStyle, text, icon, disabled, white32, size]);
+	}, [textStyle, text, icon, variant, disabled, size, white32, white80]);
 
-	const Text = size === 'small' ? Caption13M : Text02M;
+	const Text = size === 'small' ? CaptionB : BodySSB;
 
 	return (
 		<TouchableOpacity
diff --git a/src/components/CameraNoAuth.tsx b/src/components/CameraNoAuth.tsx
index e48a330d6..68a1ba01f 100644
--- a/src/components/CameraNoAuth.tsx
+++ b/src/components/CameraNoAuth.tsx
@@ -2,7 +2,7 @@ import React, { ReactElement } from 'react';
 import { View, Linking, Platform, StyleSheet } from 'react-native';
 import { Trans, useTranslation } from 'react-i18next';
 
-import { Text01S, Text01B } from '../styles/text';
+import { BodyM, BodyMB } from '../styles/text';
 import { ExclamationIcon } from '../styles/icons';
 import SafeAreaView from './SafeAreaView';
 import NavigationHeader from './NavigationHeader';
@@ -32,13 +32,13 @@ const CameraNoAuth = ({
 			<View style={styles.content}>
 				<View style={styles.textContent}>
 					<ExclamationIcon />
-					<Text01S style={styles.text}>
+					<BodyM style={styles.text}>
 						<Trans
 							t={t}
 							i18nKey="camera_no_text"
-							components={{ bold: <Text01B /> }}
+							components={{ bold: <BodyMB /> }}
 						/>
-					</Text01S>
+					</BodyM>
 				</View>
 				<View style={styles.buttonContainer}>
 					<Button
diff --git a/src/components/CheckButton.tsx b/src/components/CheckButton.tsx
index a094e57b2..0f6b1c564 100644
--- a/src/components/CheckButton.tsx
+++ b/src/components/CheckButton.tsx
@@ -6,7 +6,7 @@ import {
 	TouchableOpacityProps,
 } from 'react-native';
 
-import { Text01S, Caption13S } from '../styles/text';
+import { BodyM, Caption } from '../styles/text';
 import { View as StyledView } from '../styles/components';
 import { Checkmark } from '../styles/icons';
 
@@ -31,10 +31,8 @@ const CheckButton = memo(
 				{...props}>
 				<View style={styles.leftColumn}>
 					<View>
-						<Text01S color="white">{label}</Text01S>
-						{description && (
-							<Caption13S color="gray1">{description}</Caption13S>
-						)}
+						<BodyM color="white">{label}</BodyM>
+						{description && <Caption color="white50">{description}</Caption>}
 					</View>
 				</View>
 				<View style={styles.rightColumn}>
@@ -71,7 +69,7 @@ const styles = StyleSheet.create({
 	},
 	checkbox: {
 		borderRadius: 8,
-		borderColor: '#515151',
+		borderColor: '#636363',
 		borderWidth: 1,
 		alignItems: 'center',
 		justifyContent: 'center',
@@ -79,7 +77,7 @@ const styles = StyleSheet.create({
 		width: 32,
 	},
 	checked: {
-		borderColor: '#FF6600',
+		borderColor: '#FF4400',
 	},
 });
 
diff --git a/src/components/ContactSmall.tsx b/src/components/ContactSmall.tsx
index 07df08602..96be32f9d 100644
--- a/src/components/ContactSmall.tsx
+++ b/src/components/ContactSmall.tsx
@@ -2,7 +2,7 @@ import React, { ReactElement, memo } from 'react';
 import { StyleProp, StyleSheet, ViewStyle } from 'react-native';
 
 import { TouchableOpacity } from '../styles/components';
-import { Text02M } from '../styles/text';
+import { BodySSB } from '../styles/text';
 import { useProfile2 } from '../hooks/slashtags2';
 import ProfileImage from './ProfileImage';
 import { XIcon } from '../styles/icons';
@@ -40,15 +40,15 @@ const ContactSmall = ({
 				image={profile.image}
 				size={size === 'large' ? 32 : 24}
 			/>
-			<Text02M numberOfLines={1} style={styles.name}>
+			<BodySSB numberOfLines={1} style={styles.name}>
 				{profile.name}
-			</Text02M>
+			</BodySSB>
 			{onDelete && (
 				<TouchableOpacity
 					style={styles.delete}
 					color="transparent"
 					onPress={onDelete}>
-					<XIcon color="gray1" width={16} />
+					<XIcon color="white50" width={16} />
 				</TouchableOpacity>
 			)}
 		</TouchableOpacity>
diff --git a/src/components/ContactsList.tsx b/src/components/ContactsList.tsx
index d8832c347..8a4a3c6ca 100644
--- a/src/components/ContactsList.tsx
+++ b/src/components/ContactsList.tsx
@@ -8,7 +8,7 @@ import ProfileImage from './ProfileImage';
 import SlashtagURL from './SlashtagURL';
 import Divider from './Divider';
 import { View as ThemedView } from '../styles/components';
-import { Caption13Up, Text01M } from '../styles/text';
+import { Caption13Up, BodyMSB } from '../styles/text';
 import { useProfile2, useSelectedSlashtag2 } from '../hooks/slashtags2';
 import { IContactRecord } from '../store/types/slashtags';
 import { truncate } from '../utils/helpers';
@@ -48,12 +48,12 @@ export const ContactItem = ({
 					size={size === 'small' ? 32 : 48}
 				/>
 				<View style={cstyles.column} pointerEvents="none">
-					<Text01M
+					<BodyMSB
 						numberOfLines={1}
 						style={size !== 'small' ? cstyles.name : undefined}>
 						{name}
-					</Text01M>
-					<SlashtagURL url={contact.url} color="gray1" size="small" />
+					</BodyMSB>
+					<SlashtagURL url={contact.url} color="white50" size="small" />
 				</View>
 			</View>
 		</TouchableOpacity>
@@ -65,7 +65,7 @@ const Empty = (): ReactElement => {
 
 	return (
 		<View style={estyles.empty}>
-			<Text01M>{t('contacts_no_found')}</Text01M>
+			<BodyMSB>{t('contacts_no_found')}</BodyMSB>
 		</View>
 	);
 };
@@ -137,7 +137,7 @@ const ContactsList = ({
 				<ThemedView
 					color={sectionBackgroundColor}
 					style={!isFirst && styles.sectionSpacing}>
-					<Caption13Up color="gray1">{title}</Caption13Up>
+					<Caption13Up color="white50">{title}</Caption13Up>
 				</ThemedView>
 			);
 		},
diff --git a/src/components/Dialog.tsx b/src/components/Dialog.tsx
index c5e06ae14..1e1add864 100644
--- a/src/components/Dialog.tsx
+++ b/src/components/Dialog.tsx
@@ -1,4 +1,4 @@
-import React, { memo, ReactElement } from 'react';
+import React, { memo, ReactElement, useMemo } from 'react';
 import {
 	StyleSheet,
 	Text,
@@ -10,11 +10,13 @@ import Modal from 'react-native-modal';
 import { useTranslation } from 'react-i18next';
 
 import colors from '../styles/colors';
+import { IThemeColors } from '../styles/themes';
 
 type DialogProps = {
 	visible: boolean;
 	title: string;
 	description: string;
+	buttonColor?: keyof IThemeColors;
 	cancelText?: string;
 	confirmText?: string;
 	visibleTestID?: string;
@@ -27,6 +29,7 @@ const Dialog = ({
 	visible,
 	title,
 	description,
+	buttonColor,
 	cancelText,
 	confirmText,
 	visibleTestID,
@@ -43,6 +46,11 @@ const Dialog = ({
 		confirmText = t('ok');
 	}
 
+	const buttonStyles = useMemo(() => {
+		const color = buttonColor ? colors[buttonColor] : colors.brand;
+		return StyleSheet.compose(styles.buttonText, { color });
+	}, [buttonColor]);
+
 	return (
 		<Modal
 			isVisible={visible}
@@ -61,17 +69,17 @@ const Dialog = ({
 					{onCancel && (
 						<TouchableOpacity
 							style={[styles.button, styles.buttonLeft]}
-							onPress={onCancel}
-							testID="DialogCancel">
-							<Text style={styles.buttonText}>{cancelText}</Text>
+							testID="DialogCancel"
+							onPress={onCancel}>
+							<Text style={buttonStyles}>{cancelText}</Text>
 						</TouchableOpacity>
 					)}
 					{onConfirm && (
 						<TouchableOpacity
 							style={styles.button}
-							onPress={onConfirm}
-							testID="DialogConfirm">
-							<Text style={styles.buttonText}>{confirmText}</Text>
+							testID="DialogConfirm"
+							onPress={onConfirm}>
+							<Text style={[buttonStyles, {}]}>{confirmText}</Text>
 						</TouchableOpacity>
 					)}
 				</View>
diff --git a/src/components/FactsWidget.tsx b/src/components/FactsWidget.tsx
index 5f5b015a2..d58bd0503 100644
--- a/src/components/FactsWidget.tsx
+++ b/src/components/FactsWidget.tsx
@@ -7,11 +7,9 @@ import { Title } from '../styles/text';
 import { showToast } from '../utils/notifications';
 import { useSlashtags2 } from '../hooks/slashtags2';
 import BaseFeedWidget from './BaseFeedWidget';
-import { TFeedWidget } from '../store/types/widgets';
 
 const FactsWidget = ({
 	url,
-	widget,
 	isEditing = false,
 	style,
 	testID,
@@ -19,7 +17,6 @@ const FactsWidget = ({
 	onLongPress,
 }: {
 	url: string;
-	widget: TFeedWidget;
 	isEditing?: boolean;
 	style?: StyleProp<ViewStyle>;
 	testID?: string;
@@ -62,7 +59,6 @@ const FactsWidget = ({
 			style={style}
 			url={url}
 			name={t('widget_facts')}
-			showTitle={widget.extras?.showTitle}
 			isLoading={isLoading}
 			isEditing={isEditing}
 			testID={testID}
diff --git a/src/components/FancySlider.tsx b/src/components/FancySlider.tsx
index 76b0b0e34..f76daf8d9 100644
--- a/src/components/FancySlider.tsx
+++ b/src/components/FancySlider.tsx
@@ -80,8 +80,8 @@ const FancySlider = ({
 	const active = useRef(false);
 	const colors = useColors();
 	const minTrackColor = colors.purple;
-	const maxTrackColor = colors.orange;
-	const disabledTrackColor = colors.orange50;
+	const maxTrackColor = colors.bitcoin;
+	const disabledTrackColor = colors.bitcoin50;
 	const [containerWidth, setContainerWidth] = useState(0);
 	const endPosition = containerWidth === 0 ? 1 : containerWidth - CIRCLE_SIZE;
 	const maxEndPosition = valueToX(maxValue, startValue, endValue, endPosition);
diff --git a/src/components/FeedWidget.tsx b/src/components/FeedWidget.tsx
index 76695f47b..c9a2e2f2f 100644
--- a/src/components/FeedWidget.tsx
+++ b/src/components/FeedWidget.tsx
@@ -2,7 +2,7 @@ import React, { memo, ReactElement } from 'react';
 import { View, StyleSheet, StyleProp, ViewStyle } from 'react-native';
 import { useTranslation } from 'react-i18next';
 
-import { Caption13M, Text01M, Text02M } from '../styles/text';
+import { CaptionB, BodyMSB, BodySSB } from '../styles/text';
 import { TFeedWidget } from '../store/types/widgets';
 import { useSlashfeed } from '../hooks/widgets';
 import BaseFeedWidget from './BaseFeedWidget';
@@ -40,14 +40,14 @@ const FeedWidget = ({
 					return (
 						<View key={field.name} style={styles.row}>
 							<View style={styles.columnLeft}>
-								<Text02M color="gray1" numberOfLines={1}>
+								<BodySSB color="white50" numberOfLines={1}>
 									{field.name}
-								</Text02M>
+								</BodySSB>
 							</View>
 							<View style={styles.columnRight}>
-								<Text01M numberOfLines={1} ellipsizeMode="middle">
+								<BodyMSB numberOfLines={1} ellipsizeMode="middle">
 									{field.value}
-								</Text01M>
+								</BodyMSB>
 							</View>
 						</View>
 					);
@@ -56,14 +56,14 @@ const FeedWidget = ({
 				{widget.extras?.showSource && config?.source && (
 					<View style={styles.source}>
 						<View style={styles.columnLeft}>
-							<Caption13M color="gray1" numberOfLines={1}>
+							<CaptionB color="white50" numberOfLines={1}>
 								{t('widget_source')}
-							</Caption13M>
+							</CaptionB>
 						</View>
 						<View style={styles.columnRight}>
-							<Caption13M color="gray1" numberOfLines={1}>
+							<CaptionB color="white50" numberOfLines={1}>
 								{config.source.name}
-							</Caption13M>
+							</CaptionB>
 						</View>
 					</View>
 				)}
diff --git a/src/components/GlowImage.tsx b/src/components/GlowImage.tsx
deleted file mode 100644
index a609fc7a4..000000000
--- a/src/components/GlowImage.tsx
+++ /dev/null
@@ -1,48 +0,0 @@
-import React, { ReactElement } from 'react';
-import {
-	View,
-	StyleSheet,
-	Image,
-	StyleProp,
-	ViewStyle,
-	ImageSourcePropType,
-} from 'react-native';
-
-import { IColors } from '../styles/colors';
-import Glow from './Glow';
-
-const GlowImage = ({
-	image,
-	imageSize = 220,
-	glowColor = 'brand',
-	style,
-}: {
-	image: ImageSourcePropType;
-	imageSize?: number;
-	glowColor?: keyof IColors;
-	style?: StyleProp<ViewStyle>;
-}): ReactElement => {
-	return (
-		<View style={[styles.container, style]} pointerEvents="none">
-			<Glow color={glowColor} size={imageSize * 2.7} style={styles.glow} />
-			<Image source={image} style={[styles.image, { height: imageSize }]} />
-		</View>
-	);
-};
-
-const styles = StyleSheet.create({
-	container: {
-		flex: 1,
-		position: 'relative',
-		justifyContent: 'center',
-		alignItems: 'center',
-	},
-	glow: {
-		position: 'absolute',
-	},
-	image: {
-		resizeMode: 'contain',
-	},
-});
-
-export default GlowImage;
diff --git a/src/components/GlowingBackground.tsx b/src/components/GlowingBackground.tsx
deleted file mode 100644
index fbcc427f8..000000000
--- a/src/components/GlowingBackground.tsx
+++ /dev/null
@@ -1,151 +0,0 @@
-import React, {
-	memo,
-	ReactElement,
-	ReactNode,
-	useState,
-	useEffect,
-} from 'react';
-import { View, StyleSheet, LayoutChangeEvent } from 'react-native';
-import { useSharedValue, withTiming } from 'react-native-reanimated';
-import { Canvas, RadialGradient, Rect, vec } from '@shopify/react-native-skia';
-
-import { View as ThemedView } from '../styles/components';
-import { IColors } from '../styles/colors';
-import useColors from '../hooks/colors';
-
-const DURATION = 500;
-
-const Glow = memo(
-	({
-		top,
-		color,
-		fadeout,
-		width,
-		height,
-	}: {
-		top?: boolean;
-		color: string;
-		fadeout: boolean;
-		width: number;
-		height: number;
-	}) => {
-		const opacity = useSharedValue(0);
-
-		useEffect(() => {
-			opacity.value = withTiming(fadeout ? 0 : 1, { duration: DURATION });
-		}, [opacity, fadeout]);
-
-		return (
-			<Rect x={0} y={0} width={width} height={height} opacity={opacity}>
-				{top ? (
-					<RadialGradient
-						c={vec(-270, 100)}
-						r={600}
-						colors={[color, 'transparent']}
-					/>
-				) : (
-					<RadialGradient
-						c={vec(width + 118, height + 61)}
-						r={width}
-						colors={[color, 'transparent']}
-					/>
-				)}
-			</Rect>
-		);
-	},
-);
-
-/**
- * Draws radial gradients. When color changes, shows opacity animation
- */
-const GlowingBackground = ({
-	children,
-	topLeft,
-	bottomRight,
-}: {
-	children: ReactNode;
-	topLeft?: keyof IColors;
-	bottomRight?: keyof IColors;
-}): ReactElement => {
-	const [{ height, width }, setLayout] = useState({ width: 1, height: 1 });
-	const colors = useColors();
-	const topLeftColor = topLeft ? colors[topLeft] : colors.background;
-	const bottomRightColor = bottomRight
-		? colors[bottomRight]
-		: colors.background;
-	const [topLeftItems, setTopLeftItems] = useState([
-		{ color: topLeftColor, id: 0 },
-	]);
-	const [bottomRightItems, setBottomRightItems] = useState([
-		{ color: bottomRightColor, id: 0 },
-	]);
-
-	useEffect(() => {
-		setTopLeftItems((items) => {
-			if (items[items.length - 1].color === topLeftColor) {
-				return items;
-			}
-			const id = items[items.length - 1].id + 1;
-			return [...items.splice(-4), { color: topLeftColor, id }];
-		});
-	}, [topLeftColor]);
-
-	useEffect(() => {
-		setBottomRightItems((items) => {
-			if (items[items.length - 1].color === bottomRightColor) {
-				return items;
-			}
-			const id = items[items.length - 1].id + 1;
-			return [...items.splice(-4), { color: bottomRightColor, id }];
-		});
-	}, [bottomRightColor]);
-
-	const handleLayout = (event: LayoutChangeEvent): void => {
-		setLayout({
-			width: event.nativeEvent.layout.width,
-			height: event.nativeEvent.layout.height,
-		});
-	};
-
-	return (
-		<ThemedView style={styles.container}>
-			<View style={styles.overlay} onLayout={handleLayout}>
-				<Canvas style={styles.canvas}>
-					{topLeftItems.map(({ id, color }, index, arr) => (
-						<Glow
-							key={id}
-							top={true}
-							color={color || ''}
-							fadeout={index !== arr.length - 1}
-							width={width}
-							height={height}
-						/>
-					))}
-
-					{bottomRightItems.map(({ id, color }, index, arr) => (
-						<Glow
-							key={id}
-							color={color || ''}
-							fadeout={index !== arr.length - 1}
-							width={width}
-							height={height}
-						/>
-					))}
-				</Canvas>
-			</View>
-			{children}
-		</ThemedView>
-	);
-};
-
-const styles = StyleSheet.create({
-	container: {
-		flex: 1,
-	},
-	overlay: StyleSheet.absoluteFillObject,
-	canvas: {
-		flex: 1,
-	},
-});
-
-export default memo(GlowingBackground);
diff --git a/src/components/HeadlinesWidget.tsx b/src/components/HeadlinesWidget.tsx
index 55a0f57e4..4f7ac3543 100644
--- a/src/components/HeadlinesWidget.tsx
+++ b/src/components/HeadlinesWidget.tsx
@@ -9,12 +9,11 @@ import {
 import { useTranslation } from 'react-i18next';
 import Reader from '@synonymdev/slashtags-widget-news-feed/lib/reader';
 
-import { Caption13M, Title } from '../styles/text';
-import { openURL } from '../utils/helpers';
+import { BodyM, CaptionB, Title } from '../styles/text';
+import { openAppURL, timeAgo } from '../utils/helpers';
 import { showToast } from '../utils/notifications';
 import { useSlashtags2 } from '../hooks/slashtags2';
 import BaseFeedWidget from './BaseFeedWidget';
-import { TFeedWidget } from '../store/types/widgets';
 
 type Article = {
 	title: string;
@@ -34,7 +33,6 @@ type Article = {
 
 const HeadlinesWidget = ({
 	url,
-	widget,
 	isEditing = false,
 	style,
 	testID,
@@ -42,7 +40,6 @@ const HeadlinesWidget = ({
 	onPressIn,
 }: {
 	url: string;
-	widget: TFeedWidget;
 	isEditing?: boolean;
 	style?: StyleProp<ViewStyle>;
 	testID?: string;
@@ -98,7 +95,6 @@ const HeadlinesWidget = ({
 			style={style}
 			url={url}
 			name={t('widget_headlines')}
-			showTitle={widget.extras?.showTitle}
 			isLoading={isLoading}
 			isEditing={isEditing}
 			testID={testID}
@@ -106,31 +102,38 @@ const HeadlinesWidget = ({
 			onLongPress={onLongPress}
 			onPress={(): void => {
 				if (!isEditing && article?.link) {
-					openURL(article.link);
+					openAppURL(article.link);
 				}
 			}}>
 			<>
+				{article?.publishedDate && (
+					<BodyM style={styles.date} numberOfLines={1}>
+						{timeAgo(article.publishedDate)}
+					</BodyM>
+				)}
+
 				<Title numberOfLines={2}>{article?.title}</Title>
 
 				<TouchableOpacity
 					style={styles.source}
 					activeOpacity={0.9}
+					hitSlop={{ right: 15, bottom: 15, left: 15 }}
 					onPress={(): void => {
 						if (article?.comments) {
-							openURL(article.comments);
+							openAppURL(article.comments);
 						} else {
-							openURL(article!.link);
+							openAppURL(article!.link);
 						}
 					}}>
 					<View style={styles.columnLeft}>
-						<Caption13M color="gray1" numberOfLines={1}>
+						<CaptionB color="white50" numberOfLines={1}>
 							{t('widget_source')}
-						</Caption13M>
+						</CaptionB>
 					</View>
 					<View style={styles.columnRight}>
-						<Caption13M color="gray1" numberOfLines={1}>
+						<CaptionB color="white50" numberOfLines={1}>
 							{article?.publisher.title}
-						</Caption13M>
+						</CaptionB>
 					</View>
 				</TouchableOpacity>
 			</>
@@ -139,6 +142,9 @@ const HeadlinesWidget = ({
 };
 
 const styles = StyleSheet.create({
+	date: {
+		marginBottom: 16,
+	},
 	columnLeft: {
 		flex: 1,
 		flexDirection: 'row',
@@ -155,13 +161,6 @@ const styles = StyleSheet.create({
 		flexDirection: 'row',
 		alignItems: 'center',
 		justifyContent: 'space-between',
-		// increase hitbox
-		paddingBottom: 10,
-		marginBottom: -10,
-		paddingLeft: 10,
-		marginLeft: -10,
-		paddingRight: 10,
-		marginRight: -10,
 	},
 });
 
diff --git a/src/components/HourglassSpinner.tsx b/src/components/HourglassSpinner.tsx
index e90ba9646..94f1fd98b 100644
--- a/src/components/HourglassSpinner.tsx
+++ b/src/components/HourglassSpinner.tsx
@@ -1,32 +1,35 @@
 import React, { ReactElement } from 'react';
-import { StyleSheet, StyleProp, ViewStyle } from 'react-native';
-import { withRepeat, withTiming } from 'react-native-reanimated';
+import { View, StyleSheet, StyleProp, ViewStyle, Image } from 'react-native';
+import { Easing, withRepeat, withTiming } from 'react-native-reanimated';
 
 import { AnimatedView } from '../styles/components';
-import GlowImage from './GlowImage';
-import { IColors } from '../styles/colors';
 import { __E2E__ } from '../constants/env';
 
 const imageSrc = require('../assets/illustrations/hourglass.png');
 
 const HourglassSpinner = ({
-	imageSize = 230,
-	glowColor,
+	imageSize = 256,
 	style,
 }: {
 	imageSize?: number;
-	glowColor?: keyof IColors;
 	style?: StyleProp<ViewStyle>;
 }): ReactElement => {
 	const entering = (): { initialValues: {}; animations: {} } => {
 		'worklet';
 		const initialValues = {
-			transform: [{ rotate: '-10deg' }],
+			transform: [{ rotate: '0deg' }],
 		};
 		const animations = {
 			transform: [
 				{
-					rotate: withRepeat(withTiming('40deg', { duration: 3000 }), -1, true),
+					rotate: withRepeat(
+						withTiming('40deg', {
+							duration: 3500,
+							easing: Easing.inOut(Easing.ease),
+						}),
+						-1,
+						true,
+					),
 				},
 			],
 		};
@@ -43,7 +46,9 @@ const HourglassSpinner = ({
 			entering={__E2E__ ? undefined : entering}
 			color="transparent"
 			testID="HourglassSpinner">
-			<GlowImage image={imageSrc} imageSize={imageSize} glowColor={glowColor} />
+			<View style={[styles.imageContainer, { width: imageSize }]}>
+				<Image style={styles.image} source={imageSrc} />
+			</View>
 		</AnimatedView>
 	);
 };
@@ -54,6 +59,16 @@ const styles = StyleSheet.create({
 		justifyContent: 'center',
 		alignItems: 'center',
 	},
+	imageContainer: {
+		flexShrink: 1,
+		alignItems: 'center',
+		aspectRatio: 1,
+		marginHorizontal: 16,
+	},
+	image: {
+		flex: 1,
+		resizeMode: 'contain',
+	},
 });
 
 export default HourglassSpinner;
diff --git a/src/components/ImageText.tsx b/src/components/ImageText.tsx
index 9f2d11910..1f1570712 100644
--- a/src/components/ImageText.tsx
+++ b/src/components/ImageText.tsx
@@ -1,6 +1,6 @@
 import React, { memo, ReactElement } from 'react';
 import { View, TouchableOpacity, StyleSheet } from 'react-native';
-import { Text01M, Text02M } from '../styles/text';
+import { BodyMSB, BodySSB } from '../styles/text';
 import { PencileIcon } from '../styles/icons';
 import Money from '../components/Money';
 
@@ -27,8 +27,8 @@ const ImageText = ({
 			<View style={styles.textColumn}>
 				{icon}
 				<View style={styles.titleContainer}>
-					<Text01M>{title}</Text01M>
-					<Text02M color="gray1">{description}</Text02M>
+					<BodyMSB>{title}</BodyMSB>
+					<BodySSB color="white50">{description}</BodySSB>
 				</View>
 			</View>
 
@@ -37,7 +37,7 @@ const ImageText = ({
 					<Money
 						style={styles.value}
 						sats={value}
-						size="text01m"
+						size="bodyMSB"
 						symbol={true}
 						enableHide={true}
 					/>
@@ -46,8 +46,8 @@ const ImageText = ({
 				<Money
 					style={styles.value}
 					sats={value}
-					size="text02m"
-					color="gray1"
+					size="bodySSB"
+					color="white50"
 					symbol={true}
 					unitType="secondary"
 					enableHide={true}
diff --git a/src/components/InfoScreen.tsx b/src/components/InfoScreen.tsx
index 86a03d355..723475771 100644
--- a/src/components/InfoScreen.tsx
+++ b/src/components/InfoScreen.tsx
@@ -1,16 +1,13 @@
 import React, { ReactElement } from 'react';
-import { ImageSourcePropType, StyleSheet, View } from 'react-native';
+import { View, Image, ImageSourcePropType, StyleSheet } from 'react-native';
 
-import { Display, Text01S } from '../styles/text';
-import GlowingBackground from './GlowingBackground';
+import { Display, BodyM } from '../styles/text';
+import { View as ThemedView } from '../styles/components';
 import SafeAreaInset from './SafeAreaInset';
 import Button from './Button';
-import { IColors } from '../styles/colors';
 import NavigationHeader from './NavigationHeader';
-import GlowImage from './GlowImage';
 
 const InfoScreen = ({
-	accentColor,
 	navTitle,
 	title,
 	description,
@@ -20,9 +17,8 @@ const InfoScreen = ({
 	testID,
 	onButtonPress,
 }: {
-	accentColor: keyof IColors;
 	navTitle: string;
-	title: string;
+	title: string | ReactElement;
 	description: string | ReactElement;
 	image: ImageSourcePropType;
 	buttonText: string;
@@ -31,19 +27,21 @@ const InfoScreen = ({
 	onButtonPress: () => void;
 }): ReactElement => {
 	return (
-		<GlowingBackground topLeft={accentColor}>
+		<ThemedView style={styles.root}>
 			<SafeAreaInset type="top" />
 			<NavigationHeader
 				title={navTitle}
 				displayBackButton={displayBackButton}
 			/>
 			<View style={styles.content} testID={testID}>
-				<Display color={accentColor}>{title}</Display>
-				<Text01S style={styles.description} color="gray1">
+				<Display>{title}</Display>
+				<BodyM style={styles.description} color="white50">
 					{description}
-				</Text01S>
+				</BodyM>
 
-				<GlowImage image={image} glowColor="purple" />
+				<View style={styles.imageContainer}>
+					<Image style={styles.image} source={image} />
+				</View>
 
 				<View style={styles.buttonContainer}>
 					<Button
@@ -56,19 +54,33 @@ const InfoScreen = ({
 				</View>
 			</View>
 			<SafeAreaInset type="bottom" minPadding={16} />
-		</GlowingBackground>
+		</ThemedView>
 	);
 };
 
 const styles = StyleSheet.create({
+	root: {
+		flex: 1,
+	},
 	content: {
 		flex: 1,
-		marginTop: 8,
+		paddingTop: 16,
 		paddingHorizontal: 16,
 	},
+	imageContainer: {
+		flexShrink: 1,
+		alignItems: 'center',
+		alignSelf: 'center',
+		width: 256,
+		aspectRatio: 1,
+		marginTop: 'auto',
+	},
+	image: {
+		flex: 1,
+		resizeMode: 'contain',
+	},
 	description: {
 		marginTop: 4,
-		marginBottom: 16,
 	},
 	buttonContainer: {
 		flexDirection: 'row',
diff --git a/src/components/IntroScreen.tsx b/src/components/IntroScreen.tsx
index 661adc06f..c557ef289 100644
--- a/src/components/IntroScreen.tsx
+++ b/src/components/IntroScreen.tsx
@@ -2,8 +2,8 @@ import React, { ReactElement } from 'react';
 import { Image, ImageSourcePropType, StyleSheet, View } from 'react-native';
 import { Trans, useTranslation } from 'react-i18next';
 
-import { Display, Text01S } from '../styles/text';
-import GlowingBackground from './GlowingBackground';
+import { Display, BodyM } from '../styles/text';
+import { View as ThemedView } from '../styles/components';
 import SafeAreaInset from './SafeAreaInset';
 import Button from './Button';
 import { IColors } from '../styles/colors';
@@ -28,7 +28,7 @@ const IntroScreen = ({
 	const { t } = useTranslation();
 
 	return (
-		<GlowingBackground topLeft={accentColor}>
+		<ThemedView style={styles.root}>
 			<SafeAreaInset type="top" />
 			<View style={styles.content} testID={testID}>
 				<View style={styles.imageContainer}>
@@ -39,12 +39,12 @@ const IntroScreen = ({
 						<Trans
 							t={t}
 							i18nKey={title}
-							components={{ highlight: <Display color={accentColor} /> }}
+							components={{ accent: <Display color={accentColor} /> }}
 						/>
 					</Display>
-					<Text01S style={styles.description} color="gray1">
+					<BodyM style={styles.description} color="white50">
 						{description}
-					</Text01S>
+					</BodyM>
 				</View>
 
 				<View style={styles.buttonContainer}>
@@ -58,11 +58,14 @@ const IntroScreen = ({
 				</View>
 			</View>
 			<SafeAreaInset type="bottom" minPadding={16} />
-		</GlowingBackground>
+		</ThemedView>
 	);
 };
 
 const styles = StyleSheet.create({
+	root: {
+		flex: 1,
+	},
 	content: {
 		flex: 1,
 		marginHorizontal: 32,
diff --git a/src/components/LabeledInput.tsx b/src/components/LabeledInput.tsx
index 12bd833c3..a846eeddb 100644
--- a/src/components/LabeledInput.tsx
+++ b/src/components/LabeledInput.tsx
@@ -1,7 +1,7 @@
 import React, { ReactElement, RefObject } from 'react';
 import { View, StyleSheet, ViewStyle, StyleProp } from 'react-native';
 import { TextInput, BottomSheetTextInput } from '../styles/components';
-import { Caption13Up, Text02S } from '../styles/text';
+import { Caption13Up, BodyS } from '../styles/text';
 import { IThemeColors } from '../styles/themes';
 
 type LabeledInputProps = {
@@ -51,16 +51,16 @@ const LabeledInput = ({
 	return (
 		<View style={style}>
 			<View style={styles.header}>
-				<Caption13Up style={styles.label} color="gray1">
+				<Caption13Up style={styles.label} color="white50">
 					{label}
 				</Caption13Up>
 				{error && (
-					<Text02S
+					<BodyS
 						color="brand"
 						style={styles.error}
 						testID={testID ? testID + '-error' : undefined}>
 						{error}
-					</Text02S>
+					</BodyS>
 				)}
 			</View>
 			<View style={onChange ? styles.inputContainer : styles.readOnlyInput}>
diff --git a/src/components/LightningChannel.tsx b/src/components/LightningChannel.tsx
index 720a2cf0d..e3c2c9e29 100644
--- a/src/components/LightningChannel.tsx
+++ b/src/components/LightningChannel.tsx
@@ -21,7 +21,7 @@ const LightningChannel = ({
 	const { spendingAvailable, receivingAvailable, capacity } =
 		useLightningChannelBalance(channel);
 
-	let spendingColor: keyof IThemeColors = 'purple5';
+	let spendingColor: keyof IThemeColors = 'purple50';
 	let spendingAvailableColor: keyof IThemeColors = 'purple';
 	let receivingColor: keyof IThemeColors = 'white50';
 	let receivingAvailableColor: keyof IThemeColors = 'white';
@@ -49,7 +49,7 @@ const LightningChannel = ({
 					<Money
 						sats={spendingAvailable}
 						color={spendingAvailableColor}
-						size="caption13M"
+						size="captionB"
 						unit={EUnit.BTC}
 					/>
 				</View>
@@ -58,7 +58,7 @@ const LightningChannel = ({
 					<Money
 						sats={receivingAvailable}
 						color={receivingAvailableColor}
-						size="caption13M"
+						size="captionB"
 						unit={EUnit.BTC}
 					/>
 				</View>
diff --git a/src/components/LightningSyncing.tsx b/src/components/LightningSyncing.tsx
index e972d82b4..a1ef5a95a 100644
--- a/src/components/LightningSyncing.tsx
+++ b/src/components/LightningSyncing.tsx
@@ -1,26 +1,29 @@
 import React, { ReactElement, useEffect, useState } from 'react';
-import { StyleSheet, View, ViewStyle } from 'react-native';
+import { Image, StyleSheet, View, ViewStyle } from 'react-native';
 import Animated, {
 	Easing,
 	cancelAnimation,
 	runOnJS,
 	useSharedValue,
+	withDelay,
 	withRepeat,
+	withSequence,
 	withTiming,
 } from 'react-native-reanimated';
 import { useTranslation } from 'react-i18next';
-import { useAppSelector } from '../hooks/redux';
 
-import { Text01S, Text02M } from '../styles/text';
+import { BodyM, BodySSB } from '../styles/text';
 import { AnimatedView } from '../styles/components';
 import SafeAreaInset from './SafeAreaInset';
 import BottomSheetNavigationHeader from './BottomSheetNavigationHeader';
-import GlowImage from './GlowImage';
 import GradientView from './GradientView';
+import { useAppSelector } from '../hooks/redux';
 import { isLDKReadySelector } from '../store/reselect/ui';
 import { __E2E__ } from '../constants/env';
 
 const imageSrc = require('../assets/illustrations/lightning.png');
+const imageSyncSmall = require('../assets/illustrations/ln-sync-small.png');
+const imageSyncLarge = require('../assets/illustrations/ln-sync-large.png');
 
 const LightningSyncing = ({
 	style,
@@ -36,12 +39,12 @@ const LightningSyncing = ({
 	const [hidden, setHidden] = useState(isLDKReady);
 
 	useEffect(() => {
-		// ldk is ready and LightningSyncing is already hidden, do nothing
+		// LDK is ready and LightningSyncing is already hidden, do nothing
 		if (isLDKReady && hidden) {
 			return;
 		}
 
-		// ldk is ready, but LightningSyncing is not yet hidden, let's hide it
+		// LDK is ready, but LightningSyncing is not yet hidden, let's hide it
 		if (isLDKReady && !hidden) {
 			rootOpacity.value = withTiming(0, { duration: 200 }, () => {
 				cancelAnimation(glowOpacity);
@@ -66,26 +69,90 @@ const LightningSyncing = ({
 		return <></>;
 	}
 
+	const animationLarge = (): { initialValues: {}; animations: {} } => {
+		'worklet';
+		const initialValues = { transform: [{ rotate: '0deg' }] };
+		const animations = {
+			transform: [
+				{
+					rotate: withRepeat(
+						withSequence(
+							withTiming('-180deg', {
+								duration: 1500,
+								easing: Easing.inOut(Easing.ease),
+							}),
+							withDelay(
+								100,
+								withTiming('-360deg', {
+									duration: 1500,
+									easing: Easing.inOut(Easing.ease),
+								}),
+							),
+						),
+						-1,
+					),
+				},
+			],
+		};
+		return { initialValues, animations };
+	};
+
+	const animationSmall = (): { initialValues: {}; animations: {} } => {
+		'worklet';
+		const initialValues = { transform: [{ rotate: '0deg' }] };
+		const animations = {
+			transform: [
+				{
+					rotate: withRepeat(
+						withSequence(
+							withTiming('180deg', {
+								duration: 1500,
+								easing: Easing.inOut(Easing.ease),
+							}),
+							withDelay(
+								100,
+								withTiming('360deg', {
+									duration: 1500,
+									easing: Easing.inOut(Easing.ease),
+								}),
+							),
+						),
+						-1,
+					),
+				},
+			],
+		};
+		return { initialValues, animations };
+	};
+
 	return (
 		<AnimatedView
-			testID="LightningSyncing"
-			style={[style, { opacity: rootOpacity }]}>
-			<GradientView style={styles.gradient}>
+			style={[style, { opacity: rootOpacity }]}
+			testID="LightningSyncing">
+			<GradientView style={styles.root}>
 				<BottomSheetNavigationHeader title={title} />
 				<View style={styles.content}>
-					<Text01S style={styles.description} color="gray1">
-						{t('wait_text_top')}
-					</Text01S>
-
-					<Animated.View style={[styles.glow, { opacity: glowOpacity }]}>
-						<GlowImage image={imageSrc} glowColor="purple" />
-					</Animated.View>
+					<BodyM color="white50">{t('wait_text_top')}</BodyM>
 
-					<View style={styles.bottomContainer}>
-						<Text02M style={styles.bottom} color="white32">
-							{t('wait_text_bottom')}
-						</Text02M>
+					<View style={styles.imageContainer}>
+						<View style={styles.animation}>
+							<Animated.Image
+								style={styles.circleSmall}
+								source={imageSyncSmall}
+								entering={__E2E__ ? undefined : animationSmall}
+							/>
+							<Animated.Image
+								style={styles.circleLarge}
+								source={imageSyncLarge}
+								entering={__E2E__ ? undefined : animationLarge}
+							/>
+						</View>
+						<Image style={styles.image} source={imageSrc} />
 					</View>
+
+					<BodySSB style={styles.bottom} color="white32">
+						{t('wait_text_bottom')}
+					</BodySSB>
 				</View>
 				<SafeAreaInset type="bottom" minPadding={16} />
 			</GradientView>
@@ -94,27 +161,53 @@ const LightningSyncing = ({
 };
 
 const styles = StyleSheet.create({
-	glow: {
-		flex: 1,
-	},
-	gradient: {
+	root: {
 		flex: 1,
 	},
 	content: {
 		flex: 1,
-		marginTop: 8,
 		paddingHorizontal: 16,
 	},
-	description: {
-		marginTop: 16,
-		marginBottom: 16,
+	imageContainer: {
+		flexShrink: 1,
+		justifyContent: 'center',
+		alignItems: 'center',
+		alignSelf: 'center',
+		width: 256,
+		aspectRatio: 1,
+		marginTop: 'auto',
+		position: 'relative',
+	},
+	image: {
+		flex: 1,
+		resizeMode: 'contain',
 	},
-	bottomContainer: {
-		flexDirection: 'row',
+	animation: {
 		justifyContent: 'center',
+		alignItems: 'center',
+		alignSelf: 'center',
+		position: 'absolute',
+		width: 311,
+		aspectRatio: 1,
+	},
+	circleSmall: {
+		flex: 1,
+		position: 'absolute',
+		resizeMode: 'contain',
+		width: 207,
+		aspectRatio: 1,
+	},
+	circleLarge: {
+		flex: 1,
+		position: 'absolute',
+		resizeMode: 'contain',
+		width: 311,
+		aspectRatio: 1,
 	},
 	bottom: {
-		marginVertical: 18,
+		textAlign: 'center',
+		marginTop: 'auto',
+		marginBottom: 16,
 	},
 });
 
diff --git a/src/components/List.tsx b/src/components/List.tsx
index 9a4c93016..14f7212c3 100644
--- a/src/components/List.tsx
+++ b/src/components/List.tsx
@@ -13,17 +13,17 @@ import isEqual from 'lodash/isEqual';
 
 import { Switch } from '../styles/components';
 import {
-	Text01S,
-	Text01M,
-	Text02S,
-	Text02M,
+	BodyM,
+	BodyMSB,
+	BodyS,
+	BodySSB,
 	Caption13Up,
-	Caption13S,
+	Caption,
 } from '../styles/text';
 import { ChevronRight, Checkmark } from '../styles/icons';
 import DraggableList from '../screens/Settings/PaymentPreference/DraggableList';
 
-const _ItemHeader = memo(
+const _SectionHeader = memo(
 	({
 		title,
 		style,
@@ -36,14 +36,14 @@ const _ItemHeader = memo(
 		}
 
 		return (
-			<View style={[styles.itemHeader, style]}>
-				<Caption13Up color="gray1">{title.toUpperCase()}</Caption13Up>
+			<View style={[styles.sectionHeader, style]}>
+				<Caption13Up color="white50">{title.toUpperCase()}</Caption13Up>
 			</View>
 		);
 	},
 );
 
-const _ItemFooter = memo(
+const _SectionFooter = memo(
 	({
 		description,
 		style,
@@ -56,18 +56,18 @@ const _ItemFooter = memo(
 		}
 
 		return (
-			<View style={[styles.itemFooter, style]}>
-				<Text02S color="gray1">{description}</Text02S>
+			<View style={[styles.sectionFooter, style]}>
+				<BodyS color="white50">{description}</BodyS>
 			</View>
 		);
 	},
 );
 
-const ItemHeader = memo(_ItemHeader, (prevProps, nextProps) => {
+const SectionHeader = memo(_SectionHeader, (prevProps, nextProps) => {
 	return prevProps.title === nextProps.title;
 });
 
-const ItemFooter = memo(_ItemFooter, (prevProps, nextProps) => {
+const SectionFooter = memo(_SectionFooter, (prevProps, nextProps) => {
 	return prevProps.description === nextProps.description;
 });
 
@@ -170,7 +170,7 @@ const _Item = memo((item: ItemData): ReactElement => {
 							color={iconColor ? iconColor : 'brand'}
 						/>
 					)}
-					<Text01S color="white">{title}</Text01S>
+					<BodyM color="white">{title}</BodyM>
 				</View>
 				<View style={styles.rightColumn}>
 					<Switch onValueChange={_onPress} value={enabled} />
@@ -211,16 +211,16 @@ const _Item = memo((item: ItemData): ReactElement => {
 						/>
 					)}
 					<View>
-						<Text01S color="white">{title}</Text01S>
+						<BodyM color="white">{title}</BodyM>
 						{description && (
 							<View>
-								<Caption13S color="gray1">{description}</Caption13S>
+								<Caption color="white50">{description}</Caption>
 							</View>
 						)}
 					</View>
 				</View>
 				<View style={styles.rightColumn}>
-					<Text01S color="gray1">{value}</Text01S>
+					<BodyM color="white50">{value}</BodyM>
 				</View>
 			</TouchableOpacity>
 		);
@@ -259,12 +259,16 @@ const _Item = memo((item: ItemData): ReactElement => {
 				disabled={disabled}
 				testID={testID}
 				onPress={enabled ? _onPress : undefined}>
-				<View style={[styles.row, subtitle ? styles.rowLarge : {}]}>
+				<View
+					style={[
+						styles.row,
+						subtitle ? styles.rowLarge : {},
+						subtitle && Icon ? styles.rowXlarge : {},
+					]}>
 					<View style={styles.leftColumn}>
 						{Icon && (
 							<View style={styles.icon}>
 								<Icon
-									viewBox="0 0 32 32"
 									height={32}
 									width={32}
 									color={iconColor !== '' ? iconColor : 'brand'}
@@ -274,12 +278,12 @@ const _Item = memo((item: ItemData): ReactElement => {
 
 						{subtitle ? (
 							<View>
-								<Text01M color="white">{title}</Text01M>
-								{subtitle && <Text02M color="gray1">{subtitle}</Text02M>}
+								<BodyMSB color="white">{title}</BodyMSB>
+								{subtitle && <BodySSB color="white50">{subtitle}</BodySSB>}
 							</View>
 						) : (
 							<View>
-								<Text01S color="white">{title}</Text01S>
+								<BodyM color="white">{title}</BodyM>
 							</View>
 						)}
 					</View>
@@ -292,19 +296,19 @@ const _Item = memo((item: ItemData): ReactElement => {
 							)
 						) : (
 							<>
-								<Text01S style={styles.valueText} testID="Value">
+								<BodyM style={styles.valueText} testID="Value">
 									{value}
-								</Text01S>
-								<ChevronRight color="gray1" width={24} height={24} />
+								</BodyM>
+								<ChevronRight color="white50" width={24} height={24} />
 							</>
 						)}
 					</View>
 				</View>
 
 				{description && (
-					<Text02S style={styles.description} color="gray1">
+					<BodyS style={styles.description} color="white50">
 						{description}
-					</Text02S>
+					</BodyS>
 				)}
 			</TouchableOpacity>
 		);
@@ -350,7 +354,7 @@ const List = ({
 					const { title } = section;
 					const isFirst = title === data[0].title;
 					return (
-						<ItemHeader
+						<SectionHeader
 							title={title}
 							style={!isFirst ? styles.sectionSpacing : {}}
 						/>
@@ -360,7 +364,7 @@ const List = ({
 			)}
 			renderSectionFooter={({ section }): ReactElement => {
 				const { description } = section;
-				return <ItemFooter description={description} />;
+				return <SectionFooter description={description} />;
 			}}
 			renderItem={useCallback(
 				({ item }: { item: ItemData }): ReactElement | null => {
@@ -378,17 +382,21 @@ const List = ({
 };
 
 const styles = StyleSheet.create({
-	itemHeader: {
-		marginBottom: 10,
+	sectionHeader: {
 		justifyContent: 'center',
+		// height: 40,
+		height: 50,
 	},
-	itemFooter: {
+	sectionFooter: {
 		marginTop: 16,
 		paddingBottom: 16,
 		justifyContent: 'center',
 		borderBottomColor: 'rgba(255, 255, 255, 0.1)',
 		borderBottomWidth: 1,
 	},
+	sectionSpacing: {
+		marginTop: 16,
+	},
 	valueText: {
 		marginRight: 8,
 	},
@@ -398,9 +406,12 @@ const styles = StyleSheet.create({
 		justifyContent: 'space-between',
 		borderBottomColor: 'rgba(255, 255, 255, 0.1)',
 		borderBottomWidth: 1,
-		minHeight: 58,
+		minHeight: 52,
 	},
 	rowLarge: {
+		minHeight: 74,
+	},
+	rowXlarge: {
 		minHeight: 90,
 	},
 	leftColumn: {
@@ -413,16 +424,13 @@ const styles = StyleSheet.create({
 		flexDirection: 'row',
 	},
 	icon: {
-		borderRadius: 200,
+		borderRadius: 20,
 		marginRight: 10,
 		justifyContent: 'center',
 		alignItems: 'center',
 	},
 	description: {
-		marginTop: 4,
-	},
-	sectionSpacing: {
-		marginTop: 32,
+		marginVertical: 4,
 	},
 });
 
diff --git a/src/components/LuganoFeedWidget.tsx b/src/components/LuganoFeedWidget.tsx
index 28a371215..c47e29606 100644
--- a/src/components/LuganoFeedWidget.tsx
+++ b/src/components/LuganoFeedWidget.tsx
@@ -8,7 +8,7 @@ import {
 	TouchableOpacity,
 } from 'react-native';
 
-import { Caption13M, Text01M, Text02M } from '../styles/text';
+import { CaptionB, BodyMSB, BodySSB } from '../styles/text';
 import BaseFeedWidget from './BaseFeedWidget';
 import { openURL } from '../utils/helpers';
 
@@ -16,7 +16,6 @@ import { useSlashfeed } from '../hooks/widgets';
 import Button from './Button';
 import { CalendarIcon, MapPinLineIcon, MapTrifoldIcon } from '../styles/icons';
 import { useAppSelector } from '../hooks/redux';
-import { TFeedWidget } from '../store/types/widgets';
 
 const cache = {
 	banner: '',
@@ -26,7 +25,6 @@ const cache = {
 
 const LuganoWidget = ({
 	url,
-	widget,
 	isEditing = false,
 	style,
 	testID,
@@ -34,7 +32,6 @@ const LuganoWidget = ({
 	onPressIn,
 }: {
 	url: string;
-	widget: TFeedWidget;
 	isEditing?: boolean;
 	style?: StyleProp<ViewStyle>;
 	testID?: string;
@@ -121,7 +118,6 @@ const LuganoWidget = ({
 			url={url}
 			style={style}
 			name="Plan ₿ Forum"
-			showTitle={widget.extras?.showTitle}
 			isLoading={false}
 			isEditing={isEditing}
 			testID={testID}
@@ -131,15 +127,15 @@ const LuganoWidget = ({
 				{schedule.map((event) => (
 					<View key={event.name} style={styles.row}>
 						<View style={styles.columnLeft}>
-							<Text02M color="gray1" style={styles.time}>
+							<BodySSB color="white50" style={styles.time}>
 								{event.time}
-							</Text02M>
-							<Text02M color="gray1" numberOfLines={1}>
+							</BodySSB>
+							<BodySSB color="white50" numberOfLines={1}>
 								{event.location}
-							</Text02M>
+							</BodySSB>
 						</View>
 						<View style={styles.columnRight}>
-							<Text01M numberOfLines={1}>{event.name}</Text01M>
+							<BodyMSB numberOfLines={1}>{event.name}</BodyMSB>
 						</View>
 					</View>
 				))}
@@ -180,9 +176,9 @@ const LuganoWidget = ({
 				)}
 				<View style={styles.source}>
 					<View style={styles.sourceColumnLeft}>
-						<Caption13M color="gray1" numberOfLines={1}>
+						<CaptionB color="white50" numberOfLines={1}>
 							Treasure Chests Found: {numberOfChests} of 6
-						</Caption13M>
+						</CaptionB>
 					</View>
 					<View style={styles.columnRight}>
 						<TouchableOpacity
@@ -190,9 +186,9 @@ const LuganoWidget = ({
 							onPress={(): void => {
 								openURL('https://bitkit.to/treasure-hunt');
 							}}>
-							<Caption13M color="gray1" numberOfLines={1}>
+							<CaptionB color="white50" numberOfLines={1}>
 								bitkit.to
-							</Caption13M>
+							</CaptionB>
 						</TouchableOpacity>
 					</View>
 				</View>
diff --git a/src/components/Money.tsx b/src/components/Money.tsx
index 87390e123..1416911a1 100644
--- a/src/components/Money.tsx
+++ b/src/components/Money.tsx
@@ -2,15 +2,15 @@ import React, { memo, ReactElement, useMemo } from 'react';
 import { StyleProp, StyleSheet, View, ViewStyle } from 'react-native';
 
 import {
-	Caption13M,
+	CaptionB,
 	Caption13Up,
 	Display,
-	Text01M,
-	Text02M,
+	BodyMSB,
+	BodySSB,
 	Title,
+	DisplayT,
 } from '../styles/text';
 import { IColors } from '../styles/colors';
-import { BitcoinIcon } from '../styles/icons';
 import { useAppSelector } from '../hooks/redux';
 import { useDisplayValues } from '../hooks/displayValues';
 import { abbreviateNumber } from '../utils/helpers';
@@ -22,6 +22,15 @@ import {
 	nextUnitSelector,
 } from '../store/reselect/settings';
 
+type TSize =
+	| 'display'
+	| 'displayT'
+	| 'title'
+	| 'bodyMSB'
+	| 'bodySSB'
+	| 'captionB'
+	| 'caption13Up';
+
 type MoneyProps = {
 	sats: number;
 	unitType?: 'primary' | 'secondary'; // force primary or secondary unit. Can be overwritten by unit prop
@@ -35,13 +44,7 @@ type MoneyProps = {
 	shouldRoundUp?: boolean;
 	style?: StyleProp<ViewStyle>;
 	testID?: string;
-	size?:
-		| 'display'
-		| 'text01m'
-		| 'text02m'
-		| 'caption13M'
-		| 'caption13Up'
-		| 'title';
+	size?: TSize;
 };
 
 const Money = (props: MoneyProps): ReactElement => {
@@ -65,58 +68,41 @@ const Money = (props: MoneyProps): ReactElement => {
 
 	const dv = useDisplayValues(sats, shouldRoundUp);
 
-	const [Text, lineHeight, iconHeight, iconWidth, iconMargin] = useMemo(() => {
+	const [Text, iconMargin] = useMemo(() => {
 		switch (size) {
-			case 'caption13M':
-				return [Caption13Up, undefined, 16, 8, 3];
+			case 'captionB':
+				return [Caption13Up, 3];
 			case 'caption13Up':
-				return [Caption13M, undefined, 16, 8, 4];
-			case 'text01m':
-				return [Text01M, undefined, 16, 10, 4];
-			case 'text02m':
-				return [Text02M, undefined, 18, 9, 4];
+				return [CaptionB, 4];
+			case 'bodyMSB':
+				return [BodyMSB, 4];
+			case 'bodySSB':
+				return [BodySSB, 4];
 			case 'title':
-				return [Title, undefined, 26, 12, 6];
+				return [Title, 6];
+			case 'displayT':
+				return [DisplayT, 8];
 			default:
-				// Override lineHeight for Display font
-				return [Display, '57px', 43, 27, 10];
+				return [Display, 10];
 		}
 	}, [size]);
 
 	const symbol = useMemo(() => {
-		switch (unit) {
-			case EUnit.fiat:
-				return (
-					<Text
-						style={{ marginRight: iconMargin }}
-						lineHeight={lineHeight}
-						color={symbolColor ?? color ?? 'white50'}
-						testID="MoneyFiatSymbol">
-						{dv.fiatSymbol}
-					</Text>
-				);
-			default:
-				return (
-					<BitcoinIcon
-						style={{ marginRight: iconMargin }}
-						color={symbolColor ?? color ?? 'white50'}
-						height={iconHeight}
-						width={iconWidth}
-						testID="MoneyBitcoinSymbol"
-					/>
-				);
-		}
-	}, [
-		unit,
-		Text,
-		lineHeight,
-		color,
-		symbolColor,
-		dv.fiatSymbol,
-		iconHeight,
-		iconWidth,
-		iconMargin,
-	]);
+		const style = {
+			marginRight: iconMargin,
+			// cap symbol font weight to ExtraBold for display size
+			...(size === 'display' ? { fontFamily: 'InterTight-ExtraBold' } : {}),
+		};
+
+		return (
+			<Text
+				style={style}
+				color={symbolColor ?? color ?? 'white50'}
+				testID="MoneyFiatSymbol">
+				{unit === EUnit.BTC ? '₿' : dv.fiatSymbol}
+			</Text>
+		);
+	}, [Text, size, unit, color, symbolColor, dv.fiatSymbol, iconMargin]);
 
 	let text = useMemo(() => {
 		switch (unit) {
@@ -153,16 +139,12 @@ const Money = (props: MoneyProps): ReactElement => {
 	return (
 		<View style={[styles.root, props.style]} testID={testID}>
 			{sign && (
-				<Text
-					style={styles.sign}
-					lineHeight={lineHeight}
-					color={color ?? 'white50'}
-					testID="MoneySign">
+				<Text style={styles.sign} color={color ?? 'white50'} testID="MoneySign">
 					{sign}
 				</Text>
 			)}
 			{showSymbol && symbol}
-			<Text lineHeight={lineHeight} color={color} testID="MoneyText">
+			<Text color={color} testID="MoneyText">
 				{text}
 			</Text>
 		</View>
diff --git a/src/components/MoneySymbol.tsx b/src/components/MoneySymbol.tsx
deleted file mode 100644
index 7a4f7b52f..000000000
--- a/src/components/MoneySymbol.tsx
+++ /dev/null
@@ -1,56 +0,0 @@
-import React, { ReactElement } from 'react';
-import { View, StyleProp, ViewStyle, StyleSheet } from 'react-native';
-
-import { Display } from '../styles/text';
-import { BitcoinIcon } from '../styles/icons';
-import { EUnit } from '../store/types/wallet';
-import { useCurrency } from '../hooks/displayValues';
-
-const MoneySymbol = ({
-	unit,
-	style,
-}: {
-	unit: EUnit;
-	style?: StyleProp<ViewStyle>;
-}): ReactElement => {
-	const { fiatSymbol } = useCurrency();
-
-	return (
-		<View style={[styles.root, style]}>
-			{unit === EUnit.fiat && (
-				<Display
-					style={[styles.symbol, styles.fiatSymbol]}
-					color="white50"
-					testID="MoneyFiatSymbol">
-					{fiatSymbol}
-				</Display>
-			)}
-			{unit === EUnit.BTC && (
-				<BitcoinIcon
-					style={styles.symbol}
-					color="white50"
-					height={40}
-					width={28}
-					testID="MoneyBitcoinSymbol"
-				/>
-			)}
-		</View>
-	);
-};
-
-const styles = StyleSheet.create({
-	root: {
-		flexDirection: 'row',
-		alignItems: 'center',
-		position: 'relative',
-	},
-	symbol: {
-		marginRight: 4,
-	},
-	fiatSymbol: {
-		fontSize: 46,
-		lineHeight: 55,
-	},
-});
-
-export default MoneySymbol;
diff --git a/src/components/NavigationHeader.tsx b/src/components/NavigationHeader.tsx
index 54218ac5c..4f6ac83ab 100644
--- a/src/components/NavigationHeader.tsx
+++ b/src/components/NavigationHeader.tsx
@@ -19,13 +19,13 @@ const ActionButton = memo(
 	({
 		children,
 		style,
-		onPress,
 		testID,
+		onPress,
 	}: {
 		children?: JSX.Element;
 		style?: StyleProp<ViewStyle>;
-		onPress?: (event: GestureResponderEvent) => void;
 		testID?: string;
+		onPress?: (event: GestureResponderEvent) => void;
 	}): ReactElement => {
 		return (
 			<Pressable
@@ -35,9 +35,9 @@ const ActionButton = memo(
 					pressed ? styles.pressed : styles.notPressed,
 				]}
 				color="transparent"
-				onPress={onPress}
 				hitSlop={{ top: 15, bottom: 15, left: 15, right: 15 }}
-				testID={testID}>
+				testID={testID}
+				onPress={onPress}>
 				{children}
 			</Pressable>
 		);
@@ -48,6 +48,7 @@ const ACTION_WIDTH = 45;
 
 export type NavigationHeaderProps = {
 	title?: string;
+	icon?: ReactElement;
 	displayBackButton?: boolean;
 	navigateBack?: boolean;
 	actionIcon?: ReactElement;
@@ -60,6 +61,7 @@ export type NavigationHeaderProps = {
 
 const NavigationHeader = ({
 	title = ' ',
+	icon,
 	displayBackButton = true,
 	navigateBack = true,
 	size = 'lg',
@@ -118,16 +120,22 @@ const NavigationHeader = ({
 				{showBack && (
 					<ActionButton
 						style={styles.backButton}
-						onPress={handleBackPress}
-						testID="NavigationBack">
+						testID="NavigationBack"
+						onPress={handleBackPress}>
 						<BackIcon width={20} height={20} />
 					</ActionButton>
 				)}
 			</View>
-			<View style={styles.middleColumn} testID="NavigationTitle">
-				<Text style={styles.title} numberOfLines={1} ellipsizeMode="middle">
-					{title}
-				</Text>
+			<View style={styles.middleColumn} pointerEvents="none">
+				<View style={styles.title}>
+					{icon && <View style={styles.titleIcon}>{icon}</View>}
+					<Text
+						style={styles.titleText}
+						numberOfLines={1}
+						ellipsizeMode="middle">
+						{title}
+					</Text>
+				</View>
 			</View>
 			<View style={actionColumn}>
 				{actionIcon && (
@@ -157,7 +165,8 @@ const styles = StyleSheet.create({
 	},
 	containerLg: {
 		height: HEADER_HEIGHT,
-		marginBottom: 32,
+		// marginBottom: 32,
+		marginBottom: 16,
 	},
 	containerSm: {
 		marginTop: 2,
@@ -171,10 +180,22 @@ const styles = StyleSheet.create({
 		flexShrink: 1,
 		justifyContent: 'center',
 		alignItems: 'center',
+		pointerEvents: 'none',
 	},
 	title: {
+		flexDirection: 'row',
+		justifyContent: 'center',
+		alignItems: 'center',
+	},
+	titleIcon: {
+		height: 32,
+		width: 32,
+		justifyContent: 'center',
+		alignItems: 'center',
+		marginRight: 16,
+	},
+	titleText: {
 		textAlign: 'center',
-		width: '100%',
 	},
 	action: {
 		flex: 1,
diff --git a/src/screens/Wallets/WalletsDetail/NetworkRow.tsx b/src/components/NetworkRow.tsx
similarity index 62%
rename from src/screens/Wallets/WalletsDetail/NetworkRow.tsx
rename to src/components/NetworkRow.tsx
index ce5a70592..0a4f69625 100644
--- a/src/screens/Wallets/WalletsDetail/NetworkRow.tsx
+++ b/src/components/NetworkRow.tsx
@@ -1,61 +1,72 @@
 import React, { ReactElement } from 'react';
-import { View, StyleSheet } from 'react-native';
+import { View, TouchableOpacity, StyleSheet } from 'react-native';
 import { useTranslation } from 'react-i18next';
 
-import { TransferIcon } from '../../../styles/icons';
-import { Title, Caption13M } from '../../../styles/text';
-import Money from '../../../components/Money';
+import { TransferIcon } from '../styles/icons';
+import { BodyMSB, CaptionB } from '../styles/text';
+import Money from './Money';
 
 const NetworkRow = ({
 	title,
 	balance,
 	pendingBalance,
 	icon,
+	testID,
+	onPress,
 }: {
 	title: string;
 	balance: number;
 	pendingBalance?: number;
 	icon: ReactElement;
+	testID?: string;
+	onPress?: () => void;
 }): ReactElement => {
 	const { t } = useTranslation('wallet');
 
 	return (
-		<View style={styles.root}>
-			<View>{icon}</View>
-			<View>
-				<Title>{title}</Title>
+		<TouchableOpacity style={styles.root} testID={testID} onPress={onPress}>
+			<View style={styles.icon}>{icon}</View>
+			<View style={styles.text}>
+				<BodyMSB>{title}</BodyMSB>
 				{pendingBalance !== 0 && (
 					<View style={styles.subtitle}>
 						<TransferIcon style={styles.subtitleIcon} color="white50" />
-						<Caption13M color="white50">
+						<CaptionB color="white50">
 							{t('details_transfer_subtitle')}
-						</Caption13M>
+						</CaptionB>
 					</View>
 				)}
 			</View>
 			<View style={styles.amount}>
-				<Money sats={balance} size="title" enableHide={true} symbol={true} />
+				<Money sats={balance} size="bodyMSB" enableHide={true} symbol={true} />
 				{pendingBalance ? (
 					<View style={styles.pendingBalance}>
 						<Money
 							style={styles.pendingBalanceAmount}
 							sats={pendingBalance}
-							size="caption13M"
+							size="captionB"
 							color="white50"
 							enableHide={true}
 						/>
 					</View>
 				) : null}
 			</View>
-		</View>
+		</TouchableOpacity>
 	);
 };
 
 const styles = StyleSheet.create({
 	root: {
 		flexDirection: 'row',
+		alignItems: 'center',
 		justifyContent: 'space-between',
 	},
+	icon: {
+		marginRight: 16,
+	},
+	text: {
+		justifyContent: 'center',
+	},
 	subtitle: {
 		flexDirection: 'row',
 		alignItems: 'center',
@@ -64,7 +75,7 @@ const styles = StyleSheet.create({
 		marginRight: 3,
 	},
 	amount: {
-		justifyContent: 'space-between',
+		justifyContent: 'center',
 		alignItems: 'flex-end',
 		marginLeft: 'auto',
 	},
diff --git a/src/components/NumberPad.tsx b/src/components/NumberPad.tsx
index 01b650f82..15c017975 100644
--- a/src/components/NumberPad.tsx
+++ b/src/components/NumberPad.tsx
@@ -137,7 +137,7 @@ const styles = StyleSheet.create({
 		textAlign: 'center',
 	},
 	buttonError: {
-		color: '#ff6600',
+		color: '#FF4400',
 	},
 	pressed: {
 		opacity: ACTIVE_OPACITY,
diff --git a/src/components/NumberPadTextField.tsx b/src/components/NumberPadTextField.tsx
index 6ee25d03a..b8e9e70be 100644
--- a/src/components/NumberPadTextField.tsx
+++ b/src/components/NumberPadTextField.tsx
@@ -10,7 +10,6 @@ import {
 
 import { Display } from '../styles/text';
 import Money from './Money';
-import MoneySymbol from './MoneySymbol';
 import { EDenomination, EUnit } from '../store/types/wallet';
 import {
 	conversionUnitSelector,
@@ -18,6 +17,7 @@ import {
 	unitSelector,
 } from '../store/reselect/settings';
 import { convertToSats } from '../utils/conversion';
+import { useCurrency } from '../hooks/displayValues';
 import {
 	getDisplayValues,
 	getFiatDisplayValuesForFiat,
@@ -38,6 +38,7 @@ const NumberPadTextField = ({
 	testID?: string;
 	onPress?: () => void;
 }): ReactElement => {
+	const { fiatSymbol } = useCurrency();
 	const unit = useAppSelector(unitSelector);
 	const conversionUnit = useAppSelector(conversionUnitSelector);
 	const denomination = useAppSelector(denominationSelector);
@@ -96,19 +97,19 @@ const NumberPadTextField = ({
 					style={styles.secondary}
 					sats={satoshis}
 					size="caption13Up"
-					color="gray1"
+					color="white50"
 					symbol={true}
 					unitType="secondary"
 				/>
 			)}
 
 			<View style={styles.primary}>
-				<MoneySymbol style={styles.symbol} unit={unit} />
-				<Display color="white" lineHeight="57px">
+				<Display style={styles.symbol} color="white50">
+					{unit === EUnit.BTC ? '₿' : fiatSymbol}
+				</Display>
+				<Display>
 					{value !== placeholder && value}
-					<Display
-						color={showPlaceholder ? 'white50' : 'white'}
-						lineHeight="57px">
+					<Display color={showPlaceholder ? 'white50' : 'white'}>
 						{placeholder}
 					</Display>
 				</Display>
@@ -117,8 +118,8 @@ const NumberPadTextField = ({
 			{reverse && (
 				<Money
 					sats={satoshis}
-					size="text01m"
-					color="gray1"
+					size="bodyMSB"
+					color="white50"
 					symbol={true}
 					unitType="secondary"
 				/>
@@ -133,10 +134,11 @@ const styles = StyleSheet.create({
 		alignItems: 'center',
 	},
 	secondary: {
-		marginBottom: 9,
+		marginBottom: 16,
 	},
 	symbol: {
-		marginRight: 4,
+		fontFamily: 'InterTight-Bold',
+		marginRight: 6,
 	},
 });
 
diff --git a/src/components/OnboardingScreen.tsx b/src/components/OnboardingScreen.tsx
new file mode 100644
index 000000000..a86c7dd3b
--- /dev/null
+++ b/src/components/OnboardingScreen.tsx
@@ -0,0 +1,101 @@
+import React, { ReactElement } from 'react';
+import { View, Image, ImageSourcePropType, StyleSheet } from 'react-native';
+
+import { Display, BodyM } from '../styles/text';
+import { View as ThemedView } from '../styles/components';
+import SafeAreaInset from './SafeAreaInset';
+import Button from './Button';
+import NavigationHeader from './NavigationHeader';
+
+const OnboardingScreen = ({
+	navTitle,
+	title,
+	description,
+	image,
+	buttonText,
+	displayBackButton = true,
+	testID,
+	onClosePress,
+	onButtonPress,
+}: {
+	navTitle?: string;
+	title: string | ReactElement;
+	description: string | ReactElement;
+	image: ImageSourcePropType;
+	buttonText: string;
+	displayBackButton?: boolean;
+	testID?: string;
+	onClosePress?: () => void;
+	onButtonPress: () => void;
+}): ReactElement => {
+	return (
+		<ThemedView style={styles.root}>
+			<SafeAreaInset type="top" />
+			<NavigationHeader
+				title={navTitle}
+				displayBackButton={displayBackButton}
+				onClosePress={onClosePress}
+			/>
+			<View style={styles.content} testID={testID}>
+				<View style={styles.imageContainer}>
+					<Image style={styles.image} source={image} />
+				</View>
+
+				<View style={styles.textContainer}>
+					<Display>{title}</Display>
+					<BodyM style={styles.description} color="white50">
+						{description}
+					</BodyM>
+				</View>
+
+				<View style={styles.buttonContainer}>
+					<Button
+						style={styles.button}
+						text={buttonText}
+						size="large"
+						testID={`${testID}-button`}
+						onPress={onButtonPress}
+					/>
+				</View>
+			</View>
+			<SafeAreaInset type="bottom" minPadding={16} />
+		</ThemedView>
+	);
+};
+
+const styles = StyleSheet.create({
+	root: {
+		flex: 1,
+	},
+	content: {
+		flex: 1,
+		justifyContent: 'space-between',
+		paddingHorizontal: 32,
+	},
+	imageContainer: {
+		flexShrink: 1,
+		alignItems: 'center',
+		alignSelf: 'center',
+		aspectRatio: 1,
+		marginTop: 'auto',
+	},
+	image: {
+		flex: 1,
+		resizeMode: 'contain',
+	},
+	textContainer: {
+		marginTop: 'auto',
+	},
+	description: {
+		marginTop: 4,
+	},
+	buttonContainer: {
+		flexDirection: 'row',
+		marginTop: 32,
+	},
+	button: {
+		flex: 1,
+	},
+});
+
+export default OnboardingScreen;
diff --git a/src/components/Percentage.tsx b/src/components/Percentage.tsx
index bbe31796b..370a1f2b9 100644
--- a/src/components/Percentage.tsx
+++ b/src/components/Percentage.tsx
@@ -1,7 +1,7 @@
 import React, { ReactElement } from 'react';
 import { Platform, StyleProp, StyleSheet, View, ViewStyle } from 'react-native';
-import { Headline, Text01S } from '../styles/text';
-import { LightningHollow, SavingsIcon } from '../styles/icons';
+import { Headline, BodyMB } from '../styles/text';
+import { BitcoinCircleIcon, LightningCircleIcon } from '../styles/icons';
 
 type PercentageProps = {
 	value: number;
@@ -12,14 +12,14 @@ type PercentageProps = {
 const Percentage = ({ value, type, style }: PercentageProps): ReactElement => (
 	<View style={[styles.root, style]}>
 		{type === 'spending' ? (
-			<LightningHollow color="purple" height={32} width={32} />
+			<LightningCircleIcon style={styles.icon} width={32} height={32} />
 		) : (
-			<SavingsIcon color="orange" height={32} width={32} />
+			<BitcoinCircleIcon style={styles.icon} width={32} height={32} />
 		)}
 
-		<Headline lineHeight="40px" style={styles.text}>
+		<Headline style={styles.number}>
 			{value}
-			<Text01S>%</Text01S>
+			<BodyMB style={styles.sign}>%</BodyMB>
 		</Headline>
 	</View>
 );
@@ -30,9 +30,18 @@ const styles = StyleSheet.create({
 		justifyContent: 'space-between',
 		alignItems: 'center',
 	},
-	text: {
-		marginLeft: 8,
-		paddingTop: Platform.OS === 'android' ? 20 : 0,
+	icon: {
+		marginRight: 8,
+	},
+	number: {
+		fontFamily: 'InterTight-Bold',
+		fontSize: 34,
+		letterSpacing: 0.5,
+		// weird font bug here, fix with padding
+		paddingTop: Platform.OS === 'android' ? 49 : 40,
+	},
+	sign: {
+		fontSize: 16,
 	},
 });
 
diff --git a/src/components/PinPad.tsx b/src/components/PinPad.tsx
index e6c51e63d..6b643f9dd 100644
--- a/src/components/PinPad.tsx
+++ b/src/components/PinPad.tsx
@@ -9,11 +9,10 @@ import { StyleSheet, View, Pressable } from 'react-native';
 import { FadeIn, FadeOut } from 'react-native-reanimated';
 import { useTranslation } from 'react-i18next';
 
-import { Text02S, Subtitle } from '../styles/text';
-import { AnimatedView } from '../styles/components';
+import { BodyS, Subtitle } from '../styles/text';
+import { View as ThemedView, AnimatedView } from '../styles/components';
 import { FaceIdIcon, TouchIdIcon } from '../styles/icons';
 import SafeAreaInset from './SafeAreaInset';
-import GlowingBackground from './GlowingBackground';
 import NavigationHeader from './NavigationHeader';
 import { IsSensorAvailableResult } from './Biometrics';
 import NumberPad from './NumberPad';
@@ -164,14 +163,14 @@ const PinPad = ({
 			: biometryData?.biometryType ?? t('bio');
 
 	return (
-		<GlowingBackground topLeft="brand">
+		<ThemedView style={styles.root}>
 			<View style={styles.header}>
 				<SafeAreaInset type="top" />
 				<NavigationHeader displayBackButton={showBackNavigation} />
 			</View>
 			<View style={styles.container} testID="PinPad">
 				<View style={styles.logo}>
-					{showLogoOnPIN && <BitkitLogo height={64} width={184} />}
+					{showLogoOnPIN && <BitkitLogo height={82} width={280} />}
 				</View>
 
 				<View style={styles.content}>
@@ -185,43 +184,45 @@ const PinPad = ({
 								{t('pin_enter')}
 							</Subtitle>
 
-							{attemptsRemaining !== Number(PIN_ATTEMPTS) && (
-								<AnimatedView
-									style={styles.attempts}
-									color="transparent"
-									entering={FadeIn}
-									exiting={FadeOut}>
-									{isLastAttempt ? (
-										<Text02S style={styles.attemptsRemaining} color="brand">
-											{t('pin_last_attempt')}
-										</Text02S>
-									) : (
-										<Pressable
-											onPress={(): void => {
-												showBottomSheet('forgotPIN');
-											}}>
-											<Text02S testID="AttemptsRemaining" color="brand">
-												{t('pin_attempts', { attemptsRemaining })}
-											</Text02S>
-										</Pressable>
-									)}
-								</AnimatedView>
-							)}
-
-							{allowBiometrics && (
-								<Button
-									style={styles.biometrics}
-									text={t('pin_use_biometrics', { biometricsName })}
-									icon={
-										biometryData?.biometryType === 'FaceID' ? (
-											<FaceIdIcon height={16} width={16} color="brand" />
+							<View style={styles.actions}>
+								{attemptsRemaining !== Number(PIN_ATTEMPTS) && (
+									<AnimatedView
+										style={styles.attempts}
+										color="transparent"
+										entering={FadeIn}
+										exiting={FadeOut}>
+										{isLastAttempt ? (
+											<BodyS style={styles.attemptsRemaining} color="brand">
+												{t('pin_last_attempt')}
+											</BodyS>
 										) : (
-											<TouchIdIcon height={16} width={16} color="brand" />
-										)
-									}
-									onPress={onShowBiotmetrics}
-								/>
-							)}
+											<Pressable
+												onPress={(): void => {
+													showBottomSheet('forgotPIN');
+												}}>
+												<BodyS testID="AttemptsRemaining" color="brand">
+													{t('pin_attempts', { attemptsRemaining })}
+												</BodyS>
+											</Pressable>
+										)}
+									</AnimatedView>
+								)}
+
+								{allowBiometrics && (
+									<Button
+										style={styles.biometrics}
+										text={t('pin_use_biometrics', { biometricsName })}
+										icon={
+											biometryData?.biometryType === 'FaceID' ? (
+												<FaceIdIcon height={16} width={16} color="brand" />
+											) : (
+												<TouchIdIcon height={16} width={16} color="brand" />
+											)
+										}
+										onPress={onShowBiotmetrics}
+									/>
+								)}
+							</View>
 
 							<View style={styles.dots}>
 								{Array(4)
@@ -250,11 +251,15 @@ const PinPad = ({
 					)}
 				</View>
 			</View>
-		</GlowingBackground>
+			<SafeAreaInset type="bottom" />
+		</ThemedView>
 	);
 };
 
 const styles = StyleSheet.create({
+	root: {
+		flex: 1,
+	},
 	header: {
 		position: 'absolute',
 		top: 0,
@@ -267,7 +272,7 @@ const styles = StyleSheet.create({
 	logo: {
 		flex: 1.2,
 		alignSelf: 'center',
-		justifyContent: 'center',
+		justifyContent: 'flex-end',
 	},
 	content: {
 		flex: 2,
@@ -278,14 +283,18 @@ const styles = StyleSheet.create({
 	},
 	title: {
 		textAlign: 'center',
+		marginTop: 'auto',
 		marginBottom: 32,
 	},
+	actions: {
+		marginBottom: 16,
+		minHeight: 19,
+	},
 	attempts: {
 		flexDirection: 'row',
 		flexWrap: 'wrap',
 		justifyContent: 'center',
 		paddingHorizontal: 16,
-		marginBottom: 16,
 	},
 	attemptsRemaining: {
 		textAlign: 'center',
@@ -297,7 +306,7 @@ const styles = StyleSheet.create({
 	dots: {
 		flexDirection: 'row',
 		justifyContent: 'center',
-		marginBottom: 32,
+		marginBottom: 48,
 	},
 	dot: {
 		width: 20,
@@ -307,8 +316,7 @@ const styles = StyleSheet.create({
 		borderWidth: 1,
 	},
 	numberpad: {
-		marginTop: 'auto',
-		maxHeight: 410,
+		maxHeight: 310,
 	},
 });
 
diff --git a/src/components/PriceWidget.tsx b/src/components/PriceWidget.tsx
index 504681bc6..f2688277c 100644
--- a/src/components/PriceWidget.tsx
+++ b/src/components/PriceWidget.tsx
@@ -4,7 +4,7 @@ import { useTranslation } from 'react-i18next';
 import { Reader } from '@synonymdev/slashtags-widget-price-feed';
 import { Pair } from '@synonymdev/slashtags-widget-price-feed/types/lib/reader';
 
-import { Caption13M, Text02M } from '../styles/text';
+import { CaptionB, BodySSB } from '../styles/text';
 import { useSlashfeed } from '../hooks/widgets';
 import { TFeedWidget } from '../store/types/widgets';
 import BaseFeedWidget from './BaseFeedWidget';
@@ -141,7 +141,6 @@ const PriceWidget = ({
 			style={style}
 			url={url}
 			name={t('widget_price')}
-			showTitle={widget.extras?.showTitle}
 			isLoading={loading}
 			isEditing={isEditing}
 			testID={testID}
@@ -155,15 +154,15 @@ const PriceWidget = ({
 							style={styles.row}
 							testID={`PriceWidgetRow-${field.name}`}>
 							<View style={styles.columnLeft}>
-								<Text02M color="gray1" numberOfLines={1}>
+								<BodySSB color="white50" numberOfLines={1}>
 									{field.name}
-								</Text02M>
+								</BodySSB>
 							</View>
 							<View style={styles.columnRight}>
-								<Text02M style={styles.change} color={field.change.color}>
+								<BodySSB style={styles.change} color={field.change.color}>
 									{field.change.formatted}
-								</Text02M>
-								<Text02M numberOfLines={1}>{field.price}</Text02M>
+								</BodySSB>
+								<BodySSB numberOfLines={1}>{field.price}</BodySSB>
 							</View>
 						</View>
 					);
@@ -172,9 +171,9 @@ const PriceWidget = ({
 				{(data.length === 0 || !data[0].pastValues || error) && (
 					<View style={styles.row}>
 						<View style={styles.columnLeft}>
-							<Caption13M color="gray1" numberOfLines={1}>
+							<CaptionB color="white50" numberOfLines={1}>
 								No historical data
-							</Caption13M>
+							</CaptionB>
 						</View>
 					</View>
 				)}
@@ -191,14 +190,14 @@ const PriceWidget = ({
 				{widget.extras?.showSource && config?.source && (
 					<View style={styles.source} testID="PriceWidgetSource">
 						<View style={styles.columnLeft}>
-							<Caption13M color="gray1" numberOfLines={1}>
+							<CaptionB color="white50" numberOfLines={1}>
 								{t('widget_source')}
-							</Caption13M>
+							</CaptionB>
 						</View>
 						<View style={styles.columnRight}>
-							<Caption13M color="gray1" numberOfLines={1}>
+							<CaptionB color="white50" numberOfLines={1}>
 								{config.source.name}
-							</Caption13M>
+							</CaptionB>
 						</View>
 					</View>
 				)}
diff --git a/src/components/ProfileCard.tsx b/src/components/ProfileCard.tsx
index ff99a7988..37dceb9ae 100644
--- a/src/components/ProfileCard.tsx
+++ b/src/components/ProfileCard.tsx
@@ -54,13 +54,17 @@ const ProfileCard = ({
 							autoFocus={autoFocus || !name}
 							// placeholder doesn't like the lineHeight
 							style={[
-								theme.fonts.bold,
+								theme.fonts.black,
 								styles.nameInput,
 								name ? styles.nameInputFilled : {},
 							]}
 							value={name?.slice(0, MAX_NAME_LENGTH)}
 							placeholder={t(contact ? 'contacts_name' : 'contact_your_name')}
 							multiline={true}
+							blurOnSubmit
+							returnKeyType="done"
+							maxLength={MAX_NAME_LENGTH}
+							testID="NameInput"
 							onChangeText={(value: string): void => {
 								if (value.slice(-1) === '\t') {
 									bioRef.current?.focus();
@@ -68,10 +72,6 @@ const ProfileCard = ({
 									onChange?.('name', value.replace(/\n/g, ' '));
 								}
 							}}
-							blurOnSubmit
-							returnKeyType="done"
-							maxLength={MAX_NAME_LENGTH}
-							testID="NameInput"
 						/>
 					) : (
 						<View>
@@ -80,7 +80,7 @@ const ProfileCard = ({
 									{t('contact_retrieving')}
 								</Headline>
 							) : (
-								<Headline numberOfLines={2} style={styles.name}>
+								<Headline style={styles.name} numberOfLines={2}>
 									{truncate(name, 30)}
 								</Headline>
 							)}
@@ -119,7 +119,7 @@ const ProfileCard = ({
 				<TextInputNoOutline
 					ref={bioRef}
 					style={[theme.fonts.regular, styles.bioInput]}
-					color="gray1"
+					color="white50"
 					value={bio}
 					placeholder={t('profile_bio')}
 					multiline={true}
@@ -130,7 +130,7 @@ const ProfileCard = ({
 					testID="BioInput"
 				/>
 			) : (
-				<Text color="gray1" style={[theme.fonts.regular, styles.bio]}>
+				<Text color="white50" style={[theme.fonts.regular, styles.bio]}>
 					{bio?.slice(0, MAX_BIO_LENGTH)}
 				</Text>
 			)}
@@ -154,14 +154,16 @@ const styles = StyleSheet.create({
 	},
 	nameInput: {
 		flexWrap: 'wrap',
-		fontSize: 34,
-		lineHeight: 34,
+		fontSize: 30,
+		lineHeight: 30,
+		// textTransform: 'uppercase',
 		// needed because of issues with this font on Android
 		marginTop: Platform.OS === 'android' ? 10 : 0,
 	},
 	nameInputFilled: {
-		fontSize: 34,
-		lineHeight: 34,
+		fontSize: 30,
+		lineHeight: 30,
+		// textTransform: 'uppercase',
 	},
 	url: {
 		marginTop: 8,
diff --git a/src/components/ProfileLinks.tsx b/src/components/ProfileLinks.tsx
index 1dc588d9d..89e69a4d0 100644
--- a/src/components/ProfileLinks.tsx
+++ b/src/components/ProfileLinks.tsx
@@ -8,7 +8,7 @@ import {
 } from 'react-native';
 import { useTranslation } from 'react-i18next';
 
-import { Caption13Up, Text02M, Text02S } from '../styles/text';
+import { Caption13Up, BodySSB, BodyS } from '../styles/text';
 import { TrashIcon } from '../styles/icons';
 import { LocalLink } from '../store/types/slashtags';
 import { useAppDispatch } from '../hooks/redux';
@@ -60,7 +60,7 @@ const ProfileLinks = ({
 		<View style={style}>
 			{!editable && links?.length === 0 && linksText ? (
 				<>
-					<Text02S color="gray1">{t('contact_no_links')}</Text02S>
+					<BodyS color="white50">{t('contact_no_links')}</BodyS>
 					<Divider />
 				</>
 			) : (
@@ -88,10 +88,10 @@ const ProfileLinks = ({
 							onPress={(): void => {
 								openAppURL(link.url);
 							}}>
-							<Caption13Up style={styles.label} color="gray1">
+							<Caption13Up style={styles.label} color="white50">
 								{link.title}
 							</Caption13Up>
-							<Text02M numberOfLines={1}>{trimmedUrl}</Text02M>
+							<BodySSB numberOfLines={1}>{trimmedUrl}</BodySSB>
 							<Divider />
 						</TouchableOpacity>
 					);
diff --git a/src/components/ProgressSteps.tsx b/src/components/ProgressSteps.tsx
index e715203f8..a5eba16f1 100644
--- a/src/components/ProgressSteps.tsx
+++ b/src/components/ProgressSteps.tsx
@@ -1,7 +1,7 @@
 import React, { Fragment, ReactElement } from 'react';
 import { StyleProp, StyleSheet, View, ViewStyle } from 'react-native';
 
-import { Text02M } from '../styles/text';
+import { BodySSB } from '../styles/text';
 import { Checkmark } from '../styles/icons';
 import useColors from '../hooks/colors';
 
@@ -36,9 +36,9 @@ const ProgressSteps = ({
 								{isDone ? (
 									<Checkmark color="black" height={22} width={22} />
 								) : (
-									<Text02M color={isActive ? 'purple' : 'white32'}>
+									<BodySSB color={isActive ? 'purple' : 'white32'}>
 										{index + 1}
-									</Text02M>
+									</BodySSB>
 								)}
 							</View>
 
@@ -47,7 +47,7 @@ const ProgressSteps = ({
 					);
 				})}
 			</View>
-			<Text02M color="white32">{steps[activeStepIndex].title}</Text02M>
+			<BodySSB color="white32">{steps[activeStepIndex].title}</BodySSB>
 		</View>
 	);
 };
diff --git a/src/components/RadioButton.tsx b/src/components/RadioButton.tsx
index 4ac685750..d1ec0eb67 100644
--- a/src/components/RadioButton.tsx
+++ b/src/components/RadioButton.tsx
@@ -8,7 +8,7 @@ import {
 	ViewStyle,
 } from 'react-native';
 
-import { Text01S, Caption13S } from '../styles/text';
+import { BodyM, Caption } from '../styles/text';
 import { Checkmark } from '../styles/icons';
 
 type RadioButtonProps = {
@@ -34,10 +34,8 @@ export const RadioButton = memo(
 				onPress={onPress}>
 				<View style={styles.leftColumn}>
 					<View>
-						<Text01S color="white">{label}</Text01S>
-						{description && (
-							<Caption13S color="gray1">{description}</Caption13S>
-						)}
+						<BodyM color="white">{label}</BodyM>
+						{description && <Caption color="white50">{description}</Caption>}
 					</View>
 				</View>
 				<View style={styles.rightColumn}>
diff --git a/src/components/RectangleButton.tsx b/src/components/RectangleButton.tsx
new file mode 100644
index 000000000..94e7bc94c
--- /dev/null
+++ b/src/components/RectangleButton.tsx
@@ -0,0 +1,51 @@
+import React, { ReactElement } from 'react';
+import { StyleSheet, View } from 'react-native';
+
+import { Pressable } from '../styles/components';
+import { BodyMB } from '../styles/text';
+
+const RectangleButton = ({
+	icon,
+	text,
+	actions,
+	disabled,
+	testID,
+	onPress,
+}: {
+	icon: ReactElement;
+	text: string;
+	actions?: ReactElement;
+	disabled?: boolean;
+	testID?: string;
+	onPress: () => void;
+}): ReactElement => (
+	<Pressable
+		style={styles.button}
+		color="white06"
+		disabled={disabled}
+		testID={testID}
+		onPress={onPress}>
+		<View style={styles.buttonIcon}>{icon}</View>
+		<BodyMB color="white">{text}</BodyMB>
+		<View style={styles.buttonActions}>{actions}</View>
+	</Pressable>
+);
+
+const styles = StyleSheet.create({
+	button: {
+		flexDirection: 'row',
+		alignItems: 'center',
+		borderRadius: 8,
+		padding: 24,
+		marginBottom: 8,
+		height: 80,
+	},
+	buttonIcon: {
+		marginRight: 16,
+	},
+	buttonActions: {
+		marginLeft: 'auto',
+	},
+});
+
+export default RectangleButton;
diff --git a/src/components/SearchInput.tsx b/src/components/SearchInput.tsx
index d3d7c20c2..761fee139 100644
--- a/src/components/SearchInput.tsx
+++ b/src/components/SearchInput.tsx
@@ -27,7 +27,7 @@ const SearchInput = ({
 		<ThemedView style={[styles.root, style]} color="white10">
 			<MagnifyingGlassIcon
 				style={styles.icon}
-				color={props.value ? 'brand' : 'gray1'}
+				color={props.value ? 'brand' : 'white50'}
 			/>
 			<TextInput style={styles.input} placeholder={t('search')} {...props} />
 			{children && <View style={styles.tags}>{children}</View>}
diff --git a/src/components/SeedInput.tsx b/src/components/SeedInput.tsx
index d99ba38c8..e1996829a 100644
--- a/src/components/SeedInput.tsx
+++ b/src/components/SeedInput.tsx
@@ -1,22 +1,23 @@
-import React, { forwardRef, useMemo } from 'react';
-import { StyleSheet, View, TextInputProps } from 'react-native';
-import { TextInput } from '../styles/components';
-import { Text01S } from '../styles/text';
+import React, { forwardRef } from 'react';
+import { StyleSheet, TextInputProps } from 'react-native';
+import { View as ThemedView, TextInput } from '../styles/components';
+import { BodyMSB } from '../styles/text';
 
-type SeedInputProps = TextInputProps & { index?: number; valid?: boolean };
+type SeedInputProps = TextInputProps & { index: number; valid?: boolean };
 
 const SeedInput = forwardRef<any, SeedInputProps>(
 	({ index, valid, ...props }: SeedInputProps, ref) => {
-		const inputStyle = useMemo(
-			() => [styles.input, { paddingLeft: index !== undefined ? 45 : 16 }],
-			[index],
-		);
-
 		return (
-			<View style={styles.inputWrapper}>
+			<ThemedView style={styles.inputWrapper} color="white10">
+				<BodyMSB
+					color={valid ? 'white50' : 'red'}
+					testID={`WordIndex-${index}`}>
+					{index + 1}.
+				</BodyMSB>
 				<TextInput
 					ref={ref}
-					style={inputStyle}
+					style={styles.input}
+					backgroundColor="transparent"
 					color={valid ? 'white' : 'red'}
 					autoCapitalize="none"
 					autoCorrect={false}
@@ -24,47 +25,30 @@ const SeedInput = forwardRef<any, SeedInputProps>(
 					testID={`Word-${index}`}
 					{...props}
 				/>
-				{index !== undefined && (
-					<View style={styles.index}>
-						<Text01S
-							color={valid ? 'white50' : 'red'}
-							style={styles.indexText}
-							testID={`WordIndex-${index}`}>
-							{index + 1}.
-						</Text01S>
-					</View>
-				)}
-			</View>
+			</ThemedView>
 		);
 	},
 );
 
 const styles = StyleSheet.create({
 	inputWrapper: {
-		position: 'relative',
-		marginHorizontal: 2,
-		marginBottom: 5,
-		minWidth: 100,
-		justifyContent: 'center',
+		flexDirection: 'row',
+		alignItems: 'center',
+		gap: 5,
+		borderRadius: 8,
+		marginBottom: 4,
+		paddingLeft: 16,
+		height: 47,
 	},
 	input: {
-		paddingLeft: 45,
-		paddingRight: 6,
-		borderRadius: 8,
+		flex: 1,
+		minHeight: 0,
 		fontSize: 17,
-		backgroundColor: 'rgba(255, 255, 255, 0.08)',
-	},
-	index: {
-		position: 'absolute',
-		top: 0,
-		left: 16,
-		bottom: 0,
-		width: 30,
-		justifyContent: 'center',
-	},
-	indexText: {
-		justifyContent: 'center',
-		fontWeight: 'bold',
+		fontWeight: '400',
+		letterSpacing: 0.4,
+		paddingLeft: 0,
+		paddingTop: 0,
+		paddingBottom: 0,
 	},
 });
 
diff --git a/src/components/SeedInputAccessory.tsx b/src/components/SeedInputAccessory.tsx
index c4a11a19e..4f6652232 100644
--- a/src/components/SeedInputAccessory.tsx
+++ b/src/components/SeedInputAccessory.tsx
@@ -34,7 +34,7 @@ const SeedInputAccessory = ({
 
 	const content = (
 		<View style={styles.suggestions}>
-			<Text13UP color="gray1">{label}</Text13UP>
+			<Text13UP color="white50">{label}</Text13UP>
 			<View style={styles.suggestionsRow}>
 				{suggestions.map((s) => (
 					<Word text={s} key={s} onPress={(): void => setWord(s)} />
diff --git a/src/components/SlashtagURL.tsx b/src/components/SlashtagURL.tsx
index f613a59c5..22e732273 100644
--- a/src/components/SlashtagURL.tsx
+++ b/src/components/SlashtagURL.tsx
@@ -4,7 +4,7 @@ import { parse } from '@synonymdev/slashtags-url';
 import { TouchableOpacity } from 'react-native';
 import Clipboard from '@react-native-clipboard/clipboard';
 
-import { Caption13S, Text01M, Text02M } from '../styles/text';
+import { Caption, BodyMSB, BodySSB } from '../styles/text';
 import { IThemeColors } from '../styles/themes';
 import { ellipsis } from '../utils/helpers';
 
@@ -28,11 +28,11 @@ const SlashtagURL = ({
 	const Text = useMemo(() => {
 		switch (size) {
 			case 'large':
-				return Text01M;
+				return BodyMSB;
 			case 'medium':
-				return Text02M;
+				return BodySSB;
 			case 'small':
-				return Caption13S;
+				return Caption;
 		}
 	}, [size]);
 
diff --git a/src/components/SliderDots.tsx b/src/components/SliderDots.tsx
index b459130ab..795dba69f 100644
--- a/src/components/SliderDots.tsx
+++ b/src/components/SliderDots.tsx
@@ -39,7 +39,7 @@ const Dot = ({
 	}, [animValue, index, length]);
 
 	return (
-		<View color="gray2" style={styles.dotRoot}>
+		<View style={styles.dotRoot} color="gray2">
 			<Animated.View style={[styles.dot, animStyle]} />
 		</View>
 	);
diff --git a/src/components/Social.tsx b/src/components/Social.tsx
new file mode 100644
index 000000000..75fddfa06
--- /dev/null
+++ b/src/components/Social.tsx
@@ -0,0 +1,80 @@
+import React, { ReactElement } from 'react';
+import { StyleProp, StyleSheet, View, ViewStyle } from 'react-native';
+import { Pressable } from '../styles/components';
+import { openAppURL } from '../utils/helpers';
+import {
+	DiscordIcon,
+	GithubIcon,
+	GlobeIcon,
+	MediumIcon,
+	TelegramIcon,
+	TwitterIcon,
+} from '../styles/icons';
+
+const Social = ({ style }: { style?: StyleProp<ViewStyle> }): ReactElement => {
+	return (
+		<View style={[styles.root, style]}>
+			<Pressable
+				style={styles.socialLink}
+				color="white10"
+				onPress={(): void => {
+					openAppURL('https://www.bitkit.to');
+				}}>
+				<GlobeIcon color="white" height={24} width={24} />
+			</Pressable>
+			<Pressable
+				style={styles.socialLink}
+				color="white10"
+				onPress={(): void => {
+					openAppURL('https://www.medium.com/synonym-to');
+				}}>
+				<MediumIcon color="white" height={24} width={24} />
+			</Pressable>
+			<Pressable
+				style={styles.socialLink}
+				color="white10"
+				onPress={(): void => {
+					openAppURL('https://www.twitter.com/bitkitwallet');
+				}}>
+				<TwitterIcon color="white" height={24} width={24} />
+			</Pressable>
+			<Pressable
+				style={styles.socialLink}
+				color="white10"
+				onPress={(): void => {
+					openAppURL('https://discord.gg/DxTBJXvJxn');
+				}}>
+				<DiscordIcon color="white" height={24} width={24} />
+			</Pressable>
+			<Pressable
+				style={styles.socialLink}
+				color="white10"
+				onPress={(): void => {
+					openAppURL('https://t.me/bitkitchat');
+				}}>
+				<TelegramIcon color="white" height={24} width={24} />
+			</Pressable>
+			<Pressable
+				style={styles.socialLink}
+				color="white10"
+				onPress={(): void => {
+					openAppURL('https://www.github.com/synonymdev');
+				}}>
+				<GithubIcon color="white" height={24} width={24} />
+			</Pressable>
+		</View>
+	);
+};
+
+const styles = StyleSheet.create({
+	root: {
+		flexDirection: 'row',
+		justifyContent: 'space-between',
+	},
+	socialLink: {
+		padding: 14,
+		borderRadius: 32,
+	},
+});
+
+export default Social;
diff --git a/src/components/SuggestionCard.tsx b/src/components/SuggestionCard.tsx
index 9c918a12d..831f0da3f 100644
--- a/src/components/SuggestionCard.tsx
+++ b/src/components/SuggestionCard.tsx
@@ -14,11 +14,12 @@ import {
 	rrect,
 	rect,
 	RoundedRect,
+	LinearGradient,
 } from '@shopify/react-native-skia';
 
-import { Pressable } from '../styles/components';
-import { Caption13M, Text01M } from '../styles/text';
 import { XIcon } from '../styles/icons';
+import { Pressable } from '../styles/components';
+import { BodyMSB, CaptionB } from '../styles/text';
 import { ITodo, TTodoType } from '../store/types/todos';
 import useColors from '../hooks/colors';
 import Card from './Card';
@@ -28,21 +29,25 @@ const CARD_SIZE = 152;
 const CARD_BORDER_RADIUS = 16;
 const GLOW_OFFSET = 25;
 
-const Glow = memo(({ color }: { color: string }): ReactElement => {
+const Shade = memo((): ReactElement => {
 	return (
 		<RoundedRect
 			x={GLOW_OFFSET}
 			y={GLOW_OFFSET}
 			width={CARD_SIZE}
 			height={CARD_SIZE}
-			r={CARD_BORDER_RADIUS}
-			opacity={0.3}>
-			<RadialGradient c={vec(0, 0)} r={250} colors={[color, 'black']} />
+			r={CARD_BORDER_RADIUS}>
+			<LinearGradient
+				start={vec(0, 0)}
+				end={vec(0, CARD_SIZE)}
+				positions={[0.4, 1]}
+				colors={['transparent', 'black']}
+			/>
 		</RoundedRect>
 	);
 });
 
-const IntenseGlow = memo((): ReactElement => {
+const Glow = memo((): ReactElement => {
 	const shadowBlur = 15;
 	const shadowSpread = 5;
 	const borderSpread = 1;
@@ -113,21 +118,22 @@ const SuggestionCard = ({
 	}, [glowOpacity]);
 
 	return (
-		<Card style={containerStyle} testID={`Suggestion-${id}`}>
+		<Card style={containerStyle} color={color} testID={`Suggestion-${id}`}>
 			{dismissable ? (
-				<View style={styles.glowWrapper}>
+				<View style={styles.canvasWrapper}>
 					<Canvas style={styles.canvas}>
-						<Glow color={colors[color]} />
+						<Shade />
 					</Canvas>
 				</View>
 			) : (
 				<>
-					<Animated.View style={[styles.glowWrapper, { opacity: glowOpacity }]}>
+					<Animated.View
+						style={[styles.canvasWrapper, { opacity: glowOpacity }]}>
 						<Canvas style={styles.canvas}>
-							<IntenseGlow />
+							<Glow />
 						</Canvas>
 					</Animated.View>
-					<View style={styles.glowWrapper}>
+					<View style={styles.canvasWrapper}>
 						<Canvas style={styles.canvas}>
 							<RoundedRect
 								x={GLOW_OFFSET}
@@ -154,12 +160,12 @@ const SuggestionCard = ({
 					<Image style={styles.image} resizeMode="contain" source={image} />
 				</View>
 				<View>
-					<Text01M>{title}</Text01M>
-					<Caption13M
-						color={dismissable ? 'lightGray' : 'purple'}
+					<BodyMSB style={styles.title}>{title}</BodyMSB>
+					<CaptionB
+						color={dismissable ? 'white50' : 'purple'}
 						numberOfLines={1}>
 						{description}
-					</Caption13M>
+					</CaptionB>
 				</View>
 			</Pressable>
 
@@ -169,7 +175,7 @@ const SuggestionCard = ({
 					style={styles.dismiss}
 					onPress={(): void => onClose(id)}
 					testID="SuggestionDismiss">
-					<XIcon width={18} height={18} color="gray1" />
+					<XIcon width={18} height={18} color="white50" />
 				</Pressable>
 			)}
 		</Card>
@@ -201,7 +207,7 @@ const styles = StyleSheet.create({
 		height: 80,
 		width: 80,
 	},
-	glowWrapper: {
+	canvasWrapper: {
 		width: 200,
 		height: 200,
 		position: 'absolute',
@@ -211,6 +217,13 @@ const styles = StyleSheet.create({
 	canvas: {
 		flex: 1,
 	},
+	title: {
+		fontFamily: 'InterTight-Black',
+		fontSize: 20,
+		lineHeight: 20,
+		letterSpacing: -0.5,
+		textTransform: 'uppercase',
+	},
 });
 
 export default memo(SuggestionCard);
diff --git a/src/components/Suggestions.tsx b/src/components/Suggestions.tsx
index b83d3ca34..28a613c05 100644
--- a/src/components/Suggestions.tsx
+++ b/src/components/Suggestions.tsx
@@ -7,11 +7,12 @@ import React, {
 } from 'react';
 import { useTranslation } from 'react-i18next';
 import Carousel from 'react-native-reanimated-carousel';
-import { StyleSheet, useWindowDimensions } from 'react-native';
+import { StyleSheet, useWindowDimensions, Share } from 'react-native';
 import { useFocusEffect, useNavigation } from '@react-navigation/native';
 
 import { Caption13Up } from '../styles/text';
 import { View as ThemedView } from '../styles/components';
+import SuggestionCard from './SuggestionCard';
 import { ITodo, TTodoType } from '../store/types/todos';
 import { channelsNotificationsShown, hideTodo } from '../store/slices/todos';
 import { showBottomSheet } from '../store/utils/ui';
@@ -21,24 +22,20 @@ import {
 } from '../store/reselect/todos';
 import { lightningSettingUpStepSelector } from '../store/reselect/user';
 import { pinSelector } from '../store/reselect/settings';
-import type { RootNavigationProp } from '../navigation/types';
-import { useBalance } from '../hooks/wallet';
 import { useAppDispatch, useAppSelector } from '../hooks/redux';
-import Dialog from './Dialog';
-import SuggestionCard from './SuggestionCard';
+import type { RootNavigationProp } from '../navigation/types';
+import { appName, shareText } from '../constants/app';
 
 const Suggestions = (): ReactElement => {
 	const { t } = useTranslation('cards');
 	const navigation = useNavigation<RootNavigationProp>();
 	const { width } = useWindowDimensions();
-	const { onchainBalance } = useBalance();
 	const dispatch = useAppDispatch();
 	const pinTodoDone = useAppSelector(pinSelector);
 	const suggestions = useAppSelector(todosFullSelector);
 	const lightningSettingUpStep = useAppSelector(lightningSettingUpStepSelector);
 	const newChannels = useAppSelector(newChannelsNotificationsSelector);
 	const [index, setIndex] = useState(0);
-	const [showDialog, setShowDialog] = useState(false);
 
 	// this code is needed in order to avoid flashing wrong balance on channel open
 	// TODO: try to move/remove this
@@ -63,6 +60,11 @@ const Suggestions = (): ReactElement => {
 	// reset index on focus
 	useFocusEffect(useCallback(() => setIndex(0), []));
 
+	const onShare = useCallback(async (): Promise<void> => {
+		await Share.share({ title: appName, message: shareText });
+		dispatch(hideTodo('invite'));
+	}, [dispatch]);
+
 	const handleOnPress = useCallback(
 		(id: TTodoType): void => {
 			if (id === 'backupSeedPhrase') {
@@ -70,11 +72,7 @@ const Suggestions = (): ReactElement => {
 			}
 
 			if (id === 'lightning') {
-				if (onchainBalance > 0) {
-					navigation.navigate('LightningRoot', { screen: 'Introduction' });
-				} else {
-					setShowDialog(true);
-				}
+				navigation.navigate('LightningRoot', { screen: 'Introduction' });
 			}
 
 			if (id === 'lightningSettingUp') {
@@ -97,6 +95,14 @@ const Suggestions = (): ReactElement => {
 				navigation.navigate('BuyBitcoin');
 			}
 
+			if (id === 'invite') {
+				onShare();
+			}
+
+			if (id === 'support') {
+				navigation.navigate('Settings', { screen: 'SupportSettings' });
+			}
+
 			if (id === 'btFailed') {
 				navigation.navigate('Settings', {
 					screen: 'Channels',
@@ -104,7 +110,7 @@ const Suggestions = (): ReactElement => {
 				});
 			}
 		},
-		[onchainBalance, navigation, pinTodoDone],
+		[navigation, pinTodoDone, onShare],
 	);
 
 	const handleRenderItem = useCallback(
@@ -146,7 +152,10 @@ const Suggestions = (): ReactElement => {
 
 	return (
 		<>
-			<Caption13Up style={styles.title} color="gray1">
+			<Caption13Up
+				style={styles.title}
+				color="white50"
+				testID="SuggestionsLabel">
 				{t('suggestions')}
 			</Caption13Up>
 			<ThemedView style={styles.container} testID="Suggestions">
@@ -162,15 +171,6 @@ const Suggestions = (): ReactElement => {
 					renderItem={handleRenderItem}
 				/>
 			</ThemedView>
-			<Dialog
-				visible={showDialog}
-				title={t('lightning_no_funds_title')}
-				description={t('lightning_no_funds_desc')}
-				confirmText={t('ok')}
-				onConfirm={(): void => {
-					setShowDialog(false);
-				}}
-			/>
 		</>
 	);
 };
diff --git a/src/components/SwipeToConfirm.tsx b/src/components/SwipeToConfirm.tsx
index ec837de67..702b403fd 100644
--- a/src/components/SwipeToConfirm.tsx
+++ b/src/components/SwipeToConfirm.tsx
@@ -3,7 +3,7 @@ import { StyleProp, StyleSheet, View, ViewStyle } from 'react-native';
 import { useTranslation } from 'react-i18next';
 
 import { View as ThemedView } from '../styles/components';
-import { Text02M } from '../styles/text';
+import { BodySSB } from '../styles/text';
 import { RightArrow } from '../styles/icons';
 import { IThemeColors } from '../styles/themes';
 import useColors from '../hooks/colors';
@@ -27,26 +27,27 @@ const PADDING = 8;
 interface ISwipeToConfirm {
 	text?: string;
 	color?: keyof IThemeColors;
-	onConfirm?: () => void;
 	icon?: ReactElement;
 	loading?: boolean;
 	confirmed: boolean;
 	style?: StyleProp<ViewStyle>;
+	onConfirm: () => void;
 }
 
 const SwipeToConfirm = ({
 	text,
 	color,
-	onConfirm,
 	icon,
 	loading,
 	confirmed,
 	style,
+	onConfirm,
 }: ISwipeToConfirm): ReactElement => {
 	const { t } = useTranslation('other');
 	text = text ?? t('swipe');
 	const colors = useColors();
-	const circleColor = color ? colors[color] : colors.green ?? colors.green;
+	const trailColor = color ? `${colors[color]}24` : colors.green24;
+	const circleColor = color ? colors[color] : colors.green;
 	const [containerWidth, setContainerWidth] = useState(0);
 	const endPosition = containerWidth === 0 ? 1 : containerWidth - CIRCLE_SIZE;
 
@@ -55,7 +56,6 @@ const SwipeToConfirm = ({
 
 	const panGestureHandler = useAnimatedGestureHandler({
 		onStart: (_, ctx) => {
-			// @ts-ignore
 			ctx.offsetX = panX.value;
 		},
 		onActive: (event, ctx) => {
@@ -67,13 +67,17 @@ const SwipeToConfirm = ({
 			panX.value = withSpring(finished ? endPosition : 0);
 
 			if (finished) {
-				// @ts-ignore
 				runOnJS(onConfirm)?.();
 			}
 		},
 	});
 
 	// Animated styles
+	const trailStyle = useAnimatedStyle(() => {
+		const width = panX.value + CIRCLE_SIZE;
+		return { width };
+	});
+
 	const circleTranslateXStyle = useAnimatedStyle(() => {
 		const translateX = panX.value;
 		return { transform: [{ translateX }] };
@@ -118,8 +122,11 @@ const SwipeToConfirm = ({
 					const ww = e.nativeEvent.layout.width;
 					setContainerWidth((w) => (w === 0 ? ww : w));
 				}}>
+				<Animated.View
+					style={[styles.trail, { backgroundColor: trailColor }, trailStyle]}
+				/>
 				<Animated.View style={textOpacityStyle}>
-					<Text02M>{text}</Text02M>
+					<BodySSB>{text}</BodySSB>
 				</Animated.View>
 				<PanGestureHandler onGestureEvent={panGestureHandler}>
 					<Animated.View
@@ -165,6 +172,14 @@ const styles = StyleSheet.create({
 		alignItems: 'center',
 		justifyContent: 'center',
 	},
+	trail: {
+		borderRadius: CIRCLE_SIZE,
+		position: 'absolute',
+		left: 0,
+		top: 0,
+		bottom: 0,
+		width: '100%',
+	},
 	grab: {
 		position: 'absolute',
 		left: -INVISIBLE_BORDER,
diff --git a/src/components/SwitchRow.tsx b/src/components/SwitchRow.tsx
index 37bca3b5e..cb6c7228a 100644
--- a/src/components/SwitchRow.tsx
+++ b/src/components/SwitchRow.tsx
@@ -1,5 +1,11 @@
 import React, { memo, ReactElement, ReactNode } from 'react';
-import { View, TouchableOpacity, StyleSheet } from 'react-native';
+import {
+	View,
+	TouchableOpacity,
+	StyleSheet,
+	StyleProp,
+	ViewStyle,
+} from 'react-native';
 import { Switch } from '../styles/components';
 import { IThemeColors } from '../styles/themes';
 import Divider from './Divider';
@@ -9,20 +15,22 @@ const SwitchRow = ({
 	color,
 	isEnabled,
 	showDivider = true,
+	style,
 	onPress,
 }: {
 	children: ReactNode;
 	color?: keyof IThemeColors;
 	isEnabled: boolean;
 	showDivider?: boolean;
+	style?: StyleProp<ViewStyle>;
 	onPress: () => void;
 }): ReactElement => {
 	return (
 		<>
 			<TouchableOpacity
-				onPress={onPress}
+				style={[styles.container, style]}
 				activeOpacity={1}
-				style={styles.container}>
+				onPress={onPress}>
 				<View style={styles.leftColumn}>{children}</View>
 				<View style={styles.rightColumn}>
 					<Switch value={isEnabled} color={color} onValueChange={onPress} />
diff --git a/src/components/TabBar.tsx b/src/components/TabBar.tsx
index 13c3077ca..a534b060a 100644
--- a/src/components/TabBar.tsx
+++ b/src/components/TabBar.tsx
@@ -14,11 +14,10 @@ import { FadeIn } from 'react-native-reanimated';
 import { receiveIcon, sendIcon } from '../assets/icons/tabs';
 import { showBottomSheet } from '../store/utils/ui';
 import { resetSendTransaction } from '../store/actions/wallet';
-import { betaRiskAcceptedSelector } from '../store/reselect/user';
 import { viewControllersSelector } from '../store/reselect/ui';
 import useColors from '../hooks/colors';
 import { useAppSelector } from '../hooks/redux';
-import { Text02M } from '../styles/text';
+import { BodySSB } from '../styles/text';
 import { ScanIcon } from '../styles/icons';
 import { AnimatedView, Pressable } from '../styles/components';
 import BlurView from '../components/BlurView';
@@ -29,10 +28,9 @@ const TabBar = ({
 }: {
 	navigation: RootNavigationProp;
 }): ReactElement => {
-	const { white08 } = useColors();
+	const { white10 } = useColors();
 	const insets = useSafeAreaInsets();
 	const { t } = useTranslation('wallet');
-	const betaRiskAccepted = useAppSelector(betaRiskAcceptedSelector);
 	const viewControllers = useAppSelector(viewControllersSelector);
 
 	const shouldHide = useMemo(() => {
@@ -41,11 +39,7 @@ const TabBar = ({
 	}, [viewControllers]);
 
 	const onReceivePress = (): void => {
-		if (betaRiskAccepted) {
-			showBottomSheet('receiveNavigation');
-		} else {
-			navigation.navigate('BetaRisk');
-		}
+		showBottomSheet('receiveNavigation');
 	};
 
 	const onSendPress = (): void => {
@@ -64,10 +58,10 @@ const TabBar = ({
 		};
 
 		const iosStyles = {
-			borderColor: white08,
+			borderColor: white10,
 		};
 		return Platform.OS === 'android' ? androidStyles : iosStyles;
-	}, [white08]);
+	}, [white10]);
 
 	const bottom = useMemo(() => Math.max(insets.bottom, 16), [insets.bottom]);
 	const sendXml = useMemo(() => sendIcon('white'), []);
@@ -89,7 +83,7 @@ const TabBar = ({
 				onPress={onSendPress}>
 				<BlurView style={[styles.blur, styles.send]}>
 					<SvgXml xml={sendXml} width={13} height={13} />
-					<Text02M style={styles.tabText}>{t('send')}</Text02M>
+					<BodySSB style={styles.tabText}>{t('send')}</BodySSB>
 				</BlurView>
 			</TouchableOpacity>
 			<Pressable
@@ -109,7 +103,7 @@ const TabBar = ({
 				onPress={onReceivePress}>
 				<BlurView style={[styles.blur, styles.receive]}>
 					<SvgXml xml={receiveXml} width={13} height={13} />
-					<Text02M style={styles.tabText}>{t('receive')}</Text02M>
+					<BodySSB style={styles.tabText}>{t('receive')}</BodySSB>
 				</BlurView>
 			</TouchableOpacity>
 		</AnimatedView>
diff --git a/src/components/Tabs.tsx b/src/components/Tabs.tsx
index cfd02fa7c..5d287ba50 100644
--- a/src/components/Tabs.tsx
+++ b/src/components/Tabs.tsx
@@ -14,7 +14,7 @@ import {
 } from 'react-native';
 import { useTranslation } from 'react-i18next';
 
-import { Caption13M } from '../styles/text';
+import { CaptionB } from '../styles/text';
 import { TActivityFilter } from '../utils/activity';
 
 export type TTab = {
@@ -38,7 +38,7 @@ const Tab = ({
 		activeOpacity={0.8}
 		testID={testID}
 		onPress={onPress}>
-		<Caption13M color={active ? 'white' : 'gray1'}>{text}</Caption13M>
+		<CaptionB color={active ? 'white' : 'white50'}>{text}</CaptionB>
 	</TouchableOpacity>
 );
 
@@ -96,7 +96,7 @@ const styles = StyleSheet.create({
 		paddingVertical: 10,
 	},
 	activeTab: {
-		backgroundColor: '#ff6600',
+		backgroundColor: '#FF4400',
 		height: 2,
 		position: 'absolute',
 		top: '95%',
diff --git a/src/components/Tag.tsx b/src/components/Tag.tsx
index 9b7ffe238..8f0917455 100644
--- a/src/components/Tag.tsx
+++ b/src/components/Tag.tsx
@@ -1,7 +1,7 @@
 import React, { ReactElement, memo } from 'react';
 import { StyleProp, StyleSheet, ViewStyle } from 'react-native';
 import { TouchableOpacity } from '../styles/components';
-import { Text02M } from '../styles/text';
+import { BodySSB } from '../styles/text';
 import { TrashIcon, XIcon } from '../styles/icons';
 
 interface ITag {
@@ -25,7 +25,7 @@ const Tag = ({
 			activeOpacity={onPress ? 0.2 : 1}
 			color="transparent"
 			onPress={onPress}>
-			<Text02M testID={`Tag-${value}`}>{value}</Text02M>
+			<BodySSB testID={`Tag-${value}`}>{value}</BodySSB>
 			{onDelete && (
 				<TouchableOpacity
 					style={styles.icon}
@@ -33,9 +33,9 @@ const Tag = ({
 					onPress={onDelete}
 					testID={`Tag-${value}-delete`}>
 					{icon === 'close' ? (
-						<XIcon color="gray1" width={16} />
+						<XIcon color="white50" width={16} />
 					) : (
-						<TrashIcon color="gray1" width={16} />
+						<TrashIcon color="white50" width={16} />
 					)}
 				</TouchableOpacity>
 			)}
diff --git a/src/components/Toast.tsx b/src/components/Toast.tsx
index ac0f4a181..a4099d8ce 100644
--- a/src/components/Toast.tsx
+++ b/src/components/Toast.tsx
@@ -5,8 +5,8 @@ import { useSafeAreaInsets } from 'react-native-safe-area-context';
 
 import colors from '../styles/colors';
 import { IThemeColors } from '../styles/themes';
-import { Text01M, Text13S } from '../styles/text';
-import HorizontalGradient from '../components/HorizontalGradient';
+import { BodyMSB, Caption } from '../styles/text';
+import ToastGradient from '../components/ToastGradient';
 import BlurView from '../components/BlurView';
 
 const Toast = ({
@@ -14,48 +14,52 @@ const Toast = ({
 	text1,
 	text2,
 }: ToastConfigParams<any>): ReactElement => {
-	const dimensions = useWindowDimensions();
-
 	const insets = useSafeAreaInsets();
-	const containerStyles = useMemo(
-		() => ({
-			...styles.container,
-			// fix Toast overlapping with iPhone 14 Dynamic Island
-			...(insets.top > 47 ? { margin: 14 } : {}),
-		}),
-		[insets.top],
-	);
+	const dimensions = useWindowDimensions();
 
-	let titleColor: keyof IThemeColors = 'white';
+	let color: keyof IThemeColors = 'white';
 	let gradientColor = colors.black;
 
 	if (type === 'success') {
-		titleColor = 'green';
+		color = 'green';
 		gradientColor = '#1d2f1c';
 	}
 
 	if (type === 'info') {
-		titleColor = 'blue';
-		gradientColor = '#00294e';
+		color = 'blue';
+		gradientColor = '#032e56';
+	}
+
+	if (type === 'lightning') {
+		color = 'purple';
+		gradientColor = '#2b1637';
 	}
 
 	if (type === 'warning') {
-		titleColor = 'brand';
-		gradientColor = '#411a00';
+		color = 'brand';
+		gradientColor = '#3c1001';
 	}
 
 	if (type === 'error') {
-		titleColor = 'red';
-		gradientColor = '#2b1215';
+		color = 'red';
+		gradientColor = '#491f25';
 	}
 
+	const containerStyles = useMemo(
+		() => ({
+			...styles.container,
+			// fix Toast overlapping with iPhone 14 Dynamic Island
+			...(insets.top > 47 ? { margin: 14 } : {}),
+			borderColor: colors[color],
+		}),
+		[insets.top, color],
+	);
+
 	return (
 		<BlurView style={[{ width: dimensions.width - 16 * 2 }, containerStyles]}>
-			<HorizontalGradient style={styles.gradient} color={gradientColor} />
-			<Text01M color={titleColor}>{text1}</Text01M>
-			<Text13S style={styles.description} color="gray1">
-				{text2}
-			</Text13S>
+			<ToastGradient style={styles.gradient} color={gradientColor} />
+			<BodyMSB color={color}>{text1}</BodyMSB>
+			<Caption>{text2}</Caption>
 		</BlurView>
 	);
 };
@@ -63,6 +67,7 @@ const Toast = ({
 const styles = StyleSheet.create({
 	container: {
 		borderRadius: 8,
+		borderWidth: 1,
 		padding: 16,
 		position: 'relative',
 		overflow: 'hidden',
@@ -70,14 +75,12 @@ const styles = StyleSheet.create({
 	gradient: {
 		...StyleSheet.absoluteFillObject,
 	},
-	description: {
-		marginTop: 3,
-	},
 });
 
 export const toastConfig: ToastConfig = {
 	success: (props) => <Toast {...props} />,
 	info: (props) => <Toast {...props} />,
+	lightning: (props) => <Toast {...props} />,
 	warning: (props) => <Toast {...props} />,
 	error: (props) => <Toast {...props} />,
 };
diff --git a/src/components/HorizontalGradient.tsx b/src/components/ToastGradient.tsx
similarity index 79%
rename from src/components/HorizontalGradient.tsx
rename to src/components/ToastGradient.tsx
index ab2e7b4f3..696c25b7f 100644
--- a/src/components/HorizontalGradient.tsx
+++ b/src/components/ToastGradient.tsx
@@ -2,7 +2,7 @@ import React, { ReactElement, useState } from 'react';
 import { LayoutChangeEvent, StyleProp, View, ViewStyle } from 'react-native';
 import { Canvas, LinearGradient, Rect, vec } from '@shopify/react-native-skia';
 
-type HorizontalGradientProps = {
+type ToastGradientProps = {
 	color: string;
 	style?: StyleProp<ViewStyle>;
 };
@@ -10,10 +10,7 @@ type HorizontalGradientProps = {
 /**
  * This component draws a horizontal linear gradient, it has opacity animation on mount
  */
-const HorizontalGradient = ({
-	color,
-	style,
-}: HorizontalGradientProps): ReactElement => {
+const ToastGradient = ({ color, style }: ToastGradientProps): ReactElement => {
 	const [layout, setLayout] = useState({ width: 1, height: 1 });
 	const { height, width } = layout;
 
@@ -27,12 +24,12 @@ const HorizontalGradient = ({
 	return (
 		<View style={style} onLayout={handleLayout}>
 			<Canvas style={style}>
-				<Rect x={0} y={0} width={width} height={height} opacity={0.7}>
+				<Rect x={0} y={0} width={width} height={height} opacity={0.75}>
 					<LinearGradient
 						start={vec(0, 0)}
-						end={vec(width, 0)}
+						end={vec(0, height)}
 						positions={[0, 1]}
-						colors={[color, 'rgba(0, 15, 28, 0.5)']}
+						colors={[color, 'rgba(0, 0, 0, 1)']}
 					/>
 				</Rect>
 			</Canvas>
@@ -40,4 +37,4 @@ const HorizontalGradient = ({
 	);
 };
 
-export default HorizontalGradient;
+export default ToastGradient;
diff --git a/src/components/Tooltip.tsx b/src/components/Tooltip.tsx
index dbbd7b262..80e4b874f 100644
--- a/src/components/Tooltip.tsx
+++ b/src/components/Tooltip.tsx
@@ -1,7 +1,7 @@
 import React, { memo, ReactElement } from 'react';
 import { StyleProp, StyleSheet, View, ViewStyle } from 'react-native';
 import { View as ThemedView } from '../styles/components';
-import { Caption13M } from '../styles/text';
+import { CaptionB } from '../styles/text';
 
 const BOX_SIZE = 32;
 
@@ -20,7 +20,7 @@ const Tooltip = ({
 				<ThemedView color="black92" style={styles.box} />
 			</View>
 			<ThemedView color="black92" style={styles.content}>
-				<Caption13M>{text}</Caption13M>
+				<CaptionB>{text}</CaptionB>
 			</ThemedView>
 		</View>
 	);
diff --git a/src/components/TransferTextField.tsx b/src/components/TransferTextField.tsx
new file mode 100644
index 000000000..bc978f529
--- /dev/null
+++ b/src/components/TransferTextField.tsx
@@ -0,0 +1,102 @@
+import React, { memo, ReactElement } from 'react';
+import { useAppSelector } from '../hooks/redux';
+import { Pressable, StyleProp, StyleSheet, ViewStyle } from 'react-native';
+
+import { DisplayT } from '../styles/text';
+import { EDenomination, EUnit } from '../store/types/wallet';
+import { denominationSelector, unitSelector } from '../store/reselect/settings';
+import {
+	getDisplayValues,
+	getFiatDisplayValuesForFiat,
+} from '../utils/displayValues';
+import { useCurrency } from '../hooks/displayValues';
+
+const NumberPadTextField = ({
+	value,
+	showPlaceholder = true,
+	style,
+	testID,
+	onPress,
+}: {
+	value: string;
+	showPlaceholder?: boolean;
+	style?: StyleProp<ViewStyle>;
+	testID?: string;
+	onPress?: () => void;
+}): ReactElement => {
+	const { fiatSymbol } = useCurrency();
+	const unit = useAppSelector(unitSelector);
+	const denomination = useAppSelector(denominationSelector);
+
+	let placeholder = '0';
+	let placeholderFractional = '';
+
+	if (denomination === EDenomination.classic) {
+		placeholderFractional = '00000000';
+	}
+	if (unit === EUnit.fiat) {
+		placeholderFractional = '00';
+	}
+	if (placeholderFractional !== '') {
+		placeholder = `0.${placeholderFractional}`;
+	}
+
+	if (value) {
+		const [integer, fractional] = value.split('.');
+
+		if (unit === EUnit.fiat) {
+			const { fiatWhole } = getFiatDisplayValuesForFiat({
+				value: Number(integer),
+			});
+			value = value.replace(integer, fiatWhole);
+		}
+
+		if (value.includes('.')) {
+			placeholder = placeholder.substring(2 + fractional?.length);
+
+			// truncate to 2 decimals for fiat
+			if (unit === EUnit.fiat) {
+				const { fiatWhole } = getFiatDisplayValuesForFiat({
+					value: Number(integer),
+				});
+
+				value = `${fiatWhole}.${fractional.substring(0, 2)}`;
+			}
+		} else {
+			if (denomination === EDenomination.modern && unit === EUnit.BTC) {
+				const displayValue = getDisplayValues({ satoshis: Number(value) });
+				value = displayValue.bitcoinFormatted;
+
+				placeholder = '';
+			} else {
+				placeholder = `.${placeholderFractional}`;
+			}
+		}
+	}
+
+	return (
+		<Pressable style={[styles.root, style]} testID={testID} onPress={onPress}>
+			<DisplayT style={styles.symbol} color="white50">
+				{unit === EUnit.BTC ? '₿' : fiatSymbol}
+			</DisplayT>
+			<DisplayT>
+				{value !== placeholder && value}
+				<DisplayT color={showPlaceholder ? 'white50' : 'white'}>
+					{placeholder}
+				</DisplayT>
+			</DisplayT>
+		</Pressable>
+	);
+};
+
+const styles = StyleSheet.create({
+	root: {
+		flexDirection: 'row',
+		alignItems: 'center',
+	},
+	symbol: {
+		marginRight: 6,
+	},
+});
+
+export default memo(NumberPadTextField);
diff --git a/src/components/VerticalShadow.tsx b/src/components/VerticalShadow.tsx
index ff7ca173a..d2740ef1e 100644
--- a/src/components/VerticalShadow.tsx
+++ b/src/components/VerticalShadow.tsx
@@ -5,7 +5,11 @@ import { Canvas, LinearGradient, Rect, vec } from '@shopify/react-native-skia';
 /**
  * This component draws vertical gradient, it has opacity animation on mount
  */
-const VerticalShadow = (): ReactElement => {
+const VerticalShadow = ({
+	direction = 'top',
+}: {
+	direction?: 'top' | 'bottom';
+}): ReactElement => {
 	const [layout, setLayout] = useState({ width: 1, height: 1 });
 	const { height, width } = layout;
 
@@ -16,6 +20,11 @@ const VerticalShadow = (): ReactElement => {
 		});
 	};
 
+	let colors = ['black', 'transparent'];
+	if (direction === 'bottom') {
+		colors = colors.reverse();
+	}
+
 	return (
 		<View style={styles.shadowCanvas} onLayout={handleLayout}>
 			<Canvas style={styles.shadowCanvas}>
@@ -23,7 +32,7 @@ const VerticalShadow = (): ReactElement => {
 					<LinearGradient
 						start={vec(0, 0)}
 						end={vec(0, height)}
-						colors={['black', 'transparent']}
+						colors={colors}
 					/>
 				</Rect>
 			</Canvas>
diff --git a/src/components/WalletOnboarding.tsx b/src/components/WalletOnboarding.tsx
new file mode 100644
index 000000000..681fbbda3
--- /dev/null
+++ b/src/components/WalletOnboarding.tsx
@@ -0,0 +1,80 @@
+import React, { memo, ReactElement, useMemo, useState, useEffect } from 'react';
+import { useSafeAreaInsets } from 'react-native-safe-area-context';
+import {
+	StyleProp,
+	StyleSheet,
+	TouchableOpacity,
+	View,
+	ViewStyle,
+} from 'react-native';
+
+import { Display } from '../styles/text';
+import { XIcon } from '../styles/icons';
+import Arrow from '../assets/dotted-arrow.svg';
+import { __E2E__ } from '../constants/env';
+
+const WalletOnboarding = ({
+	text,
+	style,
+	onHide,
+}: {
+	text: string | ReactElement;
+	style?: StyleProp<ViewStyle>;
+	onHide?: () => void;
+}): ReactElement => {
+	const insets = useSafeAreaInsets();
+	const [showClose, setShowClose] = useState(!__E2E__);
+
+	useEffect(() => {
+		if (__E2E__) {
+			// delay showing close button. this is handy for e2e testing
+			setTimeout(() => setShowClose(true), 2000);
+		}
+	}, []);
+
+	const rootStyles = useMemo(() => {
+		return [styles.root, { marginBottom: 105 + insets.bottom }];
+	}, [insets.bottom]);
+
+	return (
+		<View style={[rootStyles, style]} testID="WalletOnboarding">
+			{showClose && onHide && (
+				<TouchableOpacity
+					style={styles.closeButton}
+					testID="WalletOnboardingClose"
+					onPress={onHide}>
+					<XIcon color="white50" width={16} height={16} />
+				</TouchableOpacity>
+			)}
+			<Display style={styles.text}>{text}</Display>
+			<Arrow style={styles.arrow} />
+		</View>
+	);
+};
+
+const styles = StyleSheet.create({
+	root: {
+		flexDirection: 'row',
+		alignItems: 'flex-end',
+		// paddingHorizontal: 16,
+		marginTop: 'auto',
+	},
+	closeButton: {
+		height: 40,
+		width: 40,
+		alignItems: 'center',
+		justifyContent: 'center',
+		position: 'absolute',
+		top: -15,
+		right: 5,
+		zIndex: 1,
+	},
+	text: {
+		width: '61%',
+	},
+	arrow: {
+		marginBottom: 10,
+	},
+});
+
+export default memo(WalletOnboarding);
diff --git a/src/components/BetaWarning.tsx b/src/components/WalletWarning.tsx
similarity index 71%
rename from src/components/BetaWarning.tsx
rename to src/components/WalletWarning.tsx
index 7434ffddb..17ea8e6fc 100644
--- a/src/components/BetaWarning.tsx
+++ b/src/components/WalletWarning.tsx
@@ -2,24 +2,20 @@ import React, { memo, ReactElement, useState } from 'react';
 import { LayoutChangeEvent, StyleSheet, TouchableOpacity } from 'react-native';
 import { Canvas, LinearGradient, Rect, vec } from '@shopify/react-native-skia';
 import { FadeOut } from 'react-native-reanimated';
-import { useAppDispatch, useAppSelector } from '../hooks/redux';
 import { useTranslation } from 'react-i18next';
 
 import { AnimatedView } from '../styles/components';
-import { Caption13M, Text01M } from '../styles/text';
+import { CaptionB, BodyMSB } from '../styles/text';
 import { XIcon } from '../styles/icons';
 import useColors from '../hooks/colors';
-
+import { useAppDispatch, useAppSelector } from '../hooks/redux';
 import { updateSettings } from '../store/slices/settings';
-import Flag from '../components/Flag';
-
-const BETA_HEIGHT = 100;
 
-const BetaSoftware = (): ReactElement => {
+const WalletWarning = (): ReactElement => {
 	const colors = useColors();
 	const dispatch = useAppDispatch();
 	const { t } = useTranslation('other');
-	const [layout, setLayout] = useState({ width: 1, height: 1 });
+	const [{ height, width }, setLayout] = useState({ width: 1, height: 1 });
 	const hideBeta = useAppSelector((state) => state.settings.hideBeta);
 
 	if (hideBeta) {
@@ -37,8 +33,6 @@ const BetaSoftware = (): ReactElement => {
 		dispatch(updateSettings({ hideBeta: true }));
 	};
 
-	const { height, width } = layout;
-
 	return (
 		<AnimatedView
 			exiting={FadeOut}
@@ -54,22 +48,18 @@ const BetaSoftware = (): ReactElement => {
 					/>
 				</Rect>
 			</Canvas>
-			<Flag text={t('beta')} style={styles.flag} />
-			<Text01M>{t('beta_software')}</Text01M>
-			<Caption13M color="brand">{t('beta_warn')}</Caption13M>
-			{/* TODO: allow hide it later */}
-			{false && (
-				<TouchableOpacity onPress={handleHide} style={styles.button}>
-					<XIcon color="brand" width={17} height={17} />
-				</TouchableOpacity>
-			)}
+			<BodyMSB>{t('beta_software')}</BodyMSB>
+			<CaptionB color="brand">{t('beta_warn')}</CaptionB>
+			<TouchableOpacity style={styles.button} onPress={handleHide}>
+				<XIcon color="brand" width={17} height={17} />
+			</TouchableOpacity>
 		</AnimatedView>
 	);
 };
 
 const styles = StyleSheet.create({
 	root: {
-		height: BETA_HEIGHT,
+		height: 96,
 		borderWidth: 1,
 		borderStyle: 'dashed',
 		borderRadius: 8,
@@ -79,15 +69,10 @@ const styles = StyleSheet.create({
 	canvas: {
 		...StyleSheet.absoluteFillObject,
 	},
-	flag: {
-		position: 'absolute',
-		top: -1,
-		right: -1,
-	},
 	button: {
 		position: 'absolute',
 		top: 0,
-		left: 0,
+		right: 0,
 		height: 50,
 		width: 50,
 		alignItems: 'center',
@@ -95,4 +80,4 @@ const styles = StyleSheet.create({
 	},
 });
 
-export default memo(BetaSoftware);
+export default memo(WalletWarning);
diff --git a/src/components/Widgets.tsx b/src/components/Widgets.tsx
index ca937a69e..dbffa9a5b 100644
--- a/src/components/Widgets.tsx
+++ b/src/components/Widgets.tsx
@@ -16,7 +16,7 @@ import DraggableFlatList, {
 import { __DISABLE_SLASHTAGS__ } from '../constants/env';
 import { rootNavigation } from '../navigation/root/RootNavigator';
 import { TouchableOpacity, View } from '../styles/components';
-import { Caption13Up, Text, Text01M } from '../styles/text';
+import { Caption13Up, Text, BodyMSB } from '../styles/text';
 import { PlusIcon, SortAscendingIcon, Checkmark } from '../styles/icons';
 import { useAppDispatch, useAppSelector } from '../hooks/redux';
 import { SUPPORTED_FEED_TYPES } from '../utils/widgets';
@@ -61,7 +61,7 @@ const Widgets = (): ReactElement => {
 	);
 
 	const onAdd = (): void => {
-		const screen = onboardedWidgets ? 'WidgetsSuggestions' : 'GoodbyePasswords';
+		const screen = onboardedWidgets ? 'WidgetsSuggestions' : 'HelloWidgets';
 		rootNavigation.navigate(screen);
 	};
 
@@ -149,7 +149,7 @@ const Widgets = (): ReactElement => {
 		return (
 			<>
 				<View style={styles.title}>
-					<Caption13Up color="gray1">{t('widgets')}</Caption13Up>
+					<Caption13Up color="white50">{t('widgets')}</Caption13Up>
 				</View>
 				<Text color="gray">{t('disabled')}</Text>
 			</>
@@ -157,18 +157,18 @@ const Widgets = (): ReactElement => {
 	}
 
 	return (
-		<>
+		<View style={styles.root}>
 			<View style={styles.title} testID="WidgetsTitle">
-				<Caption13Up color="gray1">{t('widgets')}</Caption13Up>
+				<Caption13Up color="white50">{t('widgets')}</Caption13Up>
 				{sortedWidgets.length > 0 && (
 					<TouchableOpacity
-						style={styles.edit}
+						hitSlop={{ top: 15, right: 15, bottom: 15, left: 15 }}
 						testID="WidgetsEdit"
 						onPress={(): void => setEditing(!editing)}>
 						{editing ? (
-							<Checkmark width={24} height={24} color="gray1" />
+							<Checkmark width={24} height={24} color="white50" />
 						) : (
-							<SortAscendingIcon color="gray1" />
+							<SortAscendingIcon color="white50" />
 						)}
 					</TouchableOpacity>
 				)}
@@ -191,29 +191,20 @@ const Widgets = (): ReactElement => {
 				<View color="green16" style={styles.iconCircle}>
 					<PlusIcon height={16} color="green" />
 				</View>
-				<Text01M>{t('widget_add')}</Text01M>
+				<BodyMSB>{t('widget_add')}</BodyMSB>
 			</TouchableOpacity>
-		</>
+		</View>
 	);
 };
 
 const styles = StyleSheet.create({
+	root: {
+		marginTop: 32,
+	},
 	title: {
 		flexDirection: 'row',
 		alignItems: 'center',
 		justifyContent: 'space-between',
-		paddingTop: 30,
-	},
-	edit: {
-		// increase hitbox
-		paddingTop: 10,
-		marginTop: -10,
-		paddingBottom: 10,
-		marginBottom: -10,
-		paddingRight: 16,
-		marginRight: -16,
-		paddingLeft: 16,
-		marginLeft: -16,
 	},
 	widget: {
 		marginTop: 16,
diff --git a/src/constants/app.ts b/src/constants/app.ts
new file mode 100644
index 000000000..ba72f06c8
--- /dev/null
+++ b/src/constants/app.ts
@@ -0,0 +1,20 @@
+import { Platform } from 'react-native';
+import { getBundleId } from 'react-native-device-info';
+
+export const appName = 'Bitkit';
+
+// TODO: add correct store IDs and test
+// const appleAppID = '1634634088';
+const androidPackageName = getBundleId();
+
+// const appStoreUrl =
+// 	Platform.OS === 'ios'
+// 		? `https://apps.apple.com/us/app/bitkit/id${appleAppID}`
+// 		: `https://play.google.com/store/apps/details?id=${androidPackageName}`;
+
+const appStoreUrl =
+	Platform.OS === 'ios'
+		? 'https://testflight.apple.com/join/lGXhnwcC'
+		: `https://play.google.com/store/apps/details?id=${androidPackageName}`;
+
+export const shareText = `Download Bitkit, Your Ultimate Bitcoin Toolkit. Handing you the keys to reshape your digital life. ${appStoreUrl}`;
diff --git a/src/navigation/bottom-sheet/AppUpdatePrompt.tsx b/src/navigation/bottom-sheet/AppUpdatePrompt.tsx
index f77758628..37d854976 100644
--- a/src/navigation/bottom-sheet/AppUpdatePrompt.tsx
+++ b/src/navigation/bottom-sheet/AppUpdatePrompt.tsx
@@ -1,14 +1,13 @@
 import React, { memo, ReactElement, useEffect, useMemo } from 'react';
-import { StyleSheet, View } from 'react-native';
+import { Image, StyleSheet, View } from 'react-native';
 import { useTranslation } from 'react-i18next';
 
 import { __E2E__ } from '../../constants/env';
-import { Text01S } from '../../styles/text';
+import { BodyM } from '../../styles/text';
 import BottomSheetWrapper from '../../components/BottomSheetWrapper';
 import BottomSheetNavigationHeader from '../../components/BottomSheetNavigationHeader';
 import SafeAreaInset from '../../components/SafeAreaInset';
 import Button from '../../components/Button';
-import GlowImage from '../../components/GlowImage';
 import { openURL } from '../../utils/helpers';
 import { objectKeys } from '../../utils/objectKeys';
 import { useAppDispatch, useAppSelector } from '../../hooks/redux';
@@ -25,14 +24,14 @@ import {
 	useSnapPoints,
 } from '../../hooks/bottomSheet';
 
-const imageSrc = require('../../assets/illustrations/bitkit-logo.png');
+const imageSrc = require('../../assets/illustrations/wand.png');
 
 const ASK_INTERVAL = 1000 * 60 * 60 * 12; // 12h - how long this prompt will be hidden if user taps Later
 const CHECK_DELAY = 2500; // how long user needs to stay on Wallets screen before he will see this prompt
 
 const AppUpdatePrompt = ({ enabled }: { enabled: boolean }): ReactElement => {
 	const { t } = useTranslation('other');
-	const snapPoints = useSnapPoints('large');
+	const snapPoints = useSnapPoints('medium');
 	const dispatch = useAppDispatch();
 	const viewControllers = useAppSelector(viewControllersSelector);
 	const updateInfo = useAppSelector(availableUpdateSelector);
@@ -99,8 +98,12 @@ const AppUpdatePrompt = ({ enabled }: { enabled: boolean }): ReactElement => {
 					title={t('update_title')}
 					displayBackButton={false}
 				/>
-				<Text01S color="gray1">{t('update_text')}</Text01S>
-				<GlowImage image={imageSrc} />
+				<BodyM color="white50">{t('update_text')}</BodyM>
+
+				<View style={styles.imageContainer}>
+					<Image style={styles.image} source={imageSrc} />
+				</View>
+
 				<View style={styles.buttonContainer}>
 					<Button
 						style={styles.button}
@@ -109,7 +112,6 @@ const AppUpdatePrompt = ({ enabled }: { enabled: boolean }): ReactElement => {
 						text={t('cancel')}
 						onPress={onCancel}
 					/>
-					<View style={styles.divider} />
 					<Button
 						style={styles.button}
 						size="large"
@@ -126,19 +128,26 @@ const AppUpdatePrompt = ({ enabled }: { enabled: boolean }): ReactElement => {
 const styles = StyleSheet.create({
 	root: {
 		flex: 1,
-		paddingHorizontal: 32,
+		paddingHorizontal: 16,
+	},
+	imageContainer: {
+		alignItems: 'center',
+		marginTop: 'auto',
+		aspectRatio: 1,
+	},
+	image: {
+		flex: 1,
+		resizeMode: 'contain',
 	},
 	buttonContainer: {
 		flexDirection: 'row',
 		justifyContent: 'center',
 		marginTop: 'auto',
+		gap: 16,
 	},
 	button: {
 		flex: 1,
 	},
-	divider: {
-		width: 16,
-	},
 });
 
 export default memo(AppUpdatePrompt);
diff --git a/src/navigation/bottom-sheet/BackupNavigation.tsx b/src/navigation/bottom-sheet/BackupNavigation.tsx
index ce2a0f106..dd75bf223 100644
--- a/src/navigation/bottom-sheet/BackupNavigation.tsx
+++ b/src/navigation/bottom-sheet/BackupNavigation.tsx
@@ -11,7 +11,7 @@ import ShowMnemonic from '../../screens/Settings/Backup/ShowMnemonic';
 import ShowPassphrase from '../../screens/Settings/Backup/ShowPassphrase';
 import ConfirmMnemonic from '../../screens/Settings/Backup/ConfirmMnemonic';
 import ConfirmPassphrase from '../../screens/Settings/Backup/ConfirmPassphrase';
-import Result from '../../screens/Settings/Backup/Result';
+import Success from '../../screens/Settings/Backup/Success';
 import Warning from '../../screens/Settings/Backup/Warning';
 import MultipleDevices from '../../screens/Settings/Backup/MultipleDevices';
 import Metadata from '../../screens/Settings/Backup/Metadata';
@@ -28,7 +28,7 @@ export type BackupStackParamList = {
 	ShowPassphrase: { seed: string[]; bip39Passphrase: string };
 	ConfirmMnemonic: { seed: string[]; bip39Passphrase: string };
 	ConfirmPassphrase: { bip39Passphrase: string };
-	Result: undefined;
+	Success: undefined;
 	Warning: undefined;
 	MultipleDevices: undefined;
 	Metadata: undefined;
@@ -59,7 +59,7 @@ const BackupNavigation = (): ReactElement => {
 							name="ConfirmPassphrase"
 							component={ConfirmPassphrase}
 						/>
-						<Stack.Screen name="Result" component={Result} />
+						<Stack.Screen name="Success" component={Success} />
 						<Stack.Screen name="Warning" component={Warning} />
 						<Stack.Screen name="MultipleDevices" component={MultipleDevices} />
 						<Stack.Screen name="Metadata" component={Metadata} />
diff --git a/src/navigation/bottom-sheet/ConnectionClosed.tsx b/src/navigation/bottom-sheet/ConnectionClosed.tsx
index 38fe3f99f..e6ecbbab2 100644
--- a/src/navigation/bottom-sheet/ConnectionClosed.tsx
+++ b/src/navigation/bottom-sheet/ConnectionClosed.tsx
@@ -1,11 +1,10 @@
 import React, { memo, ReactElement } from 'react';
-import { StyleSheet, View } from 'react-native';
+import { Image, StyleSheet, View } from 'react-native';
 import { useTranslation } from 'react-i18next';
 
-import { Text01S } from '../../styles/text';
+import { BodyM } from '../../styles/text';
 import BottomSheetWrapper from '../../components/BottomSheetWrapper';
 import SafeAreaInset from '../../components/SafeAreaInset';
-import GlowImage from '../../components/GlowImage';
 import Button from '../../components/Button';
 import BottomSheetNavigationHeader from '../../components/BottomSheetNavigationHeader';
 import { closeSheet } from '../../store/slices/ui';
@@ -38,8 +37,12 @@ const ConnectionClosed = (): ReactElement => {
 					title={t('connection_closed.title')}
 					displayBackButton={false}
 				/>
-				<Text01S color="white50">{t('connection_closed.description')}</Text01S>
-				<GlowImage image={imageSrc} imageSize={170} glowColor="red" />
+				<BodyM color="white50">{t('connection_closed.description')}</BodyM>
+
+				<View style={styles.imageContainer}>
+					<Image style={styles.image} source={imageSrc} />
+				</View>
+
 				<View style={styles.buttonContainer}>
 					<Button
 						style={styles.button}
@@ -59,6 +62,19 @@ const styles = StyleSheet.create({
 		flex: 1,
 		marginHorizontal: 32,
 	},
+	imageContainer: {
+		flexShrink: 1,
+		justifyContent: 'center',
+		alignItems: 'center',
+		alignSelf: 'center',
+		width: 256,
+		aspectRatio: 1,
+		marginTop: 'auto',
+	},
+	image: {
+		flex: 1,
+		resizeMode: 'contain',
+	},
 	buttonContainer: {
 		marginTop: 'auto',
 		flexDirection: 'row',
diff --git a/src/navigation/bottom-sheet/ForceTransfer.tsx b/src/navigation/bottom-sheet/ForceTransfer.tsx
index a191e96ae..df21cd739 100644
--- a/src/navigation/bottom-sheet/ForceTransfer.tsx
+++ b/src/navigation/bottom-sheet/ForceTransfer.tsx
@@ -3,12 +3,11 @@ import { StyleSheet, View } from 'react-native';
 import { useAppDispatch, useAppSelector } from '../../hooks/redux';
 import { useTranslation } from 'react-i18next';
 
-import { Text01S } from '../../styles/text';
+import { BodyM } from '../../styles/text';
 import BottomSheetWrapper from '../../components/BottomSheetWrapper';
 import BottomSheetNavigationHeader from '../../components/BottomSheetNavigationHeader';
 import SafeAreaInset from '../../components/SafeAreaInset';
 import Button from '../../components/Button';
-import GlowImage from '../../components/GlowImage';
 import { closeAllChannels } from '../../utils/lightning';
 import { showToast } from '../../utils/notifications';
 import {
@@ -23,6 +22,7 @@ import {
 	selectedNetworkSelector,
 	selectedWalletSelector,
 } from '../../store/reselect/wallet';
+import { Image } from 'react-native';
 
 const imageSrc = require('../../assets/illustrations/exclamation-mark.png');
 
@@ -133,9 +133,11 @@ const ForceTransfer = (): ReactElement => {
 					displayBackButton={false}
 				/>
 
-				<Text01S color="gray1">{t('force_text')}</Text01S>
+				<BodyM color="white50">{t('force_text')}</BodyM>
 
-				<GlowImage image={imageSrc} imageSize={205} glowColor="yellow" />
+				<View style={styles.imageContainer}>
+					<Image style={styles.image} source={imageSrc} />
+				</View>
 
 				<View style={styles.buttonContainer}>
 					<Button
@@ -145,7 +147,6 @@ const ForceTransfer = (): ReactElement => {
 						text={t('cancel')}
 						onPress={onCancel}
 					/>
-					<View style={styles.divider} />
 					<Button
 						style={styles.button}
 						size="large"
@@ -164,16 +165,27 @@ const styles = StyleSheet.create({
 		flex: 1,
 		paddingHorizontal: 32,
 	},
+	imageContainer: {
+		flexShrink: 1,
+		justifyContent: 'center',
+		alignItems: 'center',
+		alignSelf: 'center',
+		width: 256,
+		aspectRatio: 1,
+		marginTop: 'auto',
+	},
+	image: {
+		flex: 1,
+		resizeMode: 'contain',
+	},
 	buttonContainer: {
 		flexDirection: 'row',
 		marginTop: 'auto',
+		gap: 16,
 	},
 	button: {
 		flex: 1,
 	},
-	divider: {
-		width: 16,
-	},
 });
 
 export default memo(ForceTransfer);
diff --git a/src/navigation/bottom-sheet/HighBalanceWarning.tsx b/src/navigation/bottom-sheet/HighBalanceWarning.tsx
index d7e055108..4fb276a5a 100644
--- a/src/navigation/bottom-sheet/HighBalanceWarning.tsx
+++ b/src/navigation/bottom-sheet/HighBalanceWarning.tsx
@@ -1,19 +1,21 @@
 import React, { memo, ReactElement, useEffect, useMemo } from 'react';
-import { StyleProp, StyleSheet, View, ViewStyle } from 'react-native';
+import { Image, StyleSheet, View } from 'react-native';
 import { useTranslation } from 'react-i18next';
 
 import { __E2E__ } from '../../constants/env';
-import { Caption13Up, Display, Text02S } from '../../styles/text';
+import { Caption13Up, Display, BodyM } from '../../styles/text';
 import BottomSheetWrapper from '../../components/BottomSheetWrapper';
 import BottomSheetNavigationHeader from '../../components/BottomSheetNavigationHeader';
 import SafeAreaInset from '../../components/SafeAreaInset';
-import GlowImage from '../../components/GlowImage';
 import Button from '../../components/Button';
 import { ignoreHighBalance, MAX_WARNINGS } from '../../store/slices/user';
 import { viewControllersSelector } from '../../store/reselect/ui';
 import { useBalance } from '../../hooks/wallet';
 import { useAppDispatch, useAppSelector } from '../../hooks/redux';
-import { getFiatDisplayValues } from '../../utils/displayValues';
+import {
+	getFiatDisplayValues,
+	getFiatDisplayValuesForFiat,
+} from '../../utils/displayValues';
 import { openURL } from '../../utils/helpers';
 import { objectKeys } from '../../utils/objectKeys';
 import { exchangeRatesSelector } from '../../store/reselect/wallet';
@@ -30,37 +32,11 @@ import {
 
 const imageSrc = require('../../assets/illustrations/exclamation-mark.png');
 
-// TODO: change back after beta
-// BALANCE_THRESHOLD_USD = 1000
-// BALANCE_THRESHOLD_SATS = 5000000
-// high_text2_beta -> high_text2
-// and remove BETA variable
-const BETA = true;
-const BALANCE_THRESHOLD_USD = 100; // how high the balance must be to show this warning to the user (in USD)
-const BALANCE_THRESHOLD_SATS = 500000; // how high the balance must be to show this warning to the user (in Sats)
+const BALANCE_THRESHOLD_USD = 500; // how high the balance must be to show this warning to the user (in USD)
+const BALANCE_THRESHOLD_SATS = 650000; // how high the balance must be to show this warning to the user (in Sats)
 const ASK_INTERVAL = 1000 * 60 * 60 * 24; // 1 day - how long this prompt will be hidden if user taps Later
 const CHECK_DELAY = 3000; // how long user needs to stay on Wallets screen before he will see this prompt
 
-const Amount = ({ style }: { style?: StyleProp<ViewStyle> }): ReactElement => {
-	return (
-		<View style={[aStyles.root, style]}>
-			<Display style={aStyles.symbol} color="gray2">
-				$
-			</Display>
-			<Display>{BALANCE_THRESHOLD_USD}</Display>
-		</View>
-	);
-};
-
-const aStyles = StyleSheet.create({
-	root: {
-		flexDirection: 'row',
-	},
-	symbol: {
-		marginRight: 4,
-	},
-});
-
 const HighBalanceWarning = ({
 	enabled,
 }: {
@@ -90,6 +66,11 @@ const HighBalanceWarning = ({
 		exchangeRates,
 	});
 
+	const { fiatWhole, fiatSymbol } = getFiatDisplayValuesForFiat({
+		value: BALANCE_THRESHOLD_USD,
+		currency: 'USD',
+	});
+
 	// if balance over BALANCE_THRESHOLD
 	// and not more than MAX_WARNINGS times
 	// and user has not seen this prompt for ASK_INTERVAL
@@ -157,30 +138,35 @@ const HighBalanceWarning = ({
 					displayBackButton={false}
 				/>
 				<View style={styles.amountContainer}>
-					<Caption13Up color="gray1">{t('high_text1')}</Caption13Up>
-					<Amount style={styles.amount} />
+					<Caption13Up color="white50">{t('high_text1')}</Caption13Up>
+					<View style={styles.amount}>
+						<Display style={styles.symbol} color="white50">
+							{fiatSymbol}
+						</Display>
+						<Display>{fiatWhole}</Display>
+					</View>
+				</View>
+
+				<BodyM style={styles.text} color="white50">
+					{t('high_text2')}
+				</BodyM>
+
+				<View style={styles.imageContainer}>
+					<Image style={styles.image} source={imageSrc} />
 				</View>
-				<Text02S style={styles.text} color="gray1">
-					{t('high_text2_beta')}
-				</Text02S>
-				<GlowImage image={imageSrc} imageSize={180} glowColor="yellow" />
+
 				<View style={styles.buttonContainer}>
-					{!BETA && (
-						<>
-							<Button
-								style={styles.button}
-								variant="secondary"
-								size="large"
-								text={t('high_button_more')}
-								onPress={onMore}
-							/>
-							<View style={styles.divider} />
-						</>
-					)}
 					<Button
 						style={styles.button}
+						text={t('high_button_more')}
+						variant="secondary"
 						size="large"
+						onPress={onMore}
+					/>
+					<Button
+						style={styles.button}
 						text={t('understood')}
+						size="large"
 						onPress={onDismiss}
 					/>
 				</View>
@@ -199,22 +185,37 @@ const styles = StyleSheet.create({
 		marginTop: 8,
 	},
 	amount: {
-		marginTop: 6,
+		flexDirection: 'row',
+		marginTop: 12,
+	},
+	symbol: {
+		marginRight: 8,
 	},
 	text: {
 		marginTop: 16,
 	},
+	imageContainer: {
+		flexShrink: 1,
+		justifyContent: 'center',
+		alignItems: 'center',
+		alignSelf: 'center',
+		width: 256,
+		aspectRatio: 1,
+		marginTop: 'auto',
+	},
+	image: {
+		flex: 1,
+		resizeMode: 'contain',
+	},
 	buttonContainer: {
 		flexDirection: 'row',
 		justifyContent: 'center',
 		marginTop: 'auto',
+		gap: 16,
 	},
 	button: {
 		flex: 1,
 	},
-	divider: {
-		width: 16,
-	},
 });
 
 export default memo(HighBalanceWarning);
diff --git a/src/navigation/bottom-sheet/ReceiveNavigation.tsx b/src/navigation/bottom-sheet/ReceiveNavigation.tsx
index 487be0ed2..799ced687 100644
--- a/src/navigation/bottom-sheet/ReceiveNavigation.tsx
+++ b/src/navigation/bottom-sheet/ReceiveNavigation.tsx
@@ -15,7 +15,7 @@ import ReceiveConnect from '../../screens/Wallets/Receive/ReceiveConnect';
 import { useSnapPoints } from '../../hooks/bottomSheet';
 import { NavigationContainer } from '../../styles/components';
 import { resetInvoice } from '../../store/slices/receive';
-import { viewControllerIsOpenSelector } from '../../store/reselect/ui';
+import { viewControllerSelector } from '../../store/reselect/ui';
 import { __E2E__ } from '../../constants/env';
 
 export type ReceiveNavigationProp =
@@ -34,8 +34,7 @@ export type ReceiveStackParamList = {
 };
 
 const Stack = createNativeStackNavigator<ReceiveStackParamList>();
-
-const navOptions: NativeStackNavigationOptions = {
+const screenOptions: NativeStackNavigationOptions = {
 	headerShown: false,
 	animation: __E2E__ ? 'none' : 'default',
 };
@@ -43,10 +42,12 @@ const navOptions: NativeStackNavigationOptions = {
 const ReceiveNavigation = (): ReactElement => {
 	const snapPoints = useSnapPoints('large');
 	const dispatch = useAppDispatch();
-	const isOpen = useAppSelector((state) => {
-		return viewControllerIsOpenSelector(state, 'receiveNavigation');
+	const { isOpen, receiveScreen } = useAppSelector((state) => {
+		return viewControllerSelector(state, 'receiveNavigation');
 	});
 
+	const initialRouteName = receiveScreen ?? 'ReceiveQR';
+
 	const reset = (): void => {
 		dispatch(resetInvoice());
 	};
@@ -59,7 +60,9 @@ const ReceiveNavigation = (): ReactElement => {
 			onOpen={reset}
 			onClose={reset}>
 			<NavigationContainer key={isOpen.toString()}>
-				<Stack.Navigator screenOptions={navOptions}>
+				<Stack.Navigator
+					initialRouteName={initialRouteName}
+					screenOptions={screenOptions}>
 					<Stack.Screen name="ReceiveQR" component={ReceiveQR} />
 					<Stack.Screen name="ReceiveDetails" component={ReceiveDetails} />
 					<Stack.Screen name="Tags" component={Tags} />
diff --git a/src/navigation/lightning/LightningNavigator.tsx b/src/navigation/lightning/LightningNavigator.tsx
index 35e2bb857..6cbc707e6 100644
--- a/src/navigation/lightning/LightningNavigator.tsx
+++ b/src/navigation/lightning/LightningNavigator.tsx
@@ -7,13 +7,15 @@ import {
 import { LNURLChannelParams } from 'js-lnurl';
 
 import Introduction from '../../screens/Lightning/Introduction';
-import CustomSetup from '../../screens/Lightning/CustomSetup';
-import CustomConfirm from '../../screens/Lightning/CustomConfirm';
+import Funding from '../../screens/Lightning/Funding';
 import QuickSetup from '../../screens/Lightning/QuickSetup';
 import QuickConfirm from '../../screens/Lightning/QuickConfirm';
+import CustomSetup from '../../screens/Lightning/CustomSetup';
+import CustomConfirm from '../../screens/Lightning/CustomConfirm';
 import SettingUp from '../../screens/Lightning/SettingUp';
+import Availability from '../../screens/Lightning/Availability';
+import Interrupted from '../../screens/Lightning/Interrupted';
 import Success from '../../screens/Lightning/Success';
-import Timeout from '../../screens/Lightning/Timeout';
 import LNURLChannel from '../../screens/Lightning/LNURLChannel';
 import LNURLChannelSuccess from '../../screens/Lightning/LNURLChannelSuccess';
 import { __E2E__ } from '../../constants/env';
@@ -23,23 +25,22 @@ export type LightningNavigationProp =
 
 export type LightningStackParamList = {
 	Introduction: undefined;
+	Funding: undefined;
 	QuickSetup: undefined;
 	QuickConfirm: {
 		spendingAmount: number;
-		orderId: string;
-	};
-	CustomSetup: {
-		spending: boolean;
-		spendingAmount?: number;
+		orderId?: string;
 	};
+	CustomSetup: { spending: boolean; spendingAmount?: number };
 	CustomConfirm: {
 		spendingAmount: number;
 		receivingAmount: number;
 		orderId: string;
 	};
 	SettingUp: undefined;
-	Success: undefined;
-	Timeout: undefined;
+	Availability: undefined;
+	Interrupted: undefined;
+	Success: { type: 'spending' | 'savings' };
 	LNURLChannel: { cParams: LNURLChannelParams };
 	LNURLChannelSuccess: undefined;
 };
@@ -56,13 +57,15 @@ const LightningStack = (): ReactElement => {
 			screenOptions={screenOptions}
 			initialRouteName="Introduction">
 			<Stack.Screen name="Introduction" component={Introduction} />
+			<Stack.Screen name="Funding" component={Funding} />
 			<Stack.Screen name="QuickSetup" component={QuickSetup} />
 			<Stack.Screen name="QuickConfirm" component={QuickConfirm} />
 			<Stack.Screen name="CustomSetup" component={CustomSetup} />
 			<Stack.Screen name="CustomConfirm" component={CustomConfirm} />
 			<Stack.Screen name="SettingUp" component={SettingUp} />
+			<Stack.Screen name="Availability" component={Availability} />
+			<Stack.Screen name="Interrupted" component={Interrupted} />
 			<Stack.Screen name="Success" component={Success} />
-			<Stack.Screen name="Timeout" component={Timeout} />
 			<Stack.Screen name="LNURLChannel" component={LNURLChannel} />
 			<Stack.Screen
 				name="LNURLChannelSuccess"
diff --git a/src/navigation/root/RootNavigator.tsx b/src/navigation/root/RootNavigator.tsx
index 4c330e6d2..df81205c3 100644
--- a/src/navigation/root/RootNavigator.tsx
+++ b/src/navigation/root/RootNavigator.tsx
@@ -34,11 +34,9 @@ import WalletNavigator from '../wallet/WalletNavigator';
 import ActivityDetail from '../../screens/Activity/ActivityDetail';
 import ActivityAssignContact from '../../screens/Activity/ActivityAssignContact';
 import BuyBitcoin from '../../screens/BuyBitcoin';
-import BetaRisk from '../../screens/BetaRisk';
 import ScannerScreen from '../../screens/Scanner/MainScanner';
 import SettingsNavigator from '../settings/SettingsNavigator';
 import LightningNavigator from '../lightning/LightningNavigator';
-import TransferNavigator from '../transfer/TransferNavigator';
 import ForgotPIN from '../../screens/Settings/PIN/ForgotPIN';
 import BoostPrompt from '../../screens/Wallets/BoostPrompt';
 import NewTxPrompt from '../../screens/Wallets/NewTxPrompt';
@@ -62,8 +60,8 @@ import LNURLPayNavigation from '../bottom-sheet/LNURLPayNavigation';
 import TreasureHuntNavigation from '../bottom-sheet/TreasureHuntNavigation';
 import WidgetsSuggestions from '../../screens/Widgets/WidgetsSuggestions';
 import {
-	GoodbyePasswords,
 	HelloWidgets,
+	GoodbyePasswords,
 } from '../../screens/Widgets/WidgetsOnboarding';
 import { __E2E__ } from '../../constants/env';
 import type { RootStackParamList } from '../types';
@@ -208,7 +206,6 @@ const RootNavigator = (): ReactElement => {
 				/>
 				<Stack.Screen name="Scanner" component={ScannerScreen} />
 				<Stack.Screen name="LightningRoot" component={LightningNavigator} />
-				<Stack.Screen name="Transfer" component={TransferNavigator} />
 				<Stack.Screen name="Settings" component={SettingsNavigator} />
 				<Stack.Screen
 					name="Profile"
@@ -220,9 +217,8 @@ const RootNavigator = (): ReactElement => {
 				<Stack.Screen name="ContactEdit" component={ContactEdit} />
 				<Stack.Screen name="Contact" component={Contact} />
 				<Stack.Screen name="BuyBitcoin" component={BuyBitcoin} />
-				<Stack.Screen name="BetaRisk" component={BetaRisk} />
-				<Stack.Screen name="GoodbyePasswords" component={GoodbyePasswords} />
 				<Stack.Screen name="HelloWidgets" component={HelloWidgets} />
+				<Stack.Screen name="GoodbyePasswords" component={GoodbyePasswords} />
 				<Stack.Screen
 					name="WidgetsSuggestions"
 					component={WidgetsSuggestions}
diff --git a/src/navigation/settings/SettingsNavigator.tsx b/src/navigation/settings/SettingsNavigator.tsx
index 2e0216ee7..32ead847f 100644
--- a/src/navigation/settings/SettingsNavigator.tsx
+++ b/src/navigation/settings/SettingsNavigator.tsx
@@ -21,6 +21,7 @@ import LightningNodeInfo from '../../screens/Settings/Lightning/LightningNodeInf
 import UnitSettings from '../../screens/Settings/Unit';
 import TransactionSpeedSettings from '../../screens/Settings/TransactionSpeed';
 import CustomFee from '../../screens/Settings/TransactionSpeed/CustomFee';
+import WidgetSettings from '../../screens/Settings/Widgets';
 import AuthCheck from '../../components/AuthCheck';
 import GeneralSettings from '../../screens/Settings/General';
 import SecuritySettings from '../../screens/Settings/Security';
@@ -35,7 +36,6 @@ import SupportSettings from '../../screens/Settings/SupportSettings';
 import ReportIssue from '../../screens/Settings/ReportIssue';
 import FormSuccess from '../../screens/Settings/ReportIssue/FormSuccess';
 import FormError from '../../screens/Settings/ReportIssue/FormError';
-import EasterEgg from '../../screens/Settings/EasterEgg';
 import BitcoinNetworkSelection from '../../screens/Settings/Bitcoin/BitcoinNetworkSelection';
 import Channels from '../../screens/Settings/Lightning/Channels';
 import ChannelDetails from '../../screens/Settings/Lightning/ChannelDetails';
@@ -81,7 +81,6 @@ export type SettingsStackParamList = {
 	ReportIssue: undefined;
 	FormSuccess: undefined;
 	FormError: undefined;
-	EasterEgg: undefined;
 	CurrenciesSettings: undefined;
 	UnitSettings: undefined;
 	TransactionSpeedSettings: undefined;
@@ -106,6 +105,7 @@ export type SettingsStackParamList = {
 	LightningRoot: NavigatorScreenParams<LightningStackParamList>;
 	SlashtagsSettings: undefined;
 	TagsSettings: undefined;
+	WidgetSettings: undefined;
 	AddressViewer: undefined;
 	FeeSettings: undefined;
 	WebRelay: undefined;
@@ -143,7 +143,6 @@ const SettingsNavigator = (): ReactElement => {
 			<Stack.Screen name="ReportIssue" component={ReportIssue} />
 			<Stack.Screen name="FormSuccess" component={FormSuccess} />
 			<Stack.Screen name="FormError" component={FormError} />
-			<Stack.Screen name="EasterEgg" component={EasterEgg} />
 			<Stack.Screen name="CurrenciesSettings" component={CurrenciesSettings} />
 			<Stack.Screen name="UnitSettings" component={UnitSettings} />
 			<Stack.Screen
@@ -151,6 +150,7 @@ const SettingsNavigator = (): ReactElement => {
 				component={TransactionSpeedSettings}
 			/>
 			<Stack.Screen name="CustomFee" component={CustomFee} />
+			<Stack.Screen name="WidgetSettings" component={WidgetSettings} />
 			<Stack.Screen name="ElectrumConfig" component={ElectrumConfig} />
 			<Stack.Screen name="GapLimit" component={GapLimit} />
 			<Stack.Screen name="RGSServer" component={RGSServer} />
diff --git a/src/navigation/transfer/TransferNavigator.tsx b/src/navigation/transfer/TransferNavigator.tsx
deleted file mode 100644
index 76c668487..000000000
--- a/src/navigation/transfer/TransferNavigator.tsx
+++ /dev/null
@@ -1,47 +0,0 @@
-import React, { ReactElement } from 'react';
-import {
-	createNativeStackNavigator,
-	NativeStackNavigationOptions,
-	NativeStackNavigationProp,
-} from '@react-navigation/native-stack';
-
-import Setup from '../../screens/Transfer/Setup';
-import Confirm from '../../screens/Transfer/Confirm';
-import Availability from '../../screens/Transfer/Availability';
-import Success from '../../screens/Transfer/Success';
-import Interrupted from '../../screens/Transfer/Interrupted';
-import { __E2E__ } from '../../constants/env';
-
-export type LightningNavigationProp =
-	NativeStackNavigationProp<TransferStackParamList>;
-
-export type TransferStackParamList = {
-	Setup: undefined;
-	Confirm: {
-		spendingAmount: number;
-		orderId?: string;
-	};
-	Availability: undefined;
-	Success: { type: 'savings' | 'spending' };
-	Interrupted: undefined;
-};
-
-const Stack = createNativeStackNavigator<TransferStackParamList>();
-const screenOptions: NativeStackNavigationOptions = {
-	headerShown: false,
-	animation: __E2E__ ? 'none' : 'default',
-};
-
-const TransferStack = (): ReactElement => {
-	return (
-		<Stack.Navigator screenOptions={screenOptions} initialRouteName="Setup">
-			<Stack.Screen name="Setup" component={Setup} />
-			<Stack.Screen name="Confirm" component={Confirm} />
-			<Stack.Screen name="Availability" component={Availability} />
-			<Stack.Screen name="Success" component={Success} />
-			<Stack.Screen name="Interrupted" component={Interrupted} />
-		</Stack.Navigator>
-	);
-};
-
-export default TransferStack;
diff --git a/src/navigation/types/index.ts b/src/navigation/types/index.ts
index dd9b3a35f..22491943b 100644
--- a/src/navigation/types/index.ts
+++ b/src/navigation/types/index.ts
@@ -14,7 +14,6 @@ import type { OnboardingStackParamList } from '../onboarding/OnboardingNavigator
 import type { RecoveryStackParamList } from '../../screens/Recovery/RecoveryNavigator';
 import type { WalletStackParamList } from '../wallet/WalletNavigator';
 import type { LightningStackParamList } from '../lightning/LightningNavigator';
-import type { TransferStackParamList } from '../transfer/TransferNavigator';
 import type { SettingsStackParamList } from '../settings/SettingsNavigator';
 import type { BackupStackParamList } from '../bottom-sheet/BackupNavigation';
 import type { PinStackParamList } from '../bottom-sheet/PINNavigation';
@@ -38,7 +37,6 @@ export type RootStackParamList = {
 	AppUpdate: undefined;
 	Scanner: { onScan: (data: string) => void } | undefined;
 	LightningRoot: NavigatorScreenParams<LightningStackParamList>;
-	Transfer: NavigatorScreenParams<TransferStackParamList>;
 	Settings: NavigatorScreenParams<SettingsStackParamList>;
 	Profile: undefined;
 	ProfileEdit: undefined;
@@ -46,7 +44,6 @@ export type RootStackParamList = {
 	ContactEdit: { url: string };
 	Contact: { url: string };
 	BuyBitcoin: undefined;
-	BetaRisk: undefined;
 	GoodbyePasswords: undefined;
 	HelloWidgets: undefined;
 	WidgetsSuggestions: undefined;
@@ -84,12 +81,6 @@ export type LightningScreenProps<T extends keyof LightningStackParamList> =
 		RootStackScreenProps<keyof RootStackParamList>
 	>;
 
-export type TransferScreenProps<T extends keyof TransferStackParamList> =
-	CompositeScreenProps<
-		NativeStackScreenProps<TransferStackParamList, T>,
-		RootStackScreenProps<keyof RootStackParamList>
-	>;
-
 export type SettingsScreenProps<T extends keyof SettingsStackParamList> =
 	CompositeScreenProps<
 		NativeStackScreenProps<SettingsStackParamList, T>,
diff --git a/src/navigation/wallet/WalletNavigator.tsx b/src/navigation/wallet/WalletNavigator.tsx
index 653833201..31dade110 100644
--- a/src/navigation/wallet/WalletNavigator.tsx
+++ b/src/navigation/wallet/WalletNavigator.tsx
@@ -6,9 +6,9 @@ import {
 	TransitionPresets,
 } from '@react-navigation/stack';
 
-import { TAssetType } from '../../store/types/wallet';
 import WalletsScreen from '../../screens/Wallets';
-import WalletsDetail from '../../screens/Wallets/WalletsDetail';
+import ActivitySavings from '../../screens/Activity/ActivitySavings';
+import ActivitySpending from '../../screens/Activity/ActivitySpending';
 import ActivityFiltered from '../../screens/Activity/ActivityFiltered';
 import BackupPrompt from '../../screens/Settings/Backup/BackupPrompt';
 import AppUpdatePrompt from '../bottom-sheet/AppUpdatePrompt';
@@ -19,7 +19,8 @@ import { __E2E__ } from '../../constants/env';
 
 export type WalletStackParamList = {
 	Wallets: { onFocus: (focused: boolean) => void };
-	WalletsDetail: { assetType: TAssetType };
+	ActivitySavings: undefined;
+	ActivitySpending: undefined;
 	ActivityFiltered: undefined;
 };
 
@@ -45,7 +46,8 @@ const WalletsStack = ({
 						<WalletsScreen {...props} onFocus={setIsFocused} />
 					)}
 				</Stack.Screen>
-				<Stack.Screen name="WalletsDetail" component={WalletsDetail} />
+				<Stack.Screen name="ActivitySavings" component={ActivitySavings} />
+				<Stack.Screen name="ActivitySpending" component={ActivitySpending} />
 				<Stack.Screen name="ActivityFiltered" component={ActivityFiltered} />
 			</Stack.Navigator>
 
diff --git a/src/screens/Activity/ActivityAssignContact.tsx b/src/screens/Activity/ActivityAssignContact.tsx
index a993d87e2..f5d980a69 100644
--- a/src/screens/Activity/ActivityAssignContact.tsx
+++ b/src/screens/Activity/ActivityAssignContact.tsx
@@ -20,7 +20,12 @@ const ActivityAssignContact = ({
 	return (
 		<ThemedView style={styles.container}>
 			<SafeAreaInset type="top" />
-			<NavigationHeader title={t('contact_assign')} />
+			<NavigationHeader
+				title={t('contact_assign')}
+				onClosePress={(): void => {
+					navigation.navigate('Wallet');
+				}}
+			/>
 			<View style={styles.content}>
 				<ContactsList
 					onPress={({ url }): void => {
diff --git a/src/screens/Activity/ActivityDetail.tsx b/src/screens/Activity/ActivityDetail.tsx
index cb183821a..3639d5433 100644
--- a/src/screens/Activity/ActivityDetail.tsx
+++ b/src/screens/Activity/ActivityDetail.tsx
@@ -13,24 +13,15 @@ import {
 	StyleSheet,
 	View,
 	TouchableOpacity,
-	LayoutChangeEvent,
 } from 'react-native';
-import { useSharedValue, withTiming } from 'react-native-reanimated';
-import {
-	Canvas,
-	Path,
-	RadialGradient,
-	Rect,
-	Skia,
-	vec,
-} from '@shopify/react-native-skia';
+import { Canvas, Path, Skia } from '@shopify/react-native-skia';
 import Clipboard from '@react-native-clipboard/clipboard';
 import { useTranslation } from 'react-i18next';
 import { parse } from '@synonymdev/slashtags-url';
 import { EBoostType, EPaymentType } from 'beignet';
 
 import { View as ThemedView } from '../../styles/components';
-import { Caption13Up, Text02M, Title } from '../../styles/text';
+import { Caption13Up, BodySSB, Title } from '../../styles/text';
 import {
 	CalendarIcon,
 	CheckCircleIcon,
@@ -38,12 +29,14 @@ import {
 	GitBranchIcon,
 	HourglassIcon,
 	HourglassSimpleIcon,
+	LightningHollow,
 	LightningIcon,
 	ReceiveIcon,
 	SendIcon,
 	TagIcon,
 	TimerIcon,
 	TimerIconAlt,
+	TransferIcon,
 	UserIcon,
 	UserMinusIcon,
 	UserPlusIcon,
@@ -85,6 +78,7 @@ import { showToast } from '../../utils/notifications';
 import {
 	boostedTransactionsSelector,
 	selectedNetworkSelector,
+	transferSelector,
 } from '../../store/reselect/wallet';
 import {
 	slashTagsUrlSelector,
@@ -105,7 +99,7 @@ const Section = memo(
 		return (
 			<View style={[styles.sRoot, { borderBottomColor: white10 }]}>
 				<View style={styles.sText}>
-					<Caption13Up color="gray1">{title}</Caption13Up>
+					<Caption13Up color="white50">{title}</Caption13Up>
 				</View>
 				<View style={styles.sText}>{value}</View>
 			</View>
@@ -113,26 +107,6 @@ const Section = memo(
 	},
 );
 
-const Glow = ({
-	color,
-	size,
-}: {
-	color: string;
-	size: { width: number; height: number };
-}): ReactElement => {
-	const opacity = useSharedValue(0);
-
-	useEffect(() => {
-		opacity.value = withTiming(0.3, { duration: 100 });
-	}, [opacity]);
-
-	return (
-		<Rect x={0} y={0} width={size.width} height={size.height} opacity={opacity}>
-			<RadialGradient c={vec(0, 100)} r={600} colors={[color, 'transparent']} />
-		</Rect>
-	);
-};
-
 const ZigZag = ({ color }: { color: string }): ReactElement => {
 	const step = 12;
 	let n = 0;
@@ -159,6 +133,7 @@ const OnchainActivityDetail = ({
 }): ReactElement => {
 	const {
 		id,
+		txId,
 		activityType,
 		txType,
 		value,
@@ -166,6 +141,7 @@ const OnchainActivityDetail = ({
 		confirmed,
 		timestamp,
 		confirmTimestamp,
+		isTransfer,
 		isBoosted,
 		address,
 		exists,
@@ -183,6 +159,7 @@ const OnchainActivityDetail = ({
 	const selectedNetwork = useAppSelector(selectedNetworkSelector);
 	const activityItems = useAppSelector(activityItemsSelector);
 	const boostedTransactions = useAppSelector(boostedTransactionsSelector);
+	const transfer = useAppSelector((state) => transferSelector(state, txId));
 	const [txDetails, setTxDetails] = useState<ITransaction<ITxHash>['result']>();
 	const slashTagsUrl = useAppSelector((state) => {
 		return slashTagsUrlSelector(state, id);
@@ -304,9 +281,9 @@ const OnchainActivityDetail = ({
 				const i = `${outputAddress}${n}`;
 				return (
 					<View key={i}>
-						<Text02M numberOfLines={1} ellipsizeMode="middle">
+						<BodySSB numberOfLines={1} ellipsizeMode="middle">
 							{outputAddress}
-						</Text02M>
+						</BodySSB>
 					</View>
 				);
 			});
@@ -314,10 +291,12 @@ const OnchainActivityDetail = ({
 		return <View />;
 	}, [txDetails]);
 
+	let fees = fee;
+	let paymentAmount = value;
 	let status = (
 		<View style={styles.row}>
 			<HourglassIcon style={styles.rowIcon} color="brand" width={16} />
-			<Text02M color="brand">{t('activity_confirming')}</Text02M>
+			<BodySSB color="brand">{t('activity_confirming')}</BodySSB>
 		</View>
 	);
 
@@ -325,7 +304,7 @@ const OnchainActivityDetail = ({
 		status = (
 			<View style={styles.row}>
 				<TimerIconAlt style={styles.rowIcon} color="yellow" height={14} />
-				<Text02M color="yellow">{t('activity_boosting')}</Text02M>
+				<BodySSB color="yellow">{t('activity_boosting')}</BodySSB>
 			</View>
 		);
 	}
@@ -334,7 +313,7 @@ const OnchainActivityDetail = ({
 		status = (
 			<View style={styles.row}>
 				<CheckCircleIcon style={styles.rowIcon} color="green" />
-				<Text02M color="green">{t('activity_confirmed')}</Text02M>
+				<BodySSB color="green">{t('activity_confirmed')}</BodySSB>
 			</View>
 		);
 	}
@@ -343,17 +322,49 @@ const OnchainActivityDetail = ({
 		status = (
 			<View style={styles.row}>
 				<XIcon style={styles.rowIcon} color="red" height={18} width={16} />
-				<Text02M color="red">{t('activity_removed')}</Text02M>
+				<BodySSB color="red">{t('activity_removed')}</BodySSB>
 			</View>
 		);
 	}
 
+	let icon = isSend ? (
+		<ThemedView style={styles.icon} color="brand16">
+			<SendIcon height={19} color="brand" />
+		</ThemedView>
+	) : (
+		<ThemedView style={styles.icon} color="brand16">
+			<ReceiveIcon height={19} color="brand" />
+		</ThemedView>
+	);
+
+	if (transfer) {
+		fees = value - transfer.amount + fee;
+		paymentAmount = transfer.amount;
+
+		if (!confirmed) {
+			const duration = 10;
+			status = (
+				<View style={styles.row}>
+					<HourglassIcon style={styles.rowIcon} color="brand" width={16} />
+					<BodySSB color="brand">
+						{t('activity_transfer_pending', { duration })}
+					</BodySSB>
+				</View>
+			);
+		}
+		icon = (
+			<ThemedView style={styles.icon} color="brand16">
+				<TransferIcon height={24} width={24} color="brand" />
+			</ThemedView>
+		);
+	}
+
 	return (
 		<>
 			<Money
 				sats={total}
 				size="caption13Up"
-				color="gray1"
+				color="white50"
 				unitType="secondary"
 				symbol={true}
 			/>
@@ -362,13 +373,7 @@ const OnchainActivityDetail = ({
 					<Money sats={total} sign={isSend ? '- ' : '+ '} />
 				</View>
 
-				<ThemedView style={styles.iconContainer} color="brand16">
-					{isSend ? (
-						<SendIcon height={19} color="brand" />
-					) : (
-						<ReceiveIcon height={19} color="brand" />
-					)}
-				</ThemedView>
+				{icon}
 			</TouchableOpacity>
 
 			{!extended ? (
@@ -387,7 +392,7 @@ const OnchainActivityDetail = ({
 										color="brand"
 										width={16}
 									/>
-									<Text02M>
+									<BodySSB>
 										{tTime('dateTime', {
 											v: new Date(timestamp),
 											formatParams: {
@@ -397,7 +402,7 @@ const OnchainActivityDetail = ({
 												},
 											},
 										})}
-									</Text02M>
+									</BodySSB>
 								</View>
 							}
 						/>
@@ -406,7 +411,7 @@ const OnchainActivityDetail = ({
 							value={
 								<View style={styles.row}>
 									<ClockIcon style={styles.rowIcon} color="brand" />
-									<Text02M>
+									<BodySSB>
 										{tTime('dateTime', {
 											v: new Date(confirmed ? confirmTimestamp! : timestamp),
 											formatParams: {
@@ -417,7 +422,7 @@ const OnchainActivityDetail = ({
 												},
 											},
 										})}
-									</Text02M>
+									</BodySSB>
 								</View>
 							}
 						/>
@@ -425,30 +430,45 @@ const OnchainActivityDetail = ({
 
 					{isSend && (
 						<View style={styles.sectionContainer}>
-							<Section
-								title={t('activity_payment')}
-								value={
-									<View style={styles.row}>
-										<UserIcon
-											style={styles.rowIcon}
-											width={16}
-											height={16}
-											color="brand"
-										/>
-										<Money
-											sats={value}
-											size="text02m"
-											style={styles.moneyMargin}
-										/>
-										<Money
-											sats={value}
-											size="caption13Up"
-											color="gray1"
-											unitType="secondary"
-										/>
-									</View>
-								}
-							/>
+							{isTransfer ? (
+								<Section
+									title={t('activity_transfer_to_spending')}
+									value={
+										<View style={styles.row}>
+											<LightningHollow
+												style={styles.rowIcon}
+												width={16}
+												height={16}
+												color="brand"
+											/>
+											<Money
+												style={styles.moneyMargin}
+												sats={paymentAmount}
+												size="bodySSB"
+											/>
+										</View>
+									}
+								/>
+							) : (
+								<Section
+									title={t('activity_payment')}
+									value={
+										<View style={styles.row}>
+											<UserIcon
+												style={styles.rowIcon}
+												width={16}
+												height={16}
+												color="brand"
+											/>
+											<Money
+												style={styles.moneyMargin}
+												sats={paymentAmount}
+												size="bodySSB"
+											/>
+										</View>
+									}
+								/>
+							)}
 
 							<Section
 								title={t('activity_fee')}
@@ -456,16 +476,10 @@ const OnchainActivityDetail = ({
 									<View style={styles.row}>
 										<TimerIcon style={styles.rowIcon} color="brand" />
 										<Money
-											sats={fee}
-											size="text02m"
+											sats={fees}
+											size="bodySSB"
 											style={styles.moneyMargin}
 										/>
-										<Money
-											sats={fee}
-											size="caption13Up"
-											color="gray1"
-											unitType="secondary"
-										/>
 									</View>
 								}
 							/>
@@ -511,24 +525,25 @@ const OnchainActivityDetail = ({
 									style={styles.button}
 									text={t('activity_detach')}
 									icon={<UserMinusIcon height={16} width={16} color="brand" />}
-									onPress={handleDetach}
 									testID="ActivityDetach"
+									onPress={handleDetach}
 								/>
 							) : (
 								<Button
 									style={styles.button}
 									text={t('activity_assign')}
 									icon={<UserPlusIcon height={16} width={16} color="brand" />}
-									onPress={handleAssign}
+									disabled={isTransfer}
 									testID="ActivityAssign"
+									onPress={handleAssign}
 								/>
 							)}
 							<Button
 								style={styles.button}
 								text={t('activity_tag')}
 								icon={<TagIcon height={16} width={16} color="brand" />}
-								onPress={handleAddTag}
 								testID="ActivityTag"
+								onPress={handleAddTag}
 							/>
 						</View>
 						<View style={styles.sectionContainer}>
@@ -557,7 +572,7 @@ const OnchainActivityDetail = ({
 						onPress={(): void => onCopy(id)}>
 						<Section
 							title={t('activity_tx_id')}
-							value={<Text02M>{id}</Text02M>}
+							value={<BodySSB>{id}</BodySSB>}
 						/>
 					</TouchableOpacity>
 					<TouchableOpacity
@@ -565,7 +580,7 @@ const OnchainActivityDetail = ({
 						onPress={(): void => onCopy(address)}>
 						<Section
 							title={t('activity_address')}
-							value={<Text02M>{address}</Text02M>}
+							value={<BodySSB>{address}</BodySSB>}
 						/>
 					</TouchableOpacity>
 					{txDetails ? (
@@ -577,7 +592,7 @@ const OnchainActivityDetail = ({
 										const txid = v.txid;
 										const vout = v.vout;
 										const i = txid + ':' + vout;
-										return <Text02M key={i}>{i}</Text02M>;
+										return <BodySSB key={i}>{i}</BodySSB>;
 									})}
 								/>
 							</View>
@@ -611,9 +626,9 @@ const OnchainActivityDetail = ({
 													onPress={(): void => {
 														handleBoostParentPress(parent);
 													}}>
-													<Text02M numberOfLines={1} ellipsizeMode={'middle'}>
+													<BodySSB numberOfLines={1} ellipsizeMode={'middle'}>
 														{parent}
-													</Text02M>
+													</BodySSB>
 												</TouchableOpacity>
 											}
 										/>
@@ -698,7 +713,9 @@ const LightningActivityDetail = ({
 	const total = value + (fee ?? 0);
 
 	let statusText = t('activity_successful');
-	let statusIcon = <LightningIcon style={styles.rowIcon} color="purple" />;
+	let statusIcon = (
+		<LightningIcon style={styles.rowIcon} width={12} color="purple" />
+	);
 	let icon = (
 		<>
 			{isSend ? (
@@ -733,7 +750,7 @@ const LightningActivityDetail = ({
 	const StatusRow = (
 		<View style={styles.row}>
 			{statusIcon}
-			<Text02M color="purple">{statusText}</Text02M>
+			<BodySSB color="purple">{statusText}</BodySSB>
 		</View>
 	);
 
@@ -743,7 +760,7 @@ const LightningActivityDetail = ({
 				sats={total}
 				unitType="secondary"
 				size="caption13Up"
-				color="gray1"
+				color="white50"
 				symbol={true}
 			/>
 			<TouchableOpacity style={styles.title} onPress={switchUnit}>
@@ -751,7 +768,7 @@ const LightningActivityDetail = ({
 					<Money sats={total} sign={isSend ? '- ' : '+ '} />
 				</View>
 
-				<ThemedView style={styles.iconContainer} color="purple16">
+				<ThemedView style={styles.icon} color="purple16">
 					{icon}
 				</ThemedView>
 			</TouchableOpacity>
@@ -768,7 +785,7 @@ const LightningActivityDetail = ({
 							value={
 								<View style={styles.row}>
 									<CalendarIcon style={styles.rowIcon} color="purple" />
-									<Text02M>
+									<BodySSB>
 										{tTime('dateTime', {
 											v: new Date(timestamp),
 											formatParams: {
@@ -778,7 +795,7 @@ const LightningActivityDetail = ({
 												},
 											},
 										})}
-									</Text02M>
+									</BodySSB>
 								</View>
 							}
 						/>
@@ -787,7 +804,7 @@ const LightningActivityDetail = ({
 							value={
 								<View style={styles.row}>
 									<ClockIcon style={styles.rowIcon} color="purple" />
-									<Text02M>
+									<BodySSB>
 										{tTime('dateTime', {
 											v: new Date(timestamp),
 											formatParams: {
@@ -798,7 +815,7 @@ const LightningActivityDetail = ({
 												},
 											},
 										})}
-									</Text02M>
+									</BodySSB>
 								</View>
 							}
 						/>
@@ -818,15 +835,9 @@ const LightningActivityDetail = ({
 										/>
 										<Money
 											sats={value}
-											size="text02m"
+											size="bodySSB"
 											style={styles.moneyMargin}
 										/>
-										<Money
-											sats={value}
-											size="caption13Up"
-											color="gray1"
-											unitType="secondary"
-										/>
 									</View>
 								}
 							/>
@@ -839,15 +850,9 @@ const LightningActivityDetail = ({
 											<TimerIcon style={styles.rowIcon} color="purple" />
 											<Money
 												sats={fee}
-												size="text02m"
+												size="bodySSB"
 												style={styles.moneyMargin}
 											/>
-											<Money
-												sats={fee}
-												size="caption13Up"
-												color="gray1"
-												unitType="secondary"
-											/>
 										</View>
 									}
 								/>
@@ -888,10 +893,10 @@ const LightningActivityDetail = ({
 
 					{message ? (
 						<View style={styles.invoiceNote}>
-							<Caption13Up style={styles.sText} color="gray1">
+							<Caption13Up style={styles.sText} color="white50">
 								{t('activity_invoice_note')}
 							</Caption13Up>
-							<ThemedView color="gray5">
+							<ThemedView color="white10">
 								<Canvas style={styles.zRoot}>
 									<ZigZag color={colors.background} />
 								</Canvas>
@@ -950,7 +955,7 @@ const LightningActivityDetail = ({
 						onPress={(): void => onCopy(id)}>
 						<Section
 							title={t('activity_payment_hash')}
-							value={<Text02M>{id}</Text02M>}
+							value={<BodySSB>{id}</BodySSB>}
 						/>
 					</TouchableOpacity>
 					{address && (
@@ -959,7 +964,7 @@ const LightningActivityDetail = ({
 							onPress={(): void => onCopy(address)}>
 							<Section
 								title={t('activity_invoice')}
-								value={<Text02M>{address}</Text02M>}
+								value={<BodySSB>{address}</BodySSB>}
 							/>
 						</TouchableOpacity>
 					)}
@@ -975,8 +980,6 @@ const ActivityDetail = ({
 }: RootStackScreenProps<'ActivityDetail'>): ReactElement => {
 	const { t } = useTranslation('wallet');
 	const extended = route.params.extended ?? false;
-	const colors = useColors();
-	const [size, setSize] = useState({ width: 0, height: 0 });
 
 	const item = useAppSelector((state) => {
 		return activityItemSelector(state, route.params.id)!;
@@ -984,23 +987,19 @@ const ActivityDetail = ({
 
 	const { activityType, txType } = item;
 	const isSend = txType === EPaymentType.sent;
-
-	const handleLayout = (event: LayoutChangeEvent): void => {
-		const { height, width } = event.nativeEvent.layout;
-		setSize({ width, height });
-	};
+	const isOnchain = activityType === EActivityType.onchain;
+	const isTransfer = isOnchain && item.isTransfer;
 
 	let title = isSend
 		? t('activity_bitcoin_sent')
 		: t('activity_bitcoin_received');
-	let glowColor = colors.brand;
 
-	if (activityType === EActivityType.lightning) {
-		glowColor = colors.purple;
+	if (isTransfer) {
+		title = t('activity_transfer_spending_done');
 	}
 
 	return (
-		<ThemedView style={styles.root} onLayout={handleLayout}>
+		<ThemedView style={styles.root}>
 			<SafeAreaInset type="top" />
 			<NavigationHeader
 				title={title}
@@ -1026,15 +1025,9 @@ const ActivityDetail = ({
 						extended={extended}
 					/>
 				)}
-				{/* {activityType === EActivityType.tether && (
-					<TetherActivityDetail item={item} />
-				)} */}
 				<SafeAreaInset type="bottom" minPadding={16} />
 			</ScrollView>
 			<ActivityTagsPrompt />
-			<Canvas style={styles.canvas}>
-				<Glow color={glowColor} size={size} />
-			</Canvas>
 		</ThemedView>
 	);
 };
@@ -1044,26 +1037,23 @@ const styles = StyleSheet.create({
 		flex: 1,
 	},
 	scrollContent: {
-		paddingHorizontal: 16,
 		flexGrow: 1,
+		paddingTop: 16,
+		paddingHorizontal: 16,
 		position: 'relative',
 	},
-	canvas: {
-		...StyleSheet.absoluteFillObject,
-		zIndex: -1,
-	},
 	title: {
 		flexDirection: 'row',
 		alignItems: 'center',
 		justifyContent: 'space-between',
+		marginTop: 14,
 		marginBottom: 24,
 	},
 	titleBlock: {
 		flexDirection: 'row',
 		alignItems: 'center',
-		paddingTop: 3,
 	},
-	iconContainer: {
+	icon: {
 		borderRadius: 30,
 		overflow: 'hidden',
 		height: 48,
@@ -1076,7 +1066,7 @@ const styles = StyleSheet.create({
 		alignItems: 'center',
 	},
 	rowIcon: {
-		marginRight: 9,
+		marginRight: 6,
 	},
 	sectionContainer: {
 		marginHorizontal: -8,
diff --git a/src/screens/Activity/ActivityFiltered.tsx b/src/screens/Activity/ActivityFiltered.tsx
index eaf8b1ab1..62ea25a2a 100644
--- a/src/screens/Activity/ActivityFiltered.tsx
+++ b/src/screens/Activity/ActivityFiltered.tsx
@@ -1,6 +1,5 @@
 import React, { ReactElement, memo, useMemo, useState, useRef } from 'react';
 import { StyleSheet, TouchableOpacity, View, Keyboard } from 'react-native';
-import { useSafeAreaInsets } from 'react-native-safe-area-context';
 import { Gesture, GestureType } from 'react-native-gesture-handler';
 import { SharedValue, useSharedValue } from 'react-native-reanimated';
 import { Canvas, LinearGradient, Rect, vec } from '@shopify/react-native-skia';
@@ -52,7 +51,6 @@ const ActivityFiltered = ({
 	navigation,
 }: WalletScreenProps<'ActivityFiltered'>): ReactElement => {
 	const { t } = useTranslation('wallet');
-	const insets = useSafeAreaInsets();
 	const dispatch = useAppDispatch();
 	const size = useSharedValue({ width: 0, height: 0 });
 	const panGestureRef = useRef<GestureType>(Gesture.Pan());
@@ -67,12 +65,8 @@ const ActivityFiltered = ({
 	}, [currentTab, search, tags, timerange]);
 
 	const activityPadding = useMemo(() => {
-		return {
-			paddingTop: radiusContainerHeight,
-			// add space for TabBar
-			paddingBottom: insets.bottom + 100,
-		};
-	}, [radiusContainerHeight, insets.bottom]);
+		return { paddingTop: radiusContainerHeight };
+	}, [radiusContainerHeight]);
 
 	const addTag = (tag: string): void => {
 		setTags((tg) => [...tg, tag]);
@@ -144,7 +138,7 @@ const ActivityFiltered = ({
 										<TagIcon
 											height={25}
 											width={25}
-											color={tags.length === 0 ? 'gray1' : 'brand'}
+											color={tags.length === 0 ? 'white50' : 'brand'}
 										/>
 									</TouchableOpacity>
 									<TouchableOpacity
@@ -157,7 +151,7 @@ const ActivityFiltered = ({
 										<CalendarIcon
 											height={25}
 											width={25}
-											color={timerange.length === 0 ? 'gray1' : 'brand'}
+											color={timerange.length === 0 ? 'white50' : 'brand'}
 										/>
 									</TouchableOpacity>
 								</View>
diff --git a/src/screens/Activity/ActivityList.tsx b/src/screens/Activity/ActivityList.tsx
index b2c3fd000..e0479996a 100644
--- a/src/screens/Activity/ActivityList.tsx
+++ b/src/screens/Activity/ActivityList.tsx
@@ -11,36 +11,64 @@ import {
 	NativeSyntheticEvent,
 	StyleProp,
 	StyleSheet,
+	View,
 	ViewStyle,
+	RefreshControl,
 } from 'react-native';
-import { useAppSelector } from '../../hooks/redux';
 import { useNavigation } from '@react-navigation/native';
-import {
-	FlatList,
-	RefreshControl,
-	GestureType,
-} from 'react-native-gesture-handler';
+import { FlatList, GestureType } from 'react-native-gesture-handler';
 import { useTranslation } from 'react-i18next';
 
-import { Caption13Up, Text01S } from '../../styles/text';
+import { Caption13Up, BodyM, BodySSB } from '../../styles/text';
+import Button from '../../components/Button';
+import ListItem from './ListItem';
+import useColors from '../../hooks/colors';
+import { useAppSelector } from '../../hooks/redux';
 import { refreshWallet } from '../../utils/wallet';
 import {
 	groupActivityItems,
 	filterActivityItems,
 	TActivityFilter,
 } from '../../utils/activity';
-import ListItem from './ListItem';
 import { RootNavigationProp } from '../../navigation/types';
 import { activityItemsSelector } from '../../store/reselect/activity';
 import { tagsSelector } from '../../store/reselect/metadata';
 import { IActivityItem } from '../../store/types/activity';
 
+const ListFooter = ({ showButton }: { showButton?: boolean }): ReactElement => {
+	const { t } = useTranslation('wallet');
+	const navigation = useNavigation<RootNavigationProp>();
+
+	const onPress = (): void => {
+		navigation.navigate('Wallet', { screen: 'ActivityFiltered' });
+	};
+
+	if (showButton) {
+		return (
+			<>
+				<Button
+					style={styles.button}
+					text={<BodySSB color="white80">{t('activity_show_all')}</BodySSB>}
+					size="large"
+					variant="transparent"
+					testID="ActivityShowAll"
+					onPress={onPress}
+				/>
+				<View style={styles.bottomSpacer} />
+			</>
+		);
+	}
+
+	return <View style={styles.bottomSpacer} />;
+};
+
 const ActivityList = ({
 	style,
 	panGestureRef,
 	contentContainerStyle,
 	progressViewOffset,
 	filter = {},
+	showFooterButton,
 	onScroll,
 }: {
 	style?: StyleProp<ViewStyle>;
@@ -48,8 +76,10 @@ const ActivityList = ({
 	contentContainerStyle?: StyleProp<ViewStyle>;
 	progressViewOffset?: number;
 	filter?: TActivityFilter;
+	showFooterButton?: boolean;
 	onScroll?: (event: NativeSyntheticEvent<NativeScrollEvent>) => void;
 }): ReactElement => {
+	const colors = useColors();
 	const { t } = useTranslation('wallet');
 	const navigation = useNavigation<RootNavigationProp>();
 	const items = useAppSelector(activityItemsSelector);
@@ -76,7 +106,7 @@ const ActivityList = ({
 		}): ReactElement => {
 			if (typeof item === 'string') {
 				return (
-					<Caption13Up color="gray1" style={styles.category} key={item}>
+					<Caption13Up color="white50" style={styles.category} key={item}>
 						{item}
 					</Caption13Up>
 				);
@@ -107,23 +137,25 @@ const ActivityList = ({
 	return (
 		<FlatList
 			style={[styles.content, style]}
-			simultaneousHandlers={simultaneousHandlers}
 			contentContainerStyle={contentContainerStyle}
-			showsVerticalScrollIndicator={false}
 			data={groupedItems}
+			simultaneousHandlers={simultaneousHandlers}
+			showsVerticalScrollIndicator={false}
 			renderItem={renderItem}
-			onScroll={onScroll}
 			keyExtractor={(item): string => {
 				return typeof item === 'string' ? item : item.id;
 			}}
 			refreshControl={
 				<RefreshControl
 					refreshing={refreshing}
-					onRefresh={onRefresh}
 					progressViewOffset={progressViewOffset}
+					tintColor={colors.refreshControl}
+					onRefresh={onRefresh}
 				/>
 			}
-			ListEmptyComponent={<Text01S color="gray1">{t('activity_no')}</Text01S>}
+			ListEmptyComponent={<BodyM color="white50">{t('activity_no')}</BodyM>}
+			ListFooterComponent={<ListFooter showButton={showFooterButton} />}
+			onScroll={onScroll}
 		/>
 	);
 };
@@ -131,11 +163,17 @@ const ActivityList = ({
 const styles = StyleSheet.create({
 	content: {
 		paddingTop: 20,
-		paddingBottom: 100,
 	},
 	category: {
 		marginBottom: 16,
 	},
+	button: {
+		marginTop: -24,
+		marginBottom: 16,
+	},
+	bottomSpacer: {
+		height: 120,
+	},
 });
 
 export default memo(ActivityList);
diff --git a/src/screens/Activity/ActivityListShort.tsx b/src/screens/Activity/ActivityListShort.tsx
index 8386b2c29..dd6204225 100644
--- a/src/screens/Activity/ActivityListShort.tsx
+++ b/src/screens/Activity/ActivityListShort.tsx
@@ -10,7 +10,7 @@ import { useAppSelector } from '../../hooks/redux';
 import { useNavigation } from '@react-navigation/native';
 import { useTranslation } from 'react-i18next';
 
-import { Caption13Up, Text02M } from '../../styles/text';
+import { Caption13Up, BodySSB } from '../../styles/text';
 import { groupActivityItems } from '../../utils/activity';
 import { showBottomSheet } from '../../store/utils/ui';
 import { IActivityItem } from '../../store/types/activity';
@@ -69,7 +69,7 @@ const ActivityListShort = (): ReactElement => {
 
 	return (
 		<View style={styles.content}>
-			<Caption13Up color="gray1" style={styles.title}>
+			<Caption13Up color="white50" style={styles.title}>
 				{t('activity')}
 			</Caption13Up>
 
@@ -84,11 +84,11 @@ const ActivityListShort = (): ReactElement => {
 					))}
 					<Button
 						style={styles.button}
-						text={<Text02M color="white80">{t('activity_show_all')}</Text02M>}
+						text={<BodySSB color="white80">{t('activity_show_all')}</BodySSB>}
 						size="large"
 						variant="transparent"
-						onPress={navigateToActivityFiltered}
 						testID="ActivityShowAll"
+						onPress={navigateToActivityFiltered}
 					/>
 				</>
 			)}
diff --git a/src/screens/Activity/ActivitySavings.tsx b/src/screens/Activity/ActivitySavings.tsx
new file mode 100644
index 000000000..e19fb3542
--- /dev/null
+++ b/src/screens/Activity/ActivitySavings.tsx
@@ -0,0 +1,128 @@
+import React, { ReactElement, memo, useMemo } from 'react';
+import { StyleSheet, View } from 'react-native';
+import { Trans, useTranslation } from 'react-i18next';
+
+import { CaptionB, Display } from '../../styles/text';
+import { BitcoinCircleIcon, TransferIcon } from '../../styles/icons';
+import { View as ThemedView } from '../../styles/components';
+import NavigationHeader from '../../components/NavigationHeader';
+import SafeAreaInset from '../../components/SafeAreaInset';
+import ActivityHeader from '../../components/ActivityHeader';
+import WalletOnboarding from '../../components/WalletOnboarding';
+import Money from '../../components/Money';
+import ActivityList from './ActivityList';
+import { useBalance } from '../../hooks/wallet';
+import { useAppSelector } from '../../hooks/redux';
+import { EActivityType } from '../../store/types/activity';
+import { activityItemsSelector } from '../../store/reselect/activity';
+import type { WalletScreenProps } from '../../navigation/types';
+
+const ActivitySavings = ({
+	navigation,
+}: WalletScreenProps<'ActivitySavings'>): ReactElement => {
+	const { t } = useTranslation('wallet');
+	const { onchainBalance, balanceInTransferToSavings } = useBalance();
+	const items = useAppSelector(activityItemsSelector);
+
+	const savingsItems = useMemo(() => {
+		return items.filter((item) => {
+			return item.activityType === EActivityType.onchain;
+		});
+	}, [items]);
+
+	const filter = useMemo(() => {
+		return {
+			types: [EActivityType.onchain],
+			includeTransfers: true,
+		};
+	}, []);
+
+	const showOnboarding = onchainBalance === 0 && savingsItems.length === 0;
+
+	return (
+		<ThemedView style={styles.root}>
+			<SafeAreaInset type="top" />
+			<NavigationHeader
+				title={t('savings.title')}
+				icon={<BitcoinCircleIcon width={32} height={32} />}
+				onClosePress={navigation.popToTop}
+			/>
+
+			<View style={styles.content}>
+				<ActivityHeader
+					label={t('activity_transfer_savings')}
+					balance={onchainBalance}
+				/>
+
+				{balanceInTransferToSavings !== 0 && (
+					<View style={styles.transfer}>
+						<View style={styles.transferText}>
+							<TransferIcon style={styles.transferIcon} color="white50" />
+							<CaptionB color="white50">
+								{t('details_transfer_subtitle')}
+							</CaptionB>
+						</View>
+						<Money
+							sats={balanceInTransferToSavings}
+							size="captionB"
+							color="white50"
+						/>
+					</View>
+				)}
+
+				<View style={styles.divider} />
+
+				{showOnboarding ? (
+					<WalletOnboarding
+						text={
+							<Trans
+								t={t}
+								i18nKey="savings.onboarding"
+								components={{ accent: <Display color="brand" /> }}
+							/>
+						}
+					/>
+				) : (
+					<View style={styles.activity}>
+						<ActivityList filter={filter} showFooterButton={true} />
+					</View>
+				)}
+			</View>
+		</ThemedView>
+	);
+};
+
+const styles = StyleSheet.create({
+	root: {
+		flex: 1,
+	},
+	content: {
+		flex: 1,
+		paddingTop: 16,
+		paddingHorizontal: 16,
+	},
+	transfer: {
+		flexDirection: 'row',
+		justifyContent: 'space-between',
+		paddingTop: 4,
+		paddingBottom: 10,
+	},
+	transferText: {
+		flexDirection: 'row',
+		alignItems: 'center',
+	},
+	transferIcon: {
+		marginRight: 3,
+	},
+	divider: {
+		borderTopColor: 'rgba(255, 255, 255, 0.1)',
+		borderTopWidth: 1,
+		marginTop: 8,
+	},
+	activity: {
+		flex: 1,
+		marginTop: 16,
+	},
+});
+
+export default memo(ActivitySavings);
diff --git a/src/screens/Activity/ActivitySpending.tsx b/src/screens/Activity/ActivitySpending.tsx
new file mode 100644
index 000000000..6e81919a4
--- /dev/null
+++ b/src/screens/Activity/ActivitySpending.tsx
@@ -0,0 +1,128 @@
+import React, { ReactElement, memo, useMemo } from 'react';
+import { StyleSheet, View } from 'react-native';
+import { Trans, useTranslation } from 'react-i18next';
+
+import { CaptionB, Display } from '../../styles/text';
+import { LightningCircleIcon, TransferIcon } from '../../styles/icons';
+import { View as ThemedView } from '../../styles/components';
+import NavigationHeader from '../../components/NavigationHeader';
+import SafeAreaInset from '../../components/SafeAreaInset';
+import ActivityHeader from '../../components/ActivityHeader';
+import WalletOnboarding from '../../components/WalletOnboarding';
+import Money from '../../components/Money';
+import ActivityList from './ActivityList';
+import { useBalance } from '../../hooks/wallet';
+import { useAppSelector } from '../../hooks/redux';
+import { EActivityType } from '../../store/types/activity';
+import { activityItemsSelector } from '../../store/reselect/activity';
+import type { WalletScreenProps } from '../../navigation/types';
+
+const ActivitySpending = ({
+	navigation,
+}: WalletScreenProps<'ActivitySpending'>): ReactElement => {
+	const { t } = useTranslation('wallet');
+	const { lightningBalance, balanceInTransferToSpending } = useBalance();
+	const items = useAppSelector(activityItemsSelector);
+
+	const spendingItems = useMemo(() => {
+		return items.filter((item) => {
+			return item.activityType === EActivityType.lightning;
+		});
+	}, [items]);
+
+	const filter = useMemo(() => {
+		return {
+			types: [EActivityType.lightning],
+			includeTransfers: true,
+		};
+	}, []);
+
+	const showOnboarding = lightningBalance === 0 && spendingItems.length === 0;
+
+	return (
+		<ThemedView style={styles.root}>
+			<SafeAreaInset type="top" />
+			<NavigationHeader
+				title={t('spending.title')}
+				icon={<LightningCircleIcon width={32} height={32} />}
+				onClosePress={navigation.popToTop}
+			/>
+
+			<View style={styles.content}>
+				<ActivityHeader
+					label={t('activity_transfer_spending')}
+					balance={lightningBalance}
+				/>
+
+				{balanceInTransferToSpending !== 0 && (
+					<View style={styles.transfer}>
+						<View style={styles.transferText}>
+							<TransferIcon style={styles.transferIcon} color="white50" />
+							<CaptionB color="white50">
+								{t('details_transfer_subtitle')}
+							</CaptionB>
+						</View>
+						<Money
+							sats={balanceInTransferToSpending}
+							size="captionB"
+							color="white50"
+						/>
+					</View>
+				)}
+
+				<View style={styles.divider} />
+
+				{showOnboarding ? (
+					<WalletOnboarding
+						text={
+							<Trans
+								t={t}
+								i18nKey="spending.onboarding"
+								components={{ accent: <Display color="purple" /> }}
+							/>
+						}
+					/>
+				) : (
+					<View style={styles.activity}>
+						<ActivityList filter={filter} showFooterButton={true} />
+					</View>
+				)}
+			</View>
+		</ThemedView>
+	);
+};
+
+const styles = StyleSheet.create({
+	root: {
+		flex: 1,
+	},
+	content: {
+		flex: 1,
+		paddingTop: 16,
+		paddingHorizontal: 16,
+	},
+	transfer: {
+		flexDirection: 'row',
+		justifyContent: 'space-between',
+		paddingTop: 4,
+		paddingBottom: 10,
+	},
+	transferText: {
+		flexDirection: 'row',
+		alignItems: 'center',
+	},
+	transferIcon: {
+		marginRight: 3,
+	},
+	divider: {
+		borderTopColor: 'rgba(255, 255, 255, 0.1)',
+		borderTopWidth: 1,
+		marginTop: 8,
+	},
+	activity: {
+		flex: 1,
+		marginTop: 16,
+	},
+});
+
+export default memo(ActivitySpending);
diff --git a/src/screens/Activity/ActivityTagsPrompt.tsx b/src/screens/Activity/ActivityTagsPrompt.tsx
index cd581620d..08d36b473 100644
--- a/src/screens/Activity/ActivityTagsPrompt.tsx
+++ b/src/screens/Activity/ActivityTagsPrompt.tsx
@@ -63,7 +63,7 @@ const ActivityTagsPrompt = (): ReactElement => {
 					<>
 						{lastUsedTags.length !== 0 && (
 							<>
-								<Text13UP style={styles.label} color="gray1">
+								<Text13UP style={styles.label} color="white50">
 									{t('tags_previously')}
 								</Text13UP>
 								<View style={styles.tagsContainer}>
@@ -81,7 +81,7 @@ const ActivityTagsPrompt = (): ReactElement => {
 							</>
 						)}
 
-						<Text13UP style={styles.label} color="gray1">
+						<Text13UP style={styles.label} color="white50">
 							{t('tags_new')}
 						</Text13UP>
 						<BottomSheetTextInput
diff --git a/src/screens/Activity/EmptyWallet.tsx b/src/screens/Activity/EmptyWallet.tsx
deleted file mode 100644
index 8c10ff8ce..000000000
--- a/src/screens/Activity/EmptyWallet.tsx
+++ /dev/null
@@ -1,99 +0,0 @@
-import React, { memo, ReactElement, useMemo, useState, useEffect } from 'react';
-import { useSafeAreaInsets } from 'react-native-safe-area-context';
-import {
-	StyleSheet,
-	TouchableOpacity,
-	View,
-	useWindowDimensions,
-} from 'react-native';
-import { Trans, useTranslation } from 'react-i18next';
-
-import { Headline } from '../../styles/text';
-import { XIcon } from '../../styles/icons';
-import { updateSettings } from '../../store/slices/settings';
-import Arrow from '../../assets/dotted-arrow.svg';
-import { __E2E__ } from '../../constants/env';
-import { useAppDispatch } from '../../hooks/redux';
-
-const EmptyWallet = (): ReactElement => {
-	const insets = useSafeAreaInsets();
-	const { height } = useWindowDimensions();
-	const { t } = useTranslation('onboarding');
-	const dispatch = useAppDispatch();
-	const [showClose, setShowClose] = useState(!__E2E__);
-
-	useEffect(() => {
-		if (__E2E__) {
-			// delay showning close button. this is handy for e2e testing
-			setTimeout(() => setShowClose(true), 2000);
-		}
-	}, []);
-
-	const [root, arrowContainer, arrow] = useMemo(() => {
-		return [
-			[styles.root, { marginBottom: 110 + insets.bottom }],
-			[styles.arrowContainer, { marginTop: height * 0.04 }],
-			{ maxHeight: height * 0.28 },
-		];
-	}, [height, insets.bottom]);
-
-	const handleHide = (): void => {
-		dispatch(updateSettings({ hideOnboardingMessage: true }));
-	};
-
-	return (
-		<View style={root} testID="ToGetStarted">
-			{showClose && (
-				<TouchableOpacity
-					style={styles.closeButton}
-					onPress={handleHide}
-					testID="ToGetStartedClose">
-					<XIcon color="gray1" width={16} height={16} />
-				</TouchableOpacity>
-			)}
-
-			<Headline>
-				<Trans
-					t={t}
-					i18nKey="empty_wallet"
-					components={{ brand: <Headline color="brand" /> }}
-				/>
-			</Headline>
-
-			<View style={arrowContainer}>
-				<View style={styles.spaceLeft} />
-				<Arrow style={arrow} />
-				<View style={styles.spaceRight} />
-			</View>
-		</View>
-	);
-};
-
-const styles = StyleSheet.create({
-	root: {
-		paddingHorizontal: 16,
-		position: 'relative',
-		marginTop: 'auto',
-	},
-	closeButton: {
-		height: 30,
-		width: 30,
-		alignItems: 'center',
-		justifyContent: 'center',
-		position: 'absolute',
-		top: -10,
-		right: 10,
-		zIndex: 1,
-	},
-	arrowContainer: {
-		flexDirection: 'row',
-	},
-	spaceLeft: {
-		flex: 7,
-	},
-	spaceRight: {
-		flex: 3,
-	},
-});
-
-export default memo(EmptyWallet);
diff --git a/src/screens/Activity/ListItem.tsx b/src/screens/Activity/ListItem.tsx
index 47cdf5597..a7a4d5583 100644
--- a/src/screens/Activity/ListItem.tsx
+++ b/src/screens/Activity/ListItem.tsx
@@ -3,7 +3,7 @@ import { StyleSheet, View } from 'react-native';
 import { useTranslation } from 'react-i18next';
 
 import { TouchableOpacity, View as ThemedView } from '../../styles/components';
-import { Caption13M, Text01M } from '../../styles/text';
+import { CaptionB, BodyMSB } from '../../styles/text';
 import {
 	HeartbeatIcon,
 	HourglassSimpleIcon,
@@ -49,10 +49,10 @@ export const ListItem = ({
 	<>
 		{icon}
 		<View style={styles.text}>
-			<Text01M color={exists ? undefined : 'red'}>{title}</Text01M>
-			<Caption13M color={exists ? 'gray1' : 'red'}>
+			<BodyMSB color={exists ? undefined : 'red'}>{title}</BodyMSB>
+			<CaptionB color={exists ? 'white50' : 'red'}>
 				{truncate(description, 35)}
-			</Caption13M>
+			</CaptionB>
 		</View>
 
 		{amount ? (
@@ -61,15 +61,15 @@ export const ListItem = ({
 					color={exists ? undefined : 'red'}
 					sats={amount}
 					enableHide={true}
-					size="text01m"
+					size="bodyMSB"
 					sign={isSend ? '-' : '+'}
 					unitType="primary"
 				/>
 				<Money
 					sats={amount}
 					enableHide={true}
-					size="caption13M"
-					color={exists ? 'gray1' : 'red'}
+					size="captionB"
+					color={exists ? 'white50' : 'red'}
 					unitType="secondary"
 				/>
 			</View>
@@ -126,7 +126,7 @@ const OnchainListItem = ({
 
 	if (transfer) {
 		if (isTransferToSpending) {
-			title = t('activity_transfer_spending');
+			title = t('activity_transfer');
 			if (confirmed) {
 				description = t('activity_transfer_spending_done');
 			} else {
@@ -134,14 +134,14 @@ const OnchainListItem = ({
 				description = t('activity_transfer_spending_pending', { duration });
 			}
 			icon = (
-				<ThemedView style={styles.icon} color="purple16">
-					<TransferIcon color="purple" />
+				<ThemedView style={styles.icon} color="brand16">
+					<TransferIcon color="brand" />
 				</ThemedView>
 			);
 		} else {
 			const transferToSavings = transfer as TTransferToSavings;
 			const requiredConfs = 6;
-			title = t('activity_transfer_savings');
+			title = t('activity_transfer');
 			if (transferToSavings.confirmations >= requiredConfs) {
 				description = t('activity_transfer_savings_done');
 			} else {
diff --git a/src/screens/Activity/TagsPrompt.tsx b/src/screens/Activity/TagsPrompt.tsx
index ec55cdf98..6e2068095 100644
--- a/src/screens/Activity/TagsPrompt.tsx
+++ b/src/screens/Activity/TagsPrompt.tsx
@@ -2,7 +2,7 @@ import React, { memo, ReactElement } from 'react';
 import { StyleSheet, View } from 'react-native';
 import { useTranslation } from 'react-i18next';
 
-import { Subtitle, Text02S, Text13UP } from '../../styles/text';
+import { Subtitle, BodyS, Text13UP } from '../../styles/text';
 import BottomSheetWrapper from '../../components/BottomSheetWrapper';
 import SafeAreaInset from '../../components/SafeAreaInset';
 import Tag from '../../components/Tag';
@@ -42,7 +42,7 @@ const TagsPrompt = ({
 			<View style={styles.root}>
 				<Subtitle style={styles.title}>{t('tags_filter_title')}</Subtitle>
 
-				<Text13UP color="gray1">{t('tags_filter')}</Text13UP>
+				<Text13UP color="white50">{t('tags_filter')}</Text13UP>
 
 				<View style={styles.suggestionsRow}>
 					{suggestions.map((tag) => (
@@ -54,7 +54,7 @@ const TagsPrompt = ({
 						/>
 					))}
 					{suggestions.length === 0 && (
-						<Text02S style={styles.noTags}>{t('tags_no')}</Text02S>
+						<BodyS style={styles.noTags}>{t('tags_no')}</BodyS>
 					)}
 				</View>
 
diff --git a/src/screens/Activity/TimeRangePrompt.tsx b/src/screens/Activity/TimeRangePrompt.tsx
index e2e8f0a7e..a11417390 100644
--- a/src/screens/Activity/TimeRangePrompt.tsx
+++ b/src/screens/Activity/TimeRangePrompt.tsx
@@ -2,7 +2,7 @@ import React, { memo, ReactElement, useMemo, useState } from 'react';
 import { StyleSheet, View, TouchableOpacity } from 'react-native';
 import { useTranslation } from 'react-i18next';
 
-import { Subtitle, Text01M, Caption13Up } from '../../styles/text';
+import { Subtitle, BodyMSB, Caption13Up } from '../../styles/text';
 import { View as ThemedView } from '../../styles/components';
 import { LeftSign, RightSign } from '../../styles/icons';
 import BottomSheetWrapper from '../../components/BottomSheetWrapper';
@@ -82,9 +82,9 @@ const Day = ({
 			style={styles.day}
 			testID={day ? `Day-${day}` : undefined}>
 			{back}
-			<Text01M color={textColor} testID={today ? 'Today' : undefined}>
+			<BodyMSB color={textColor} testID={today ? 'Today' : undefined}>
 				{day}
-			</Text01M>
+			</BodyMSB>
 		</TouchableOpacity>
 	);
 };
@@ -160,12 +160,12 @@ const Calendar = ({
 		<View style={styles.calendar}>
 			<View style={styles.selector}>
 				<View style={styles.current}>
-					<Text01M>
+					<BodyMSB>
 						{tTime('dateTime', {
 							v: monthDate,
 							formatParams: { v: { month: 'long', year: 'numeric', timeZone } },
 						})}
-					</Text01M>
+					</BodyMSB>
 				</View>
 				<TouchableOpacity
 					onPress={prevMonth}
@@ -184,7 +184,7 @@ const Calendar = ({
 			<View style={styles.weekCaption}>
 				{weekDays.map((day) => (
 					<View key={day} style={styles.weekDay}>
-						<Caption13Up color="gray1">{day}</Caption13Up>
+						<Caption13Up color="white50">{day}</Caption13Up>
 					</View>
 				))}
 			</View>
@@ -232,17 +232,17 @@ const Calendar = ({
 
 			<View style={styles.range}>
 				{range.length === 1 && (
-					<Text01M>
+					<BodyMSB>
 						{tTime('dateTime', {
 							v: range[0],
 							formatParams: {
 								v: { day: 'numeric', month: 'long', year: 'numeric', timeZone },
 							},
 						})}
-					</Text01M>
+					</BodyMSB>
 				)}
 				{range.length === 2 && (
-					<Text01M>
+					<BodyMSB>
 						{tTime('dateTime', {
 							v: range[0],
 							formatParams: {
@@ -256,7 +256,7 @@ const Calendar = ({
 								v: { day: 'numeric', month: 'long', year: 'numeric', timeZone },
 							},
 						})}
-					</Text01M>
+					</BodyMSB>
 				)}
 			</View>
 
@@ -270,7 +270,6 @@ const Calendar = ({
 					disabled={range.length === 0}
 					testID="CalendarClearButton"
 				/>
-				<View style={styles.divider} />
 				<Button
 					style={styles.button}
 					size="large"
@@ -393,13 +392,11 @@ const styles = StyleSheet.create({
 		flexDirection: 'row',
 		justifyContent: 'center',
 		marginHorizontal: 16,
+		gap: 16,
 	},
 	button: {
 		flex: 1,
 	},
-	divider: {
-		width: 16,
-	},
 	range: {
 		marginTop: 'auto',
 		marginBottom: 36,
diff --git a/src/screens/AppError.tsx b/src/screens/AppError.tsx
index 776c0df5a..9808a57af 100644
--- a/src/screens/AppError.tsx
+++ b/src/screens/AppError.tsx
@@ -11,7 +11,6 @@ import {
 import RNExitApp from 'react-native-exit-app';
 import { SafeAreaProvider } from 'react-native-safe-area-context';
 
-import { Glow } from '../components/Glow';
 import SafeAreaInset from '../components/SafeAreaInset';
 import { openURL } from '../utils/helpers';
 import { createSupportLink } from '../utils/support';
@@ -44,13 +43,6 @@ const AppError = ({ error }: { error: ReactError }): ReactElement => {
 				<SafeAreaInset type="top" minPadding={16} />
 				<Text style={styles.header}>Unexpected Error</Text>
 
-				<View style={styles.background}>
-					<View style={styles.imageContainer} pointerEvents="none">
-						<Glow style={styles.glow} color="#E95164" size={600} />
-						<Image style={styles.image} source={imageSrc} />
-					</View>
-				</View>
-
 				<View style={styles.content}>
 					<Text style={styles.text}>
 						Sorry, Bitkit just crashed unexpectedly. Here is a glimpse of what
@@ -65,6 +57,10 @@ const AppError = ({ error }: { error: ReactError }): ReactElement => {
 						</Text>
 					</View>
 
+					<View style={styles.imageContainer} pointerEvents="none">
+						<Image style={styles.image} source={imageSrc} />
+					</View>
+
 					<View style={styles.buttonContainer}>
 						<TouchableOpacity
 							style={[styles.button, styles.buttonSecondary]}
@@ -72,7 +68,6 @@ const AppError = ({ error }: { error: ReactError }): ReactElement => {
 							onPress={onClose}>
 							<Text style={styles.buttonText}>Close Bitkit</Text>
 						</TouchableOpacity>
-						<View style={styles.divider} />
 						<TouchableOpacity
 							style={[styles.button, styles.buttonPrimary]}
 							testID="ErrorReport"
@@ -100,11 +95,6 @@ const styles = StyleSheet.create({
 		marginTop: 17,
 		paddingBottom: 35,
 	},
-	background: {
-		...StyleSheet.absoluteFillObject,
-		alignItems: 'center',
-		justifyContent: 'center',
-	},
 	content: {
 		flex: 1,
 		paddingHorizontal: 16,
@@ -134,22 +124,23 @@ const styles = StyleSheet.create({
 		color: '#E95164',
 	},
 	imageContainer: {
-		// flex: 1,
-		position: 'relative',
+		flexShrink: 1,
 		justifyContent: 'center',
 		alignItems: 'center',
+		alignSelf: 'center',
+		width: 256,
+		aspectRatio: 1,
+		marginTop: 'auto',
 	},
 	image: {
-		height: 220,
+		flex: 1,
 		resizeMode: 'contain',
 	},
-	glow: {
-		position: 'absolute',
-	},
 	buttonContainer: {
 		flexDirection: 'row',
 		justifyContent: 'center',
 		marginTop: 'auto',
+		gap: 16,
 	},
 	button: {
 		borderRadius: 64,
@@ -173,9 +164,6 @@ const styles = StyleSheet.create({
 		fontSize: 15,
 		fontWeight: 'bold',
 	},
-	divider: {
-		width: 16,
-	},
 });
 
 export default AppError;
diff --git a/src/screens/AppUpdate.tsx b/src/screens/AppUpdate.tsx
index 51135e971..32e8608ea 100644
--- a/src/screens/AppUpdate.tsx
+++ b/src/screens/AppUpdate.tsx
@@ -1,17 +1,16 @@
 import React, { ReactElement } from 'react';
-import { StyleSheet, View } from 'react-native';
+import { Image, StyleSheet, View } from 'react-native';
 import { useTranslation } from 'react-i18next';
 
 import { View as ThemedView } from '../styles/components';
-import { Text01S, Title } from '../styles/text';
+import { BodyM, Title } from '../styles/text';
 import SafeAreaInset from '../components/SafeAreaInset';
-import GlowImage from '../components/GlowImage';
 import Button from '../components/Button';
 import { useAppSelector } from '../hooks/redux';
 import { openURL } from '../utils/helpers';
 import { availableUpdateSelector } from '../store/reselect/ui';
 
-const imageSrc = require('../assets/illustrations/bitkit-logo.png');
+const imageSrc = require('../assets/illustrations/exclamation-mark.png');
 
 const AppUpdate = (): ReactElement => {
 	const { t } = useTranslation('other');
@@ -26,9 +25,11 @@ const AppUpdate = (): ReactElement => {
 			<SafeAreaInset type="top" />
 			<Title style={styles.header}>{t('up_title')}</Title>
 			<View style={styles.content}>
-				<Text01S color="gray1">{t('up_text')}</Text01S>
+				<BodyM color="white50">{t('up_text')}</BodyM>
 
-				<GlowImage image={imageSrc} />
+				<View style={styles.imageContainer}>
+					<Image style={styles.image} source={imageSrc} />
+				</View>
 
 				<View style={styles.buttonContainer}>
 					<Button
@@ -50,13 +51,23 @@ const styles = StyleSheet.create({
 	},
 	header: {
 		textAlign: 'center',
-		marginTop: 17,
 		paddingBottom: 35,
 	},
 	content: {
 		flex: 1,
 		paddingHorizontal: 16,
 	},
+	imageContainer: {
+		alignSelf: 'center',
+		alignItems: 'center',
+		marginTop: 'auto',
+		aspectRatio: 1,
+		height: 300,
+	},
+	image: {
+		flex: 1,
+		resizeMode: 'contain',
+	},
 	buttonContainer: {
 		flexDirection: 'row',
 		marginTop: 'auto',
diff --git a/src/screens/BetaRisk.tsx b/src/screens/BetaRisk.tsx
deleted file mode 100644
index ec0f3e1ae..000000000
--- a/src/screens/BetaRisk.tsx
+++ /dev/null
@@ -1,98 +0,0 @@
-import React, { ReactElement } from 'react';
-import { Image, StyleSheet, View } from 'react-native';
-import { Trans, useTranslation } from 'react-i18next';
-
-import { Display, Text01S } from '../styles/text';
-import SafeAreaInset from '../components/SafeAreaInset';
-import GlowingBackground from '../components/GlowingBackground';
-import Button from '../components/Button';
-import { useAppDispatch } from '../hooks/redux';
-import { sleep } from '../utils/helpers';
-import { showBottomSheet } from '../store/utils/ui';
-import { acceptBetaRisk } from '../store/slices/user';
-import type { RootStackScreenProps } from '../navigation/types';
-
-const imageSrc = require('../assets/illustrations/exclamation-mark.png');
-
-const BetaRisk = ({
-	navigation,
-}: RootStackScreenProps<'BetaRisk'>): ReactElement => {
-	const { t } = useTranslation('other');
-	const dispatch = useAppDispatch();
-
-	const handlePress = async (): Promise<void> => {
-		dispatch(acceptBetaRisk());
-		navigation.goBack();
-		await sleep(200);
-		showBottomSheet('receiveNavigation');
-	};
-
-	return (
-		<GlowingBackground topLeft="yellow">
-			<SafeAreaInset type="top" />
-			<View style={styles.content}>
-				<View style={styles.imageContainer}>
-					<Image style={styles.image} source={imageSrc} />
-				</View>
-				<View style={styles.textContent}>
-					<Display>
-						<Trans
-							t={t}
-							i18nKey="caution_header"
-							components={{
-								yellow: <Display color="yellow" />,
-							}}
-						/>
-					</Display>
-					<Text01S color="gray1" style={styles.text}>
-						{t('caution_text')}
-					</Text01S>
-				</View>
-
-				<View style={styles.buttonContainer}>
-					<Button
-						style={styles.button}
-						text={t('understood')}
-						size="large"
-						onPress={handlePress}
-						testID="UnderstoodButton"
-					/>
-				</View>
-			</View>
-			<SafeAreaInset type="bottom" minPadding={16} />
-		</GlowingBackground>
-	);
-};
-
-const styles = StyleSheet.create({
-	content: {
-		flex: 1,
-		marginHorizontal: 32,
-	},
-	imageContainer: {
-		flex: 3.2,
-		alignItems: 'center',
-		paddingVertical: 50,
-	},
-	image: {
-		flex: 1,
-		resizeMode: 'contain',
-	},
-	textContent: {
-		flex: 3,
-		paddingHorizontal: 4,
-	},
-	text: {
-		marginTop: 4,
-	},
-	buttonContainer: {
-		flexDirection: 'row',
-		justifyContent: 'center',
-		marginTop: 'auto',
-	},
-	button: {
-		flex: 1,
-	},
-});
-
-export default BetaRisk;
diff --git a/src/screens/BuyBitcoin.tsx b/src/screens/BuyBitcoin.tsx
index 5bc1334f2..b16831cdd 100644
--- a/src/screens/BuyBitcoin.tsx
+++ b/src/screens/BuyBitcoin.tsx
@@ -1,18 +1,14 @@
 import React, { ReactElement } from 'react';
-import { Image, StyleSheet, View } from 'react-native';
 import { Trans, useTranslation } from 'react-i18next';
 
-import { Display, Text01S } from '../styles/text';
-import SafeAreaInset from '../components/SafeAreaInset';
-import GlowingBackground from '../components/GlowingBackground';
-import NavigationHeader from '../components/NavigationHeader';
-import Button from '../components/Button';
-import { useAppDispatch } from '../hooks/redux';
+import { Display } from '../styles/text';
+import OnboardingScreen from '../components/OnboardingScreen';
 import { openURL } from '../utils/helpers';
+import { useAppDispatch } from '../hooks/redux';
 import { hideTodo } from '../store/slices/todos';
 import type { RootStackScreenProps } from '../navigation/types';
 
-const imageSrc = require('../assets/illustrations/b-emboss.png');
+const imageSrc = require('../assets/illustrations/bitcoin-emboss.png');
 
 const BuyBitcoin = ({
 	navigation,
@@ -21,77 +17,27 @@ const BuyBitcoin = ({
 	const dispatch = useAppDispatch();
 
 	return (
-		<GlowingBackground topLeft="orange">
-			<SafeAreaInset type="top" />
-			<NavigationHeader
-				onClosePress={(): void => {
-					navigation.navigate('Wallet');
-				}}
-			/>
-			<View style={styles.content}>
-				<View style={styles.imageContainer}>
-					<Image style={styles.image} source={imageSrc} />
-				</View>
-				<View style={styles.textContent}>
-					<Display>
-						<Trans
-							t={t}
-							i18nKey="buy_header"
-							components={{
-								orange: <Display color="orange" />,
-							}}
-						/>
-					</Display>
-					<Text01S color="gray1" style={styles.text}>
-						{t('buy_text')}
-					</Text01S>
-				</View>
-
-				<View style={styles.buttonContainer}>
-					<Button
-						style={styles.button}
-						text={t('buy_button')}
-						size="large"
-						onPress={(): void => {
-							dispatch(hideTodo('buyBitcoin'));
-							openURL('https://bitcoin.org/en/exchanges');
-						}}
-					/>
-				</View>
-			</View>
-			<SafeAreaInset type="bottom" minPadding={16} />
-		</GlowingBackground>
+		<OnboardingScreen
+			title={
+				<Trans
+					t={t}
+					i18nKey="buy_header"
+					components={{ accent: <Display color="brand" /> }}
+				/>
+			}
+			description={t('buy_text')}
+			image={imageSrc}
+			buttonText={t('buy_button')}
+			testID="BuyBitcoin"
+			onClosePress={(): void => {
+				navigation.navigate('Wallet');
+			}}
+			onButtonPress={(): void => {
+				dispatch(hideTodo('buyBitcoin'));
+				openURL('https://bitcoin.org/en/exchanges');
+			}}
+		/>
 	);
 };
 
-const styles = StyleSheet.create({
-	content: {
-		flex: 1,
-		marginHorizontal: 32,
-	},
-	imageContainer: {
-		flex: 3.2,
-		alignItems: 'center',
-		paddingVertical: 50,
-	},
-	image: {
-		flex: 1,
-		resizeMode: 'contain',
-	},
-	textContent: {
-		flex: 3,
-		paddingHorizontal: 4,
-	},
-	text: {
-		marginTop: 16,
-	},
-	buttonContainer: {
-		flexDirection: 'row',
-		marginTop: 'auto',
-	},
-	button: {
-		flex: 1,
-	},
-});
-
 export default BuyBitcoin;
diff --git a/src/screens/Contacts/AddContact.tsx b/src/screens/Contacts/AddContact.tsx
index d71d96d0a..a7f36aeea 100644
--- a/src/screens/Contacts/AddContact.tsx
+++ b/src/screens/Contacts/AddContact.tsx
@@ -12,7 +12,7 @@ import BottomSheetNavigationHeader from '../../components/BottomSheetNavigationH
 import LabeledInput from '../../components/LabeledInput';
 import Button from '../../components/Button';
 import SafeAreaInset from '../../components/SafeAreaInset';
-import { Text01S } from '../../styles/text';
+import { BodyM } from '../../styles/text';
 import { ClipboardTextIcon, CornersOutIcon } from '../../styles/icons';
 import type { RootStackParamList } from '../../navigation/types';
 import { useAppDispatch } from '../../hooks/redux';
@@ -99,13 +99,11 @@ const AddContact = ({
 					title={t('contact_add_capital')}
 					displayBackButton={false}
 				/>
-				<Text01S
-					testID="AddContactNote"
-					color="gray1"
-					style={styles.addContactNote}>
-					{t('contact_add_explain')}
-				</Text01S>
+
 				<View style={styles.content}>
+					<BodyM style={styles.text} color="white50" testID="AddContactNote">
+						{t('contact_add_explain')}
+					</BodyM>
 					<LabeledInput
 						bottomSheet={true}
 						label={t('contact_add')}
@@ -123,18 +121,17 @@ const AddContact = ({
 							<ClipboardTextIcon width={24} height={24} color="brand" />
 						</TouchableOpacity>
 					</LabeledInput>
-				</View>
 
-				<View style={styles.footer}>
 					<Button
+						style={styles.button}
 						size="large"
 						disabled={!url}
-						style={styles.button}
 						text={t('contact_add_button')}
-						onPress={(): void => handleAddContact()}
 						testID="AddContactButton"
+						onPress={(): void => handleAddContact()}
 					/>
 				</View>
+
 				<SafeAreaInset type="bottom" minPadding={16} />
 			</View>
 		</BottomSheetWrapper>
@@ -146,22 +143,14 @@ const styles = StyleSheet.create({
 		flex: 1,
 	},
 	content: {
+		flex: 1,
 		paddingHorizontal: 16,
 	},
-	addContactNote: {
-		marginHorizontal: 16,
-		marginBottom: 16,
-	},
-	footer: {
-		paddingHorizontal: 16,
-		alignItems: 'flex-end',
-		justifyContent: 'flex-end',
-		flex: 1,
-		flexDirection: 'row',
+	text: {
+		marginBottom: 32,
 	},
 	button: {
-		marginBottom: 16,
-		flex: 1,
+		marginTop: 'auto',
 	},
 });
 
diff --git a/src/screens/Contacts/Contact.tsx b/src/screens/Contacts/Contact.tsx
index f240473aa..dd732f793 100644
--- a/src/screens/Contacts/Contact.tsx
+++ b/src/screens/Contacts/Contact.tsx
@@ -126,7 +126,7 @@ const Contact = ({
 	const firstName = name.split(/\s+/)[0];
 
 	return (
-		<View style={styles.container}>
+		<View style={styles.root}>
 			<SafeAreaInset type="top" />
 			<NavigationHeader
 				title={t('contact')}
@@ -217,15 +217,14 @@ const Contact = ({
 };
 
 const styles = StyleSheet.create({
-	container: {
+	root: {
 		flex: 1,
 	},
 	content: {
 		flex: 1,
 		justifyContent: 'space-between',
-		margin: 20,
-		marginTop: 0,
-		backgroundColor: 'transparent',
+		paddingTop: 4,
+		paddingHorizontal: 16,
 	},
 	divider: {
 		height: 1,
diff --git a/src/screens/Contacts/ContactEdit.tsx b/src/screens/Contacts/ContactEdit.tsx
index bc3ddadd7..9e5402432 100644
--- a/src/screens/Contacts/ContactEdit.tsx
+++ b/src/screens/Contacts/ContactEdit.tsx
@@ -3,7 +3,7 @@ import { View, StyleSheet } from 'react-native';
 import { useTranslation } from 'react-i18next';
 import { parse } from '@synonymdev/slashtags-url';
 
-import { Text02S } from '../../styles/text';
+import { BodyS } from '../../styles/text';
 import { View as ThemedView } from '../../styles/components';
 import Button from '../../components/Button';
 import Divider from '../../components/Divider';
@@ -99,7 +99,7 @@ const ContactEdit = ({
 
 				{myProfile && (
 					<View style={styles.error} testID="ContactError">
-						<Text02S color="brand">{t('contact_error_yourself')}</Text02S>
+						<BodyS color="brand">{t('contact_error_yourself')}</BodyS>
 					</View>
 				)}
 
@@ -111,7 +111,6 @@ const ContactEdit = ({
 						variant="secondary"
 						onPress={onDiscard}
 					/>
-					<View style={styles.divider} />
 					<Button
 						style={styles.button}
 						text={t('save')}
@@ -139,13 +138,11 @@ const styles = StyleSheet.create({
 		flexDirection: 'row',
 		justifyContent: 'space-between',
 		marginTop: 'auto',
+		gap: 16,
 	},
 	button: {
 		flex: 1,
 	},
-	divider: {
-		width: 16,
-	},
 	error: {
 		justifyContent: 'center',
 		alignItems: 'center',
diff --git a/src/screens/Contacts/Contacts.tsx b/src/screens/Contacts/Contacts.tsx
index 2b4dff6d3..dc16a1687 100644
--- a/src/screens/Contacts/Contacts.tsx
+++ b/src/screens/Contacts/Contacts.tsx
@@ -50,7 +50,7 @@ const ContactsScreen = ({
 	};
 
 	return (
-		<ThemedView style={styles.container}>
+		<ThemedView style={styles.root}>
 			<SafeAreaInset type="top" />
 			<NavigationHeader
 				title={t('contacts')}
@@ -74,11 +74,11 @@ const ContactsScreen = ({
 						style={styles.addButton}
 						color="white16"
 						activeOpacity={0.8}
+						testID="AddContact"
 						onPress={(): void => {
 							Keyboard.dismiss();
 							showBottomSheet('addContactModal');
-						}}
-						testID="AddContact">
+						}}>
 						<PlusIcon width={24} height={24} color="brand" />
 					</ThemedTouchableOpacity>
 				</View>
@@ -104,12 +104,13 @@ const ContactsScreen = ({
 };
 
 const styles = StyleSheet.create({
-	container: {
+	root: {
 		flex: 1,
 	},
 	content: {
 		flex: 1,
 		justifyContent: 'space-between',
+		paddingTop: 4,
 		paddingHorizontal: 16,
 	},
 	searchRow: {
diff --git a/src/screens/Contacts/ContactsOnboarding.tsx b/src/screens/Contacts/ContactsOnboarding.tsx
index daa43785e..deab35460 100644
--- a/src/screens/Contacts/ContactsOnboarding.tsx
+++ b/src/screens/Contacts/ContactsOnboarding.tsx
@@ -1,16 +1,12 @@
 import React, { ReactElement } from 'react';
-import { View, Image, StyleSheet } from 'react-native';
 import { StackScreenProps } from '@react-navigation/stack';
 import { Trans, useTranslation } from 'react-i18next';
 
-import { Display, Text01S } from '../../styles/text';
-import NavigationHeader from '../../components/NavigationHeader';
-import Button from '../../components/Button';
-import GlowingBackground from '../../components/GlowingBackground';
-import SafeAreaInset from '../../components/SafeAreaInset';
+import { Display } from '../../styles/text';
 import { useAppDispatch } from '../../hooks/redux';
 import { setOnboardedContacts } from '../../store/slices/slashtags';
 import { RootStackParamList } from '../../navigation/types';
+import OnboardingScreen from '../../components/OnboardingScreen';
 
 const imageSrc = require('../../assets/illustrations/book.png');
 
@@ -23,78 +19,27 @@ const ContactsOnboarding = ({
 	const dispatch = useAppDispatch();
 
 	return (
-		<GlowingBackground topLeft="brand">
-			<SafeAreaInset type="top" />
-			<NavigationHeader
-				title={t('contacts')}
-				displayBackButton={false}
-				onClosePress={(): void => {
-					navigation.navigate('Wallet');
-				}}
-			/>
-			<View style={styles.content}>
-				<View style={styles.imageContainer}>
-					<Image style={styles.image} source={imageSrc} />
-				</View>
-				<View style={styles.text}>
-					<Display>
-						<Trans
-							t={t}
-							i18nKey="onboarding_header"
-							components={{
-								brand: <Display color="brand" />,
-							}}
-						/>
-					</Display>
-					<Text01S color="gray1" style={styles.introText}>
-						{t('onboarding_text')}
-					</Text01S>
-				</View>
-
-				<View style={styles.buttonContainer}>
-					<Button
-						style={styles.button}
-						text={t('onboarding_button')}
-						size="large"
-						testID="ContactsOnboardingButton"
-						onPress={(): void => {
-							dispatch(setOnboardedContacts(true));
-						}}
-					/>
-				</View>
-			</View>
-			<SafeAreaInset type="bottom" minPadding={16} />
-		</GlowingBackground>
+		<OnboardingScreen
+			navTitle={t('contacts')}
+			title={
+				<Trans
+					t={t}
+					i18nKey="onboarding_header"
+					components={{ accent: <Display color="brand" /> }}
+				/>
+			}
+			description={t('onboarding_text')}
+			image={imageSrc}
+			buttonText={t('onboarding_button')}
+			testID="ContactsOnboarding"
+			onClosePress={(): void => {
+				navigation.navigate('Wallet');
+			}}
+			onButtonPress={(): void => {
+				dispatch(setOnboardedContacts(true));
+			}}
+		/>
 	);
 };
 
-const styles = StyleSheet.create({
-	content: {
-		flex: 1,
-		marginHorizontal: 32,
-	},
-	imageContainer: {
-		flex: 1,
-		alignItems: 'center',
-	},
-	image: {
-		flex: 1,
-		resizeMode: 'contain',
-	},
-	introText: {
-		marginTop: 8,
-	},
-	text: {
-		flex: 1,
-	},
-	buttonContainer: {
-		flexDirection: 'row',
-		justifyContent: 'center',
-		marginTop: 'auto',
-	},
-	button: {
-		flex: 1,
-	},
-});
-
 export default ContactsOnboarding;
diff --git a/src/screens/Transfer/Availability.tsx b/src/screens/Lightning/Availability.tsx
similarity index 67%
rename from src/screens/Transfer/Availability.tsx
rename to src/screens/Lightning/Availability.tsx
index 3b8f46c10..1cff84896 100644
--- a/src/screens/Transfer/Availability.tsx
+++ b/src/screens/Lightning/Availability.tsx
@@ -1,24 +1,23 @@
 import React, { ReactElement, memo, useState } from 'react';
-import { StyleSheet, View } from 'react-native';
+import { Image, StyleSheet, View } from 'react-native';
 import { Trans, useTranslation } from 'react-i18next';
 
-import { Display, Text01B, Text01S } from '../../styles/text';
+import { Display, BodyMB, BodyM } from '../../styles/text';
+import { View as ThemedView } from '../../styles/components';
 import SafeAreaInset from '../../components/SafeAreaInset';
-import GlowingBackground from '../../components/GlowingBackground';
 import NavigationHeader from '../../components/NavigationHeader';
-import GlowImage from '../../components/GlowImage';
 import Button from '../../components/Button';
 import { useAppDispatch } from '../../hooks/redux';
 import { refreshWallet } from '../../utils/wallet';
 import { closeAllChannels } from '../../utils/lightning';
-import type { TransferScreenProps } from '../../navigation/types';
 import { startCoopCloseTimer } from '../../store/slices/user';
+import type { LightningScreenProps } from '../../navigation/types';
 
 const imageSrc = require('../../assets/illustrations/exclamation-mark.png');
 
 const Availability = ({
 	navigation,
-}: TransferScreenProps<'Availability'>): ReactElement => {
+}: LightningScreenProps<'Availability'>): ReactElement => {
 	const { t } = useTranslation('lightning');
 	const [isLoading, setIsLoading] = useState(false);
 	const dispatch = useAppDispatch();
@@ -42,23 +41,31 @@ const Availability = ({
 	};
 
 	return (
-		<GlowingBackground topLeft="purple">
+		<ThemedView style={styles.root}>
 			<SafeAreaInset type="top" />
 			<NavigationHeader
 				title={t('availability_title')}
 				displayBackButton={false}
 			/>
-			<View style={styles.root}>
-				<Display color="purple">{t('availability_header')}</Display>
-				<Text01S color="gray1" style={styles.text}>
+			<View style={styles.content}>
+				<Display>
+					<Trans
+						t={t}
+						i18nKey="availability_header"
+						components={{ accent: <Display color="purple" /> }}
+					/>
+				</Display>
+				<BodyM color="white50" style={styles.text}>
 					<Trans
 						t={t}
 						i18nKey="availability_text"
-						components={{ highlight: <Text01B color="white" /> }}
+						components={{ accent: <BodyMB color="white" /> }}
 					/>
-				</Text01S>
+				</BodyM>
 
-				<GlowImage image={imageSrc} glowColor="purple" />
+				<View style={styles.imageContainer}>
+					<Image style={styles.image} source={imageSrc} />
+				</View>
 
 				<View style={styles.buttonContainer}>
 					<Button
@@ -68,7 +75,6 @@ const Availability = ({
 						variant="secondary"
 						onPress={onCancel}
 					/>
-					<View style={styles.divider} />
 					<Button
 						style={styles.button}
 						text={t('ok')}
@@ -79,31 +85,43 @@ const Availability = ({
 				</View>
 			</View>
 			<SafeAreaInset type="bottom" minPadding={16} />
-		</GlowingBackground>
+		</ThemedView>
 	);
 };
 
 const styles = StyleSheet.create({
 	root: {
 		flex: 1,
-		marginTop: 8,
+	},
+	content: {
+		flex: 1,
+		paddingTop: 16,
 		paddingHorizontal: 16,
 	},
 	text: {
 		marginTop: 4,
 		marginBottom: 16,
 	},
-	buttonContainer: {
+	imageContainer: {
+		alignItems: 'center',
+		alignSelf: 'center',
+		aspectRatio: 1,
+		width: 256,
 		marginTop: 'auto',
+	},
+	image: {
+		flex: 1,
+		resizeMode: 'contain',
+	},
+	buttonContainer: {
 		flexDirection: 'row',
 		justifyContent: 'center',
+		marginTop: 'auto',
+		gap: 16,
 	},
 	button: {
 		flex: 1,
 	},
-	divider: {
-		width: 16,
-	},
 });
 
 export default memo(Availability);
diff --git a/src/screens/Lightning/CustomConfirm.tsx b/src/screens/Lightning/CustomConfirm.tsx
index ab2ac82e2..3b328ade8 100644
--- a/src/screens/Lightning/CustomConfirm.tsx
+++ b/src/screens/Lightning/CustomConfirm.tsx
@@ -3,14 +3,13 @@ import { StyleSheet, View } from 'react-native';
 import { FadeIn, FadeOut } from 'react-native-reanimated';
 import { Trans, useTranslation } from 'react-i18next';
 
-import { AnimatedView } from '../../styles/components';
-import { Caption13Up, Display, Text01B, Text01S } from '../../styles/text';
+import { View as ThemedView, AnimatedView } from '../../styles/components';
+import { Caption13Up, Display, BodyMB, BodyM } from '../../styles/text';
 import { LightningIcon, PencileIcon } from '../../styles/icons';
 import SafeAreaInset from '../../components/SafeAreaInset';
-import GlowingBackground from '../../components/GlowingBackground';
 import NavigationHeader from '../../components/NavigationHeader';
 import SwipeToConfirm from '../../components/SwipeToConfirm';
-import AmountToggle from '../../components/AmountToggle';
+import Money from '../../components/Money';
 import { useAppSelector } from '../../hooks/redux';
 import { useCurrency, useDisplayValues } from '../../hooks/displayValues';
 import NumberPadWeeks from './NumberPadWeeks';
@@ -91,30 +90,30 @@ const CustomConfirm = ({
 	};
 
 	return (
-		<GlowingBackground topLeft="purple">
+		<ThemedView style={styles.root}>
 			<SafeAreaInset type="top" />
 			<NavigationHeader
-				title={t('add_instant_payments')}
+				title={t('transfer.nav_title')}
 				onClosePress={(): void => navigation.navigate('Wallet')}
 			/>
-			<View style={styles.root} testID="CustomConfirm">
+			<View style={styles.content} testID="CustomConfirm">
 				{!showNumberPad && (
 					<AnimatedView color="transparent" entering={FadeIn} exiting={FadeOut}>
 						<Display>
 							<Trans
 								t={t}
-								i18nKey="custom_confirm_header"
-								components={{ purple: <Display color="purple" /> }}
+								i18nKey={'custom_confirm_header'}
+								components={{ accent: <Display color="purple" /> }}
 							/>
 						</Display>
-						<Text01S color="gray1" style={styles.text}>
+						<BodyM color="white50" style={styles.text}>
 							<Trans
 								t={t}
 								i18nKey="custom_confirm_cost"
 								components={{
-									highlight: <Text01B color="white" />,
-									highlightWithKeyboard: (
-										<Text01B
+									accent: <BodyMB color="white" />,
+									accentWithKeyboard: (
+										<BodyMB
 											color="white"
 											testID="CustomConfirmWeeks"
 											onPress={(): void => setShowNumberPad(true)}
@@ -128,20 +127,20 @@ const CustomConfirm = ({
 									weeks,
 								}}
 							/>
-						</Text01S>
+						</BodyM>
 
-						<View style={styles.block}>
-							<Caption13Up color="purple" style={styles.space}>
+						<View style={styles.balance}>
+							<Caption13Up style={styles.balanceLabel} color="purple">
 								{t('spending_label')}
 							</Caption13Up>
-							<AmountToggle sats={spendingAmount} secondaryFont="text01m" />
+							<Money sats={spendingAmount} size="displayT" symbol={true} />
 						</View>
 
-						<View style={styles.block}>
-							<Caption13Up color="purple" style={styles.space}>
+						<View style={styles.balance}>
+							<Caption13Up style={styles.balanceLabel} color="purple">
 								{t('receiving_label')}
 							</Caption13Up>
-							<AmountToggle sats={receivingAmount} secondaryFont="text01m" />
+							<Money sats={receivingAmount} size="displayT" symbol={true} />
 						</View>
 					</AnimatedView>
 				)}
@@ -153,7 +152,7 @@ const CustomConfirm = ({
 						entering={FadeIn}
 						exiting={FadeOut}>
 						<SwipeToConfirm
-							text={t('connect_swipe')}
+							text={t('transfer.swipe')}
 							color="purple"
 							onConfirm={handleConfirm}
 							icon={<LightningIcon width={30} height={30} color="black" />}
@@ -165,10 +164,16 @@ const CustomConfirm = ({
 
 				{showNumberPad && (
 					<AnimatedView color="transparent" entering={FadeIn} exiting={FadeOut}>
-						<Display color="purple">{t('duration_header')}</Display>
-						<Text01S style={styles.text} color="gray1">
+						<Display>
+							<Trans
+								t={t}
+								i18nKey="duration_header"
+								components={{ accent: <Display color="purple" /> }}
+							/>
+						</Display>
+						<BodyM style={styles.text} color="white50">
 							{t('duration_text')}
-						</Text01S>
+						</BodyM>
 					</AnimatedView>
 				)}
 
@@ -196,25 +201,27 @@ const CustomConfirm = ({
 				)}
 			</View>
 			<SafeAreaInset type="bottom" minPadding={16} />
-		</GlowingBackground>
+		</ThemedView>
 	);
 };
 
 const styles = StyleSheet.create({
 	root: {
 		flex: 1,
-		marginTop: 8,
+	},
+	content: {
+		flex: 1,
+		paddingTop: 16,
 		paddingHorizontal: 16,
 	},
 	text: {
 		marginTop: 4,
-		marginBottom: 16,
+		marginBottom: 32,
 	},
-	space: {
-		marginBottom: 8,
-		alignItems: 'center',
+	balanceLabel: {
+		marginBottom: 16,
 	},
-	block: {
+	balance: {
 		marginBottom: 32,
 	},
 	buttonContainer: {
diff --git a/src/screens/Lightning/CustomSetup.tsx b/src/screens/Lightning/CustomSetup.tsx
index 7718d3711..3f25031c9 100644
--- a/src/screens/Lightning/CustomSetup.tsx
+++ b/src/screens/Lightning/CustomSetup.tsx
@@ -12,11 +12,10 @@ import { FadeIn, FadeOut } from 'react-native-reanimated';
 import { useAppSelector } from '../../hooks/redux';
 import { Trans, useTranslation } from 'react-i18next';
 
-import { AnimatedView } from '../../styles/components';
-import { Caption13Up, Display, Text01S } from '../../styles/text';
+import { View as ThemedView, AnimatedView } from '../../styles/components';
+import { Caption13Up, Display, BodyM } from '../../styles/text';
 import SafeAreaInset from '../../components/SafeAreaInset';
-import Barrel from './Barrel';
-import GlowingBackground from '../../components/GlowingBackground';
+import Barrel from '../../components/Barrel';
 import NavigationHeader from '../../components/NavigationHeader';
 import Button from '../../components/Button';
 import NumberPadLightning from './NumberPadLightning';
@@ -44,7 +43,7 @@ import {
 	denominationSelector,
 } from '../../store/reselect/settings';
 import { blocktankInfoSelector } from '../../store/reselect/blocktank';
-import NumberPadTextField from '../../components/NumberPadTextField';
+import TransferTextField from '../../components/TransferTextField';
 import { getNumberPadText } from '../../utils/numberpad';
 import {
 	BT_MIN_CHANNEL_SIZE_SAT_MULTIPLIER,
@@ -419,6 +418,10 @@ const CustomSetup = ({
 		setShowNumberPad(false);
 	}, []);
 
+	const onSwitch = (): void => {
+		navigation.replace('QuickSetup');
+	};
+
 	const onContinue = useCallback(async (): Promise<void> => {
 		if (spending) {
 			// go to second setup screen
@@ -471,10 +474,10 @@ const CustomSetup = ({
 	]);
 
 	return (
-		<GlowingBackground topLeft="purple">
+		<ThemedView style={styles.root}>
 			<SafeAreaInset type="top" />
 			<NavigationHeader
-				title={t('add_instant_payments')}
+				title={t('transfer.nav_title')}
 				onClosePress={(): void => {
 					navigation.navigate('Wallet');
 				}}
@@ -482,35 +485,33 @@ const CustomSetup = ({
 
 			{/* TODO: add scrolling on small screens */}
 
-			<View style={styles.root} testID="CustomSetup">
+			<View style={styles.content} testID="CustomSetup">
 				<Display>
 					<Trans
 						t={t}
-						i18nKey={spending ? 'spending_header' : 'receiving_header'}
-						components={{
-							purple: <Display color="purple" />,
-						}}
+						i18nKey="transfer.title_numpad"
+						components={{ accent: <Display color="purple" /> }}
 					/>
 				</Display>
 				{spending && !showNumberPad && (
-					<Text01S color="gray1" style={styles.text}>
+					<BodyM color="white50" style={styles.text}>
 						{t('spending_amount_bitcoin')}
-					</Text01S>
+					</BodyM>
 				)}
 				{spending && showNumberPad && (
-					<Text01S color="gray1" style={styles.text}>
+					<BodyM color="white50" style={styles.text}>
 						{t('enter_money')}
-					</Text01S>
+					</BodyM>
 				)}
 				{!spending && !showNumberPad && (
-					<Text01S color="gray1" style={styles.text}>
+					<BodyM color="white50" style={styles.text}>
 						{t('receiving_amount_money')}
-					</Text01S>
+					</BodyM>
 				)}
 				{!spending && showNumberPad && (
-					<Text01S color="gray1" style={styles.text}>
+					<BodyM color="white50" style={styles.text}>
 						{t('receiving_amount_bitcoin')}
-					</Text01S>
+					</BodyM>
 				)}
 
 				{!showNumberPad && (
@@ -527,10 +528,10 @@ const CustomSetup = ({
 					</AnimatedView>
 				)}
 
-				<View style={styles.amount}>
+				<View style={styles.amountContainer}>
 					{!showNumberPad && (
-						<View style={styles.amountCaption}>
-							<Caption13Up style={styles.amountCaption} color="purple">
+						<View style={styles.amountLabel}>
+							<Caption13Up color="purple">
 								{t(spending ? 'spending_label' : 'receiving_label')}
 							</Caption13Up>
 							{channelOpenFee[`${spendingAmount}-${amount}`] && (
@@ -542,7 +543,7 @@ const CustomSetup = ({
 							)}
 						</View>
 					)}
-					<NumberPadTextField
+					<TransferTextField
 						value={textFieldValue}
 						showPlaceholder={showNumberPad}
 						testID="CustomSetupNumberField"
@@ -551,8 +552,21 @@ const CustomSetup = ({
 				</View>
 
 				{!showNumberPad && (
-					<AnimatedView color="transparent" entering={FadeIn} exiting={FadeOut}>
+					<AnimatedView
+						style={styles.buttonContainer}
+						color="transparent"
+						entering={FadeIn}
+						exiting={FadeOut}>
 						<Button
+							style={styles.button}
+							text={t('quick_setup')}
+							size="large"
+							variant="secondary"
+							testID="TransferAdvanced"
+							onPress={onSwitch}
+						/>
+						<Button
+							style={styles.button}
 							text={t('continue')}
 							size="large"
 							loading={loading}
@@ -575,14 +589,17 @@ const CustomSetup = ({
 				)}
 			</View>
 			<SafeAreaInset type="bottom" minPadding={16} />
-		</GlowingBackground>
+		</ThemedView>
 	);
 };
 
 const styles = StyleSheet.create({
 	root: {
 		flex: 1,
-		marginTop: 8,
+	},
+	content: {
+		flex: 1,
+		paddingTop: 16,
 		paddingHorizontal: 16,
 	},
 	text: {
@@ -597,20 +614,28 @@ const styles = StyleSheet.create({
 	buttonCustom: {
 		alignSelf: 'flex-start',
 	},
-	amount: {
+	amountContainer: {
 		marginTop: 'auto',
-		marginBottom: 32,
 	},
-	amountCaption: {
+	amountLabel: {
 		flexDirection: 'row',
-		marginBottom: 4,
+		marginBottom: 16,
 	},
 	amountCaptionCost: {
 		marginLeft: 2,
 	},
 	numberpad: {
+		marginTop: 16,
 		marginHorizontal: -16,
 	},
+	buttonContainer: {
+		flexDirection: 'row',
+		gap: 16,
+		marginTop: 42,
+	},
+	button: {
+		flex: 1,
+	},
 });
 
 export default memo(CustomSetup);
diff --git a/src/screens/Lightning/Funding.tsx b/src/screens/Lightning/Funding.tsx
new file mode 100644
index 000000000..109e2751b
--- /dev/null
+++ b/src/screens/Lightning/Funding.tsx
@@ -0,0 +1,145 @@
+import React, { ReactElement } from 'react';
+import { View, StyleSheet } from 'react-native';
+import { useAppSelector } from '../../hooks/redux';
+import { Trans, useTranslation } from 'react-i18next';
+
+import { TransferIcon, QrIcon, ShareAndroidIcon } from '../../styles/icons';
+import { Display, BodyM } from '../../styles/text';
+import { View as ThemedView } from '../../styles/components';
+import RectangleButton from '../../components/RectangleButton';
+import SafeAreaInset from '../../components/SafeAreaInset';
+import NavigationHeader from '../../components/NavigationHeader';
+import Button from '../../components/Button';
+import { useBalance } from '../../hooks/wallet';
+import { isGeoBlockedSelector } from '../../store/reselect/user';
+import { TRANSACTION_DEFAULTS } from '../../utils/wallet/constants';
+import { showBottomSheet } from '../../store/utils/ui';
+import type { LightningScreenProps } from '../../navigation/types';
+
+const Funding = ({
+	navigation,
+}: LightningScreenProps<'Funding'>): ReactElement => {
+	const { t } = useTranslation('lightning');
+	const { onchainBalance } = useBalance();
+	const isGeoBlocked = useAppSelector(isGeoBlockedSelector);
+
+	const onTransfer = (): void => {
+		navigation.navigate('QuickSetup');
+	};
+
+	const onFund = (): void => {
+		navigation.navigate('Wallet');
+		showBottomSheet('receiveNavigation', { receiveScreen: 'ReceiveAmount' });
+	};
+
+	const canTransfer = onchainBalance >= TRANSACTION_DEFAULTS.recommendedBaseFee;
+	const text = isGeoBlocked ? t('funding.text_blocked') : t('funding.text');
+
+	return (
+		<ThemedView style={styles.root}>
+			<SafeAreaInset type="top" />
+			<NavigationHeader
+				title={t('funding.nav_title')}
+				onClosePress={(): void => {
+					navigation.navigate('Wallet');
+				}}
+			/>
+			<View style={styles.content}>
+				<Display>
+					<Trans
+						t={t}
+						i18nKey="funding.title"
+						components={{ accent: <Display color="purple" /> }}
+					/>
+				</Display>
+				<BodyM color="white50" style={styles.text}>
+					{text}
+				</BodyM>
+
+				<View style={styles.buttonContainer}>
+					{!isGeoBlocked && (
+						<>
+							<RectangleButton
+								icon={<TransferIcon color="purple" width={32} height={30} />}
+								text={t('funding.button1')}
+								disabled={!canTransfer || isGeoBlocked}
+								testID="FundTransfer"
+								onPress={onTransfer}
+							/>
+
+							<RectangleButton
+								icon={<QrIcon color="purple" width={32} height={30} />}
+								text={t('funding.button2')}
+								disabled={isGeoBlocked}
+								testID="FundReceive"
+								onPress={onFund}
+							/>
+
+							<RectangleButton
+								icon={
+									<ShareAndroidIcon color="purple" width={32} height={30} />
+								}
+								text={t('funding.button3')}
+								disabled={true}
+								testID="FundCustom"
+								onPress={(): void => {}}
+							/>
+						</>
+					)}
+				</View>
+
+				{isGeoBlocked && (
+					<Button
+						style={styles.button}
+						text={t('cancel')}
+						size="large"
+						onPress={(): void => {
+							navigation.navigate('Wallet');
+						}}
+					/>
+				)}
+			</View>
+
+			{/* <Dialog
+				visible={showDialog}
+				title={t('no_funds.title')}
+				description={t('no_funds.description')}
+				buttonColor="purple"
+				cancelText={t('cancel')}
+				confirmText={t('no_funds.fund')}
+				onCancel={(): void => {
+					setShowDialog(false);
+				}}
+				onConfirm={(): void => {
+					setShowDialog(false);
+					showBottomSheet('receiveNavigation');
+				}}
+			/> */}
+			<SafeAreaInset type="bottom" minPadding={16} />
+		</ThemedView>
+	);
+};
+
+const styles = StyleSheet.create({
+	root: {
+		flex: 1,
+	},
+	content: {
+		flex: 1,
+		paddingTop: 16,
+		paddingHorizontal: 16,
+	},
+	text: {
+		marginTop: 4,
+	},
+	buttonContainer: {
+		marginTop: 32,
+	},
+	button: {
+		flexDirection: 'row',
+		marginTop: 'auto',
+		marginHorizontal: 16,
+	},
+});
+
+export default Funding;
diff --git a/src/screens/Lightning/Interrupted.tsx b/src/screens/Lightning/Interrupted.tsx
new file mode 100644
index 000000000..f0b816c86
--- /dev/null
+++ b/src/screens/Lightning/Interrupted.tsx
@@ -0,0 +1,46 @@
+import React, { ReactElement, memo } from 'react';
+import { Trans, useTranslation } from 'react-i18next';
+
+import { BodyMB, Display } from '../../styles/text';
+import InfoScreen from '../../components/InfoScreen';
+import type { LightningScreenProps } from '../../navigation/types';
+
+const imageSrc = require('../../assets/illustrations/exclamation-mark.png');
+
+const Interrupted = ({
+	navigation,
+}: LightningScreenProps<'Interrupted'>): ReactElement => {
+	const { t } = useTranslation('lightning');
+
+	const onContinue = (): void => {
+		navigation.popToTop();
+		navigation.goBack();
+	};
+
+	return (
+		<InfoScreen
+			navTitle={t('interrupted_title')}
+			displayBackButton={false}
+			title={
+				<Trans
+					t={t}
+					i18nKey="timeout_header"
+					components={{ accent: <Display color="purple" /> }}
+				/>
+			}
+			description={
+				<Trans
+					t={t}
+					i18nKey="timeout_text"
+					components={{ accent: <BodyMB color="white" /> }}
+				/>
+			}
+			image={imageSrc}
+			buttonText={t('close')}
+			testID="TransferInterrupted"
+			onButtonPress={onContinue}
+		/>
+	);
+};
+
+export default memo(Interrupted);
diff --git a/src/screens/Lightning/Introduction.tsx b/src/screens/Lightning/Introduction.tsx
index d2994a12e..51425f1b5 100644
--- a/src/screens/Lightning/Introduction.tsx
+++ b/src/screens/Lightning/Introduction.tsx
@@ -1,19 +1,12 @@
-import React, { ReactElement, useMemo } from 'react';
-import { View, Image, StyleSheet } from 'react-native';
-import { useAppSelector } from '../../hooks/redux';
+import React, { ReactElement } from 'react';
 import { Trans, useTranslation } from 'react-i18next';
 
-import { Display, Text01S } from '../../styles/text';
-import SafeAreaInset from '../../components/SafeAreaInset';
-import GlowingBackground from '../../components/GlowingBackground';
-import NavigationHeader from '../../components/NavigationHeader';
-import Button from '../../components/Button';
-import { useBalance } from '../../hooks/wallet';
-import { isGeoBlockedSelector } from '../../store/reselect/user';
-import { TRANSACTION_DEFAULTS } from '../../utils/wallet/constants';
-import type { LightningScreenProps } from '../../navigation/types';
-import { accountVersionSelector } from '../../store/reselect/lightning';
+import { Display } from '../../styles/text';
+import OnboardingScreen from '../../components/OnboardingScreen';
+import { useAppSelector } from '../../hooks/redux';
 import { showToast } from '../../utils/notifications';
+import { accountVersionSelector } from '../../store/reselect/lightning';
+import type { LightningScreenProps } from '../../navigation/types';
 
 const imageSrc = require('../../assets/illustrations/lightning.png');
 
@@ -21,144 +14,41 @@ const Introduction = ({
 	navigation,
 }: LightningScreenProps<'Introduction'>): ReactElement => {
 	const { t } = useTranslation('lightning');
-	const { onchainBalance } = useBalance();
-	const isGeoBlocked = useAppSelector(isGeoBlockedSelector);
 	const accountVersion = useAppSelector(accountVersionSelector);
 
-	const txt = useMemo(
-		() => t(isGeoBlocked ? 'int_blocked' : 'int_text'),
-		[isGeoBlocked, t],
-	);
+	const onContinue = (): void => {
+		if (accountVersion < 2) {
+			showToast({
+				type: 'warning',
+				title: t('migrating_ldk_title'),
+				description: t('migrating_ldk_description'),
+			});
+			return;
+		}
 
-	const isDisabled = useMemo(() => {
-		return onchainBalance <= TRANSACTION_DEFAULTS.recommendedBaseFee;
-	}, [onchainBalance]);
+		navigation.navigate('Funding');
+	};
 
 	return (
-		<GlowingBackground topLeft="purple">
-			<View style={styles.slide}>
-				<SafeAreaInset type="top" />
-				<NavigationHeader
-					onClosePress={(): void => {
-						navigation.navigate('Wallet');
-					}}
+		<OnboardingScreen
+			displayBackButton={false}
+			title={
+				<Trans
+					t={t}
+					i18nKey="introduction.title"
+					components={{ accent: <Display color="purple" /> }}
 				/>
-				<View style={styles.imageContainer}>
-					<Image style={styles.image} source={imageSrc} />
-				</View>
-				<View style={styles.textContent}>
-					<Display>
-						<Trans
-							t={t}
-							i18nKey="int_header"
-							components={{
-								purple: <Display color="purple" />,
-							}}
-						/>
-					</Display>
-					<Text01S color="gray1" style={styles.text}>
-						{txt}
-					</Text01S>
-				</View>
-
-				<View style={styles.buttonContainer}>
-					{!isGeoBlocked && (
-						<>
-							<Button
-								style={[styles.button, styles.quickButton]}
-								text={t('int_quick')}
-								size="large"
-								disabled={isDisabled}
-								testID="QuickSetupButton"
-								onPress={(): void => {
-									if (accountVersion < 2) {
-										showToast({
-											type: 'warning',
-											title: t('migrating_ldk_title'),
-											description: t('migrating_ldk_description'),
-										});
-										return;
-									}
-									navigation.navigate('QuickSetup');
-								}}
-							/>
-
-							<Button
-								style={[styles.button, styles.customButton]}
-								text={t('int_custom')}
-								size="large"
-								variant="secondary"
-								disabled={isDisabled}
-								testID="CustomSetupButton"
-								onPress={(): void => {
-									if (accountVersion < 2) {
-										showToast({
-											type: 'warning',
-											title: t('migrating_ldk_title'),
-											description: t('migrating_ldk_description'),
-										});
-										return;
-									}
-									navigation.navigate('CustomSetup', { spending: true });
-								}}
-							/>
-						</>
-					)}
-
-					{/* TODO: build third party channel flow */}
-					{/* {isGeoBlocked && (
-						<Button
-							style={styles.button}
-							text={t('int_third_party')}
-							size="large"
-							testID="ThirdPartySetup"
-							// onPress={(): void => {}}
-						/>
-					)} */}
-				</View>
-				<SafeAreaInset type="bottom" minPadding={16} />
-			</View>
-		</GlowingBackground>
+			}
+			description={t('introduction.text')}
+			image={imageSrc}
+			buttonText={t('introduction.button')}
+			testID="LnIntroduction"
+			onClosePress={(): void => {
+				navigation.navigate('Wallet');
+			}}
+			onButtonPress={onContinue}
+		/>
 	);
 };
 
-const styles = StyleSheet.create({
-	slide: {
-		flex: 1,
-		justifyContent: 'space-between',
-		alignItems: 'stretch',
-	},
-	imageContainer: {
-		flex: 3.2,
-		alignItems: 'center',
-		paddingVertical: 50,
-	},
-	image: {
-		flex: 1,
-		resizeMode: 'contain',
-	},
-	textContent: {
-		flex: 3,
-		paddingHorizontal: 32,
-	},
-	text: {
-		marginTop: 4,
-	},
-	buttonContainer: {
-		flexDirection: 'row',
-		justifyContent: 'center',
-		marginTop: 'auto',
-		marginHorizontal: 32,
-	},
-	button: {
-		flex: 1,
-	},
-	quickButton: {
-		marginRight: 6,
-	},
-	customButton: {
-		marginLeft: 6,
-	},
-});
-
 export default Introduction;
diff --git a/src/screens/Lightning/LNURLChannel.tsx b/src/screens/Lightning/LNURLChannel.tsx
index b95895168..8989d2ef8 100644
--- a/src/screens/Lightning/LNURLChannel.tsx
+++ b/src/screens/Lightning/LNURLChannel.tsx
@@ -1,11 +1,11 @@
 import React, { ReactElement, useMemo, useState } from 'react';
 import { StyleSheet, View } from 'react-native';
 import { useAppSelector } from '../../hooks/redux';
-import { useTranslation } from 'react-i18next';
+import { Trans, useTranslation } from 'react-i18next';
 
-import { Caption13M, Caption13Up, Display, Text01S } from '../../styles/text';
+import { CaptionB, Caption13Up, Display, BodyM } from '../../styles/text';
+import { View as ThemedView } from '../../styles/components';
 import SafeAreaInset from '../../components/SafeAreaInset';
-import GlowingBackground from '../../components/GlowingBackground';
 import NavigationHeader from '../../components/NavigationHeader';
 import { ellipsis } from '../../utils/helpers';
 import type { LightningScreenProps } from '../../navigation/types';
@@ -54,34 +54,38 @@ const LNURLChannel = ({
 	};
 
 	return (
-		<GlowingBackground topLeft="purple">
+		<ThemedView style={styles.root}>
 			<SafeAreaInset type="top" />
 			<NavigationHeader
 				title={t('lnurl_channel_header')}
 				onClosePress={handleCancel}
 				displayBackButton={false}
 			/>
-			<View style={styles.root}>
-				<Display color="purple" style={styles.title}>
-					{t('lnurl_channel_title')}
+			<View style={styles.content}>
+				<Display style={styles.title}>
+					<Trans
+						t={t}
+						i18nKey="lnurl_channel_title"
+						components={{ accent: <Display color="purple" /> }}
+					/>
 				</Display>
-				<Text01S color="gray1">{t('lnurl_channel_message')}</Text01S>
-				<Caption13Up color="gray1" style={styles.lsp}>
+				<BodyM color="white50">{t('lnurl_channel_message')}</BodyM>
+				<Caption13Up color="white50" style={styles.lsp}>
 					{t('lnurl_channel_lsp')}
 				</Caption13Up>
 				<View style={styles.row}>
-					<Caption13M>{t('lnurl_channel_node')}</Caption13M>
-					<Caption13M>{ellipsis(node, 32)}</Caption13M>
+					<CaptionB>{t('lnurl_channel_node')}</CaptionB>
+					<CaptionB>{ellipsis(node, 32)}</CaptionB>
 				</View>
 				<Divider />
 				<View style={styles.row}>
-					<Caption13M>{t('lnurl_channel_host')}</Caption13M>
-					<Caption13M>{host}</Caption13M>
+					<CaptionB>{t('lnurl_channel_host')}</CaptionB>
+					<CaptionB>{host}</CaptionB>
 				</View>
 				<Divider />
 				<View style={styles.row}>
-					<Caption13M>{t('lnurl_channel_port')}</Caption13M>
-					<Caption13M>{port}</Caption13M>
+					<CaptionB>{t('lnurl_channel_port')}</CaptionB>
+					<CaptionB>{port}</CaptionB>
 				</View>
 				<Divider />
 			</View>
@@ -94,7 +98,6 @@ const LNURLChannel = ({
 					text={t('cancel')}
 					onPress={handleCancel}
 				/>
-				<View style={styles.divider} />
 				<Button
 					style={styles.button}
 					size="large"
@@ -105,14 +108,17 @@ const LNURLChannel = ({
 				/>
 			</View>
 			<SafeAreaInset type="bottom" minPadding={16} />
-		</GlowingBackground>
+		</ThemedView>
 	);
 };
 
 const styles = StyleSheet.create({
 	root: {
 		flex: 1,
-		marginTop: 8,
+	},
+	content: {
+		flex: 1,
+		paddingTop: 16,
 		paddingHorizontal: 16,
 	},
 	title: {
@@ -132,13 +138,11 @@ const styles = StyleSheet.create({
 		justifyContent: 'center',
 		marginTop: 'auto',
 		paddingHorizontal: 16,
+		gap: 16,
 	},
 	button: {
 		flex: 1,
 	},
-	divider: {
-		width: 16,
-	},
 });
 
 export default LNURLChannel;
diff --git a/src/screens/Lightning/LNURLChannelSuccess.tsx b/src/screens/Lightning/LNURLChannelSuccess.tsx
index 6b2d8b638..3ce121315 100644
--- a/src/screens/Lightning/LNURLChannelSuccess.tsx
+++ b/src/screens/Lightning/LNURLChannelSuccess.tsx
@@ -1,7 +1,7 @@
 import React, { ReactElement, memo } from 'react';
 import { Trans, useTranslation } from 'react-i18next';
 
-import { Text01B } from '../../styles/text';
+import { BodyMB, Display } from '../../styles/text';
 import InfoScreen from '../../components/InfoScreen';
 import type { LightningScreenProps } from '../../navigation/types';
 
@@ -19,15 +19,20 @@ const LNURLChannelSuccess = ({
 
 	return (
 		<InfoScreen
-			accentColor="purple"
 			navTitle={t('lnurl_channel_header')}
 			displayBackButton={false}
-			title={t('lnurl_channel_connecting')}
+			title={
+				<Trans
+					t={t}
+					i18nKey="lnurl_channel_connecting"
+					components={{ accent: <Display color="purple" /> }}
+				/>
+			}
 			description={
 				<Trans
 					t={t}
 					i18nKey="lnurl_channel_connecting_text"
-					components={{ highlight: <Text01B color="white" /> }}
+					components={{ accent: <BodyMB color="white" /> }}
 				/>
 			}
 			image={imageSrc}
diff --git a/src/screens/Lightning/PieChart.tsx b/src/screens/Lightning/PieChart.tsx
index bf14b268b..5c234c644 100644
--- a/src/screens/Lightning/PieChart.tsx
+++ b/src/screens/Lightning/PieChart.tsx
@@ -32,7 +32,7 @@ const PieChart = ({
 	let content;
 	if (primary === 0 || primary === 100) {
 		// full circle
-		const color = primary === 100 ? colors.purple : colors.orange;
+		const color = primary === 100 ? colors.purple : colors.bitcoin;
 		content = (
 			<Path
 				color={color}
@@ -64,7 +64,7 @@ const PieChart = ({
 		content = (
 			<>
 				<Path
-					color={colors.orange}
+					color={colors.bitcoin}
 					style="stroke"
 					strokeJoin="round"
 					strokeWidth={1.5}
diff --git a/src/screens/Lightning/QuickConfirm.tsx b/src/screens/Lightning/QuickConfirm.tsx
index c84af1147..59ea861bb 100644
--- a/src/screens/Lightning/QuickConfirm.tsx
+++ b/src/screens/Lightning/QuickConfirm.tsx
@@ -2,16 +2,15 @@ import React, { ReactElement, useMemo, useState } from 'react';
 import { StyleSheet, View } from 'react-native';
 import { Trans, useTranslation } from 'react-i18next';
 
-import { Caption13Up, Display, Text01B, Text01S } from '../../styles/text';
+import { Caption13Up, Display, BodyMB, BodyM } from '../../styles/text';
+import { View as ThemedView } from '../../styles/components';
 import { LightningIcon } from '../../styles/icons';
 import SafeAreaInset from '../../components/SafeAreaInset';
-import GlowingBackground from '../../components/GlowingBackground';
 import NavigationHeader from '../../components/NavigationHeader';
-import AmountToggle from '../../components/AmountToggle';
 import Percentage from '../../components/Percentage';
 import SwipeToConfirm from '../../components/SwipeToConfirm';
+import Money from '../../components/Money';
 import PieChart from './PieChart';
-import { sleep } from '../../utils/helpers';
 import { useBalance } from '../../hooks/wallet';
 import { useAppSelector } from '../../hooks/redux';
 import { useCurrency, useDisplayValues } from '../../hooks/displayValues';
@@ -31,7 +30,7 @@ const QuickConfirm = ({
 	route,
 }: LightningScreenProps<'QuickConfirm'>): ReactElement => {
 	const { spendingAmount, orderId } = route.params;
-	const { onchainBalance } = useBalance();
+	const { onchainBalance, lightningBalance } = useBalance();
 	const { t } = useTranslation('lightning');
 	const orders = useAppSelector(blocktankOrdersSelector);
 	const transactionFee = useAppSelector(transactionFeeSelector);
@@ -48,6 +47,7 @@ const QuickConfirm = ({
 	const fiatTransactionFee = useDisplayValues(transactionFee);
 	const clientBalance = useDisplayValues(order?.clientBalanceSat ?? 0);
 
+	const isTransferToSavings = spendingAmount < lightningBalance;
 	const txFee = fiatTransactionFee.fiatValue;
 	const lspFee = purchaseFeeValue.fiatValue - clientBalance.fiatValue;
 
@@ -58,41 +58,57 @@ const QuickConfirm = ({
 	const savingsPercentage = Math.round((savingsAmount / onchainBalance) * 100);
 
 	const handleConfirm = async (): Promise<void> => {
-		if (!order) {
-			return;
-		}
 		setLoading(true);
-		await sleep(5);
-		const res = await confirmChannelPurchase({ order, selectedNetwork });
-		if (res.isErr()) {
+
+		if (order) {
+			// savings -> spending
+			setLoading(true);
+			const res = await confirmChannelPurchase({ order, selectedNetwork });
+			if (res.isErr()) {
+				setLoading(false);
+				return;
+			}
 			setLoading(false);
-			return;
+			navigation.navigate('SettingUp');
+		} else {
+			setLoading(false);
+			// spending -> savings
+			navigation.navigate('Availability');
 		}
-		navigation.navigate('SettingUp');
 	};
 
 	return (
-		<GlowingBackground topLeft="purple">
+		<ThemedView style={styles.root}>
 			<SafeAreaInset type="top" />
 			<NavigationHeader
-				title={t('add_instant_payments')}
+				title={t('transfer.nav_title')}
 				onClosePress={(): void => {
 					navigation.navigate('Wallet');
 				}}
 			/>
-			<View style={styles.root} testID="QuickConfirm">
-				<Display color="purple">{t('quick_confirm_header')}</Display>
-				<Text01S style={styles.text} color="gray1">
+			<View style={styles.content} testID="Confirm">
+				<Display>
 					<Trans
 						t={t}
-						i18nKey="quick_confirm_cost"
-						components={{ highlight: <Text01B color="white" /> }}
-						values={{
-							txFee: `${fiatSymbol}${txFee.toFixed(2)}`,
-							lspFee: `${fiatSymbol}${lspFee.toFixed(2)}`,
-						}}
+						i18nKey={'quick_confirm_header'}
+						components={{ accent: <Display color="purple" /> }}
 					/>
-				</Text01S>
+				</Display>
+				<BodyM style={styles.text} color="white50">
+					{isTransferToSavings ? (
+						t('transfer_close')
+					) : (
+						<Trans
+							t={t}
+							i18nKey="quick_confirm_cost"
+							components={{ accent: <BodyMB color="white" /> }}
+							values={{
+								txFee: `${fiatSymbol}${txFee.toFixed(2)}`,
+								lspFee: `${fiatSymbol}${lspFee.toFixed(2)}`,
+							}}
+						/>
+					)}
+				</BodyM>
 
 				<View style={styles.chartContainer}>
 					<View style={styles.chart}>
@@ -116,15 +132,15 @@ const QuickConfirm = ({
 					</View>
 				</View>
 
-				<View style={styles.amount}>
+				<View style={styles.amountContainer}>
 					<Caption13Up style={styles.amountCaption} color="purple">
 						{t('spending_label')}
 					</Caption13Up>
-					<AmountToggle sats={spendingAmount} secondaryFont="text01m" />
+					<Money sats={spendingAmount} size="displayT" symbol={true} />
 				</View>
 
 				<SwipeToConfirm
-					text={t('connect_swipe')}
+					text={t('transfer.swipe')}
 					color="purple"
 					icon={<LightningIcon width={30} height={30} color="black" />}
 					loading={loading}
@@ -133,22 +149,24 @@ const QuickConfirm = ({
 				/>
 			</View>
 			<SafeAreaInset type="bottom" minPadding={16} />
-		</GlowingBackground>
+		</ThemedView>
 	);
 };
 
 const styles = StyleSheet.create({
 	root: {
 		flex: 1,
-		marginTop: 8,
+	},
+	content: {
+		flex: 1,
+		paddingTop: 16,
 		paddingHorizontal: 16,
 	},
 	text: {
 		marginTop: 4,
-		marginBottom: 62,
+		marginBottom: 32,
 	},
 	chartContainer: {
-		// flex: 1,
 		flexDirection: 'row',
 		alignItems: 'center',
 	},
@@ -162,12 +180,12 @@ const styles = StyleSheet.create({
 	percentage: {
 		marginVertical: 8,
 	},
-	amount: {
+	amountContainer: {
 		marginTop: 'auto',
-		marginBottom: 16,
+		marginBottom: 26,
 	},
 	amountCaption: {
-		marginBottom: 4,
+		marginBottom: 16,
 	},
 });
 
diff --git a/src/screens/Lightning/QuickSetup.tsx b/src/screens/Lightning/QuickSetup.tsx
index a18791cf8..4eba5d240 100644
--- a/src/screens/Lightning/QuickSetup.tsx
+++ b/src/screens/Lightning/QuickSetup.tsx
@@ -8,17 +8,16 @@ import React, {
 import { StyleSheet, View } from 'react-native';
 import { useFocusEffect } from '@react-navigation/native';
 import { FadeIn, FadeOut } from 'react-native-reanimated';
-import { useTranslation } from 'react-i18next';
+import { Trans, useTranslation } from 'react-i18next';
 
-import { AnimatedView } from '../../styles/components';
-import { Caption13Up, Display, Text01S, Text02S } from '../../styles/text';
+import { View as ThemedView, AnimatedView } from '../../styles/components';
+import { Caption13Up, Display, BodyM, BodyS } from '../../styles/text';
 import SafeAreaInset from '../../components/SafeAreaInset';
-import GlowingBackground from '../../components/GlowingBackground';
 import NavigationHeader from '../../components/NavigationHeader';
 import Percentage from '../../components/Percentage';
 import Button from '../../components/Button';
 import FancySlider from '../../components/FancySlider';
-import NumberPadTextField from '../../components/NumberPadTextField';
+import TransferTextField from '../../components/TransferTextField';
 import NumberPadLightning from './NumberPadLightning';
 import { useAppSelector } from '../../hooks/redux';
 import { useSwitchUnit } from '../../hooks/wallet';
@@ -99,11 +98,13 @@ const QuickSetup = ({
 		return fiatWhole;
 	}, [lnSetup.limits.lsp]);
 
-	const setInitialClientBalance = useCallback(() => {
+	useEffect(() => {
+		// set to initial client balance
 		const value = lnSetup.initialClientBalance;
 		const result = getNumberPadText(value, denomination, unit);
 		setTextFieldValue(result);
-	}, [lnSetup.initialClientBalance, denomination, unit]);
+		// eslint-disable-next-line react-hooks/exhaustive-deps
+	}, [lnSetup.initialClientBalance]);
 
 	const onMax = useCallback(() => {
 		const result = getNumberPadText(
@@ -114,10 +115,6 @@ const QuickSetup = ({
 		setTextFieldValue(result);
 	}, [lnSetup.slider.maxValue, denomination, unit]);
 
-	useEffect(() => {
-		setInitialClientBalance();
-	}, [setInitialClientBalance, unit]);
-
 	const onChangeUnit = (): void => {
 		const result = getNumberPadText(spendingAmount, denomination, nextUnit);
 		setTextFieldValue(result);
@@ -141,8 +138,17 @@ const QuickSetup = ({
 		setShowNumberPad(false);
 	}, []);
 
+	const onSwitch = (): void => {
+		navigation.replace('CustomSetup', { spending: true });
+	};
+
 	const onContinue = useCallback(async (): Promise<void> => {
-		const { clientBalance, lspBalance } = lnSetup;
+		const { clientBalance, lspBalance, isTransferringToSavings } = lnSetup;
+
+		if (isTransferringToSavings) {
+			navigation.navigate('QuickConfirm', { spendingAmount });
+			return;
+		}
 
 		setLoading(true);
 
@@ -176,25 +182,37 @@ const QuickSetup = ({
 		t,
 	]);
 
+	const title = showNumberPad
+		? 'transfer.title_numpad'
+		: 'transfer.title_slider';
+
+	const text = showNumberPad
+		? t('transfer.text_numpad')
+		: t('transfer.text_slider');
+
 	const showMaxSpendingNote = spendingAmount >= lnSetup.limits.local;
 	const showLspLimitNote = spendingAmount >= Math.round(lnSetup.limits.lsp);
 
 	return (
-		<GlowingBackground topLeft="purple">
+		<ThemedView style={styles.root}>
 			<SafeAreaInset type="top" />
 			<NavigationHeader
-				title={t('add_instant_payments')}
+				title={t('transfer.nav_title')}
 				onClosePress={(): void => {
 					navigation.navigate('Wallet');
 				}}
 			/>
-			<View style={styles.root} testID="QuickSetup">
-				<Display color="purple">
-					{t(showNumberPad ? 'spending_money' : 'spending_balance')}
+			<View style={styles.content} testID="QuickSetup">
+				<Display>
+					<Trans
+						t={t}
+						i18nKey={title}
+						components={{ accent: <Display color="purple" /> }}
+					/>
 				</Display>
-				<Text01S color="gray1" style={styles.text}>
-					{t(showNumberPad ? 'enter_money' : 'enter_amount')}
-				</Text01S>
+				<BodyM style={styles.text} color="white50">
+					{text}
+				</BodyM>
 
 				{!showNumberPad && (
 					<>
@@ -204,14 +222,15 @@ const QuickSetup = ({
 							exiting={FadeOut}>
 							<View style={styles.row}>
 								<Caption13Up color="purple">{t('spending')}</Caption13Up>
-								<Caption13Up color="orange">{t('savings')}</Caption13Up>
+								<Caption13Up color="bitcoin">{t('savings')}</Caption13Up>
 							</View>
 							<View style={styles.sliderContainer}>
 								<FancySlider
 									value={spendingAmount}
-									startValue={lnSetup.slider.startValue}
-									endValue={lnSetup.slider.endValue}
+									startValue={0}
 									maxValue={lnSetup.slider.maxValue}
+									endValue={lnSetup.slider.endValue}
+									snapPoint={lnSetup.slider.snapPoint}
 									onValueChange={onSliderChange}
 								/>
 							</View>
@@ -230,11 +249,11 @@ const QuickSetup = ({
 								entering={FadeIn}
 								exiting={FadeOut}
 								testID="QuickSetupBlocktankNote">
-								<Text02S color="gray1">
+								<BodyS color="white50">
 									{t('note_blocktank_limit', {
 										usdValue: btSpendingLimitBalancedUsd,
 									})}
-								</Text02S>
+								</BodyS>
 							</AnimatedView>
 						)}
 
@@ -244,7 +263,7 @@ const QuickSetup = ({
 								entering={FadeIn}
 								exiting={FadeOut}
 								testID="QuickSetupReserveNote">
-								<Text02S color="gray1">{t('note_reserve_limit')}</Text02S>
+								<BodyS color="white50">{t('note_reserve_limit')}</BodyS>
 							</AnimatedView>
 						)}
 
@@ -262,23 +281,36 @@ const QuickSetup = ({
 					</>
 				)}
 
-				<View style={styles.amount}>
+				<View style={styles.amountContainer}>
 					{!showNumberPad && (
 						<Caption13Up style={styles.amountCaption} color="purple">
 							{t('spending_label')}
 						</Caption13Up>
 					)}
-					<NumberPadTextField
+					<TransferTextField
 						value={textFieldValue}
 						showPlaceholder={showNumberPad}
-						reverse={true}
+						testID="QuickSetupTextField"
 						onPress={onChangeUnit}
 					/>
 				</View>
 
 				{!showNumberPad && (
-					<AnimatedView color="transparent" entering={FadeIn} exiting={FadeOut}>
+					<AnimatedView
+						style={styles.buttonContainer}
+						color="transparent"
+						entering={FadeIn}
+						exiting={FadeOut}>
+						<Button
+							style={styles.button}
+							text={t('advanced')}
+							size="large"
+							variant="secondary"
+							testID="QuickSetupAdvanced"
+							onPress={onSwitch}
+						/>
 						<Button
+							style={styles.button}
 							loading={loading}
 							text={t('continue')}
 							size="large"
@@ -302,19 +334,22 @@ const QuickSetup = ({
 				)}
 			</View>
 			<SafeAreaInset type="bottom" minPadding={16} />
-		</GlowingBackground>
+		</ThemedView>
 	);
 };
 
 const styles = StyleSheet.create({
 	root: {
 		flex: 1,
-		marginTop: 8,
+	},
+	content: {
+		flex: 1,
+		paddingTop: 16,
 		paddingHorizontal: 16,
 	},
 	text: {
 		marginTop: 4,
-		marginBottom: 42,
+		marginBottom: 32,
 	},
 	row: {
 		flexDirection: 'row',
@@ -323,8 +358,8 @@ const styles = StyleSheet.create({
 		marginVertical: 4,
 	},
 	sliderContainer: {
-		marginTop: 24,
-		marginBottom: 16,
+		marginTop: 22,
+		marginBottom: 10,
 	},
 	percentages: {
 		flexDirection: 'row',
@@ -334,20 +369,28 @@ const styles = StyleSheet.create({
 	note: {
 		marginTop: 16,
 	},
-	amount: {
+	amountContainer: {
 		marginTop: 'auto',
-		marginBottom: 32,
 	},
 	amountCaption: {
-		marginBottom: 4,
+		marginBottom: 16,
 	},
 	numberpad: {
+		marginTop: 16,
 		marginHorizontal: -16,
 	},
 	buttonCustom: {
 		marginTop: 16,
 		alignSelf: 'flex-start',
 	},
+	buttonContainer: {
+		flexDirection: 'row',
+		gap: 16,
+		marginTop: 42,
+	},
+	button: {
+		flex: 1,
+	},
 });
 
 export default QuickSetup;
diff --git a/src/screens/Lightning/SettingUp.tsx b/src/screens/Lightning/SettingUp.tsx
index f7c51938f..813a0d867 100644
--- a/src/screens/Lightning/SettingUp.tsx
+++ b/src/screens/Lightning/SettingUp.tsx
@@ -1,24 +1,18 @@
-import React, { ReactElement, memo, useCallback } from 'react';
+import React, { ReactElement, memo } from 'react';
 import { StyleSheet, View } from 'react-native';
 import { Trans, useTranslation } from 'react-i18next';
-import { useFocusEffect } from '@react-navigation/native';
-import {
-	activateKeepAwake,
-	deactivateKeepAwake,
-} from '@sayem314/react-native-keep-awake';
 
-import { Display, Text01B, Text01S } from '../../styles/text';
+import { Display, BodyMB, BodyM } from '../../styles/text';
+import { View as ThemedView } from '../../styles/components';
 import SafeAreaInset from '../../components/SafeAreaInset';
-import GlowingBackground from '../../components/GlowingBackground';
 import NavigationHeader from '../../components/NavigationHeader';
 import HourglassSpinner from '../../components/HourglassSpinner';
 import ProgressSteps from '../../components/ProgressSteps';
+import Button from '../../components/Button';
 import { useAppSelector } from '../../hooks/redux';
 import { lightningSettingUpStepSelector } from '../../store/reselect/user';
 import type { LightningScreenProps } from '../../navigation/types';
 
-const TIMEOUT_DELAY = 10 * 60 * 1000; // 10 minutes
-
 const SettingUp = ({
 	navigation,
 }: LightningScreenProps<'SettingUp'>): ReactElement => {
@@ -32,61 +26,57 @@ const SettingUp = ({
 		{ title: t('setting_up_step4') },
 	];
 
-	useFocusEffect(
-		useCallback(() => {
-			activateKeepAwake();
-
-			let timeout = setTimeout(() => {
-				navigation.navigate('Timeout');
-			}, TIMEOUT_DELAY);
-
-			if (lightningSettingUpStep === 3) {
-				clearTimeout(timeout);
-				timeout = setTimeout(() => navigation.navigate('Success'), 1000);
-			}
-
-			return () => {
-				clearTimeout(timeout);
-				deactivateKeepAwake();
-			};
-		}, [lightningSettingUpStep, navigation]),
-	);
+	const onClose = (): void => {
+		navigation.navigate('Wallet');
+	};
 
 	return (
-		<GlowingBackground topLeft="purple">
+		<ThemedView style={styles.root}>
 			<SafeAreaInset type="top" />
 			<NavigationHeader
-				title={t('add_instant_payments')}
+				title={t('transfer.nav_title')}
 				displayBackButton={false}
-				onClosePress={(): void => navigation.navigate('Wallet')}
+				onClosePress={onClose}
 			/>
 			<View style={styles.content} testID="LightningSettingUp">
 				<Display color="purple">{t('setting_up_header')}</Display>
-				<Text01S style={styles.text} color="gray1">
+				<BodyM style={styles.text} color="white50">
 					<Trans
 						t={t}
 						i18nKey="setting_up_text"
-						components={{ highlight: <Text01B color="white" /> }}
+						components={{ accent: <BodyMB color="white" /> }}
 					/>
-				</Text01S>
+				</BodyM>
 
-				<HourglassSpinner glowColor="purple" />
+				<HourglassSpinner />
 
 				<ProgressSteps
 					style={styles.progress}
 					steps={steps}
 					activeStepIndex={lightningSettingUpStep}
 				/>
+
+				<View style={styles.buttonContainer}>
+					<Button
+						style={styles.button}
+						text={t('setting_up_button')}
+						size="large"
+						onPress={onClose}
+					/>
+				</View>
 			</View>
 			<SafeAreaInset type="bottom" minPadding={16} />
-		</GlowingBackground>
+		</ThemedView>
 	);
 };
 
 const styles = StyleSheet.create({
+	root: {
+		flex: 1,
+	},
 	content: {
 		flex: 1,
-		marginTop: 8,
+		paddingTop: 16,
 		paddingHorizontal: 16,
 	},
 	text: {
@@ -96,6 +86,15 @@ const styles = StyleSheet.create({
 	progress: {
 		marginTop: 'auto',
 		paddingVertical: 20,
+		marginBottom: 32,
+	},
+	buttonContainer: {
+		flexDirection: 'row',
+		justifyContent: 'center',
+		marginTop: 'auto',
+	},
+	button: {
+		flex: 1,
 	},
 });
 
diff --git a/src/screens/Lightning/Success.tsx b/src/screens/Lightning/Success.tsx
index 0642663ed..596157f96 100644
--- a/src/screens/Lightning/Success.tsx
+++ b/src/screens/Lightning/Success.tsx
@@ -1,30 +1,51 @@
 import React, { ReactElement, memo } from 'react';
-import { useTranslation } from 'react-i18next';
+import { Trans, useTranslation } from 'react-i18next';
+import { BodyMB, Display } from '../../styles/text';
 import InfoScreen from '../../components/InfoScreen';
 import type { LightningScreenProps } from '../../navigation/types';
 
-const imageSrc = require('../../assets/illustrations/switch.png');
+const readyImage = require('../../assets/illustrations/check.png');
+const transferImage = require('../../assets/illustrations/transfer.png');
 
 const Success = ({
 	navigation,
+	route,
 }: LightningScreenProps<'Success'>): ReactElement => {
 	const { t } = useTranslation('lightning');
+	const { type } = route.params;
 
 	const onContinue = (): void => {
 		navigation.popToTop();
 		navigation.goBack();
 	};
 
+	const isTransferToSavings = type === 'savings';
+	const title = isTransferToSavings ? 'ts_savings_title' : 'result_header';
+	const description = isTransferToSavings ? 'ts_savings_text' : 'result_text';
+	const image = isTransferToSavings ? transferImage : readyImage;
+	const buttonText = isTransferToSavings ? t('ok') : t('awesome');
+
 	return (
 		<InfoScreen
-			accentColor="purple"
-			navTitle={t('add_instant_payments')}
+			navTitle={t('transfer.nav_title')}
 			displayBackButton={false}
-			title={t('result_header')}
-			description={t('result_text')}
-			image={imageSrc}
-			buttonText={t('awesome')}
-			testID="LightningSuccess"
+			title={
+				<Trans
+					t={t}
+					i18nKey={title}
+					components={{ accent: <Display color="purple" /> }}
+				/>
+			}
+			description={
+				<Trans
+					t={t}
+					i18nKey={description}
+					components={{ accent: <BodyMB color="white" /> }}
+				/>
+			}
+			image={image}
+			buttonText={buttonText}
+			testID="TransferSuccess"
 			onButtonPress={onContinue}
 		/>
 	);
diff --git a/src/screens/Lightning/Timeout.tsx b/src/screens/Lightning/Timeout.tsx
deleted file mode 100644
index 97115fa3e..000000000
--- a/src/screens/Lightning/Timeout.tsx
+++ /dev/null
@@ -1,33 +0,0 @@
-import React, { ReactElement, memo } from 'react';
-import { useTranslation } from 'react-i18next';
-import InfoScreen from '../../components/InfoScreen';
-import type { LightningScreenProps } from '../../navigation/types';
-
-const imageSrc = require('../../assets/illustrations/exclamation-mark.png');
-
-const Timeout = ({
-	navigation,
-}: LightningScreenProps<'Timeout'>): ReactElement => {
-	const { t } = useTranslation('lightning');
-
-	const onContinue = (): void => {
-		navigation.popToTop();
-		navigation.goBack();
-	};
-
-	return (
-		<InfoScreen
-			accentColor="purple"
-			navTitle={t('add_instant_payments')}
-			displayBackButton={false}
-			title={t('timeout_header')}
-			description={t('timeout_text')}
-			image={imageSrc}
-			buttonText={t('close')}
-			testID="LightningTimeout"
-			onButtonPress={onContinue}
-		/>
-	);
-};
-
-export default memo(Timeout);
diff --git a/src/screens/Onboarding/Loading.tsx b/src/screens/Onboarding/Loading.tsx
index ecfa52000..74816c69a 100644
--- a/src/screens/Onboarding/Loading.tsx
+++ b/src/screens/Onboarding/Loading.tsx
@@ -1,6 +1,22 @@
-import React, { ReactElement } from 'react';
-import { View, StyleSheet, Image } from 'react-native';
-import { FadeOut, withRepeat, withTiming } from 'react-native-reanimated';
+import React, { ReactElement, useEffect } from 'react';
+import {
+	View,
+	StyleSheet,
+	Image,
+	useWindowDimensions,
+	TextInput,
+} from 'react-native';
+import Animated, {
+	Easing,
+	FadeOut,
+	useAnimatedProps,
+	useDerivedValue,
+	useSharedValue,
+	withDelay,
+	withRepeat,
+	withSequence,
+	withTiming,
+} from 'react-native-reanimated';
 import { Trans, useTranslation } from 'react-i18next';
 
 import { AnimatedView } from '../../styles/components';
@@ -8,54 +24,121 @@ import { Display } from '../../styles/text';
 import SafeAreaInset from '../../components/SafeAreaInset';
 import { __E2E__ } from '../../constants/env';
 
-const imageSrc = require('../../assets/illustrations/rocket.png');
+const circleSrc = require('../../assets/illustrations/loading-circle.png');
+const rocketSrc = require('../../assets/illustrations/rocket.png');
+const rocketSize = 256;
+
+Animated.addWhitelistedNativeProps({ text: true });
+const AnimatedText = Animated.createAnimatedComponent(TextInput);
 
 const LoadingWalletScreen = (): ReactElement => {
 	const { t } = useTranslation('onboarding');
+	const { width } = useWindowDimensions();
+
+	const progressValue = useSharedValue(0);
+	const progressText = useDerivedValue(() => {
+		return `${Math.round(progressValue.value)}%`;
+	});
+	const textAnimatedProps = useAnimatedProps(() => {
+		return { text: progressText.value, defaultValue: progressText.value };
+	});
+
+	useEffect(() => {
+		progressValue.value = withTiming(100, {
+			duration: 4000,
+			easing: Easing.linear,
+		});
+		// eslint-disable-next-line react-hooks/exhaustive-deps
+	}, []);
+
+	const circleAnimation = (): { initialValues: {}; animations: {} } => {
+		'worklet';
+		const initialValues = { transform: [{ rotate: '0deg' }] };
+		const animations = {
+			transform: [
+				{
+					rotate: withRepeat(
+						withSequence(
+							withTiming('-180deg', {
+								duration: 1500,
+								easing: Easing.inOut(Easing.ease),
+							}),
+							withDelay(
+								100,
+								withTiming('-360deg', {
+									duration: 1500,
+									easing: Easing.inOut(Easing.ease),
+								}),
+							),
+						),
+						-1,
+					),
+				},
+			],
+		};
+		return { initialValues, animations };
+	};
 
-	const entering = (): { initialValues: {}; animations: {} } => {
+	const rocketAnimation = (): { initialValues: {}; animations: {} } => {
 		'worklet';
 		const initialValues = {
-			transform: [{ translateX: -1000 }, { translateY: 1000 }],
+			transform: [{ translateX: 0 }, { translateY: 0 }],
 		};
 
 		const animations = {
 			transform: [
 				{
-					translateX: withRepeat(withTiming(1000, { duration: 5000 }), -1),
+					translateX: withRepeat(
+						withTiming(width + rocketSize, { duration: 4000 }),
+						-1,
+					),
 				},
 				{
-					translateY: withRepeat(withTiming(-1000, { duration: 5000 }), -1),
+					translateY: withRepeat(
+						withTiming(-(width + rocketSize), { duration: 4000 }),
+						-1,
+					),
 				},
 			],
 		};
 
-		return {
-			initialValues,
-			animations,
-		};
+		return { initialValues, animations };
 	};
 
 	return (
-		<View style={styles.container}>
+		<View style={styles.root}>
 			<SafeAreaInset type="top" />
-			<View style={styles.loadingText}>
+			<View style={styles.content}>
+				<View style={styles.progress}>
+					<View style={styles.circleContainer}>
+						<Animated.Image
+							style={styles.circleImage}
+							source={circleSrc}
+							entering={__E2E__ ? undefined : circleAnimation}
+						/>
+					</View>
+					<View style={styles.progressContainer}>
+						<AnimatedText
+							style={styles.progressText}
+							animatedProps={textAnimatedProps}
+							editable={false}
+						/>
+					</View>
+				</View>
 				<Display>
 					<Trans
 						t={t}
 						i18nKey="loading_header"
-						components={{
-							brand: <Display color="brand" />,
-						}}
+						components={{ accent: <Display color="brand" /> }}
 					/>
 				</Display>
 			</View>
-			<View style={styles.animationContainer}>
+			<View style={styles.rocketContainer}>
 				<AnimatedView
-					entering={__E2E__ ? undefined : entering}
+					entering={__E2E__ ? undefined : rocketAnimation}
 					exiting={__E2E__ ? undefined : FadeOut}
 					color="transparent">
-					<Image source={imageSrc} />
+					<Image style={styles.rocketImage} source={rocketSrc} />
 				</AnimatedView>
 			</View>
 		</View>
@@ -63,19 +146,49 @@ const LoadingWalletScreen = (): ReactElement => {
 };
 
 const styles = StyleSheet.create({
-	container: {
+	root: {
 		flex: 1,
-		padding: 32,
+		paddingHorizontal: 32,
 	},
-	loadingText: {
+	content: {
 		flex: 1,
 		justifyContent: 'center',
 	},
-	animationContainer: {
-		marginTop: 30,
-		flex: 2,
+	progress: {
+		justifyContent: 'center',
 		alignItems: 'center',
 		alignSelf: 'center',
+		marginBottom: 32,
+		height: 192,
+		width: 192,
+	},
+	progressContainer: {
+		flexDirection: 'row',
+		justifyContent: 'center',
+		alignItems: 'center',
+	},
+	progressText: {
+		fontFamily: 'InterTight-Bold',
+		fontSize: 48,
+		color: '#FF4400',
+		letterSpacing: -1,
+	},
+	circleContainer: {
+		position: 'absolute',
+	},
+	circleImage: {
+		height: 192,
+		width: 192,
+	},
+	rocketContainer: {
+		...StyleSheet.absoluteFillObject,
+		justifyContent: 'flex-end',
+		zIndex: -1,
+	},
+	rocketImage: {
+		position: 'absolute',
+		left: -290,
+		bottom: -210,
 	},
 });
 
diff --git a/src/screens/Onboarding/MultipleDevices.tsx b/src/screens/Onboarding/MultipleDevices.tsx
index 66a435480..94ff2c658 100644
--- a/src/screens/Onboarding/MultipleDevices.tsx
+++ b/src/screens/Onboarding/MultipleDevices.tsx
@@ -1,12 +1,8 @@
 import React, { ReactElement } from 'react';
-import { View, Image, StyleSheet } from 'react-native';
 import { Trans, useTranslation } from 'react-i18next';
 
-import { Display, Text01S } from '../../styles/text';
-import SafeAreaInset from '../../components/SafeAreaInset';
-import GlowingBackground from '../../components/GlowingBackground';
-import NavigationHeader from '../../components/NavigationHeader';
-import Button from '../../components/Button';
+import { Display } from '../../styles/text';
+import OnboardingScreen from '../../components/OnboardingScreen';
 import type { OnboardingStackScreenProps } from '../../navigation/types';
 
 const imageSrc = require('../../assets/illustrations/phone.png');
@@ -17,81 +13,23 @@ const MultipleDevices = ({
 	const { t } = useTranslation('onboarding');
 
 	return (
-		<GlowingBackground topLeft="yellow">
-			<View style={styles.slide}>
-				<SafeAreaInset type="top" />
-				<NavigationHeader />
-				<View style={styles.imageContainer}>
-					<Image style={styles.image} source={imageSrc} />
-				</View>
-				<View style={styles.textContent}>
-					<Display>
-						<Trans
-							t={t}
-							i18nKey="multiple_header"
-							components={{
-								yellow: <Display color="yellow" />,
-							}}
-						/>
-					</Display>
-					<Text01S color="gray1" style={styles.text}>
-						{t('multiple_text')}
-					</Text01S>
-				</View>
-
-				<View style={styles.buttonContainer}>
-					<Button
-						text={t('understood')}
-						size="large"
-						style={[styles.button, styles.quickButton]}
-						onPress={(): void => {
-							navigation.navigate('RestoreFromSeed');
-						}}
-						testID="MultipleButton"
-					/>
-				</View>
-				<SafeAreaInset type="bottom" minPadding={16} />
-			</View>
-		</GlowingBackground>
+		<OnboardingScreen
+			title={
+				<Trans
+					t={t}
+					i18nKey="multiple_header"
+					components={{ accent: <Display color="yellow" /> }}
+				/>
+			}
+			description={t('multiple_text')}
+			image={imageSrc}
+			buttonText={t('understood')}
+			testID="MultipleDevices"
+			onButtonPress={(): void => {
+				navigation.navigate('RestoreFromSeed');
+			}}
+		/>
 	);
 };
 
-const styles = StyleSheet.create({
-	slide: {
-		flex: 1,
-		justifyContent: 'space-between',
-		alignItems: 'stretch',
-	},
-	imageContainer: {
-		flex: 4,
-		alignItems: 'center',
-		paddingVertical: 50,
-		justifyContent: 'flex-end',
-		width: '100%',
-	},
-	image: {
-		flex: 1,
-		resizeMode: 'contain',
-	},
-	textContent: {
-		flex: 4,
-		paddingHorizontal: 32,
-	},
-	text: {
-		marginTop: 8,
-	},
-	buttonContainer: {
-		flexDirection: 'row',
-		justifyContent: 'center',
-		marginTop: 'auto',
-		marginHorizontal: 32,
-	},
-	button: {
-		flex: 1,
-	},
-	quickButton: {
-		marginRight: 6,
-	},
-});
-
 export default MultipleDevices;
diff --git a/src/screens/Onboarding/Passphrase.tsx b/src/screens/Onboarding/Passphrase.tsx
index 94d9efd38..1ca8667cd 100644
--- a/src/screens/Onboarding/Passphrase.tsx
+++ b/src/screens/Onboarding/Passphrase.tsx
@@ -1,17 +1,14 @@
 import React, { ReactElement, memo, useState, useMemo } from 'react';
 import { Trans, useTranslation } from 'react-i18next';
-import {
-	Image,
-	Platform,
-	StyleSheet,
-	View,
-	useWindowDimensions,
-} from 'react-native';
+import { Image, StyleSheet, View, useWindowDimensions } from 'react-native';
 
-import { ScrollView, TextInput } from '../../styles/components';
-import { Display, Text01S } from '../../styles/text';
+import {
+	View as ThemedView,
+	ScrollView,
+	TextInput,
+} from '../../styles/components';
+import { Display, BodyM } from '../../styles/text';
 import SafeAreaInset from '../../components/SafeAreaInset';
-import GlowingBackground from '../../components/GlowingBackground';
 import NavigationHeader from '../../components/NavigationHeader';
 import KeyboardAvoidingView from '../../components/KeyboardAvoidingView';
 import Button from '../../components/Button';
@@ -29,18 +26,18 @@ const Passphrase = ({
 	const { isSmallScreen } = useScreenSize();
 	const [bip39Passphrase, setPassphrase] = useState<string>('');
 
-	const illustrationStyles = useMemo(
+	const imageStyles = useMemo(
 		() => ({
 			...styles.image,
-			width: dimensions.width * (isSmallScreen ? 0.6 : 0.7),
-			height: dimensions.width * (isSmallScreen ? 0.6 : 0.7),
+			width: dimensions.width * (isSmallScreen ? 0.6 : 0.79),
+			height: dimensions.width * (isSmallScreen ? 0.6 : 0.79),
 			...(isSmallScreen ? { marginTop: -30 } : {}),
 		}),
 		[dimensions.width, isSmallScreen],
 	);
 
 	return (
-		<GlowingBackground topLeft="brand">
+		<ThemedView style={styles.root}>
 			<KeyboardAvoidingView style={styles.content}>
 				<ScrollView
 					color="transparent"
@@ -53,21 +50,19 @@ const Passphrase = ({
 						<Flag text={t('advanced')} style={styles.flag} />
 					</View>
 					<View style={styles.imageContainer}>
-						<Image style={illustrationStyles} source={imageSrc} />
+						<Image style={imageStyles} source={imageSrc} />
 					</View>
 					<View style={styles.textContent}>
 						<Trans
 							t={t}
 							i18nKey="passphrase_header"
 							parent={Display}
-							components={{
-								brand: <Display color="brand" />,
-							}}
+							components={{ accent: <Display color="brand" /> }}
 						/>
 
-						<Text01S color="gray1" style={styles.text}>
+						<BodyM color="white50" style={styles.text}>
 							{t('passphrase_text')}
-						</Text01S>
+						</BodyM>
 
 						<TextInput
 							style={styles.input}
@@ -97,18 +92,20 @@ const Passphrase = ({
 				</ScrollView>
 				<SafeAreaInset type="bottom" minPadding={16} />
 			</KeyboardAvoidingView>
-		</GlowingBackground>
+		</ThemedView>
 	);
 };
 
 const styles = StyleSheet.create({
-	scrollContent: {
-		flexGrow: 1,
+	root: {
+		flex: 1,
 	},
 	content: {
+		flexGrow: 1,
+	},
+	scrollContent: {
 		flex: 1,
-		justifyContent: 'space-between',
-		alignItems: 'stretch',
+		flexGrow: 1,
 	},
 	navigationContainer: {
 		position: 'relative',
@@ -119,30 +116,27 @@ const styles = StyleSheet.create({
 		right: 0,
 	},
 	imageContainer: {
-		flex: 2.8,
 		alignItems: 'center',
-		marginBottom: 32,
 		justifyContent: 'flex-end',
+		marginTop: 'auto',
+		marginBottom: 32,
 	},
 	image: {
 		resizeMode: 'contain',
 	},
 	textContent: {
-		// line up Welcome screen content with Slideshow
-		flex: Platform.OS === 'ios' ? 3.2 : 3.5,
 		paddingHorizontal: 32,
 	},
 	text: {
-		marginTop: 8,
+		marginTop: 4,
 	},
 	input: {
-		marginTop: 24,
-		marginBottom: 16,
+		marginTop: 32,
+		marginBottom: 28,
 	},
 	buttonContainer: {
 		flexDirection: 'row',
 		justifyContent: 'center',
-		marginTop: 'auto',
 		paddingHorizontal: 32,
 	},
 	button: {
diff --git a/src/screens/Onboarding/RestoreFromSeed.tsx b/src/screens/Onboarding/RestoreFromSeed.tsx
index 5ba37454e..b2bed7a16 100644
--- a/src/screens/Onboarding/RestoreFromSeed.tsx
+++ b/src/screens/Onboarding/RestoreFromSeed.tsx
@@ -9,8 +9,8 @@ import {
 	Keyboard,
 	NativeSyntheticEvent,
 	StyleSheet,
-	TextInput,
 	TextInputKeyPressEventData,
+	TextInput as TTextInput,
 	View,
 } from 'react-native';
 import * as bip39 from 'bip39';
@@ -18,9 +18,12 @@ import rnAndroidKeyboardAdjust from 'rn-android-keyboard-adjust';
 import { KeyboardAccessoryView } from 'react-native-keyboard-accessory';
 import { Trans, useTranslation } from 'react-i18next';
 
-import { ScrollView } from '../../styles/components';
-import { Display, Text01S, Text02S } from '../../styles/text';
-import GlowingBackground from '../../components/GlowingBackground';
+import {
+	View as ThemedView,
+	ScrollView,
+	TextInput,
+} from '../../styles/components';
+import { Display, BodyM, BodyS } from '../../styles/text';
 import SafeAreaInset from '../../components/SafeAreaInset';
 import SeedInput from '../../components/SeedInput';
 import SeedInputAccessory from '../../components/SeedInputAccessory';
@@ -43,8 +46,8 @@ const RestoreFromSeed = (): ReactElement => {
 	const [focused, setFocused] = useState<number | null>(null);
 	const [showPassphrase, setShowPassphrase] = useState(false);
 	const [bip39Passphrase, setPassphrase] = useState<string>('');
-	const inputRefs = useRef<Array<TextInput>>([]);
-	const passRef = useRef<TextInput>(null);
+	const inputRefs = useRef<Array<TTextInput>>([]);
+	const passRef = useRef<TTextInput>(null);
 	const { t } = useTranslation('onboarding');
 	const enableButtons = useMemo(
 		() =>
@@ -151,7 +154,7 @@ const RestoreFromSeed = (): ReactElement => {
 		return (
 			<SeedInput
 				key={index}
-				ref={(el: TextInput): void => {
+				ref={(el: TTextInput): void => {
 					inputRefs.current[index] = el;
 				}}
 				index={index}
@@ -169,14 +172,14 @@ const RestoreFromSeed = (): ReactElement => {
 
 	if (isRestoringWallet) {
 		return (
-			<GlowingBackground key="back" topLeft="brand">
+			<ThemedView style={styles.root}>
 				<LoadingWalletScreen />
-			</GlowingBackground>
+			</ThemedView>
 		);
 	}
 
 	return (
-		<GlowingBackground key="back" topLeft="blue">
+		<ThemedView style={styles.root}>
 			<View style={styles.header}>
 				<SafeAreaInset type="top" />
 				<NavigationHeader displayBackButton={true} />
@@ -193,9 +196,15 @@ const RestoreFromSeed = (): ReactElement => {
 				</View>
 				<View>
 					<View style={styles.title}>
-						<Display>{t('restore_header')}</Display>
+						<Display>
+							<Trans
+								t={t}
+								i18nKey="restore_header"
+								components={{ accent: <Display color="blue" /> }}
+							/>
+						</Display>
 					</View>
-					<Text01S color="white80">{t('restore_phrase')}</Text01S>
+					<BodyM color="white80">{t('restore_phrase')}</BodyM>
 				</View>
 				<View style={styles.inputsContainer}>
 					<View style={styles.inputsColumn}>
@@ -210,37 +219,39 @@ const RestoreFromSeed = (): ReactElement => {
 				</View>
 
 				{showRedExplanation && (
-					<Text02S color="gray1" style={styles.explanation}>
+					<BodyS color="white50" style={styles.explanation}>
 						<Trans
 							t={t}
 							i18nKey="restore_red_explain"
-							components={{
-								red: <Text02S color="red" />,
-							}}
+							components={{ accent: <BodyS color="red" /> }}
 						/>
-					</Text02S>
+					</BodyS>
 				)}
 
 				{showInvalidChecksum && (
-					<Text02S color="red" style={styles.explanation}>
+					<BodyS color="red" style={styles.explanation}>
 						{t('restore_inv_checksum')}
-					</Text02S>
+					</BodyS>
 				)}
 
 				{showPassphrase && (
 					<>
-						<SeedInput
+						<TextInput
+							style={styles.passphrase}
 							ref={passRef}
 							value={bip39Passphrase}
-							onChangeText={setPassphrase}
-							onSubmitEditing={handleSubmitEditing}
+							returnKeyType="done"
+							autoCapitalize="none"
+							autoCompleteType="off"
+							autoCorrect={false}
 							placeholder={t('restore_passphrase_placeholder')}
-							valid={true}
 							testID="PassphraseInput"
+							onChangeText={setPassphrase}
+							onSubmitEditing={handleSubmitEditing}
 						/>
-						<Text02S color="gray1" style={styles.explanation}>
+						<BodyS color="white50" style={styles.explanation}>
 							{t('restore_passphrase_meaning')}
-						</Text02S>
+						</BodyS>
 					</>
 				)}
 
@@ -291,11 +302,14 @@ const RestoreFromSeed = (): ReactElement => {
 					}}
 				/>
 			)}
-		</GlowingBackground>
+		</ThemedView>
 	);
 };
 
 const styles = StyleSheet.create({
+	root: {
+		flex: 1,
+	},
 	header: {
 		position: 'absolute',
 		top: 0,
@@ -306,25 +320,30 @@ const styles = StyleSheet.create({
 		marginHorizontal: -50,
 	},
 	content: {
-		paddingHorizontal: 32,
 		flexGrow: 1,
 		justifyContent: 'space-between',
+		paddingTop: 16,
+		paddingHorizontal: 32,
 	},
 	title: {
-		marginBottom: 8,
+		marginBottom: 4,
 	},
 	inputsContainer: {
-		flexWrap: 'wrap',
 		flexDirection: 'row',
-		paddingHorizontal: -2,
-		marginTop: 38,
+		marginTop: 44,
+		gap: 4,
 	},
 	inputsColumn: {
-		width: '50%',
+		flex: 1,
 	},
 	explanation: {
 		marginTop: 16,
 	},
+	passphrase: {
+		fontSize: 17,
+		fontWeight: '600',
+		letterSpacing: 0.4,
+	},
 	buttonsContainer: {
 		marginTop: 'auto',
 		flexDirection: 'row',
diff --git a/src/screens/Onboarding/Restoring.tsx b/src/screens/Onboarding/Restoring.tsx
index f31512a24..904a9e560 100644
--- a/src/screens/Onboarding/Restoring.tsx
+++ b/src/screens/Onboarding/Restoring.tsx
@@ -1,17 +1,16 @@
 import React, { ReactElement, useCallback, useEffect, useState } from 'react';
 import { StyleSheet, View } from 'react-native';
-import { useTranslation } from 'react-i18next';
+import { Trans, useTranslation } from 'react-i18next';
 
-import { Display, Text01S } from '../../styles/text';
+import { Display, BodyM } from '../../styles/text';
+import { View as ThemedView } from '../../styles/components';
 import { IColors } from '../../styles/colors';
 import { restoreRemoteBackups, startWalletServices } from '../../utils/startup';
 import { showToast } from '../../utils/notifications';
 import { sleep } from '../../utils/helpers';
 import { useSelectedSlashtag } from '../../hooks/slashtags';
 import { updateUser } from '../../store/slices/user';
-import GlowingBackground from '../../components/GlowingBackground';
 import SafeAreaInset from '../../components/SafeAreaInset';
-import GlowImage from '../../components/GlowImage';
 import Button from '../../components/Button';
 import Dialog from '../../components/Dialog';
 import LoadingWalletScreen from './Loading';
@@ -19,6 +18,7 @@ import { useAppDispatch, useAppSelector } from '../../hooks/redux';
 import { useProfile2, useSelectedSlashtag2 } from '../../hooks/slashtags2';
 import { setOnboardingProfileStep } from '../../store/slices/slashtags';
 import { onboardingProfileStepSelector } from '../../store/reselect/slashtags';
+import { Image } from 'react-native';
 
 const checkImageSrc = require('../../assets/illustrations/check.png');
 const crossImageSrc = require('../../assets/illustrations/cross.png');
@@ -111,10 +111,18 @@ const RestoringScreen = (): ReactElement => {
 
 		content = (
 			<View style={styles.content}>
-				<Display style={styles.title}>{title}</Display>
-				<Text01S color="white80">{subtitle}</Text01S>
+				<Display style={styles.title}>
+					<Trans
+						t={t}
+						i18nKey={title}
+						components={{ accent: <Display color={color} /> }}
+					/>
+				</Display>
+				<BodyM color="white80">{subtitle}</BodyM>
 
-				<GlowImage image={imageSrc} imageSize={200} glowColor={color} />
+				<View style={styles.imageContainer}>
+					<Image style={styles.image} source={imageSrc} />
+				</View>
 
 				<View style={styles.buttonContainer}>
 					<Button
@@ -153,17 +161,33 @@ const RestoringScreen = (): ReactElement => {
 		);
 	}
 
-	return <GlowingBackground topLeft={color}>{content}</GlowingBackground>;
+	return <ThemedView style={styles.root}>{content}</ThemedView>;
 };
 
 const styles = StyleSheet.create({
+	root: {
+		flex: 1,
+	},
 	content: {
 		flex: 1,
 		paddingHorizontal: 32,
 		paddingTop: 120,
 	},
 	title: {
-		marginBottom: 8,
+		marginBottom: 4,
+	},
+	imageContainer: {
+		flexShrink: 1,
+		justifyContent: 'center',
+		alignItems: 'center',
+		alignSelf: 'center',
+		width: 256,
+		aspectRatio: 1,
+		marginTop: 'auto',
+	},
+	image: {
+		flex: 1,
+		resizeMode: 'contain',
 	},
 	buttonContainer: {
 		marginTop: 'auto',
diff --git a/src/screens/Onboarding/Slideshow.tsx b/src/screens/Onboarding/Slideshow.tsx
index 2b7eab548..c1e868741 100644
--- a/src/screens/Onboarding/Slideshow.tsx
+++ b/src/screens/Onboarding/Slideshow.tsx
@@ -1,4 +1,3 @@
-/* eslint-disable react/no-unstable-nested-components */
 import React, {
 	memo,
 	ReactElement,
@@ -10,233 +9,151 @@ import React, {
 } from 'react';
 import {
 	Image,
-	Platform,
+	ImageSourcePropType,
 	Pressable,
 	StyleSheet,
 	View,
 	useWindowDimensions,
+	Platform,
 } from 'react-native';
-import { useSafeAreaInsets } from 'react-native-safe-area-context';
 import Carousel, { ICarouselInstance } from 'react-native-reanimated-carousel';
-import {
+import Animated, {
 	interpolate,
 	useAnimatedStyle,
 	useSharedValue,
 } from 'react-native-reanimated';
 import { Trans, useTranslation } from 'react-i18next';
 
-import { AnimatedView, TouchableOpacity } from '../../styles/components';
-import { Caption13M, Display, Text01M, Text01S } from '../../styles/text';
+import { View as ThemedView } from '../../styles/components';
+import { Display, BodyMSB, BodyM } from '../../styles/text';
+import { IThemeColors } from '../../styles/themes';
 import SafeAreaInset from '../../components/SafeAreaInset';
-import GlowingBackground from '../../components/GlowingBackground';
 import Dot from '../../components/SliderDots';
 import Button from '../../components/Button';
+import LoadingWalletScreen from './Loading';
 import { useAppDispatch } from '../../hooks/redux';
 import { createNewWallet } from '../../utils/startup';
 import { showToast } from '../../utils/notifications';
 import { sleep } from '../../utils/helpers';
-import LoadingWalletScreen from './Loading';
 import { updateUser } from '../../store/slices/user';
-import { IColors } from '../../styles/colors';
 import type { OnboardingStackScreenProps } from '../../navigation/types';
 
-const shieldImageSrc = require('../../assets/illustrations/shield-b.png');
-const lightningImageSrc = require('../../assets/illustrations/lightning.png');
-const sparkImageSrc = require('../../assets/illustrations/spark.png');
-const walletImageSrc = require('../../assets/illustrations/wallet.png');
-
 type Slide = {
-	topLeftColor: keyof IColors;
-	slide: () => ReactElement;
+	color: keyof IThemeColors;
+	image: ImageSourcePropType;
 };
 
-/**
- * Slideshow for Welcome screen
- */
-const Slideshow = ({
-	navigation,
-	route,
-}: OnboardingStackScreenProps<'Slideshow'>): ReactElement => {
-	const skipIntro = route.params?.skipIntro ?? false;
-	const bip39Passphrase = route.params?.bip39Passphrase;
-	const ref = useRef<ICarouselInstance | null>(null);
-	const [isCreatingWallet, setIsCreatingWallet] = useState(false);
-	const insets = useSafeAreaInsets();
+const slide1ImageSrc = require('../../assets/illustrations/keyring.png');
+const slide2ImageSrc = require('../../assets/illustrations/lightning.png');
+const slide3ImageSrc = require('../../assets/illustrations/spark.png');
+const slide4ImageSrc = require('../../assets/illustrations/shield.png');
+const slide5ImageSrc = require('../../assets/illustrations/wallet.png');
+
+const slides: Slide[] = [
+	{ color: 'blue', image: slide1ImageSrc },
+	{ color: 'purple', image: slide2ImageSrc },
+	{ color: 'yellow', image: slide3ImageSrc },
+	{ color: 'green', image: slide4ImageSrc },
+	{ color: 'brand', image: slide5ImageSrc },
+];
+
+type SlideProps = Slide & {
+	index: number;
+	onCreate: () => void;
+	onRestore: () => void;
+};
+
+const Slide = ({
+	index,
+	color,
+	image,
+	onCreate,
+	onRestore,
+}: SlideProps): ReactElement => {
 	const { t } = useTranslation('onboarding');
-	const dispatch = useAppDispatch();
+	const dimensions = useWindowDimensions();
 
 	// because we can't properly scala image inside the <Swiper let's calculate with by hand
-	const dimensions = useWindowDimensions();
-	const illustrationStyles = useMemo(
+	const imageStyles = useMemo(
 		() => ({
-			...styles.illustration,
-			width: dimensions.width * 0.6,
-			height: dimensions.width * 0.6,
+			...styles.image,
+			width: dimensions.width * 0.79,
+			height: dimensions.width * 0.79,
 		}),
 		[dimensions.width],
 	);
 
-	const onNewWallet = useCallback(async (): Promise<void> => {
-		setIsCreatingWallet(true);
-		await sleep(500); // wait for animation to be started
-		const res = await createNewWallet({ bip39Passphrase });
-		if (res.isErr()) {
-			setIsCreatingWallet(false);
-			showToast({
-				type: 'warning',
-				title: t('error_create'),
-				description: res.error.message,
-			});
-		}
+	const isLast = index === slides.length - 1;
 
-		dispatch(updateUser({ requiresRemoteRestore: false }));
-	}, [bip39Passphrase, t, dispatch]);
+	return (
+		<View style={styles.slide} testID={`Slide${index}`}>
+			<View style={styles.imageContainer}>
+				<Image style={imageStyles} source={image} />
+			</View>
 
-	const slides = useMemo(
-		(): Slide[] => [
-			{
-				topLeftColor: 'brand',
-				slide: (): ReactElement => (
-					<View style={styles.slide} testID="Slide1">
-						<View style={styles.imageContainer}>
-							<Image style={illustrationStyles} source={shieldImageSrc} />
-						</View>
-						<View style={styles.textContent}>
-							<Trans
-								t={t}
-								i18nKey="slide1_header"
-								parent={Display}
-								components={{
-									brand: <Display color="brand" />,
-								}}
-							/>
-							<Text01S color="gray1" style={styles.text}>
-								{t('slide1_text')}
-							</Text01S>
-						</View>
-						<SafeAreaInset type="bottom" minPadding={16} />
-					</View>
-				),
-			},
-			{
-				topLeftColor: 'purple',
-				slide: (): ReactElement => (
-					<View style={styles.slide} testID="Slide2">
-						<View style={styles.imageContainer}>
-							<Image style={illustrationStyles} source={lightningImageSrc} />
-						</View>
-						<View style={styles.textContent}>
-							<Trans
-								t={t}
-								i18nKey="slide2_header"
-								parent={Display}
-								components={{
-									purple: <Display color="purple" />,
-								}}
-							/>
-							<Text01S color="gray1" style={styles.text}>
-								{t('slide2_text')}
-							</Text01S>
-						</View>
-						<SafeAreaInset type="bottom" minPadding={16} />
-					</View>
-				),
-			},
-			{
-				topLeftColor: 'blue',
-				slide: (): ReactElement => (
-					<View style={styles.slide} testID="Slide3">
-						<View style={styles.imageContainer}>
-							<Image style={illustrationStyles} source={sparkImageSrc} />
-						</View>
-						<View style={styles.textContent}>
-							<Trans
-								t={t}
-								i18nKey="slide3_header"
-								parent={Display}
-								components={{
-									blue: <Display color="blue" />,
-								}}
-							/>
-							<Text01S color="gray1" style={styles.text}>
-								{t('slide3_text')}
-							</Text01S>
-						</View>
-						<SafeAreaInset type="bottom" minPadding={16} />
-					</View>
-				),
-			},
-			{
-				topLeftColor: 'brand',
-				slide: (): ReactElement => (
-					<View style={styles.slide}>
-						<View style={styles.imageContainer}>
-							<Image style={illustrationStyles} source={walletImageSrc} />
-						</View>
-						<View style={styles.textContent}>
-							<Trans
-								t={t}
-								i18nKey="slide4_header"
-								parent={Display}
-								components={{
-									brand: <Display color="brand" />,
-								}}
-							/>
+			<Trans
+				t={t}
+				i18nKey={`slide${index}_header`}
+				parent={Display}
+				components={{ accent: <Display color={color} /> }}
+			/>
+			<BodyM style={styles.text} color="white50">
+				{t(`slide${index}_text`)}
+			</BodyM>
 
-							<Text01S color="gray1" style={styles.text}>
-								<Trans
-									t={t}
-									i18nKey="slide4_text"
-									components={{
-										brand: <Text01S color="brand" />,
-									}}
-								/>
-							</Text01S>
+			{isLast ? (
+				<View style={styles.buttonsContainer}>
+					<Button
+						style={styles.button}
+						text={t('new_wallet')}
+						size="large"
+						testID="NewWallet"
+						onPress={onCreate}
+					/>
 
-							<View style={styles.buttonsContainer}>
-								<Button
-									size="large"
-									style={[styles.button, styles.restoreButton]}
-									onPress={onNewWallet}
-									text={t('new_wallet')}
-									testID="NewWallet"
-								/>
+					<Button
+						style={styles.button}
+						text={t('restore')}
+						size="large"
+						variant="secondary"
+						testID="RestoreWallet"
+						onPress={onRestore}
+					/>
+				</View>
+			) : (
+				<View style={styles.dotsSpacing} />
+			)}
 
-								<Button
-									size="large"
-									variant="secondary"
-									style={[styles.button, styles.newButton]}
-									onPress={(): void => navigation.navigate('MultipleDevices')}
-									text={t('restore')}
-									testID="RestoreWallet"
-								/>
-							</View>
-						</View>
-						<SafeAreaInset type="bottom" minPadding={16} />
-					</View>
-				),
-			},
-		],
-		[illustrationStyles, navigation, onNewWallet, t],
+			<SafeAreaInset type="bottom" minPadding={16} />
+		</View>
 	);
+};
 
-	const [index, setIndex] = useState(skipIntro ? slides.length - 1 : 0);
-	const progressValue = useSharedValue<number>(
-		skipIntro ? slides.length - 1 : 0,
-	);
+const Slideshow = ({
+	navigation,
+	route,
+}: OnboardingStackScreenProps<'Slideshow'>): ReactElement => {
+	const skipIntro = route.params?.skipIntro ?? false;
+	const bip39Passphrase = route.params?.bip39Passphrase;
+	const dispatch = useAppDispatch();
+	const dimensions = useWindowDimensions();
+	const { t } = useTranslation('onboarding');
+	const ref = useRef<ICarouselInstance>(null);
+	const progressValue = useSharedValue(0);
+	const [isCreatingWallet, setIsCreatingWallet] = useState(false);
 
-	// skip button should be visible on all slides, except the last one
-	const skipOpacity = useAnimatedStyle(() => {
+	// dots and 'skip' button should not be visible on last slide
+	const startOpacity = useAnimatedStyle(() => {
 		const opacity = interpolate(
 			progressValue.value,
-			[0, slides.length - 2, slides.length - 1],
+			[1, slides.length - 2, slides.length - 1],
 			[1, 1, 0],
 		);
 		return { opacity };
 	}, [slides.length, progressValue]);
 
-	// Advanced button should be visible only on last slide
-	const advOpacity = useAnimatedStyle(() => {
+	// 'advanced' button should be visible only on last slide
+	const endOpacity = useAnimatedStyle(() => {
 		const opacity = interpolate(
 			progressValue.value,
 			[0, slides.length - 2, slides.length - 1],
@@ -245,40 +162,43 @@ const Slideshow = ({
 		return { opacity };
 	}, [slides.length, progressValue]);
 
-	// Dots should not be visible on last slide
-	const dotsOpacity = useAnimatedStyle(() => {
-		const opacity = interpolate(
-			progressValue.value,
-			[1, slides.length - 2, slides.length - 1],
-			[1, 1, 0],
-		);
-		return { opacity };
-	}, [slides.length, progressValue]);
-
-	const onSkip = (): void => {
-		ref.current?.scrollTo({ index: slides.length - 1, animated: true });
+	const onHeaderButton = (): void => {
+		const isLast = progressValue.value === slides.length - 1;
+		if (isLast) {
+			navigation.navigate('Passphrase');
+		} else {
+			ref.current?.scrollTo({ index: slides.length - 1, animated: true });
+		}
 	};
 
-	useEffect(() => {
-		if (skipIntro) {
-			progressValue.value = slides.length - 1;
-			ref.current?.scrollTo({ index: slides.length - 1, animated: false });
+	const onCreateWallet = useCallback(async (): Promise<void> => {
+		setIsCreatingWallet(true);
+		await sleep(500); // wait for animation to be started
+		const res = await createNewWallet({ bip39Passphrase });
+		if (res.isErr()) {
+			setIsCreatingWallet(false);
+			showToast({
+				type: 'warning',
+				title: t('error_create'),
+				description: res.error.message,
+			});
 		}
-	}, [skipIntro, slides.length, progressValue]);
+
+		dispatch(updateUser({ requiresRemoteRestore: false }));
+	}, [bip39Passphrase, t, dispatch]);
+
+	const onRestoreWallet = (): void => {
+		navigation.navigate('MultipleDevices');
+	};
 
 	useEffect(() => {
-		if (bip39Passphrase === undefined) {
-			return;
+		if (bip39Passphrase) {
+			onCreateWallet();
 		}
-		onNewWallet();
-	}, [bip39Passphrase, onNewWallet]);
-
-	const glowColor: keyof IColors = isCreatingWallet
-		? 'brand'
-		: slides[index]?.topLeftColor ?? 'brand';
+	}, [bip39Passphrase, onCreateWallet]);
 
 	return (
-		<GlowingBackground topLeft={glowColor}>
+		<ThemedView style={styles.root}>
 			{isCreatingWallet ? (
 				<LoadingWalletScreen />
 			) : (
@@ -287,128 +207,108 @@ const Slideshow = ({
 						ref={ref}
 						loop={false}
 						width={dimensions.width}
-						height={dimensions.height - 56 - (insets.bottom || 12)}
+						height={dimensions.height}
 						data={slides}
-						renderItem={({ index: i }): ReactElement => {
-							const Slide = slides[i].slide;
-							return <Slide key={i} />;
-						}}
-						onSnapToItem={setIndex}
+						defaultIndex={skipIntro ? slides.length - 1 : 0}
 						onProgressChange={(_, absoluteProgress): void => {
 							progressValue.value = absoluteProgress;
 						}}
+						renderItem={({ index }): ReactElement => (
+							<Slide
+								key={`slide-${index}`}
+								index={index}
+								color={slides[index].color}
+								image={slides[index].image}
+								onCreate={onCreateWallet}
+								onRestore={onRestoreWallet}
+							/>
+						)}
 					/>
 
-					<View style={styles.footer}>
-						<AnimatedView style={[styles.adv, advOpacity]}>
-							<TouchableOpacity
-								style={styles.advTouchable}
-								onPress={(): void => {
-									if (index !== slides.length - 1) {
-										return;
-									}
-									navigation.navigate('Passphrase');
-								}}
-								testID="Passphrase">
-								<Caption13M color="gray1">{t('advanced_setup')}</Caption13M>
-							</TouchableOpacity>
-						</AnimatedView>
-						<AnimatedView
-							style={[styles.dots, dotsOpacity]}
-							pointerEvents="none">
-							{slides.map((_backgroundColor, i) => (
-								<Dot
-									key={i}
-									index={i}
-									animValue={progressValue}
-									length={slides.length}
-								/>
-							))}
-						</AnimatedView>
-					</View>
+					<Animated.View style={[styles.headerButtonContainer, startOpacity]}>
+						<Pressable testID="SkipButton" onPress={onHeaderButton}>
+							<SafeAreaInset type="top" />
+							<BodyMSB color="white50">{t('skip')}</BodyMSB>
+						</Pressable>
+					</Animated.View>
 
-					<AnimatedView
-						color="transparent"
-						style={[styles.headerButtonContainer, skipOpacity]}>
-						<Pressable
-							style={styles.skipButton}
-							onPress={onSkip}
-							testID="SkipButton">
+					<Animated.View style={[styles.headerButtonContainer, endOpacity]}>
+						<Pressable testID="Passphrase" onPress={onHeaderButton}>
 							<SafeAreaInset type="top" />
-							<Text01M color="gray1">{t('skip')}</Text01M>
+							<BodyMSB color="white50">{t('advanced_setup')}</BodyMSB>
 						</Pressable>
-					</AnimatedView>
+					</Animated.View>
+
+					<Animated.View
+						style={[styles.dots, startOpacity]}
+						pointerEvents="none">
+						{slides.map((_, i) => (
+							<Dot
+								key={i}
+								index={i}
+								animValue={progressValue}
+								length={slides.length}
+							/>
+						))}
+					</Animated.View>
 				</>
 			)}
-		</GlowingBackground>
+		</ThemedView>
 	);
 };
 
 const styles = StyleSheet.create({
+	root: {
+		flex: 1,
+	},
+	slide: {
+		flex: 1,
+		paddingHorizontal: 32,
+	},
 	headerButtonContainer: {
 		flexDirection: 'row',
-		width: '100%',
 		justifyContent: 'flex-end',
+		width: '100%',
+		position: 'absolute',
 		top: 20,
 		paddingHorizontal: 28,
-		position: 'absolute',
-	},
-	skipButton: {
-		backgroundColor: 'transparent',
-	},
-	slide: {
-		flex: 1,
-		paddingHorizontal: 32,
 	},
 	imageContainer: {
-		flex: 4,
 		alignItems: 'center',
-		marginBottom: 32,
 		justifyContent: 'flex-end',
-		position: 'relative', // for first slide background image
+		marginBottom: 48,
+		marginTop: 'auto',
 	},
-	illustration: {
+	image: {
 		resizeMode: 'contain',
 	},
-	textContent: {
-		// line up Welcome screen content with Slideshow
-		flex: Platform.OS === 'ios' ? 3.2 : 3.5,
-	},
 	text: {
-		marginTop: 8,
+		marginTop: 4,
+		minHeight: 90,
 	},
 	buttonsContainer: {
 		flexDirection: 'row',
-		marginTop: 42,
+		gap: 16,
 	},
 	button: {
 		flex: 1,
-		paddingHorizontal: 10,
-	},
-	restoreButton: {
-		marginRight: 6,
 	},
-	newButton: {
-		marginLeft: 6,
-	},
-	footer: {
-		position: 'relative',
-		justifyContent: 'center',
+	dotsSpacing: {
+		height: 55,
 	},
 	dots: {
-		position: 'absolute',
+		width: '100%',
 		flexDirection: 'row',
-		justifyContent: 'space-between',
-		alignSelf: 'center',
-	},
-	adv: {
-		backgroundColor: 'transparent',
+		justifyContent: 'center',
 		position: 'absolute',
-		alignSelf: 'center',
-	},
-	advTouchable: {
-		padding: 16,
-		backgroundColor: 'transparent',
+		...Platform.select({
+			ios: {
+				bottom: 60,
+			},
+			android: {
+				bottom: 40,
+			},
+		}),
 	},
 });
 
diff --git a/src/screens/Onboarding/TermsOfUse.tsx b/src/screens/Onboarding/TermsOfUse.tsx
index 891e5ec0a..ce90cb604 100644
--- a/src/screens/Onboarding/TermsOfUse.tsx
+++ b/src/screens/Onboarding/TermsOfUse.tsx
@@ -2,16 +2,15 @@ import React, { ReactElement, useState } from 'react';
 import { View, StyleSheet, ScrollView } from 'react-native';
 import { Trans, useTranslation } from 'react-i18next';
 
-import { Display, Text01B, Text01S, Text02B } from '../../styles/text';
-import GlowingBackground from '../../components/GlowingBackground';
+import { Display, BodyM, BodyMSB, BodySSB } from '../../styles/text';
 import SafeAreaInset from '../../components/SafeAreaInset';
 import Button from '../../components/Button';
 import CheckButton from '../../components/CheckButton';
+import VerticalShadow from '../../components/VerticalShadow';
 import { openURL } from '../../utils/helpers';
-import type { OnboardingStackScreenProps } from '../../navigation/types';
-
-import termsOfUseText from '../../assets/tos';
 import { wipeApp } from '../../store/utils/settings';
+import termsOfUseText from '../../assets/tos';
+import type { OnboardingStackScreenProps } from '../../navigation/types';
 
 const TermsOfUse = ({
 	navigation,
@@ -21,6 +20,14 @@ const TermsOfUse = ({
 	const [loading, setLoading] = useState(false);
 	const { t } = useTranslation('onboarding');
 
+	const onTerms = (): void => {
+		openURL('https://bitkit.to/terms-of-use');
+	};
+
+	const onPrivacy = (): void => {
+		openURL('https://bitkit.to/privacy-policy');
+	};
+
 	const onPress = async (): Promise<void> => {
 		setLoading(true);
 		// Ensure the app is sufficiently wiped of data from any previous install.
@@ -39,70 +46,62 @@ const TermsOfUse = ({
 	const isValid = termsOfUse && privacyPolicy && !loading;
 
 	return (
-		<GlowingBackground topLeft="brand">
+		<>
 			<SafeAreaInset type="top" />
 			<View style={styles.content}>
-				<ScrollView style={styles.tos} testID="TOS">
-					<Trans
-						t={t}
-						i18nKey="tos_header"
-						parent={Display}
-						components={{
-							brand: <Display color="brand" />,
-						}}
-					/>
+				<View style={styles.scrollViewContainer}>
+					<ScrollView style={styles.scrollView} testID="TOS">
+						<Trans
+							t={t}
+							i18nKey="tos_header"
+							parent={Display}
+							components={{ accent: <Display color="brand" /> }}
+						/>
 
-					<Text01S color="gray1" style={styles.text}>
-						{termsOfUseText}
-					</Text01S>
-				</ScrollView>
+						<BodyM color="white50" style={styles.text}>
+							{termsOfUseText}
+						</BodyM>
+					</ScrollView>
+
+					<View style={styles.shadowContainer}>
+						<VerticalShadow direction="bottom" />
+					</View>
+				</View>
 
 				<View style={styles.checkboxes}>
 					<CheckButton
-						label={<Text01B>{t('tos_checkbox')}</Text01B>}
+						label={<BodyMSB>{t('tos_checkbox')}</BodyMSB>}
 						description={
-							<Trans
-								t={t}
-								i18nKey="tos_checkbox_value"
-								components={{
-									gray: <Text02B color="gray1" />,
-									brand: (
-										<Text02B
-											color="brand"
-											onPress={(): void => {
-												openURL('https://bitkit.to/terms-of-use');
-											}}
-										/>
-									),
-								}}
-							/>
+							<BodySSB color="white50">
+								<Trans
+									t={t}
+									i18nKey="tos_checkbox_value"
+									components={{
+										accent: <BodySSB color="brand" onPress={onTerms} />,
+									}}
+								/>
+							</BodySSB>
 						}
 						checked={termsOfUse}
-						onPress={(): void => setTermsOfUse((prevState) => !prevState)}
 						testID="Check1"
+						onPress={(): void => setTermsOfUse((prevState) => !prevState)}
 					/>
 					<CheckButton
-						label={<Text01B>{t('pp_checkbox')}</Text01B>}
+						label={<BodyMSB>{t('pp_checkbox')}</BodyMSB>}
 						description={
-							<Trans
-								t={t}
-								i18nKey="pp_checkbox_value"
-								components={{
-									gray: <Text02B color="gray1" />,
-									brand: (
-										<Text02B
-											color="brand"
-											onPress={(): void => {
-												openURL('https://bitkit.to/privacy-policy');
-											}}
-										/>
-									),
-								}}
-							/>
+							<BodySSB color="white50">
+								<Trans
+									t={t}
+									i18nKey="pp_checkbox_value"
+									components={{
+										accent: <BodySSB color="brand" onPress={onPrivacy} />,
+									}}
+								/>
+							</BodySSB>
 						}
 						checked={privacyPolicy}
-						onPress={(): void => setPrivacyPolicy((prevState) => !prevState)}
 						testID="Check2"
+						onPress={(): void => setPrivacyPolicy((prevState) => !prevState)}
 					/>
 				</View>
 
@@ -117,7 +116,7 @@ const TermsOfUse = ({
 				</View>
 			</View>
 			<SafeAreaInset type="bottom" minPadding={16} />
-		</GlowingBackground>
+		</>
 	);
 };
 
@@ -126,15 +125,27 @@ const styles = StyleSheet.create({
 		flex: 1,
 		paddingHorizontal: 32,
 	},
-	tos: {
+	scrollViewContainer: {
+		flex: 1,
+		position: 'relative',
+	},
+	scrollView: {
 		flex: 1,
 		paddingTop: 48,
+		textTransform: 'uppercase',
+	},
+	shadowContainer: {
+		position: 'absolute',
+		bottom: 0,
+		left: 0,
+		right: 0,
+		height: 70,
+		pointerEvents: 'none',
 	},
 	text: {
 		marginTop: 8,
 	},
 	checkboxes: {
-		paddingTop: 16,
 		marginTop: 'auto',
 	},
 	buttonContainer: {
diff --git a/src/screens/Onboarding/Welcome.tsx b/src/screens/Onboarding/Welcome.tsx
index 914b4d974..fe8aa5922 100644
--- a/src/screens/Onboarding/Welcome.tsx
+++ b/src/screens/Onboarding/Welcome.tsx
@@ -1,18 +1,17 @@
 import React, { ReactElement } from 'react';
-import { View, StyleSheet, Image } from 'react-native';
+import { View, StyleSheet, Image, ImageBackground } from 'react-native';
 import { FadeIn } from 'react-native-reanimated';
 import { Trans, useTranslation } from 'react-i18next';
 
 import { AnimatedView } from '../../styles/components';
-import { Display, Text01S } from '../../styles/text';
-import GlowingBackground from '../../components/GlowingBackground';
+import { Display, BodyM } from '../../styles/text';
 import SafeAreaInset from '../../components/SafeAreaInset';
 import Button from '../../components/Button';
-import BitkitLogo from '../../assets/bitkit-logo.svg';
 import DetectSwipe from '../../components/DetectSwipe';
 import type { OnboardingStackScreenProps } from '../../navigation/types';
 
-const imageSrc = require('../../assets/illustrations/figures.png');
+const backgroundSrc = require('../../assets/illustrations/figures.png');
+const logoSrc = require('../../assets/logo.png');
 
 const OnboardingWelcomeScreen = ({
 	navigation,
@@ -28,90 +27,84 @@ const OnboardingWelcomeScreen = ({
 	};
 
 	const onSwipeLeft = (): void => {
-		console.log('swiped');
 		navigation.navigate('Slideshow');
 	};
 
 	return (
-		<GlowingBackground topLeft="brand">
+		<ImageBackground style={styles.root} source={backgroundSrc}>
 			<DetectSwipe onSwipeLeft={onSwipeLeft}>
 				<View style={styles.content}>
 					<AnimatedView
-						style={styles.imageContainer}
+						style={styles.logoContainer}
 						color="transparent"
 						entering={FadeIn.duration(1000)}>
-						<Image style={styles.floatIllustraion} source={imageSrc} />
+						<Image style={styles.logo} source={logoSrc} />
 					</AnimatedView>
 
 					<View style={styles.textContent}>
 						<Trans
 							t={t}
-							i18nKey="toolkit"
+							i18nKey="welcome_title"
 							parent={Display}
-							components={{
-								brand: <Display color="brand" />,
-							}}
+							components={{ accent: <Display color="brand" /> }}
 						/>
 
-						<Text01S color="gray1" style={styles.text}>
-							{t('toolkit_text')}
-						</Text01S>
+						<BodyM style={styles.text} color="white50">
+							{t('welcome_text')}
+						</BodyM>
 
 						<View style={styles.buttonsContainer}>
 							<Button
-								size="large"
-								onPress={onGetStarted}
-								text={t('get_started')}
 								style={[styles.button, styles.restoreButton]}
+								text={t('get_started')}
+								size="large"
 								testID="GetStarted"
+								onPress={onGetStarted}
 							/>
 							<Button
+								style={[styles.button, styles.skipButton]}
+								text={t('skip_intro')}
 								size="large"
 								variant="secondary"
-								onPress={onSkipIntro}
-								text={t('skip_intro')}
-								style={[styles.button, styles.skipButton]}
 								testID="SkipIntro"
+								onPress={onSkipIntro}
 							/>
 						</View>
-
-						<View style={styles.logoContainer} pointerEvents="none">
-							<BitkitLogo height={30} width={72} />
-						</View>
 						<SafeAreaInset type="bottom" minPadding={16} />
 					</View>
 				</View>
 			</DetectSwipe>
-		</GlowingBackground>
+		</ImageBackground>
 	);
 };
 
 const styles = StyleSheet.create({
+	root: {
+		flex: 1,
+	},
 	content: {
 		flex: 1,
 		paddingHorizontal: 32,
 	},
-	imageContainer: {
-		flex: 4,
-		paddingTop: 20,
+	logoContainer: {
+		flex: 1,
+		paddingBottom: 70,
 		justifyContent: 'center',
 		alignItems: 'center',
-		width: '100%',
 	},
-	floatIllustraion: {
-		position: 'absolute',
-		top: 10,
+	logo: {
+		width: 270,
+		resizeMode: 'contain',
 	},
 	textContent: {
-		flex: 3.4,
+		marginTop: 'auto',
 	},
 	text: {
-		marginTop: 8,
+		marginTop: 4,
 	},
 	buttonsContainer: {
 		flexDirection: 'row',
-		marginTop: 20,
-		marginBottom: 50,
+		marginTop: 32,
 	},
 	button: {
 		flex: 1,
@@ -123,11 +116,6 @@ const styles = StyleSheet.create({
 	skipButton: {
 		marginLeft: 6,
 	},
-	logoContainer: {
-		flexDirection: 'row',
-		justifyContent: 'center',
-		marginTop: 'auto',
-	},
 });
 
 export default OnboardingWelcomeScreen;
diff --git a/src/screens/Profile/Profile.tsx b/src/screens/Profile/Profile.tsx
index 62dc70562..0eb92c842 100644
--- a/src/screens/Profile/Profile.tsx
+++ b/src/screens/Profile/Profile.tsx
@@ -21,7 +21,7 @@ import {
 	TouchableOpacity,
 	View as ThemedView,
 } from '../../styles/components';
-import { Text02S } from '../../styles/text';
+import { BodyS } from '../../styles/text';
 import {
 	CopyIcon,
 	PencileIcon,
@@ -231,9 +231,9 @@ const QRView = ({
 				</View>
 			</TouchableOpacity>
 
-			<Text02S style={styles.qrViewNote}>
+			<BodyS style={styles.qrViewNote}>
 				{t('profile_scan_to_add', { name: truncate(firstName, 30) })}
-			</Text02S>
+			</BodyS>
 		</View>
 	);
 };
@@ -264,6 +264,7 @@ const styles = StyleSheet.create({
 	},
 	content: {
 		flexGrow: 1,
+		paddingTop: 4,
 		paddingHorizontal: 16,
 	},
 	actions: {
diff --git a/src/screens/Profile/ProfileEdit.tsx b/src/screens/Profile/ProfileEdit.tsx
index 21ef2de53..e2fc3b1e8 100644
--- a/src/screens/Profile/ProfileEdit.tsx
+++ b/src/screens/Profile/ProfileEdit.tsx
@@ -11,7 +11,7 @@ import { useAppDispatch, useAppSelector } from '../../hooks/redux';
 import { useTranslation } from 'react-i18next';
 
 import { ScrollView, View as ThemedView } from '../../styles/components';
-import { Text02S } from '../../styles/text';
+import { BodyS } from '../../styles/text';
 import { PlusIcon } from '../../styles/icons';
 import NavigationHeader from '../../components/NavigationHeader';
 import KeyboardAvoidingView from '../../components/KeyboardAvoidingView';
@@ -128,7 +128,7 @@ const ProfileEdit = ({
 		<ThemedView style={styles.container}>
 			<SafeAreaInset type="top" />
 			<NavigationHeader
-				title={t(onboardedProfile ? 'profile' : 'profile_create')}
+				title={t(onboardedProfile ? 'profile_edit' : 'profile_create')}
 				onClosePress={(): void => {
 					navigation.navigate(onboardedProfile ? 'Profile' : 'Wallet');
 				}}
@@ -157,7 +157,7 @@ const ProfileEdit = ({
 						onPress={onAddLink}
 					/>
 					<Divider />
-					<Text02S color="gray1">{t('profile_public_warn')}</Text02S>
+					<BodyS color="white50">{t('profile_public_warn')}</BodyS>
 
 					{/* leave button visible over keyboard for onboarding */}
 					<View style={onboardedProfile && styles.bottom}>
diff --git a/src/screens/Profile/ProfileLink.tsx b/src/screens/Profile/ProfileLink.tsx
index 11c4acbb7..83aacc75a 100644
--- a/src/screens/Profile/ProfileLink.tsx
+++ b/src/screens/Profile/ProfileLink.tsx
@@ -2,7 +2,7 @@ import React, { ReactElement } from 'react';
 import { useTranslation } from 'react-i18next';
 import { StyleSheet, TouchableOpacity, View } from 'react-native';
 
-import { Text02B, Text02S } from '../../styles/text';
+import { BodySB, BodyS } from '../../styles/text';
 import BottomSheetNavigationHeader from '../../components/BottomSheetNavigationHeader';
 import Button from '../../components/Button';
 import LabeledInput from '../../components/LabeledInput';
@@ -58,7 +58,7 @@ const ProfileLink = ({
 					onPress={(): void => {
 						navigation.navigate('ProfileLinkSuggestions');
 					}}>
-					<Text02B color="brand">{t('profile_link_suggestions')}</Text02B>
+					<BodySB color="brand">{t('profile_link_suggestions')}</BodySB>
 				</TouchableOpacity>
 			</LabeledInput>
 			<LabeledInput
@@ -74,9 +74,9 @@ const ProfileLink = ({
 					dispatch(updateProfileLink({ ...form, url: value }));
 				}}
 			/>
-			<Text02S style={styles.note} color="gray1">
+			<BodyS style={styles.note} color="white50">
 				{t('profile_link_public')}
-			</Text02S>
+			</BodyS>
 
 			<View style={styles.buttonContainer}>
 				<Button
diff --git a/src/screens/Profile/ProfileOnboarding.tsx b/src/screens/Profile/ProfileOnboarding.tsx
index 4fba237f0..42ca940cb 100644
--- a/src/screens/Profile/ProfileOnboarding.tsx
+++ b/src/screens/Profile/ProfileOnboarding.tsx
@@ -3,7 +3,6 @@ import React, {
 	ReactElement,
 	ReactNode,
 	useCallback,
-	useMemo,
 	useState,
 } from 'react';
 import { View, StyleSheet, Image, ImageSourcePropType } from 'react-native';
@@ -11,10 +10,10 @@ import { StackNavigationProp } from '@react-navigation/stack';
 import { useAppDispatch, useAppSelector } from '../../hooks/redux';
 import { Trans, useTranslation } from 'react-i18next';
 
-import { Display, Text01S, Text02S } from '../../styles/text';
+import { Display, BodyM, BodyS } from '../../styles/text';
+import { View as ThemedView } from '../../styles/components';
 import NavigationHeader from '../../components/NavigationHeader';
 import Button from '../../components/Button';
-import GlowingBackground from '../../components/GlowingBackground';
 import SafeAreaInset from '../../components/SafeAreaInset';
 import { TSlashtagsState } from '../../store/types/slashtags';
 import SwitchRow from '../../components/SwitchRow';
@@ -25,7 +24,6 @@ import type {
 	RootStackParamList,
 	RootStackScreenProps,
 } from '../../navigation/types';
-import { useScreenSize } from '../../hooks/screen';
 import {
 	selectedNetworkSelector,
 	selectedWalletSelector,
@@ -50,14 +48,12 @@ export const ProfileIntro = memo(
 					<Trans
 						t={t}
 						i18nKey="onboarding_profile1_header"
-						components={{
-							brand: <Display color="brand" />,
-						}}
+						components={{ accent: <Display color="brand" /> }}
 					/>
 				</Display>
-				<Text01S color="gray1" style={styles.introText}>
+				<BodyM color="white50" style={styles.introText}>
 					{t('onboarding_profile1_text')}
-				</Text01S>
+				</BodyM>
 			</Layout>
 		);
 	},
@@ -82,28 +78,28 @@ export const OfflinePayments = ({
 			navigation={navigation}
 			illustration={coinsImageSrc}
 			nextStep="Done"
-			buttonText={t('profile_save')}
+			buttonText={t('continue')}
 			header={t('profile_pay_contacts')}
 			onNext={savePaymentConfig}>
 			<Display>
 				<Trans
 					t={t}
 					i18nKey="onboarding_profile2_header"
-					components={{ brand: <Display color="brand" /> }}
+					components={{ accent: <Display color="brand" /> }}
 				/>
 			</Display>
-			<Text01S color="gray1" style={styles.introText}>
+			<BodyM color="white50" style={styles.introText}>
 				{t('onboarding_profile2_text')}
-			</Text01S>
+			</BodyM>
 
 			<View style={styles.enableOfflineRow}>
 				<SwitchRow
 					isEnabled={enableOfflinePayments}
 					showDivider={false}
 					onPress={(): void => setOfflinePayments(!enableOfflinePayments)}>
-					<Text01S>{t('offline_enable')}</Text01S>
+					<BodyM>{t('offline_enable')}</BodyM>
 				</SwitchRow>
-				<Text02S color="gray1">{t('offline_enable_explain')}</Text02S>
+				<BodyS color="white50">{t('offline_enable_explain')}</BodyS>
 			</View>
 		</Layout>
 	);
@@ -127,23 +123,14 @@ const Layout = memo(
 		children: ReactNode;
 		onNext?: () => void;
 	}): ReactElement => {
-		const { isSmallScreen } = useScreenSize();
 		const dispatch = useAppDispatch();
 
 		const onSwipeLeft = (): void => {
 			navigation.navigate('Wallet');
 		};
 
-		const imageContainerStyles = useMemo(
-			() => ({
-				...styles.imageContainer,
-				flex: isSmallScreen ? 0.7 : 1,
-			}),
-			[isSmallScreen],
-		);
-
 		return (
-			<GlowingBackground topLeft="brand">
+			<ThemedView style={styles.root}>
 				<SafeAreaInset type="top" />
 				<NavigationHeader
 					title={header}
@@ -154,45 +141,61 @@ const Layout = memo(
 				/>
 				<DetectSwipe onSwipeLeft={onSwipeLeft}>
 					<View style={styles.content}>
-						<View style={imageContainerStyles}>
+						<View style={styles.imageContainer}>
 							<Image source={illustration} style={styles.image} />
 						</View>
 						<View style={styles.middleContainer}>{children}</View>
-						<Button
-							text={buttonText}
-							size="large"
-							onPress={(): void => {
-								onNext?.();
-								dispatch(setOnboardingProfileStep(nextStep));
-							}}
-							testID="OnboardingContinue"
-						/>
+						<View style={styles.buttonContainer}>
+							<Button
+								style={styles.button}
+								text={buttonText}
+								size="large"
+								testID="OnboardingContinue"
+								onPress={(): void => {
+									onNext?.();
+									dispatch(setOnboardingProfileStep(nextStep));
+								}}
+							/>
+						</View>
 					</View>
 				</DetectSwipe>
 				<SafeAreaInset type="bottom" minPadding={16} />
-			</GlowingBackground>
+			</ThemedView>
 		);
 	},
 );
 
 const styles = StyleSheet.create({
+	root: {
+		flex: 1,
+	},
 	content: {
 		flex: 1,
 		justifyContent: 'space-between',
 		paddingHorizontal: 32,
 	},
 	imageContainer: {
-		flex: 1,
+		flexShrink: 1,
 		alignItems: 'center',
+		alignSelf: 'center',
+		aspectRatio: 1,
+		marginTop: 'auto',
 	},
 	image: {
 		flex: 1,
 		resizeMode: 'contain',
 	},
 	introText: {
-		marginTop: 8,
+		marginTop: 4,
 	},
 	middleContainer: {
+		marginTop: 'auto',
+	},
+	buttonContainer: {
+		flexDirection: 'row',
+		marginTop: 32,
+	},
+	button: {
 		flex: 1,
 	},
 	enableOfflineRow: {
diff --git a/src/screens/Recovery/Lightning.tsx b/src/screens/Recovery/Lightning.tsx
index 13768d11b..44d592e63 100644
--- a/src/screens/Recovery/Lightning.tsx
+++ b/src/screens/Recovery/Lightning.tsx
@@ -7,7 +7,7 @@ import { useAppSelector } from '../../hooks/redux';
 import lm, { ldk, TLdkData } from '@synonymdev/react-native-ldk';
 import { View as ThemedView } from '../../styles/components';
 import List, { EItemType, IListData, ItemData } from '../../components/List';
-import { Text01S } from '../../styles/text';
+import { BodyM } from '../../styles/text';
 
 import NavigationHeader from '../../components/NavigationHeader';
 import SafeAreaInset from '../../components/SafeAreaInset';
@@ -237,7 +237,7 @@ const LightningWithSlashtags = ({
 				) : (
 					<>
 						{history.data.length === 0 ? (
-							<Text01S>No backups found.</Text01S>
+							<BodyM>No backups found.</BodyM>
 						) : (
 							<List data={[history]} />
 						)}
diff --git a/src/screens/Recovery/Mnemonic.tsx b/src/screens/Recovery/Mnemonic.tsx
index f22f5407a..91b0ccc89 100644
--- a/src/screens/Recovery/Mnemonic.tsx
+++ b/src/screens/Recovery/Mnemonic.tsx
@@ -3,7 +3,7 @@ import { StyleSheet, View } from 'react-native';
 import { Trans, useTranslation } from 'react-i18next';
 
 import { View as ThemedView } from '../../styles/components';
-import { Text01M, Text01S } from '../../styles/text';
+import { BodyMSB, BodyM } from '../../styles/text';
 import { showToast } from '../../utils/notifications';
 import { getBip39Passphrase, getMnemonicPhrase } from '../../utils/wallet';
 import NavigationHeader from '../../components/NavigationHeader';
@@ -48,11 +48,11 @@ const Mnemonic = ({
 			<SafeAreaInset type="top" />
 			<NavigationHeader title={t('mnemonic_phrase')} />
 			<View style={styles.content}>
-				<Text01S style={styles.text} color="gray1">
+				<BodyM style={styles.text} color="white50">
 					{t('mnemonic_write', { length: seed.length })}
-				</Text01S>
+				</BodyM>
 
-				<ThemedView color="gray324" style={styles.seed}>
+				<ThemedView style={styles.seed} color="white10">
 					<View style={styles.col}>
 						{seed.slice(0, seed.length / 2).map((w, i) => (
 							<Word key={i} word={w} number={i + 1} />
@@ -67,19 +67,17 @@ const Mnemonic = ({
 
 				{passphrase !== '' && (
 					<View style={styles.passphrase}>
-						<Text01S style={styles.passphrase} color="gray1">
+						<BodyM style={styles.passphrase} color="white50">
 							{t('pass_text')}
-						</Text01S>
-						<Text01M>
+						</BodyM>
+						<BodyMSB>
 							<Trans
 								t={t}
 								i18nKey="pass_recovery"
-								components={{
-									gray: <Text01M color="gray1" />,
-								}}
+								components={{ accent: <BodyMSB color="white50" /> }}
 								values={{ passphrase }}
 							/>
-						</Text01M>
+						</BodyMSB>
 					</View>
 				)}
 
@@ -103,6 +101,7 @@ const styles = StyleSheet.create({
 	},
 	content: {
 		flex: 1,
+		paddingTop: 16,
 		paddingHorizontal: 16,
 	},
 	text: {
diff --git a/src/screens/Recovery/Recovery.tsx b/src/screens/Recovery/Recovery.tsx
index 6e94b8643..b36d54a90 100644
--- a/src/screens/Recovery/Recovery.tsx
+++ b/src/screens/Recovery/Recovery.tsx
@@ -11,7 +11,7 @@ import { zipLogs } from '../../utils/lightning/logs';
 import { createSupportLink } from '../../utils/support';
 import { showToast } from '../../utils/notifications';
 import { View as ThemedView } from '../../styles/components';
-import { Text01S } from '../../styles/text';
+import { BodyM } from '../../styles/text';
 import NavigationHeader from '../../components/NavigationHeader';
 import SafeAreaInset from '../../components/SafeAreaInset';
 import Button from '../../components/Button';
@@ -120,7 +120,7 @@ const Recovery = ({
 			<SafeAreaInset type="top" />
 			<NavigationHeader title={t('recovery')} displayBackButton={false} />
 			<View style={styles.content}>
-				<Text01S color="gray1">{t('recovery_text')}</Text01S>
+				<BodyM color="white50">{t('recovery_text')}</BodyM>
 
 				<View style={styles.buttons}>
 					<Button
diff --git a/src/screens/Scanner/MainScanner.tsx b/src/screens/Scanner/MainScanner.tsx
index b0df6e6eb..70c385634 100644
--- a/src/screens/Scanner/MainScanner.tsx
+++ b/src/screens/Scanner/MainScanner.tsx
@@ -66,6 +66,7 @@ const ScannerScreen = ({
 				<NavigationHeader
 					style={styles.navigationHeader}
 					title={t('qr_scan')}
+					onClosePress={(): void => navigation.pop()}
 				/>
 			</ScannerComponent>
 		</DetectSwipe>
diff --git a/src/screens/Scanner/ScannerComponent.tsx b/src/screens/Scanner/ScannerComponent.tsx
index 453d69be0..a48064d5b 100644
--- a/src/screens/Scanner/ScannerComponent.tsx
+++ b/src/screens/Scanner/ScannerComponent.tsx
@@ -13,7 +13,7 @@ import RNQRGenerator from 'rn-qr-generator';
 import { useTranslation } from 'react-i18next';
 
 import { AnimatedView } from '../../styles/components';
-import { Text02M } from '../../styles/text';
+import { BodySSB } from '../../styles/text';
 import {
 	ClipboardTextIcon,
 	PictureIcon,
@@ -182,9 +182,9 @@ const ScannerComponent = ({
 								color="transparent"
 								entering={FadeIn}
 								exiting={FadeOut}>
-								<Text02M style={styles.error} color="brand">
+								<BodySSB style={styles.error} color="brand">
 									{error}
-								</Text02M>
+								</BodySSB>
 							</AnimatedView>
 						)}
 					</Background>
diff --git a/src/screens/Settings/About/index.tsx b/src/screens/Settings/About/index.tsx
index 7f13e0b6b..5ccf726b4 100644
--- a/src/screens/Settings/About/index.tsx
+++ b/src/screens/Settings/About/index.tsx
@@ -1,57 +1,26 @@
 import React, {
 	memo,
 	ReactElement,
-	// useCallback,
+	useCallback,
 	useMemo,
 	// useState,
 } from 'react';
 // import Rate, { AndroidMarket } from 'react-native-rate';
-import {
-	View,
-	Image,
-	// Share,
-	// Platform,
-	StyleSheet,
-	Pressable,
-} from 'react-native';
-import {
-	getBuildNumber,
-	// getBundleId,
-	getVersion,
-} from 'react-native-device-info';
-import { Trans, useTranslation } from 'react-i18next';
+import { View, Image, Share, StyleSheet } from 'react-native';
+import { getBuildNumber, getVersion } from 'react-native-device-info';
+import { useTranslation } from 'react-i18next';
 
-import { Text01S } from '../../../styles/text';
-import {
-	BitkitIcon,
-	DiscordIcon,
-	GithubIcon,
-	GlobeIcon,
-	MediumIcon,
-	TelegramIcon,
-	TwitterIcon,
-} from '../../../styles/icons';
-//import { createSupportLink } from '../../../utils/support';
-import NavigationHeader from '../../../components/NavigationHeader';
-import List, { EItemType, IListData } from '../../../components/List';
-import GlowingBackground from '../../../components/GlowingBackground';
+import { View as ThemedView } from '../../../styles/components';
+import { EItemType, IListData } from '../../../components/List';
 import SafeAreaInset from '../../../components/SafeAreaInset';
-import type { SettingsScreenProps } from '../../../navigation/types';
-import { openAppURL, openURL } from '../../../utils/helpers';
+import Social from '../../../components/Social';
+import SettingsView from '../SettingsView';
+import { openURL } from '../../../utils/helpers';
+import { appName, shareText } from '../../../constants/app';
 
-const imageSrc = require('../../../assets/powered-by.png');
+const imageSrc = require('../../../assets/logo.png');
 
-// TODO: add correct store IDs and test
-// const appleAppID = '1634634088';
-// const androidPackageName = getBundleId();
-// const appStoreUrl =
-// 	Platform.OS === 'ios'
-// 		? `https://apps.apple.com/us/app/bitkit/id${appleAppID}`
-// 		: `https://play.google.com/store/apps/details?id=${androidPackageName}`;
-
-const About = ({
-	navigation,
-}: SettingsScreenProps<'AboutSettings'>): ReactElement => {
+const About = (): ReactElement => {
 	const { t } = useTranslation('settings');
 	// TODO: uncomment links after full launch
 
@@ -77,14 +46,11 @@ const About = ({
 	// 	});
 	// }, []);
 
-	// const onShare = useCallback(async (): Promise<void> => {
-	// 	await Share.share({
-	// 		title: 'Bitkit',
-	// 		message: `Download Bitkit, Your Ultimate Bitcoin Toolkit. Handing you the keys to reshape your digital life. ${appStoreUrl}`,
-	// 	});
-	// }, []);
+	const onShare = useCallback(async (): Promise<void> => {
+		await Share.share({ title: appName, message: shareText });
+	}, []);
 
-	const settingsListData: IListData[] = useMemo(
+	const listData: IListData[] = useMemo(
 		() => [
 			{
 				data: [
@@ -102,19 +68,18 @@ const About = ({
 					// 		openURL('https://www.synonym.to/').then();
 					// 	},
 					// },
-					// {
-					// 	title: 'Share Bitkit with a friend',
-					// 	type: EItemType.button,
-					// 	onPress: onShare,
-					// },
 					{
 						title: t('about.legal'),
 						type: EItemType.button,
 						onPress: (): void => {
-							// TODO: update with correct url
 							openURL('https://www.bitkit.to/terms-of-use').then();
 						},
 					},
+					{
+						title: t('about.share'),
+						type: EItemType.button,
+						onPress: onShare,
+					},
 					{
 						title: t('about.version'),
 						value: `${getVersion()} (${getBuildNumber()})`,
@@ -129,150 +94,43 @@ const About = ({
 			},
 		],
 		// [isReviewing],
-		[t],
+		[onShare, t],
 	);
 
 	return (
-		<GlowingBackground bottomRight="brand">
-			<SafeAreaInset type="top" />
-			<NavigationHeader
+		<ThemedView style={styles.root}>
+			<SettingsView
+				headerText={t('about.text')}
 				title={t('about.title')}
-				onClosePress={(): void => {
-					navigation.navigate('Wallet');
-				}}
+				listData={listData}
+				fullHeight={false}
 			/>
-			<View style={styles.content}>
-				<Text01S style={styles.text} color="gray1">
-					<Trans
-						t={t}
-						i18nKey="about.text"
-						components={{
-							easterEgg: (
-								<Text01S
-									color="gray1"
-									onPress={(): void => {
-										navigation.navigate('EasterEgg');
-									}}
-								/>
-							),
-						}}
-					/>
-				</Text01S>
-
-				<List style={styles.list} data={settingsListData} bounces={false} />
-
-				<View style={styles.footer}>
-					<View style={styles.logoContainer}>
-						<Pressable
-							style={styles.logoLink}
-							onPress={(): void => {
-								navigation.navigate('EasterEgg');
-							}}
-							testID="Logo"
-						/>
-						<BitkitIcon height={64} width={184} />
-						<Image style={styles.poweredBy} source={imageSrc} />
-					</View>
-					<View style={styles.socialLinks}>
-						<Pressable
-							style={styles.socialLink}
-							onPress={(): void => {
-								openAppURL('https://www.bitkit.to');
-							}}>
-							<GlobeIcon color="white" height={24} width={24} />
-						</Pressable>
-						<Pressable
-							style={styles.socialLink}
-							onPress={(): void => {
-								openAppURL('https://www.medium.com/synonym-to');
-							}}>
-							<MediumIcon color="white" height={24} width={24} />
-						</Pressable>
-						<Pressable
-							style={styles.socialLink}
-							onPress={(): void => {
-								openAppURL('https://www.twitter.com/bitkitwallet');
-							}}>
-							<TwitterIcon color="white" height={24} width={24} />
-						</Pressable>
-						<Pressable
-							style={styles.socialLink}
-							onPress={(): void => {
-								openAppURL('https://discord.gg/DxTBJXvJxn');
-							}}>
-							<DiscordIcon color="white" height={24} width={24} />
-						</Pressable>
-						<Pressable
-							style={styles.socialLink}
-							onPress={(): void => {
-								openAppURL('https://t.me/bitkitchat');
-							}}>
-							<TelegramIcon color="white" height={24} width={24} />
-						</Pressable>
-						<Pressable
-							style={styles.socialLink}
-							onPress={(): void => {
-								openAppURL('https://www.github.com/synonymdev');
-							}}>
-							<GithubIcon color="white" height={24} width={24} />
-						</Pressable>
-					</View>
-				</View>
-
-				<SafeAreaInset type="bottom" minPadding={16} />
+			<View style={styles.imageContainer} testID="AboutLogo">
+				<Image style={styles.image} source={imageSrc} />
 			</View>
-		</GlowingBackground>
+			<Social style={styles.social} />
+			<SafeAreaInset type="bottom" minPadding={16} />
+		</ThemedView>
 	);
 };
 
 const styles = StyleSheet.create({
-	content: {
-		flexGrow: 1,
-		paddingHorizontal: 16,
-	},
-	text: {
-		paddingBottom: 32,
+	root: {
+		flex: 1,
 	},
-	list: {
-		marginBottom: 32,
-	},
-	footer: {
+	imageContainer: {
+		flexShrink: 1,
 		alignItems: 'center',
-		justifyContent: 'flex-end',
 		marginTop: 'auto',
-		marginBottom: 16,
-	},
-	logoContainer: {
-		position: 'relative',
-		marginBottom: 38,
-		justifyContent: 'center',
-		alignItems: 'center',
+		height: 82,
 	},
-	logoLink: {
-		position: 'absolute',
-		top: 0,
-		left: 0,
-		height: 65,
-		width: 65,
-		zIndex: 1,
+	image: {
+		flex: 1,
+		resizeMode: 'contain',
 	},
-	poweredBy: {
-		position: 'absolute',
-		bottom: -2,
-		right: -65,
-		height: 18,
-		width: 165,
-	},
-	socialLinks: {
-		width: 375,
-		flexDirection: 'row',
-		alignItems: 'center',
-		justifyContent: 'space-evenly',
-	},
-	socialLink: {
-		padding: 14,
-		backgroundColor: '#FFFFFF1A',
-		borderRadius: 32,
+	social: {
+		paddingHorizontal: 16,
+		marginTop: 'auto',
 	},
 });
 
diff --git a/src/screens/Settings/AddressTypePreference/index.tsx b/src/screens/Settings/AddressTypePreference/index.tsx
index 5ee79432a..e1322a4c9 100644
--- a/src/screens/Settings/AddressTypePreference/index.tsx
+++ b/src/screens/Settings/AddressTypePreference/index.tsx
@@ -114,13 +114,7 @@ const AddressTypeSettings = ({
 		hasShownMonitorNotification,
 	]);
 
-	return (
-		<SettingsView
-			title={t('adv.address_type')}
-			listData={listData}
-			showBackNavigation={true}
-		/>
-	);
+	return <SettingsView title={t('adv.address_type')} listData={listData} />;
 };
 
 export default memo(AddressTypeSettings);
diff --git a/src/screens/Settings/AddressViewer/AddressViewerListItem.tsx b/src/screens/Settings/AddressViewer/AddressViewerListItem.tsx
index a203bad97..6dd2f33d8 100644
--- a/src/screens/Settings/AddressViewer/AddressViewerListItem.tsx
+++ b/src/screens/Settings/AddressViewer/AddressViewerListItem.tsx
@@ -1,7 +1,7 @@
 import React, { ReactElement } from 'react';
 import { StyleSheet, TextInputProps, View } from 'react-native';
 import { TouchableOpacity } from '../../../styles/components';
-import { Subtitle, Text01M } from '../../../styles/text';
+import { Subtitle, BodyMSB } from '../../../styles/text';
 import { Checkmark } from '../../../styles/icons';
 import { IThemeColors } from '../../../styles/themes';
 import { IAddress } from 'beignet';
@@ -31,13 +31,13 @@ const AddressViewerListItem = (props: ListItemProps): ReactElement => {
 			onPress={onItemRowPress}>
 			<View style={styles.contentRow}>
 				<View style={styles.container}>
-					<Text01M
+					<BodyMSB
 						color="white80"
 						numberOfLines={1}
 						ellipsizeMode="middle"
 						testID={`Address-${item.index}`}>
 						{item.index}: {item.address}
-					</Text01M>
+					</BodyMSB>
 				</View>
 				{balance >= 0 && (
 					<View style={styles.balanceRow}>
@@ -49,7 +49,7 @@ const AddressViewerListItem = (props: ListItemProps): ReactElement => {
 							onPress={onCheckMarkPress}>
 							{balance > 0 && (
 								<Checkmark
-									color={isSelected ? 'brand' : 'gray4'}
+									color={isSelected ? 'brand' : 'gray3'}
 									height={30}
 									width={30}
 								/>
diff --git a/src/screens/Settings/AddressViewer/index.tsx b/src/screens/Settings/AddressViewer/index.tsx
index 30224f867..16f48a7c8 100644
--- a/src/screens/Settings/AddressViewer/index.tsx
+++ b/src/screens/Settings/AddressViewer/index.tsx
@@ -20,7 +20,7 @@ import {
 	TouchableOpacity,
 	View as ThemedView,
 } from '../../../styles/components';
-import { Subtitle, Text02S } from '../../../styles/text';
+import { Subtitle, BodyS } from '../../../styles/text';
 import SafeAreaInset from '../../../components/SafeAreaInset';
 import type { SettingsScreenProps } from '../../../navigation/types';
 import NavigationHeader from '../../../components/NavigationHeader';
@@ -123,7 +123,7 @@ const defaultAllAddressesData: TAddressViewerData = {
 };
 
 const Separator = memo(
-	(): ReactElement => <ThemedView color="darkGray" style={styles.separator} />,
+	(): ReactElement => <ThemedView color="gray2" style={styles.separator} />,
 );
 
 const EmptyComponent = memo(
@@ -884,33 +884,33 @@ const AddressViewer = ({
 							</TouchableOpacity>
 						</View>
 						<View>
-							<Text02S style={styles.headerText}>
+							<BodyS style={styles.headerText}>
 								{t('addr.index', { index: selectedAddress?.index })}
-							</Text02S>
-							<Text02S style={styles.headerText} testID="Path">
+							</BodyS>
+							<BodyS style={styles.headerText} testID="Path">
 								{t('addr.path', { path: selectedAddress?.path })}
-							</Text02S>
+							</BodyS>
 							<TouchableOpacity
 								style={styles.headerText}
 								onPress={onPrivateKeyPress}>
-								<Text02S>
+								<BodyS>
 									{t(privateKey ? 'addr.private_hide' : 'addr.private_view')}
-								</Text02S>
+								</BodyS>
 							</TouchableOpacity>
 							{config.selectedNetwork !== 'bitcoinRegtest' && (
 								<TouchableOpacity
 									style={styles.headerText}
 									onPress={openBlockExplorer}>
-									<Text02S>View Block Explorer</Text02S>
+									<BodyS>View Block Explorer</BodyS>
 								</TouchableOpacity>
 							)}
 						</View>
 					</View>
 				)}
 				{privateKey && (
-					<Text02S style={styles.privKeyText}>
+					<BodyS style={styles.privKeyText}>
 						{t('addr.private_key', { privateKey })}
-					</Text02S>
+					</BodyS>
 				)}
 				<SearchInput
 					style={styles.searchInput}
@@ -1041,7 +1041,6 @@ const AddressViewer = ({
 
 				<View style={styles.footer}>
 					<Button style={styles.backToTop} text="↑" onPress={scrollToTop} />
-					<View style={styles.divider} />
 					<Button
 						style={styles.footerButton}
 						text={t('addr.gen_20')}
@@ -1049,15 +1048,12 @@ const AddressViewer = ({
 						onPress={onGenerateMorePress}
 					/>
 					{!utxos && (
-						<>
-							<View style={styles.divider} />
-							<Button
-								style={styles.footerButton}
-								text={t('addr.check_balances')}
-								loading={isCheckingBalances}
-								onPress={onCheckBalance}
-							/>
-						</>
+						<Button
+							style={styles.footerButton}
+							text={t('addr.check_balances')}
+							loading={isCheckingBalances}
+							onPress={onCheckBalance}
+						/>
 					)}
 				</View>
 			</View>
@@ -1132,13 +1128,11 @@ const styles = StyleSheet.create({
 		alignItems: 'center',
 		justifyContent: 'space-between',
 		paddingTop: 2,
+		gap: 2,
 	},
 	footerButton: {
 		flex: 1,
 	},
-	divider: {
-		width: 2,
-	},
 	backToTop: {
 		minWidth: 50,
 	},
diff --git a/src/screens/Settings/Advanced/index.tsx b/src/screens/Settings/Advanced/index.tsx
index d50f24656..7cfc6de46 100644
--- a/src/screens/Settings/Advanced/index.tsx
+++ b/src/screens/Settings/Advanced/index.tsx
@@ -150,12 +150,7 @@ const AdvancedSettings = ({
 
 	return (
 		<>
-			<SettingsView
-				title={t('advanced_title')}
-				listData={SettingsListData}
-				showBackNavigation={true}
-			/>
-
+			<SettingsView title={t('advanced_title')} listData={SettingsListData} />
 			<Dialog
 				visible={showDialog}
 				title={t('adv.reset_title')}
diff --git a/src/screens/Settings/AppStatus/index.tsx b/src/screens/Settings/AppStatus/index.tsx
index 0b2b4d295..760c76df4 100644
--- a/src/screens/Settings/AppStatus/index.tsx
+++ b/src/screens/Settings/AppStatus/index.tsx
@@ -27,7 +27,7 @@ import {
 	GlobeSimpleIcon,
 	LightningHollow,
 } from '../../../styles/icons';
-import { Caption13M, Text01M } from '../../../styles/text';
+import { CaptionB, BodyMSB } from '../../../styles/text';
 import { FAILED_BACKUP_CHECK_TIME } from '../../../utils/backup/backups-subscriber';
 import { i18nTime } from '../../../utils/i18n';
 import SettingsView from '../SettingsView';
@@ -76,8 +76,8 @@ const Status = ({
 				</ThemedView>
 			</View>
 			<View style={styles.desc}>
-				<Text01M>{t(`status.${item}.title`)}</Text01M>
-				<Caption13M color="gray1">{subtitle}</Caption13M>
+				<BodyMSB>{t(`status.${item}.title`)}</BodyMSB>
+				<CaptionB color="white50">{subtitle}</CaptionB>
 			</View>
 		</View>
 	);
@@ -198,10 +198,7 @@ const AppStatus = ({}: SettingsScreenProps<'AppStatus'>): ReactElement => {
 	];
 
 	return (
-		<SettingsView
-			title={t('status.title')}
-			fullHeight={true}
-			showBackNavigation={true}>
+		<SettingsView title={t('status.title')} fullHeight={true}>
 			<ScrollView style={styles.statusRoot}>
 				{items.map((it) => (
 					<Status key={it.item} {...it} />
diff --git a/src/screens/Settings/Backup/BackupPrompt.tsx b/src/screens/Settings/Backup/BackupPrompt.tsx
index ea710d87f..a5c67cffd 100644
--- a/src/screens/Settings/Backup/BackupPrompt.tsx
+++ b/src/screens/Settings/Backup/BackupPrompt.tsx
@@ -1,12 +1,11 @@
 import React, { memo, ReactElement, useMemo, useEffect } from 'react';
-import { StyleSheet, View } from 'react-native';
-import { useTranslation } from 'react-i18next';
+import { Image, StyleSheet, View } from 'react-native';
+import { Trans, useTranslation } from 'react-i18next';
 
 import { __E2E__ } from '../../../constants/env';
-import { Text01S } from '../../../styles/text';
+import { BodyM, Display } from '../../../styles/text';
 import BottomSheetWrapper from '../../../components/BottomSheetWrapper';
 import SafeAreaInset from '../../../components/SafeAreaInset';
-import GlowImage from '../../../components/GlowImage';
 import Button from '../../../components/Button';
 import { closeSheet } from '../../../store/slices/ui';
 import { ignoreBackup } from '../../../store/slices/user';
@@ -113,8 +112,15 @@ const BackupPrompt = ({ enabled }: { enabled: boolean }): ReactElement => {
 					title={t('backup_wallet')}
 					displayBackButton={false}
 				/>
-				<Text01S color="white50">{text}</Text01S>
-				<GlowImage image={imageSrc} imageSize={170} glowColor="blue" />
+				<Image style={styles.image} source={imageSrc} />
+				<Display>
+					<Trans
+						t={t}
+						i18nKey="backup_title"
+						components={{ accent: <Display color="blue" /> }}
+					/>
+				</Display>
+				<BodyM color="white50">{text}</BodyM>
 				<View style={styles.buttonContainer}>
 					<Button
 						style={styles.button}
@@ -123,7 +129,6 @@ const BackupPrompt = ({ enabled }: { enabled: boolean }): ReactElement => {
 						text={t('later')}
 						onPress={handleLater}
 					/>
-					<View style={styles.divider} />
 					<Button
 						style={styles.button}
 						size="large"
@@ -142,17 +147,23 @@ const styles = StyleSheet.create({
 		flex: 1,
 		marginHorizontal: 32,
 	},
-	buttonContainer: {
+	image: {
+		flex: 1,
+		alignSelf: 'center',
+		width: 256,
+		aspectRatio: 1,
+		resizeMode: 'contain',
 		marginTop: 'auto',
+	},
+	buttonContainer: {
 		flexDirection: 'row',
 		justifyContent: 'center',
+		marginTop: 32,
+		gap: 16,
 	},
 	button: {
 		flex: 1,
 	},
-	divider: {
-		width: 16,
-	},
 });
 
 export default memo(BackupPrompt);
diff --git a/src/screens/Settings/Backup/ConfirmMnemonic.tsx b/src/screens/Settings/Backup/ConfirmMnemonic.tsx
index 30c8d4d34..7f78ce57d 100644
--- a/src/screens/Settings/Backup/ConfirmMnemonic.tsx
+++ b/src/screens/Settings/Backup/ConfirmMnemonic.tsx
@@ -2,7 +2,7 @@ import React, { memo, ReactElement, useMemo, useState } from 'react';
 import { StyleSheet, View } from 'react-native';
 import { useTranslation } from 'react-i18next';
 
-import { Text01S, Text01M } from '../../../styles/text';
+import { BodyM, BodyMSB } from '../../../styles/text';
 import { shuffleArray } from '../../../utils/helpers';
 import BottomSheetNavigationHeader from '../../../components/BottomSheetNavigationHeader';
 import SafeAreaInset from '../../../components/SafeAreaInset';
@@ -20,10 +20,10 @@ const Word = ({
 	correct: boolean;
 }): ReactElement => {
 	return (
-		<Text01M style={styles.word}>
-			<Text01M color="white50">{number}. </Text01M>
-			<Text01M color={correct ? 'green' : 'red'}> {word}</Text01M>
-		</Text01M>
+		<BodyMSB style={styles.word}>
+			<BodyMSB color="white50">{number}. </BodyMSB>
+			<BodyMSB color={correct ? 'green' : 'red'}> {word}</BodyMSB>
+		</BodyMSB>
 	);
 };
 
@@ -75,15 +75,15 @@ const ConfirmMnemonic = ({
 		});
 	};
 
-	const showButton = seed.some((v, i) => origSeed[i] !== v);
+	const isDisabled = seed.some((v, i) => origSeed[i] !== v);
 
 	return (
 		<GradientView style={styles.container}>
 			<BottomSheetNavigationHeader title={t('mnemonic_confirm')} />
 
-			<Text01S color="gray1" style={styles.text}>
+			<BodyM color="white50" style={styles.text}>
 				{t('mnemonic_confirm_tap')}
-			</Text01S>
+			</BodyM>
 
 			<View style={styles.buttons}>
 				{shuffled.map((w, i) => {
@@ -119,20 +119,19 @@ const ConfirmMnemonic = ({
 			</View>
 
 			<View style={styles.buttonContainer}>
-				{!showButton && (
-					<Button
-						size="large"
-						text={t('continue')}
-						onPress={(): void => {
-							if (bip39Passphrase) {
-								navigation.navigate('ConfirmPassphrase', { bip39Passphrase });
-							} else {
-								navigation.navigate('Result');
-							}
-						}}
-						testID="ContinueConfirmMnemonic"
-					/>
-				)}
+				<Button
+					size="large"
+					text={t('continue')}
+					disabled={isDisabled}
+					testID="ContinueConfirmMnemonic"
+					onPress={(): void => {
+						if (bip39Passphrase) {
+							navigation.navigate('ConfirmPassphrase', { bip39Passphrase });
+						} else {
+							navigation.navigate('Success');
+						}
+					}}
+				/>
 			</View>
 			<SafeAreaInset type="bottom" minPadding={16} />
 		</GradientView>
diff --git a/src/screens/Settings/Backup/ConfirmPassphrase.tsx b/src/screens/Settings/Backup/ConfirmPassphrase.tsx
index 9fc6298f0..63e2e9de4 100644
--- a/src/screens/Settings/Backup/ConfirmPassphrase.tsx
+++ b/src/screens/Settings/Backup/ConfirmPassphrase.tsx
@@ -3,7 +3,7 @@ import { StyleSheet, View } from 'react-native';
 import { useTranslation } from 'react-i18next';
 
 import { BottomSheetTextInput } from '../../../styles/components';
-import { Text01S } from '../../../styles/text';
+import { BodyM } from '../../../styles/text';
 import BottomSheetNavigationHeader from '../../../components/BottomSheetNavigationHeader';
 import SafeAreaInset from '../../../components/SafeAreaInset';
 import GradientView from '../../../components/GradientView';
@@ -26,7 +26,7 @@ const ConfirmPassphrase = ({
 		<GradientView style={styles.gradient}>
 			<BottomSheetNavigationHeader title={t('pass_confirm')} />
 			<View style={styles.container}>
-				<Text01S color="gray1">{t('pass_confirm_text')}</Text01S>
+				<BodyM color="white50">{t('pass_confirm_text')}</BodyM>
 
 				<View style={styles.input}>
 					<BottomSheetTextInput
@@ -46,7 +46,7 @@ const ConfirmPassphrase = ({
 						disabled={bip39Passphrase !== origPass}
 						size="large"
 						text={t('continue')}
-						onPress={(): void => navigation.navigate('Result')}
+						onPress={(): void => navigation.navigate('Success')}
 					/>
 				</View>
 			</View>
diff --git a/src/screens/Settings/Backup/ExportToPhone.tsx b/src/screens/Settings/Backup/ExportToPhone.tsx
index 534aa4bae..e587c7e8d 100644
--- a/src/screens/Settings/Backup/ExportToPhone.tsx
+++ b/src/screens/Settings/Backup/ExportToPhone.tsx
@@ -4,7 +4,7 @@ import Share, { ShareOptions } from 'react-native-share';
 import { useTranslation } from 'react-i18next';
 
 import { TextInput, View } from '../../../styles/components';
-import { Text01S } from '../../../styles/text';
+import { BodyM } from '../../../styles/text';
 import NavigationHeader from '../../../components/NavigationHeader';
 import KeyboardAvoidingView from '../../../components/KeyboardAvoidingView';
 import SafeAreaInset from '../../../components/SafeAreaInset';
@@ -89,7 +89,7 @@ const ExportToPhone = ({
 				}}
 			/>
 			<KeyboardAvoidingView style={styles.content}>
-				<Text01S color="gray1">{t('export_text')}</Text01S>
+				<BodyM color="white50">{t('export_text')}</BodyM>
 				<TextInput
 					style={styles.textField}
 					placeholder={t('export_password')}
diff --git a/src/screens/Settings/Backup/Metadata.tsx b/src/screens/Settings/Backup/Metadata.tsx
index e32d13935..dde3f5aca 100644
--- a/src/screens/Settings/Backup/Metadata.tsx
+++ b/src/screens/Settings/Backup/Metadata.tsx
@@ -1,12 +1,11 @@
 import React, { memo, ReactElement } from 'react';
-import { StyleSheet, View } from 'react-native';
+import { Image, StyleSheet, View } from 'react-native';
 import { Trans, useTranslation } from 'react-i18next';
 
-import { Text01S, Text02B, Text02S } from '../../../styles/text';
+import { BodyM, BodySB, BodyS } from '../../../styles/text';
 import GradientView from '../../../components/GradientView';
 import BottomSheetNavigationHeader from '../../../components/BottomSheetNavigationHeader';
 import SafeAreaInset from '../../../components/SafeAreaInset';
-import GlowImage from '../../../components/GlowImage';
 import Button from '../../../components/Button';
 import { useAppDispatch, useAppSelector } from '../../../hooks/redux';
 import { closeSheet } from '../../../store/slices/ui';
@@ -14,7 +13,7 @@ import { backupSelector } from '../../../store/reselect/backup';
 import { i18nTime } from '../../../utils/i18n';
 import { EBackupCategories } from '../../../store/utils/backup';
 
-const imageSrc = require('../../../assets/illustrations/tag.png');
+const imageSrc = require('../../../assets/illustrations/card.png');
 
 const Metadata = (): ReactElement => {
 	const { t } = useTranslation('security');
@@ -36,21 +35,21 @@ const Metadata = (): ReactElement => {
 		<GradientView style={styles.container}>
 			<BottomSheetNavigationHeader title={t('mnemonic_data_header')} />
 
-			<Text01S color="gray1" style={styles.text}>
+			<BodyM color="white50" style={styles.text}>
 				{t('mnemonic_data_text')}
-			</Text01S>
+			</BodyM>
 
-			<GlowImage image={imageSrc} imageSize={200} />
+			<View style={styles.imageContainer}>
+				<Image style={styles.image} source={imageSrc} />
+			</View>
 
 			<View style={styles.buttonContainer}>
 				{max && (
-					<Text02S style={styles.last}>
+					<BodyS style={styles.last}>
 						<Trans
 							t={t}
 							i18nKey="mnemonic_latest_backup"
-							components={{
-								bold: <Text02B />,
-							}}
+							components={{ bold: <BodySB /> }}
 							values={{
 								time: tTime('dateTime', {
 									v: new Date(max),
@@ -66,7 +65,7 @@ const Metadata = (): ReactElement => {
 								}),
 							}}
 						/>
-					</Text02S>
+					</BodyS>
 				)}
 				<Button
 					size="large"
@@ -87,6 +86,19 @@ const styles = StyleSheet.create({
 	text: {
 		paddingHorizontal: 32,
 	},
+	imageContainer: {
+		flexShrink: 1,
+		justifyContent: 'center',
+		alignItems: 'center',
+		alignSelf: 'center',
+		width: 256,
+		aspectRatio: 1,
+		marginTop: 'auto',
+	},
+	image: {
+		flex: 1,
+		resizeMode: 'contain',
+	},
 	last: {
 		marginBottom: 16,
 	},
diff --git a/src/screens/Settings/Backup/MultipleDevices.tsx b/src/screens/Settings/Backup/MultipleDevices.tsx
index 5b037d5c6..21d06d672 100644
--- a/src/screens/Settings/Backup/MultipleDevices.tsx
+++ b/src/screens/Settings/Backup/MultipleDevices.tsx
@@ -1,12 +1,11 @@
 import React, { memo, ReactElement } from 'react';
-import { StyleSheet, View } from 'react-native';
+import { Image, StyleSheet, View } from 'react-native';
 import { useTranslation } from 'react-i18next';
 
-import { Text01S } from '../../../styles/text';
+import { BodyM } from '../../../styles/text';
 import GradientView from '../../../components/GradientView';
 import BottomSheetNavigationHeader from '../../../components/BottomSheetNavigationHeader';
 import SafeAreaInset from '../../../components/SafeAreaInset';
-import GlowImage from '../../../components/GlowImage';
 import Button from '../../../components/Button';
 import type { BackupScreenProps } from '../../../navigation/types';
 
@@ -25,11 +24,13 @@ const MultipleDevices = ({
 		<GradientView style={styles.container}>
 			<BottomSheetNavigationHeader title={t('mnemonic_multiple_header')} />
 
-			<Text01S color="gray1" style={styles.text}>
+			<BodyM color="white50" style={styles.text}>
 				{t('mnemonic_multiple_text')}
-			</Text01S>
+			</BodyM>
 
-			<GlowImage image={imageSrc} imageSize={200} glowColor="yellow" />
+			<View style={styles.imageContainer}>
+				<Image style={styles.image} source={imageSrc} />
+			</View>
 
 			<View style={styles.buttonContainer}>
 				<Button
@@ -51,6 +52,19 @@ const styles = StyleSheet.create({
 	text: {
 		paddingHorizontal: 32,
 	},
+	imageContainer: {
+		flexShrink: 1,
+		justifyContent: 'center',
+		alignItems: 'center',
+		alignSelf: 'center',
+		width: 256,
+		aspectRatio: 1,
+		marginTop: 'auto',
+	},
+	image: {
+		flex: 1,
+		resizeMode: 'contain',
+	},
 	buttonContainer: {
 		marginTop: 'auto',
 		paddingHorizontal: 32,
diff --git a/src/screens/Settings/Backup/ResetAndRestore.tsx b/src/screens/Settings/Backup/ResetAndRestore.tsx
index bd4b931a0..d1aa42331 100644
--- a/src/screens/Settings/Backup/ResetAndRestore.tsx
+++ b/src/screens/Settings/Backup/ResetAndRestore.tsx
@@ -1,13 +1,12 @@
 import React, { memo, ReactElement, useState } from 'react';
-import { StyleSheet } from 'react-native';
+import { Image, StyleSheet } from 'react-native';
 import { useTranslation } from 'react-i18next';
 
 import { View } from '../../../styles/components';
-import { Text01S } from '../../../styles/text';
+import { BodyM } from '../../../styles/text';
 import NavigationHeader from '../../../components/NavigationHeader';
 import SafeAreaInset from '../../../components/SafeAreaInset';
 import Dialog from '../../../components/Dialog';
-import GlowImage from '../../../components/GlowImage';
 import Button from '../../../components/Button';
 import { wipeApp } from '../../../store/utils/settings';
 import { showBottomSheet } from '../../../store/utils/ui';
@@ -29,9 +28,11 @@ const ResetAndRestore = ({
 				onClosePress={(): void => navigation.navigate('Wallet')}
 			/>
 			<View style={styles.container}>
-				<Text01S color="gray1">{t('reset_text')}</Text01S>
+				<BodyM color="white50">{t('reset_text')}</BodyM>
 
-				<GlowImage image={imageSrc} imageSize={230} />
+				<View style={styles.imageContainer}>
+					<Image style={styles.image} source={imageSrc} />
+				</View>
 
 				<View style={styles.buttonContainer}>
 					<Button
@@ -43,7 +44,6 @@ const ResetAndRestore = ({
 							showBottomSheet('backupNavigation');
 						}}
 					/>
-					<View style={styles.divider} />
 					<Button
 						size="large"
 						style={styles.button}
@@ -58,6 +58,7 @@ const ResetAndRestore = ({
 				visible={showDialog}
 				title={t('reset_dialog_title')}
 				description={t('reset_dialog_desc')}
+				confirmText={t('reset_confirm')}
 				onCancel={(): void => setShowDialog(false)}
 				onConfirm={async (): Promise<void> => {
 					await wipeApp();
@@ -74,19 +75,30 @@ const styles = StyleSheet.create({
 	},
 	container: {
 		flex: 1,
+		paddingTop: 16,
 		paddingHorizontal: 16,
 	},
+	imageContainer: {
+		flexShrink: 1,
+		alignItems: 'center',
+		alignSelf: 'center',
+		aspectRatio: 1,
+		marginTop: 'auto',
+		width: 256,
+	},
+	image: {
+		flex: 1,
+		resizeMode: 'contain',
+	},
 	buttonContainer: {
 		marginTop: 'auto',
 		flexDirection: 'row',
 		justifyContent: 'center',
+		gap: 16,
 	},
 	button: {
 		flex: 1,
 	},
-	divider: {
-		width: 16,
-	},
 });
 
 export default memo(ResetAndRestore);
diff --git a/src/screens/Settings/Backup/ShowMnemonic.tsx b/src/screens/Settings/Backup/ShowMnemonic.tsx
index 6f5d89e37..87850f111 100644
--- a/src/screens/Settings/Backup/ShowMnemonic.tsx
+++ b/src/screens/Settings/Backup/ShowMnemonic.tsx
@@ -4,7 +4,7 @@ import { Trans, useTranslation } from 'react-i18next';
 import Clipboard from '@react-native-clipboard/clipboard';
 
 import { View as ThemedView } from '../../../styles/components';
-import { Text01S, Text01M, Text02S } from '../../../styles/text';
+import { BodyM, BodyMSB, BodyS } from '../../../styles/text';
 import BottomSheetNavigationHeader from '../../../components/BottomSheetNavigationHeader';
 import SafeAreaInset from '../../../components/SafeAreaInset';
 import Button from '../../../components/Button';
@@ -26,10 +26,10 @@ export const Word = ({
 	word: string;
 }): ReactElement => {
 	return (
-		<Text01M style={styles.word}>
-			<Text01M color="white50">{number}.</Text01M>
-			<Text01M> {word}</Text01M>
-		</Text01M>
+		<BodyMSB style={styles.word}>
+			<BodyMSB color="white50">{number}.</BodyMSB>
+			<BodyMSB> {word}</BodyMSB>
+		</BodyMSB>
 	);
 };
 
@@ -71,11 +71,11 @@ const ShowMnemonic = ({
 				displayBackButton={false}
 			/>
 
-			<Text01S color="gray1">
+			<BodyM color="white50">
 				{show
 					? t('mnemonic_write', { length: seedToShow.length })
 					: t('mnemonic_use')}
-			</Text01S>
+			</BodyM>
 
 			<View
 				style={styles.seedContainer}
@@ -107,7 +107,7 @@ const ShowMnemonic = ({
 						<Button
 							size="large"
 							text={t('mnemonic_reveal')}
-							color="black5"
+							color="black50"
 							onPress={(): void => setShow(true)}
 							testID="TapToReveal"
 						/>
@@ -115,33 +115,30 @@ const ShowMnemonic = ({
 				)}
 			</View>
 
-			<Text02S color="gray1">
+			<BodyS color="white50">
 				<Trans
 					t={t}
 					i18nKey="mnemonic_never_share"
-					components={{
-						brand: <Text02S color="brand" />,
-					}}
+					components={{ accent: <BodyS color="brand" /> }}
 				/>
-			</Text02S>
+			</BodyS>
 
 			<View style={styles.buttonContainer}>
-				{show && (
-					<Button
-						size="large"
-						text={t('continue')}
-						onPress={(): void => {
-							navigation.navigate(
-								bip39Passphrase ? 'ShowPassphrase' : 'ConfirmMnemonic',
-								{
-									seed,
-									bip39Passphrase,
-								},
-							);
-						}}
-						testID="ContinueShowMnemonic"
-					/>
-				)}
+				<Button
+					size="large"
+					text={t('continue')}
+					disabled={!show}
+					testID="ContinueShowMnemonic"
+					onPress={(): void => {
+						navigation.navigate(
+							bip39Passphrase ? 'ShowPassphrase' : 'ConfirmMnemonic',
+							{
+								seed,
+								bip39Passphrase,
+							},
+						);
+					}}
+				/>
 			</View>
 			<SafeAreaInset type="bottom" minPadding={16} />
 		</View>
diff --git a/src/screens/Settings/Backup/ShowPassphrase.tsx b/src/screens/Settings/Backup/ShowPassphrase.tsx
index 554dcb246..6139cca09 100644
--- a/src/screens/Settings/Backup/ShowPassphrase.tsx
+++ b/src/screens/Settings/Backup/ShowPassphrase.tsx
@@ -4,7 +4,7 @@ import { BottomSheetScrollView } from '@gorhom/bottom-sheet';
 import { Trans, useTranslation } from 'react-i18next';
 
 import { View as ThemedView } from '../../../styles/components';
-import { Text01S, Text01M, Text02S } from '../../../styles/text';
+import { BodyM, BodyMSB, BodyS } from '../../../styles/text';
 import BottomSheetNavigationHeader from '../../../components/BottomSheetNavigationHeader';
 import SafeAreaInset from '../../../components/SafeAreaInset';
 import GradientView from '../../../components/GradientView';
@@ -25,26 +25,24 @@ const ShowPassphrase = ({
 		<GradientView style={styles.gradient}>
 			<BottomSheetNavigationHeader title={t('pass_your')} />
 			<View style={styles.container}>
-				<Text01S color="gray1">{t('pass_text')}</Text01S>
+				<BodyM color="white50">{t('pass_text')}</BodyM>
 
 				<ThemedView color="white10" style={styles.passphrase}>
 					<BottomSheetScrollView>
-						<Text01M color="white50" style={styles.p}>
+						<BodyMSB color="white50" style={styles.p}>
 							{t('pass')}
-						</Text01M>
-						<Text01M>{bip39Passphrase}</Text01M>
+						</BodyMSB>
+						<BodyMSB>{bip39Passphrase}</BodyMSB>
 					</BottomSheetScrollView>
 				</ThemedView>
 
-				<Text02S color="gray1">
+				<BodyS color="white50">
 					<Trans
 						t={t}
 						i18nKey="pass_never_share"
-						components={{
-							brand: <Text02S color="brand" />,
-						}}
+						components={{ accent: <BodyS color="brand" /> }}
 					/>
-				</Text02S>
+				</BodyS>
 
 				<View style={styles.buttonContainer}>
 					<Button
diff --git a/src/screens/Settings/Backup/Result.tsx b/src/screens/Settings/Backup/Success.tsx
similarity index 68%
rename from src/screens/Settings/Backup/Result.tsx
rename to src/screens/Settings/Backup/Success.tsx
index 574af77dc..45883bc70 100644
--- a/src/screens/Settings/Backup/Result.tsx
+++ b/src/screens/Settings/Backup/Success.tsx
@@ -1,12 +1,11 @@
 import React, { memo, ReactElement } from 'react';
-import { StyleSheet, View } from 'react-native';
+import { Image, StyleSheet, View } from 'react-native';
 import { Trans, useTranslation } from 'react-i18next';
 
-import { Text01B, Text01S } from '../../../styles/text';
+import { BodyMB, BodyM } from '../../../styles/text';
 import BottomSheetNavigationHeader from '../../../components/BottomSheetNavigationHeader';
 import SafeAreaInset from '../../../components/SafeAreaInset';
 import GradientView from '../../../components/GradientView';
-import GlowImage from '../../../components/GlowImage';
 import Button from '../../../components/Button';
 import { useAppDispatch } from '../../../hooks/redux';
 import { verifyBackup } from '../../../store/slices/user';
@@ -14,7 +13,9 @@ import { BackupScreenProps } from '../../../navigation/types';
 
 const imageSrc = require('../../../assets/illustrations/check.png');
 
-const Result = ({ navigation }: BackupScreenProps<'Result'>): ReactElement => {
+const Success = ({
+	navigation,
+}: BackupScreenProps<'Success'>): ReactElement => {
 	const { t } = useTranslation('security');
 	const dispatch = useAppDispatch();
 
@@ -27,22 +28,24 @@ const Result = ({ navigation }: BackupScreenProps<'Result'>): ReactElement => {
 		<GradientView style={styles.container}>
 			<BottomSheetNavigationHeader title={t('mnemonic_result_header')} />
 
-			<Text01S color="gray1" style={styles.text}>
+			<BodyM style={styles.text} color="white50">
 				<Trans
 					t={t}
 					i18nKey="mnemonic_result_text"
-					components={{ highlight: <Text01B color="white" /> }}
+					components={{ accent: <BodyMB color="white" /> }}
 				/>
-			</Text01S>
+			</BodyM>
 
-			<GlowImage image={imageSrc} imageSize={200} glowColor="green" />
+			<View style={styles.imageContainer}>
+				<Image style={styles.image} source={imageSrc} />
+			</View>
 
 			<View style={styles.buttonContainer}>
 				<Button
 					size="large"
 					text={t('ok')}
-					onPress={handleButtonPress}
 					testID="OK"
+					onPress={handleButtonPress}
 				/>
 			</View>
 			<SafeAreaInset type="bottom" minPadding={16} />
@@ -57,10 +60,23 @@ const styles = StyleSheet.create({
 	text: {
 		paddingHorizontal: 32,
 	},
+	imageContainer: {
+		flexShrink: 1,
+		justifyContent: 'center',
+		alignItems: 'center',
+		alignSelf: 'center',
+		width: 256,
+		aspectRatio: 1,
+		marginTop: 'auto',
+	},
+	image: {
+		flex: 1,
+		resizeMode: 'contain',
+	},
 	buttonContainer: {
 		marginTop: 'auto',
 		paddingHorizontal: 32,
 	},
 });
 
-export default memo(Result);
+export default memo(Success);
diff --git a/src/screens/Settings/Backup/Warning.tsx b/src/screens/Settings/Backup/Warning.tsx
index 8215f1dd6..286a878c7 100644
--- a/src/screens/Settings/Backup/Warning.tsx
+++ b/src/screens/Settings/Backup/Warning.tsx
@@ -1,12 +1,11 @@
 import React, { memo, ReactElement } from 'react';
-import { StyleSheet, View } from 'react-native';
-import { useTranslation } from 'react-i18next';
+import { StyleSheet, View, Image } from 'react-native';
+import { Trans, useTranslation } from 'react-i18next';
 
-import { Text01S } from '../../../styles/text';
+import { BodyM, BodyMB } from '../../../styles/text';
 import GradientView from '../../../components/GradientView';
 import BottomSheetNavigationHeader from '../../../components/BottomSheetNavigationHeader';
 import SafeAreaInset from '../../../components/SafeAreaInset';
-import GlowImage from '../../../components/GlowImage';
 import Button from '../../../components/Button';
 import type { BackupScreenProps } from '../../../navigation/types';
 
@@ -24,16 +23,25 @@ const Warning = ({
 	return (
 		<GradientView style={styles.container}>
 			<BottomSheetNavigationHeader title={t('mnemonic_keep_header')} />
-			<Text01S color="gray1" style={styles.text}>
-				{t('mnemonic_keep_text')}
-			</Text01S>
-			<GlowImage image={imageSrc} imageSize={200} glowColor="yellow" />
+
+			<BodyM style={styles.text} color="white50">
+				<Trans
+					t={t}
+					i18nKey="mnemonic_keep_text"
+					components={{ accent: <BodyMB color="white" /> }}
+				/>
+			</BodyM>
+
+			<View style={styles.imageContainer}>
+				<Image style={styles.image} source={imageSrc} />
+			</View>
+
 			<View style={styles.buttonContainer}>
 				<Button
 					size="large"
 					text={t('ok')}
-					onPress={handleButtonPress}
 					testID="OK"
+					onPress={handleButtonPress}
 				/>
 			</View>
 			<SafeAreaInset type="bottom" minPadding={16} />
@@ -48,6 +56,19 @@ const styles = StyleSheet.create({
 	text: {
 		paddingHorizontal: 32,
 	},
+	imageContainer: {
+		flexShrink: 1,
+		justifyContent: 'center',
+		alignItems: 'center',
+		alignSelf: 'center',
+		width: 256,
+		aspectRatio: 1,
+		marginTop: 'auto',
+	},
+	image: {
+		flex: 1,
+		resizeMode: 'contain',
+	},
 	buttonContainer: {
 		marginTop: 'auto',
 		paddingHorizontal: 32,
diff --git a/src/screens/Settings/BackupSettings/index.tsx b/src/screens/Settings/BackupSettings/index.tsx
index d179fc8d4..e76d6fc6e 100644
--- a/src/screens/Settings/BackupSettings/index.tsx
+++ b/src/screens/Settings/BackupSettings/index.tsx
@@ -26,7 +26,7 @@ import {
 	TransferIcon,
 	UsersIcon,
 } from '../../../styles/icons';
-import { Caption13M, Caption13Up, Text01M } from '../../../styles/text';
+import { CaptionB, Caption13Up, BodyMSB } from '../../../styles/text';
 import { IThemeColors } from '../../../styles/themes';
 import { i18nTime } from '../../../utils/i18n';
 import SettingsView from '../SettingsView';
@@ -109,8 +109,8 @@ const Status = ({
 				</ThemedView>
 			</View>
 			<View style={styles.desc}>
-				<Text01M>{title}</Text01M>
-				<Caption13M color="gray1">{subtitle}</Caption13M>
+				<BodyMSB>{title}</BodyMSB>
+				<CaptionB color="white50">{subtitle}</CaptionB>
 			</View>
 			{!disableRetry && showRetry && (
 				<TouchableOpacity onPress={retry} color="white16" style={styles.button}>
@@ -261,10 +261,9 @@ const BackupSettings = ({
 				title={t('backup.title')}
 				listData={settingsListData}
 				fullHeight={false}
-				showBackNavigation={true}
 			/>
 			<ScrollView style={styles.statusRoot}>
-				<Caption13Up style={styles.caption} color="gray1">
+				<Caption13Up style={styles.caption} color="white50">
 					{t('backup.latest')}
 				</Caption13Up>
 				{categories.map((c) => (
@@ -285,6 +284,7 @@ const styles = StyleSheet.create({
 	},
 	statusRoot: {
 		flex: 1,
+		marginTop: 28,
 	},
 	status: {
 		marginHorizontal: 16,
diff --git a/src/screens/Settings/Bitcoin/BitcoinNetworkSelection.tsx b/src/screens/Settings/Bitcoin/BitcoinNetworkSelection.tsx
index 030de99ed..99afbf23a 100644
--- a/src/screens/Settings/Bitcoin/BitcoinNetworkSelection.tsx
+++ b/src/screens/Settings/Bitcoin/BitcoinNetworkSelection.tsx
@@ -55,7 +55,6 @@ const BitcoinNetworkSelection = ({
 		<SettingsView
 			title={t('adv.bitcoin_network')}
 			listData={settingsListData}
-			showBackNavigation={true}
 		/>
 	);
 };
diff --git a/src/screens/Settings/CoinSelectPreference/index.tsx b/src/screens/Settings/CoinSelectPreference/index.tsx
index cb60b1a39..fe796a132 100644
--- a/src/screens/Settings/CoinSelectPreference/index.tsx
+++ b/src/screens/Settings/CoinSelectPreference/index.tsx
@@ -94,11 +94,7 @@ const CoinSelectSettings = (): ReactElement => {
 	);
 
 	return (
-		<SettingsView
-			title={t('adv.coin_selection')}
-			listData={settingsListData}
-			showBackNavigation={true}
-		/>
+		<SettingsView title={t('adv.coin_selection')} listData={settingsListData} />
 	);
 };
 
diff --git a/src/screens/Settings/Currencies/index.tsx b/src/screens/Settings/Currencies/index.tsx
index cb82c9193..a51821fb2 100644
--- a/src/screens/Settings/Currencies/index.tsx
+++ b/src/screens/Settings/Currencies/index.tsx
@@ -59,7 +59,6 @@ const CurrenciesSettings = ({
 		<SettingsView
 			title={t('general.currency_local_title')}
 			listData={currencyListData}
-			showBackNavigation={true}
 			showSearch={true}
 			footerText={t('general.currency_footer')}
 		/>
diff --git a/src/screens/Settings/DevSettings/index.tsx b/src/screens/Settings/DevSettings/index.tsx
index a18b69fd6..2bf545ba9 100644
--- a/src/screens/Settings/DevSettings/index.tsx
+++ b/src/screens/Settings/DevSettings/index.tsx
@@ -403,12 +403,7 @@ const DevSettings = ({
 
 	return (
 		<>
-			<SettingsView
-				title="Dev Settings"
-				listData={settingsListData}
-				showBackNavigation={true}
-			/>
-
+			<SettingsView title="Dev Settings" listData={settingsListData} />
 			<Dialog
 				visible={showDialog}
 				title="Export sensitive logs?"
diff --git a/src/screens/Settings/EasterEgg/index.tsx b/src/screens/Settings/EasterEgg/index.tsx
deleted file mode 100644
index 8fd485ed1..000000000
--- a/src/screens/Settings/EasterEgg/index.tsx
+++ /dev/null
@@ -1,109 +0,0 @@
-import React, { memo, ReactElement } from 'react';
-import { View, Image, StyleSheet, Share, Platform } from 'react-native';
-import { getBundleId } from 'react-native-device-info';
-import { Trans, useTranslation } from 'react-i18next';
-
-import Button from '../../../components/Button';
-import GlowingBackground from '../../../components/GlowingBackground';
-import NavigationHeader from '../../../components/NavigationHeader';
-import SafeAreaInset from '../../../components/SafeAreaInset';
-import { Display } from '../../../styles/text';
-import type { SettingsScreenProps } from '../../../navigation/types';
-
-const imageSrc = require('../../../assets/illustrations/orange-pill.png');
-
-// TODO: add correct store IDs and test
-// const appleAppID = '1634634088';
-const androidPackageName = getBundleId();
-const appStoreUrl =
-	Platform.OS === 'ios'
-		? 'https://testflight.apple.com/join/lGXhnwcC'
-		: `https://play.google.com/store/apps/details?id=${androidPackageName}`;
-
-const EasterEgg = ({
-	navigation,
-}: SettingsScreenProps<'EasterEgg'>): ReactElement => {
-	const { t } = useTranslation('settings');
-
-	const onShare = async (): Promise<void> => {
-		await Share.share({
-			title: 'Bitkit',
-			message: t('about.op_message', { appStoreUrl }),
-		});
-	};
-
-	return (
-		<GlowingBackground bottomRight="brand">
-			<SafeAreaInset type="top" />
-			<NavigationHeader
-				title={t('about.op_title')}
-				onClosePress={(): void => {
-					navigation.navigate('Wallet');
-				}}
-			/>
-			<View style={styles.root} testID="EasterEgg">
-				<View style={styles.alignCenter}>
-					<Image source={imageSrc} />
-				</View>
-				<View style={styles.intro}>
-					<Display color="white" style={styles.text}>
-						<Trans
-							t={t}
-							i18nKey="about.op_text"
-							parent={Display}
-							components={{
-								brand: <Display color="brand" style={styles.text} />,
-							}}
-						/>
-					</Display>
-				</View>
-
-				<View style={styles.buttonContainer}>
-					<Button
-						style={styles.button}
-						text={t('about.op_share')}
-						size="large"
-						onPress={onShare}
-					/>
-				</View>
-			</View>
-			<SafeAreaInset type="bottom" minPadding={16} />
-		</GlowingBackground>
-	);
-};
-
-const styles = StyleSheet.create({
-	root: {
-		flex: 1,
-		paddingHorizontal: 16,
-	},
-	intro: {
-		marginBottom: 40,
-		flexDirection: 'column',
-		justifyContent: 'center',
-		alignItems: 'center',
-	},
-	text: {
-		fontStyle: 'normal',
-		fontWeight: '700',
-		fontSize: 48,
-		lineHeight: 48,
-		marginLeft: 16,
-		marginRight: 16,
-		width: '100%',
-		maxWidth: 281,
-	},
-	alignCenter: {
-		alignItems: 'center',
-	},
-	buttonContainer: {
-		marginTop: 'auto',
-		flexDirection: 'row',
-		justifyContent: 'center',
-	},
-	button: {
-		flex: 1,
-	},
-});
-
-export default memo(EasterEgg);
diff --git a/src/screens/Settings/ElectrumConfig/index.tsx b/src/screens/Settings/ElectrumConfig/index.tsx
index abd5c0e72..119da0aac 100644
--- a/src/screens/Settings/ElectrumConfig/index.tsx
+++ b/src/screens/Settings/ElectrumConfig/index.tsx
@@ -6,7 +6,7 @@ import { useTranslation } from 'react-i18next';
 import isEqual from 'lodash/isEqual';
 
 import { View, TextInput, ScrollView } from '../../../styles/components';
-import { Text01S, Caption13Up } from '../../../styles/text';
+import { BodyM, Caption13Up } from '../../../styles/text';
 import { ScanIcon } from '../../../styles/icons';
 import { useAppDispatch, useAppSelector } from '../../../hooks/redux';
 import { updateUi } from '../../../store/slices/ui';
@@ -258,7 +258,7 @@ const ElectrumConfig = ({
 	const hasEdited = !isEqual({ host, port, protocol }, connectedPeer);
 
 	return (
-		<View style={styles.container}>
+		<View style={styles.root}>
 			<SafeAreaInset type="top" />
 			<NavigationHeader
 				title={t('adv.electrum_server')}
@@ -266,22 +266,20 @@ const ElectrumConfig = ({
 				onActionPress={navigateToScanner}
 			/>
 			<ScrollView contentContainerStyle={styles.content} bounces={false}>
-				<Text01S color="gray1">{t('es.connected_to')}</Text01S>
-				<View style={styles.row}>
-					<View style={styles.connectedPeer} testID="Status">
-						{connectedPeer ? (
-							<Text01S color="green" testID="Connected">
-								{connectedPeer.host}:{connectedPeer.port}
-							</Text01S>
-						) : (
-							<Text01S color="red" testID="Disconnected">
-								{t('es.disconnected')}
-							</Text01S>
-						)}
-					</View>
+				<BodyM color="white50">{t('es.connected_to')}</BodyM>
+				<View style={styles.connectedPeer} testID="ElectrumStatus">
+					{connectedPeer ? (
+						<BodyM color="green" testID="Connected">
+							{connectedPeer.host}:{connectedPeer.port}
+						</BodyM>
+					) : (
+						<BodyM color="red" testID="Disconnected">
+							{t('es.disconnected')}
+						</BodyM>
+					)}
 				</View>
 
-				<Caption13Up color="gray1" style={styles.label}>
+				<Caption13Up style={styles.label} color="white50">
 					{t('es.host')}
 				</Caption13Up>
 				<TextInput
@@ -299,7 +297,7 @@ const ElectrumConfig = ({
 					testID="HostInput"
 				/>
 
-				<Caption13Up color="gray1" style={styles.label}>
+				<Caption13Up style={styles.label} color="white50">
 					{t('es.port')}
 				</Caption13Up>
 				<TextInput
@@ -320,7 +318,7 @@ const ElectrumConfig = ({
 					style={styles.protocol}
 					accessibilityLabel={protocol}
 					testID="ElectrumProtocol">
-					<Caption13Up color="gray1" style={styles.label}>
+					<Caption13Up style={styles.label} color="white50">
 						{t('es.protocol')}
 					</Caption13Up>
 					<RadioButtonGroup
@@ -348,7 +346,6 @@ const ElectrumConfig = ({
 						testID="ResetToDefault"
 						onPress={resetToDefault}
 					/>
-					<View style={styles.divider} />
 					<Button
 						style={styles.button}
 						text={t('es.button_connect')}
@@ -368,26 +365,21 @@ const ElectrumConfig = ({
 };
 
 const styles = StyleSheet.create({
-	container: {
+	root: {
 		flex: 1,
 	},
 	content: {
 		flexGrow: 1,
+		paddingTop: 16,
 		paddingHorizontal: 16,
 	},
-	row: {
-		flexDirection: 'row',
-		alignItems: 'flex-start',
-		paddingBottom: 16,
-		justifyContent: 'center',
+	connectedPeer: {
+		marginBottom: 16,
 	},
 	label: {
 		marginTop: 16,
 		marginBottom: 4,
 	},
-	connectedPeer: {
-		flex: 1.5,
-	},
 	textInput: {
 		minHeight: 52,
 		marginTop: 5,
@@ -396,15 +388,13 @@ const styles = StyleSheet.create({
 		marginTop: 11,
 	},
 	buttons: {
-		marginTop: 16,
 		flexDirection: 'row',
+		marginTop: 'auto',
+		gap: 16,
 	},
 	button: {
 		flex: 1,
 	},
-	divider: {
-		width: 16,
-	},
 });
 
 export default memo(ElectrumConfig);
diff --git a/src/screens/Settings/Fee/index.tsx b/src/screens/Settings/Fee/index.tsx
index a5903b88c..2c8483500 100644
--- a/src/screens/Settings/Fee/index.tsx
+++ b/src/screens/Settings/Fee/index.tsx
@@ -4,7 +4,7 @@ import { useTranslation } from 'react-i18next';
 
 import SettingsView from '../SettingsView';
 import { SettingsScreenProps } from '../../../navigation/types';
-import { Caption13Up, Text01S } from '../../../styles/text';
+import { Caption13Up, BodyM } from '../../../styles/text';
 import { ScrollView, View as ThemedView } from '../../../styles/components';
 import { i18nTime } from '../../../utils/i18n';
 import { useAppDispatch, useAppSelector } from '../../../hooks/redux';
@@ -42,7 +42,7 @@ const FeeInput = ({
 		<View style={styles.item}>
 			<View style={styles.leftColumn}>
 				<View>
-					<Text01S color="white">{capitalize(title)}</Text01S>
+					<BodyM color="white">{capitalize(title)}</BodyM>
 				</View>
 			</View>
 			{override && (
@@ -66,7 +66,7 @@ const FeeInput = ({
 				</View>
 			)}
 			<View style={styles.rightColumn}>
-				<Text01S color="gray1">{value}</Text01S>
+				<BodyM color="white50">{value}</BodyM>
 			</View>
 		</View>
 	);
@@ -160,12 +160,11 @@ const FeeSettings = ({}: SettingsScreenProps<'FeeSettings'>): ReactElement => {
 				title="Override Fees"
 				listData={settingsListData}
 				fullHeight={false}
-				showBackNavigation={true}
 			/>
 			<ScrollView
 				style={styles.override}
 				contentContainerStyle={styles.override}>
-				<Caption13Up style={styles.caption} color="gray1">
+				<Caption13Up style={styles.caption} color="white50">
 					Values
 				</Caption13Up>
 				{order.map((o) => (
diff --git a/src/screens/Settings/GapLimit/index.tsx b/src/screens/Settings/GapLimit/index.tsx
index 8f79574aa..772035d3d 100644
--- a/src/screens/Settings/GapLimit/index.tsx
+++ b/src/screens/Settings/GapLimit/index.tsx
@@ -3,7 +3,7 @@ import { StyleSheet } from 'react-native';
 import { useTranslation } from 'react-i18next';
 
 import { View, TextInput, ScrollView } from '../../../styles/components';
-import { Text01S, Caption13Up } from '../../../styles/text';
+import { BodyM, Caption13Up } from '../../../styles/text';
 import { useAppSelector } from '../../../hooks/redux';
 import { gapLimitOptionsSelector } from '../../../store/reselect/wallet';
 import NavigationHeader from '../../../components/NavigationHeader';
@@ -76,7 +76,7 @@ const GapLimit = ({}: SettingsScreenProps<'GapLimit'>): ReactElement => {
 			<SafeAreaInset type="top" />
 			<NavigationHeader title={t('adv.gap_limit')} />
 			<ScrollView contentContainerStyle={styles.content} bounces={false}>
-				<Text01S color="gray1">Look Behind</Text01S>
+				<BodyM color="white50">Look Behind</BodyM>
 				<TextInput
 					style={styles.textInput}
 					value={lookBehind}
@@ -94,7 +94,7 @@ const GapLimit = ({}: SettingsScreenProps<'GapLimit'>): ReactElement => {
 					testID="LookBehind"
 				/>
 
-				<Caption13Up color="gray1" style={styles.label}>
+				<Caption13Up color="white50" style={styles.label}>
 					{'Look Ahead'}
 				</Caption13Up>
 				<TextInput
@@ -123,7 +123,6 @@ const GapLimit = ({}: SettingsScreenProps<'GapLimit'>): ReactElement => {
 						onPress={clearChanges}
 						disabled={!hasEdited}
 					/>
-					<View style={styles.divider} />
 					<Button
 						style={styles.button}
 						text={t('gap.save')}
@@ -157,15 +156,13 @@ const styles = StyleSheet.create({
 		marginTop: 5,
 	},
 	buttons: {
-		marginTop: 16,
 		flexDirection: 'row',
+		marginTop: 16,
+		gap: 16,
 	},
 	button: {
 		flex: 1,
 	},
-	divider: {
-		width: 16,
-	},
 });
 
 export default memo(GapLimit);
diff --git a/src/screens/Settings/General/index.tsx b/src/screens/Settings/General/index.tsx
index f160feb98..53ec19112 100644
--- a/src/screens/Settings/General/index.tsx
+++ b/src/screens/Settings/General/index.tsx
@@ -1,32 +1,28 @@
 import React, { memo, ReactElement, useMemo } from 'react';
-import { useAppDispatch, useAppSelector } from '../../../hooks/redux';
 import { useTranslation } from 'react-i18next';
 
 import { EItemType, IListData, ItemData } from '../../../components/List';
 import SettingsView from './../SettingsView';
+import { useAppSelector } from '../../../hooks/redux';
 import type { SettingsScreenProps } from '../../../navigation/types';
 import { lastUsedTagsSelector } from '../../../store/reselect/metadata';
+import { EUnit } from '../../../store/types/wallet';
 import {
 	unitSelector,
 	selectedCurrencySelector,
-	showWidgetsSelector,
 	transactionSpeedSelector,
 } from '../../../store/reselect/settings';
-import { EUnit } from '../../../store/types/wallet';
-import { updateSettings } from '../../../store/slices/settings';
 
 const GeneralSettings = ({
 	navigation,
 }: SettingsScreenProps<'GeneralSettings'>): ReactElement => {
 	const { t } = useTranslation('settings');
-	const dispatch = useAppDispatch();
 	const lastUsedTags = useAppSelector(lastUsedTagsSelector);
-	const showWidgets = useAppSelector(showWidgetsSelector);
 	const selectedTransactionSpeed = useAppSelector(transactionSpeedSelector);
 	const selectedCurrency = useAppSelector(selectedCurrencySelector);
 	const selectedUnit = useAppSelector(unitSelector);
 
-	const settingsListData: IListData[] = useMemo(() => {
+	const listData: IListData[] = useMemo(() => {
 		const transactionSpeeds = {
 			slow: t('fee.slow.value'),
 			normal: t('fee.normal.value'),
@@ -60,13 +56,10 @@ const GeneralSettings = ({
 				onPress: (): void => navigation.navigate('TransactionSpeedSettings'),
 			},
 			{
-				title: t('general.widgets'),
-				type: EItemType.switch,
-				enabled: showWidgets,
+				title: t('widgets.nav_title'),
+				type: EItemType.button,
 				testID: 'WidgetsSettings',
-				onPress: (): void => {
-					dispatch(updateSettings({ showWidgets: !showWidgets }));
-				},
+				onPress: (): void => navigation.navigate('WidgetSettings'),
 			},
 		];
 
@@ -81,22 +74,14 @@ const GeneralSettings = ({
 		return [{ data }];
 	}, [
 		lastUsedTags,
-		showWidgets,
 		selectedCurrency,
 		selectedUnit,
 		selectedTransactionSpeed,
 		navigation,
-		dispatch,
 		t,
 	]);
 
-	return (
-		<SettingsView
-			title={t('general_title')}
-			listData={settingsListData}
-			showBackNavigation={true}
-		/>
-	);
+	return <SettingsView title={t('general_title')} listData={listData} />;
 };
 
 export default memo(GeneralSettings);
diff --git a/src/screens/Settings/Ledger/LedgerTransaction.tsx b/src/screens/Settings/Ledger/LedgerTransaction.tsx
index fc3d265f5..7f80cd59c 100644
--- a/src/screens/Settings/Ledger/LedgerTransaction.tsx
+++ b/src/screens/Settings/Ledger/LedgerTransaction.tsx
@@ -7,7 +7,7 @@ import NavigationHeader from '../../../components/NavigationHeader';
 import SafeAreaInset from '../../../components/SafeAreaInset';
 import { SettingsScreenProps } from '../../../navigation/types';
 import { ScrollView, View as ThemedView } from '../../../styles/components';
-import { Caption13M, Caption13Up } from '../../../styles/text';
+import { CaptionB, Caption13Up } from '../../../styles/text';
 import { i18nTime } from '../../../utils/i18n';
 import { bitkitLedger } from '../../../utils/ledger';
 import { showToast } from '../../../utils/notifications';
@@ -31,7 +31,7 @@ const Section = memo(
 				onPress={onPress}
 				style={styles.sectionRoot}>
 				<View style={styles.sectionName}>
-					<Caption13M>{name}</Caption13M>
+					<CaptionB>{name}</CaptionB>
 				</View>
 				<View style={styles.sectionValue} testID={testID}>
 					{value}
@@ -74,9 +74,9 @@ const LedgerTransaction = ({
 					<Section
 						name="id"
 						value={
-							<Caption13M ellipsizeMode="middle" numberOfLines={1}>
+							<CaptionB ellipsizeMode="middle" numberOfLines={1}>
 								{id}
-							</Caption13M>
+							</CaptionB>
 						}
 						onPress={(): void => {
 							Clipboard.setString(String(id));
@@ -90,7 +90,7 @@ const LedgerTransaction = ({
 					<Section
 						name="Time recorded"
 						value={
-							<Caption13M>
+							<CaptionB>
 								{tTime('dateTime', {
 									v: new Date(timestamp),
 									formatParams: {
@@ -104,24 +104,24 @@ const LedgerTransaction = ({
 										},
 									},
 								})}
-							</Caption13M>
+							</CaptionB>
 						}
 					/>
-					<Section name="Amount" value={<Caption13M>{amount}</Caption13M>} />
+					<Section name="Amount" value={<CaptionB>{amount}</CaptionB>} />
 					<Section
 						name="From"
 						value={
-							<Caption13M>
+							<CaptionB>
 								{fromAcc.wallet} / {fromAcc.account}
-							</Caption13M>
+							</CaptionB>
 						}
 					/>
 					<Section
 						name="To"
 						value={
-							<Caption13M>
+							<CaptionB>
 								{toAcc.wallet} / {toAcc.account}
-							</Caption13M>
+							</CaptionB>
 						}
 					/>
 				</View>
@@ -135,17 +135,17 @@ const LedgerTransaction = ({
 							<Section
 								name="Available"
 								value={
-									<Caption13M ellipsizeMode="middle" numberOfLines={1}>
+									<CaptionB ellipsizeMode="middle" numberOfLines={1}>
 										{balancesBefore.fromWallet.available}
-									</Caption13M>
+									</CaptionB>
 								}
 							/>
 							<Section
 								name="Hodl"
 								value={
-									<Caption13M ellipsizeMode="middle" numberOfLines={1}>
+									<CaptionB ellipsizeMode="middle" numberOfLines={1}>
 										{balancesBefore.fromWallet.hold}
-									</Caption13M>
+									</CaptionB>
 								}
 							/>
 						</View>
@@ -156,17 +156,17 @@ const LedgerTransaction = ({
 							<Section
 								name="Available"
 								value={
-									<Caption13M ellipsizeMode="middle" numberOfLines={1}>
+									<CaptionB ellipsizeMode="middle" numberOfLines={1}>
 										{balancesBefore.toWallet.available}
-									</Caption13M>
+									</CaptionB>
 								}
 							/>
 							<Section
 								name="Hodl"
 								value={
-									<Caption13M ellipsizeMode="middle" numberOfLines={1}>
+									<CaptionB ellipsizeMode="middle" numberOfLines={1}>
 										{balancesBefore.toWallet.hold}
-									</Caption13M>
+									</CaptionB>
 								}
 							/>
 						</View>
@@ -178,7 +178,7 @@ const LedgerTransaction = ({
 						<Caption13Up color="gray1">Metadata</Caption13Up>
 					</View>
 
-					<Caption13M>{`${meta}`}</Caption13M>
+					<CaptionB>{`${meta}`}</CaptionB>
 				</View>
 
 				<SafeAreaInset type="bottom" />
diff --git a/src/screens/Settings/Ledger/index.tsx b/src/screens/Settings/Ledger/index.tsx
index a5091c427..bef17230b 100644
--- a/src/screens/Settings/Ledger/index.tsx
+++ b/src/screens/Settings/Ledger/index.tsx
@@ -12,7 +12,7 @@ import {
 	TouchableOpacity as ThemedTouchableOpacity,
 	View as ThemedView,
 } from '../../../styles/components';
-import { Caption13Up, Text01S } from '../../../styles/text';
+import { Caption13Up, BodyM } from '../../../styles/text';
 import {
 	bitkitLedger,
 	deleteLedger,
@@ -121,7 +121,7 @@ const Ledger = ({
 			<ScrollView contentContainerStyle={styles.content}>
 				{!bitkitLedger ? (
 					<>
-						<Text01S color="white">Ledger is not initialized yet</Text01S>
+						<BodyM color="white">Ledger is not initialized yet</BodyM>
 					</>
 				) : (
 					<>
@@ -148,7 +148,7 @@ const Ledger = ({
 						</Caption13Up>
 						<View style={styles.item}>
 							<View style={styles.column4}>
-								<Text01S color="gray1" />
+								<BodyM color="gray1" />
 							</View>
 							<View style={styles.column4}>
 								<Caption13Up>Actual</Caption13Up>
diff --git a/src/screens/Settings/Lightning/AddConnection.tsx b/src/screens/Settings/Lightning/AddConnection.tsx
index bcc0d9b91..e17e32f0a 100644
--- a/src/screens/Settings/Lightning/AddConnection.tsx
+++ b/src/screens/Settings/Lightning/AddConnection.tsx
@@ -2,7 +2,7 @@ import React, { ReactElement, memo } from 'react';
 import { StyleSheet, View } from 'react-native';
 
 import { View as ThemedView, ScrollView } from '../../../styles/components';
-import { Caption13Up, Caption13M, Text01M } from '../../../styles/text';
+import { Caption13Up, CaptionB, BodyMSB } from '../../../styles/text';
 import SafeAreaInset from '../../../components/SafeAreaInset';
 import Button from '../../../components/Button';
 import NavigationHeader from '../../../components/NavigationHeader';
@@ -20,7 +20,7 @@ const Section = ({
 }): ReactElement => {
 	return (
 		<View style={styles.sectionRoot}>
-			<Caption13M>{name}</Caption13M>
+			<CaptionB>{name}</CaptionB>
 			{value}
 		</View>
 	);
@@ -36,27 +36,27 @@ const AddConnection = ({
 
 			<ScrollView contentContainerStyle={styles.content}>
 				<View style={styles.sectionTitle}>
-					<Caption13Up color="gray1">New connection</Caption13Up>
+					<Caption13Up color="white50">New connection</Caption13Up>
 				</View>
-				<Text01M>LNBIG Lightning Node</Text01M>
+				<BodyMSB>LNBIG Lightning Node</BodyMSB>
 				<View style={styles.channel}>
 					{/* Example channel */}
 					{/* <LightningChannel channelId="" /> */}
 				</View>
 
 				<View style={styles.sectionTitle}>
-					<Caption13Up color="gray1">CONNECTION DETAILS</Caption13Up>
+					<Caption13Up color="white50">CONNECTION DETAILS</Caption13Up>
 				</View>
 				<Section
 					name="Node ID"
-					value={<Caption13M>0296b2db..d73bf5c9</Caption13M>}
+					value={<CaptionB>0296b2db..d73bf5c9</CaptionB>}
 				/>
 				<Section
 					name="Receiving capacity"
 					value={
 						<Money
 							sats={100500}
-							size="caption13M"
+							size="captionB"
 							symbol={true}
 							color="white"
 							unit={EUnit.BTC}
@@ -68,7 +68,7 @@ const AddConnection = ({
 					value={
 						<Money
 							sats={100500}
-							size="caption13M"
+							size="captionB"
 							symbol={true}
 							color="white"
 							unit={EUnit.BTC}
@@ -80,7 +80,7 @@ const AddConnection = ({
 					value={
 						<Money
 							sats={100500}
-							size="caption13M"
+							size="captionB"
 							symbol={true}
 							color="white"
 							unit={EUnit.BTC}
@@ -92,7 +92,7 @@ const AddConnection = ({
 					value={
 						<Money
 							sats={100500}
-							size="caption13M"
+							size="captionB"
 							symbol={true}
 							color="white"
 							unit={EUnit.BTC}
diff --git a/src/screens/Settings/Lightning/AddConnectionResult.tsx b/src/screens/Settings/Lightning/AddConnectionResult.tsx
index 9e15819c6..aafb15ce7 100644
--- a/src/screens/Settings/Lightning/AddConnectionResult.tsx
+++ b/src/screens/Settings/Lightning/AddConnectionResult.tsx
@@ -1,11 +1,10 @@
 import React, { ReactElement, memo } from 'react';
-import { StyleSheet, View } from 'react-native';
+import { Image, StyleSheet, View } from 'react-native';
 
 import { View as ThemedView } from '../../../styles/components';
-import { Text01S } from '../../../styles/text';
+import { BodyM } from '../../../styles/text';
 import SafeAreaInset from '../../../components/SafeAreaInset';
 import NavigationHeader from '../../../components/NavigationHeader';
-import GlowImage from '../../../components/GlowImage';
 import Button from '../../../components/Button';
 import type { SettingsScreenProps } from '../../../navigation/types';
 
@@ -19,12 +18,14 @@ const AddConnectionResult = ({
 			<SafeAreaInset type="top" />
 			<NavigationHeader title="Connection opened" />
 			<View style={styles.content}>
-				<Text01S color="gray1" style={styles.text}>
+				<BodyM color="white50" style={styles.text}>
 					You successfully opened a connection with ‘LNBIG Lightning Node’. It
 					might take a while for the connection to become ready for use.
-				</Text01S>
+				</BodyM>
 
-				<GlowImage image={imageSrc} imageSize={200} glowColor="green" />
+				<View style={styles.imageContainer}>
+					<Image style={styles.image} source={imageSrc} />
+				</View>
 
 				<View>
 					<Button
@@ -56,6 +57,19 @@ const styles = StyleSheet.create({
 		marginTop: 16,
 		marginBottom: 16,
 	},
+	imageContainer: {
+		flexShrink: 1,
+		justifyContent: 'center',
+		alignItems: 'center',
+		alignSelf: 'center',
+		width: 256,
+		aspectRatio: 1,
+		marginTop: 'auto',
+	},
+	image: {
+		flex: 1,
+		resizeMode: 'contain',
+	},
 });
 
 export default memo(AddConnectionResult);
diff --git a/src/screens/Settings/Lightning/ChannelDetails.tsx b/src/screens/Settings/Lightning/ChannelDetails.tsx
index d39558c57..63322e498 100644
--- a/src/screens/Settings/Lightning/ChannelDetails.tsx
+++ b/src/screens/Settings/Lightning/ChannelDetails.tsx
@@ -10,7 +10,7 @@ import {
 } from '@synonymdev/blocktank-lsp-http-client';
 
 import { View as ThemedView } from '../../../styles/components';
-import { Caption13Up, Caption13M } from '../../../styles/text';
+import { Caption13Up, CaptionB } from '../../../styles/text';
 import SafeAreaInset from '../../../components/SafeAreaInset';
 import Button from '../../../components/Button';
 import NavigationHeader from '../../../components/NavigationHeader';
@@ -56,7 +56,7 @@ const Section = memo(
 				onPress={onPress}
 				style={styles.sectionRoot}>
 				<View style={styles.sectionName}>
-					<Caption13M>{name}</Caption13M>
+					<CaptionB>{name}</CaptionB>
 				</View>
 				<View style={styles.sectionValue} testID={testID}>
 					{value}
@@ -210,7 +210,7 @@ const ChannelDetails = ({
 
 				<View style={styles.status}>
 					<View style={styles.sectionTitle}>
-						<Caption13Up color="gray1">{t('status')}</Caption13Up>
+						<Caption13Up color="white50">{t('status')}</Caption13Up>
 					</View>
 					<ChannelStatus status={channel.status} order={blocktankOrder} />
 				</View>
@@ -218,14 +218,14 @@ const ChannelDetails = ({
 				{blocktankOrder && (
 					<View style={styles.section}>
 						<View style={styles.sectionTitle}>
-							<Caption13Up color="gray1">{t('order_details')}</Caption13Up>
+							<Caption13Up color="white50">{t('order_details')}</Caption13Up>
 						</View>
 						<Section
 							name={t('order')}
 							value={
-								<Caption13M ellipsizeMode="middle" numberOfLines={1}>
+								<CaptionB ellipsizeMode="middle" numberOfLines={1}>
 									{blocktankOrder.id}
-								</Caption13M>
+								</CaptionB>
 							}
 							onPress={(): void => {
 								Clipboard.setString(blocktankOrder.id);
@@ -239,7 +239,7 @@ const ChannelDetails = ({
 						<Section
 							name={t('created_on')}
 							value={
-								<Caption13M>
+								<CaptionB>
 									{tTime('dateTime', {
 										v: new Date(blocktankOrder.createdAt),
 										formatParams: {
@@ -253,16 +253,16 @@ const ChannelDetails = ({
 											},
 										},
 									})}
-								</Caption13M>
+								</CaptionB>
 							}
 						/>
 						{channel.funding_txid && (
 							<Section
 								name={t('transaction')}
 								value={
-									<Caption13M ellipsizeMode="middle" numberOfLines={1}>
+									<CaptionB ellipsizeMode="middle" numberOfLines={1}>
 										{channel.funding_txid}
-									</Caption13M>
+									</CaptionB>
 								}
 								onPress={(): void => {
 									if (channel.funding_txid) {
@@ -280,10 +280,10 @@ const ChannelDetails = ({
 							value={
 								<Money
 									sats={blocktankOrder.feeSat - blocktankOrder.clientBalanceSat}
-									size="caption13M"
+									size="captionB"
 									color="white"
 									symbol={true}
-									symbolColor="gray1"
+									symbolColor="white50"
 									unit={EUnit.BTC}
 								/>
 							}
@@ -293,16 +293,16 @@ const ChannelDetails = ({
 
 				<View style={styles.section}>
 					<View style={styles.sectionTitle}>
-						<Caption13Up color="gray1">{t('balance')}</Caption13Up>
+						<Caption13Up color="white50">{t('balance')}</Caption13Up>
 					</View>
 					<Section
 						name={t('receiving_label')}
 						value={
 							<Money
 								sats={receivingAvailable}
-								size="caption13M"
+								size="captionB"
 								symbol={true}
-								symbolColor="gray1"
+								symbolColor="white50"
 								color="white"
 								unit={EUnit.BTC}
 							/>
@@ -313,9 +313,9 @@ const ChannelDetails = ({
 						value={
 							<Money
 								sats={spendingAvailable}
-								size="caption13M"
+								size="captionB"
 								symbol={true}
-								symbolColor="gray1"
+								symbolColor="white50"
 								color="white"
 								unit={EUnit.BTC}
 							/>
@@ -326,9 +326,9 @@ const ChannelDetails = ({
 						value={
 							<Money
 								sats={Number(channel.unspendable_punishment_reserve)}
-								size="caption13M"
+								size="captionB"
 								symbol={true}
-								symbolColor="gray1"
+								symbolColor="white50"
 								color="white"
 								unit={EUnit.BTC}
 							/>
@@ -340,9 +340,9 @@ const ChannelDetails = ({
 						value={
 							<Money
 								sats={capacity}
-								size="caption13M"
+								size="captionB"
 								symbol={true}
-								symbolColor="gray1"
+								symbolColor="white50"
 								color="white"
 								unit={EUnit.BTC}
 							/>
@@ -353,16 +353,16 @@ const ChannelDetails = ({
 				{/* TODO: show fees */}
 				{/* <View style={styles.section}>
 					<View style={styles.sectionTitle}>
-						<Caption13Up color="gray1">Fees</Caption13Up>
+						<Caption13Up color="white50">Fees</Caption13Up>
 					</View>
 					<Section
 						name="Spending base fee"
 						value={
 							<Money
 								sats={123}
-								size="caption13M"
+								size="captionB"
 								symbol={true}
-								symbolColor="gray1"
+								symbolColor="white50"
 								color="white"
 								unit={EUnit.BTC}
 							/>
@@ -373,9 +373,9 @@ const ChannelDetails = ({
 						value={
 							<Money
 								sats={123}
-								size="caption13M"
+								size="captionB"
 								symbol={true}
-								symbolColor="gray1"
+								symbolColor="white50"
 								color="white"
 								unit={EUnit.BTC}
 							/>
@@ -385,26 +385,26 @@ const ChannelDetails = ({
 
 				<View style={styles.section}>
 					<View style={styles.sectionTitle}>
-						<Caption13Up color="gray1">{t('other')}</Caption13Up>
+						<Caption13Up color="white50">{t('other')}</Caption13Up>
 					</View>
 					{txTime && (
 						<Section
 							name={t('opened_on')}
-							value={<Caption13M>{txTime}</Caption13M>}
+							value={<CaptionB>{txTime}</CaptionB>}
 						/>
 					)}
 					{channelCloseTime && (
 						<Section
 							name={t('closed_on')}
-							value={<Caption13M>{channelCloseTime}</Caption13M>}
+							value={<CaptionB>{channelCloseTime}</CaptionB>}
 						/>
 					)}
 					<Section
 						name={t('channel_node_id')}
 						value={
-							<Caption13M ellipsizeMode="middle" numberOfLines={1}>
+							<CaptionB ellipsizeMode="middle" numberOfLines={1}>
 								{channel.counterparty_node_id}
-							</Caption13M>
+							</CaptionB>
 						}
 						onPress={(): void => {
 							Clipboard.setString(channel.counterparty_node_id);
@@ -420,31 +420,29 @@ const ChannelDetails = ({
 				{enableDevOptions && (
 					<View style={styles.section}>
 						<View style={styles.sectionTitle}>
-							<Caption13Up color="gray1">{t('debug')}</Caption13Up>
+							<Caption13Up color="white50">{t('debug')}</Caption13Up>
 						</View>
 						{blocktankOrder?.orderExpiresAt && (
 							<Section
 								name="Order Expiry"
 								value={
-									<Caption13M>
+									<CaptionB>
 										{new Date(blocktankOrder.orderExpiresAt).toLocaleString()}
-									</Caption13M>
+									</CaptionB>
 								}
 							/>
 						)}
 						<Section
 							name={t('is_usable')}
-							value={
-								<Caption13M>{t(channel.is_usable ? 'yes' : 'no')}</Caption13M>
-							}
+							value={<CaptionB>{t(channel.is_usable ? 'yes' : 'no')}</CaptionB>}
 						/>
 						<Section
 							name={t('is_ready')}
 							testID={channel.is_channel_ready ? 'IsReadyYes' : 'IsReadyNo'}
 							value={
-								<Caption13M>
+								<CaptionB>
 									{t(channel.is_channel_ready ? 'yes' : 'no')}
-								</Caption13M>
+								</CaptionB>
 							}
 						/>
 					</View>
@@ -452,18 +450,15 @@ const ChannelDetails = ({
 
 				<View style={styles.buttons}>
 					{blocktankOrder && (
-						<>
-							<Button
-								style={styles.button}
-								text={t('support')}
-								size="large"
-								variant="secondary"
-								onPress={(): void => {
-									openSupportLink(blocktankOrder);
-								}}
-							/>
-							<View style={styles.divider} />
-						</>
+						<Button
+							style={styles.button}
+							text={t('support')}
+							size="large"
+							variant="secondary"
+							onPress={(): void => {
+								openSupportLink(blocktankOrder);
+							}}
+						/>
 					)}
 					{channelIsOpen && (
 						<Button
@@ -534,15 +529,13 @@ const styles = StyleSheet.create({
 		flexDirection: 'row',
 		alignItems: 'center',
 		marginTop: 'auto',
+		gap: 16,
 	},
 	button: {
 		marginTop: 16,
 		paddingHorizontal: 16,
 		flex: 1,
 	},
-	divider: {
-		width: 16,
-	},
 });
 
 export default memo(ChannelDetails);
diff --git a/src/screens/Settings/Lightning/ChannelStatus.tsx b/src/screens/Settings/Lightning/ChannelStatus.tsx
index 9900fa2f1..38d6a0347 100644
--- a/src/screens/Settings/Lightning/ChannelStatus.tsx
+++ b/src/screens/Settings/Lightning/ChannelStatus.tsx
@@ -10,7 +10,7 @@ import { BtPaymentState2 } from '@synonymdev/blocktank-lsp-http-client/dist/shar
 
 import { EChannelStatus } from '../../../store/types/lightning';
 import { View as ThemedView } from '../../../styles/components';
-import { Text01M } from '../../../styles/text';
+import { BodyMSB } from '../../../styles/text';
 import {
 	ArrowCounterClock,
 	Checkmark,
@@ -38,7 +38,7 @@ const ChannelStatus = ({
 					<ThemedView style={styles.statusIcon} color="green16">
 						<LightningIcon color="green" width={16} height={16} />
 					</ThemedView>
-					<Text01M color="green">{t('order_state.open')}</Text01M>
+					<BodyMSB color="green">{t('order_state.open')}</BodyMSB>
 				</View>
 			);
 		}
@@ -46,9 +46,9 @@ const ChannelStatus = ({
 			return (
 				<View style={styles.statusRow}>
 					<ThemedView style={styles.statusIcon} color="white10">
-						<LightningIcon color="gray1" width={16} height={16} />
+						<LightningIcon color="white50" width={16} height={16} />
 					</ThemedView>
-					<Text01M color="gray1">{t('order_state.closed')}</Text01M>
+					<BodyMSB color="white50">{t('order_state.closed')}</BodyMSB>
 				</View>
 			);
 		}
@@ -68,7 +68,7 @@ const ChannelStatus = ({
 							<ThemedView style={styles.statusIcon} color="purple16">
 								<HourglassSimpleIcon color="purple" width={16} height={16} />
 							</ThemedView>
-							<Text01M color="purple">{t('order_state.opening')}</Text01M>
+							<BodyMSB color="purple">{t('order_state.opening')}</BodyMSB>
 						</View>
 					);
 				}
@@ -82,7 +82,7 @@ const ChannelStatus = ({
 						<ThemedView style={styles.statusIcon} color="red16">
 							<TimerSpeedIcon color="red" width={16} height={16} />
 						</ThemedView>
-						<Text01M color="red">{t('order_state.expired')}</Text01M>
+						<BodyMSB color="red">{t('order_state.expired')}</BodyMSB>
 					</View>
 				);
 			}
@@ -95,7 +95,7 @@ const ChannelStatus = ({
 						<ThemedView style={styles.statusIcon} color="red16">
 							<XIcon color="red" width={16} height={16} />
 						</ThemedView>
-						<Text01M color="red">{t('order_state.payment_canceled')}</Text01M>
+						<BodyMSB color="red">{t('order_state.payment_canceled')}</BodyMSB>
 					</View>
 				);
 			}
@@ -105,9 +105,9 @@ const ChannelStatus = ({
 						<ThemedView style={styles.statusIcon} color="yellow16">
 							<ArrowCounterClock color="yellow" width={16} height={16} />
 						</ThemedView>
-						<Text01M color="yellow">
+						<BodyMSB color="yellow">
 							{t('order_state.refund_available')}
-						</Text01M>
+						</BodyMSB>
 					</View>
 				);
 			}
@@ -115,9 +115,9 @@ const ChannelStatus = ({
 				return (
 					<View style={styles.statusRow}>
 						<ThemedView style={styles.statusIcon} color="white10">
-							<ArrowCounterClock color="gray1" width={16} height={16} />
+							<ArrowCounterClock color="white50" width={16} height={16} />
 						</ThemedView>
-						<Text01M color="gray1">{t('order_state.refunded')}</Text01M>
+						<BodyMSB color="white50">{t('order_state.refunded')}</BodyMSB>
 					</View>
 				);
 			}
@@ -130,9 +130,9 @@ const ChannelStatus = ({
 						<ThemedView style={styles.statusIcon} color="purple16">
 							<ClockIcon color="purple" width={16} height={16} />
 						</ThemedView>
-						<Text01M color="purple">
+						<BodyMSB color="purple">
 							{t('order_state.awaiting_payment')}
-						</Text01M>
+						</BodyMSB>
 					</View>
 				);
 			}
@@ -142,7 +142,7 @@ const ChannelStatus = ({
 						<ThemedView style={styles.statusIcon} color="purple16">
 							<Checkmark color="purple" width={16} height={16} />
 						</ThemedView>
-						<Text01M color="purple">{t('order_state.paid')}</Text01M>
+						<BodyMSB color="purple">{t('order_state.paid')}</BodyMSB>
 					</View>
 				);
 			}
@@ -156,7 +156,7 @@ const ChannelStatus = ({
 					<ThemedView style={styles.statusIcon} color="purple16">
 						<HourglassSimpleIcon color="purple" width={16} height={16} />
 					</ThemedView>
-					<Text01M color="purple">{t('order_state.opening')}</Text01M>
+					<BodyMSB color="purple">{t('order_state.opening')}</BodyMSB>
 				</View>
 			);
 		}
diff --git a/src/screens/Settings/Lightning/Channels.tsx b/src/screens/Settings/Lightning/Channels.tsx
index b34ecfb33..1c73e2109 100644
--- a/src/screens/Settings/Lightning/Channels.tsx
+++ b/src/screens/Settings/Lightning/Channels.tsx
@@ -18,7 +18,7 @@ import {
 	View as ThemedView,
 	TextInput,
 } from '../../../styles/components';
-import { Caption13Up, Text01M } from '../../../styles/text';
+import { Caption13Up, BodyMSB } from '../../../styles/text';
 import {
 	ChevronRight,
 	DownArrow,
@@ -167,17 +167,17 @@ const Channel = memo(
 		return (
 			<TouchableOpacity
 				style={styles.nRoot}
-				onPress={(): void => onPress(channel)}
-				testID="Channel">
+				testID="Channel"
+				onPress={(): void => onPress(channel)}>
 				<View style={styles.nTitle}>
-					<Text01M
+					<BodyMSB
 						style={styles.nName}
-						color={closed ? 'gray1' : 'white'}
+						color={closed ? 'white50' : 'white'}
 						numberOfLines={1}
 						ellipsizeMode="middle">
 						{channelName}
-					</Text01M>
-					<ChevronRight color="gray1" height={24} />
+					</BodyMSB>
+					<ChevronRight color="white50" height={24} />
 				</View>
 				<LightningChannel channel={channel} status={getChannelStatus()} />
 			</TouchableOpacity>
@@ -391,7 +391,7 @@ const Channels = ({
 				}>
 				<View style={styles.balances}>
 					<View style={styles.balance}>
-						<Caption13Up color="gray1">{t('spending_label')}</Caption13Up>
+						<Caption13Up color="white50">{t('spending_label')}</Caption13Up>
 						<View style={styles.row}>
 							<UpArrow color="purple" width={22} height={22} />
 							<Money
@@ -403,7 +403,7 @@ const Channels = ({
 						</View>
 					</View>
 					<View style={styles.balance}>
-						<Caption13Up color="gray1">{t('receiving_label')}</Caption13Up>
+						<Caption13Up color="white50">{t('receiving_label')}</Caption13Up>
 						<View style={styles.row}>
 							<DownArrow color="white" width={22} height={22} />
 							<Money
@@ -418,7 +418,7 @@ const Channels = ({
 
 				{pendingConnections.length > 0 && (
 					<>
-						<Caption13Up color="gray1" style={styles.sectionTitle}>
+						<Caption13Up color="white50" style={styles.sectionTitle}>
 							{t('conn_pending')}
 						</Caption13Up>
 						<ChannelList
@@ -431,7 +431,7 @@ const Channels = ({
 
 				{openChannels.length > 0 && (
 					<>
-						<Caption13Up color="gray1" style={styles.sectionTitle}>
+						<Caption13Up color="white50" style={styles.sectionTitle}>
 							{t('conn_open')}
 						</Caption13Up>
 						<ChannelList
@@ -445,7 +445,7 @@ const Channels = ({
 					<AnimatedView entering={FadeIn} exiting={FadeOut}>
 						{closedChannels.length > 0 && (
 							<>
-								<Caption13Up color="gray1" style={styles.sectionTitle}>
+								<Caption13Up color="white50" style={styles.sectionTitle}>
 									{t('conn_closed')}
 								</Caption13Up>
 								<ChannelList
@@ -457,7 +457,7 @@ const Channels = ({
 						)}
 						{failedOrders.length > 0 && (
 							<>
-								<Caption13Up color="gray1" style={styles.sectionTitle}>
+								<Caption13Up color="white50" style={styles.sectionTitle}>
 									{t('conn_failed')}
 								</Caption13Up>
 								<ChannelList
@@ -482,11 +482,10 @@ const Channels = ({
 
 				{enableDevOptions && (
 					<>
-						<Caption13Up color="gray1" style={styles.sectionTitle}>
+						<Caption13Up color="white50" style={styles.sectionTitle}>
 							Dev Options
 						</Caption13Up>
 						<TextInput
-							selectionColor="orange"
 							autoCapitalize="none"
 							autoComplete="off"
 							autoCorrect={false}
@@ -673,7 +672,6 @@ const Channels = ({
 						variant="secondary"
 						onPress={handleExportLogs}
 					/>
-					<View style={styles.divider} />
 					<Button
 						style={styles.button}
 						text={t('conn_button_add')}
@@ -693,8 +691,9 @@ const styles = StyleSheet.create({
 		flex: 1,
 	},
 	content: {
-		paddingHorizontal: 16,
 		flexGrow: 1,
+		paddingTop: 16,
+		paddingHorizontal: 16,
 	},
 	balances: {
 		flexDirection: 'row',
@@ -747,13 +746,11 @@ const styles = StyleSheet.create({
 		flexDirection: 'row',
 		alignItems: 'center',
 		marginTop: 'auto',
+		gap: 16,
 	},
 	button: {
 		flex: 1,
 	},
-	divider: {
-		width: 16,
-	},
 });
 
 export default memo(Channels);
diff --git a/src/screens/Settings/Lightning/CloseConnection.tsx b/src/screens/Settings/Lightning/CloseConnection.tsx
index dfc841447..16c8374d2 100644
--- a/src/screens/Settings/Lightning/CloseConnection.tsx
+++ b/src/screens/Settings/Lightning/CloseConnection.tsx
@@ -1,12 +1,11 @@
 import React, { ReactElement, memo, useState } from 'react';
-import { StyleSheet, View } from 'react-native';
+import { Image, StyleSheet, View } from 'react-native';
 import { Trans, useTranslation } from 'react-i18next';
 
 import { View as ThemedView } from '../../../styles/components';
-import { Text01B, Text01S } from '../../../styles/text';
+import { BodyMB, BodyM } from '../../../styles/text';
 import SafeAreaInset from '../../../components/SafeAreaInset';
 import NavigationHeader from '../../../components/NavigationHeader';
-import GlowImage from '../../../components/GlowImage';
 import Button from '../../../components/Button';
 import { useAppSelector } from '../../../hooks/redux';
 import { showToast } from '../../../utils/notifications';
@@ -72,17 +71,17 @@ const CloseConnection = ({
 				onClosePress={(): void => navigation.navigate('Wallet')}
 			/>
 			<View style={styles.content}>
-				<Text01S color="gray1">
+				<BodyM color="white50">
 					<Trans
 						t={t}
 						i18nKey="close_text"
-						components={{
-							white: <Text01B color="white" />,
-						}}
+						components={{ accent: <BodyMB color="white" /> }}
 					/>
-				</Text01S>
+				</BodyM>
 
-				<GlowImage image={imageSrc} imageSize={200} glowColor="yellow" />
+				<View style={styles.imageContainer}>
+					<Image style={styles.image} source={imageSrc} />
+				</View>
 
 				<View style={styles.buttonContainer}>
 					<Button
@@ -92,7 +91,6 @@ const CloseConnection = ({
 						variant="secondary"
 						onPress={navigation.goBack}
 					/>
-					<View style={styles.divider} />
 					<Button
 						style={styles.button}
 						text={t('close_button')}
@@ -114,20 +112,31 @@ const styles = StyleSheet.create({
 	},
 	content: {
 		flex: 1,
-		marginTop: 8,
+		paddingTop: 16,
 		paddingHorizontal: 16,
 	},
+	imageContainer: {
+		flexShrink: 1,
+		justifyContent: 'center',
+		alignItems: 'center',
+		alignSelf: 'center',
+		width: 256,
+		aspectRatio: 1,
+		marginTop: 'auto',
+	},
+	image: {
+		flex: 1,
+		resizeMode: 'contain',
+	},
 	buttonContainer: {
 		marginTop: 'auto',
 		flexDirection: 'row',
 		alignItems: 'center',
+		gap: 16,
 	},
 	button: {
 		flex: 1,
 	},
-	divider: {
-		width: 16,
-	},
 });
 
 export default memo(CloseConnection);
diff --git a/src/screens/Settings/Lightning/LightningNodeInfo.tsx b/src/screens/Settings/Lightning/LightningNodeInfo.tsx
index e5adb3063..efb74ae04 100644
--- a/src/screens/Settings/Lightning/LightningNodeInfo.tsx
+++ b/src/screens/Settings/Lightning/LightningNodeInfo.tsx
@@ -36,8 +36,17 @@ const LightningNodeInfo = ({
 		})();
 	}, [selectedNetwork, t]);
 
+	const onCopy = (): void => {
+		Clipboard.setString(nodeId);
+		showToast({
+			type: 'success',
+			title: t('copied'),
+			description: nodeId,
+		});
+	};
+
 	return (
-		<ThemedView style={styles.container}>
+		<ThemedView style={styles.root}>
 			<SafeAreaInset type="top" />
 			<NavigationHeader
 				title={t('node_info')}
@@ -48,19 +57,12 @@ const LightningNodeInfo = ({
 			/>
 
 			<View style={styles.content}>
+				<View style={styles.label}>
+					<Caption13Up color="white50">{t('node_id')}</Caption13Up>
+				</View>
+
 				{!error && (
-					<TouchableOpacity
-						onPress={(): void => {
-							Clipboard.setString(nodeId);
-							showToast({
-								type: 'success',
-								title: t('copied'),
-								description: nodeId,
-							});
-						}}>
-						<Caption13Up style={styles.label} color="gray1">
-							{t('node_id')}
-						</Caption13Up>
+					<TouchableOpacity onPress={onCopy}>
 						<Subtitle testID="LDKNodeID" accessibilityLabel={nodeId}>
 							{nodeId}
 						</Subtitle>
@@ -69,12 +71,7 @@ const LightningNodeInfo = ({
 
 				{!!error && (
 					<>
-						<View>
-							<Caption13Up style={styles.label} color="gray1">
-								{t('node_id')}
-							</Caption13Up>
-							<Subtitle color="red">{t('node_disconnected')}</Subtitle>
-						</View>
+						<Subtitle color="red">{t('node_disconnected')}</Subtitle>
 						<View style={styles.error}>
 							<Subtitle>{error}</Subtitle>
 						</View>
@@ -88,7 +85,7 @@ const LightningNodeInfo = ({
 };
 
 const styles = StyleSheet.create({
-	container: {
+	root: {
 		flex: 1,
 	},
 	content: {
@@ -96,7 +93,8 @@ const styles = StyleSheet.create({
 		paddingHorizontal: 16,
 	},
 	label: {
-		marginBottom: 8,
+		justifyContent: 'center',
+		height: 40,
 	},
 	error: {
 		marginTop: 32,
diff --git a/src/screens/Settings/Lightning/OpenConnectionSuccess.tsx b/src/screens/Settings/Lightning/OpenConnectionSuccess.tsx
index 63774f545..a97d95bab 100644
--- a/src/screens/Settings/Lightning/OpenConnectionSuccess.tsx
+++ b/src/screens/Settings/Lightning/OpenConnectionSuccess.tsx
@@ -1,11 +1,10 @@
 import React, { ReactElement, memo } from 'react';
-import { StyleSheet, View } from 'react-native';
+import { Image, StyleSheet, View } from 'react-native';
 
 import { View as ThemedView } from '../../../styles/components';
-import { Text01S } from '../../../styles/text';
+import { BodyM } from '../../../styles/text';
 import SafeAreaInset from '../../../components/SafeAreaInset';
 import NavigationHeader from '../../../components/NavigationHeader';
-import GlowImage from '../../../components/GlowImage';
 import Button from '../../../components/Button';
 import type { SettingsScreenProps } from '../../../navigation/types';
 
@@ -27,12 +26,14 @@ const OpenConnectionSuccess = ({
 			<SafeAreaInset type="top" />
 			<NavigationHeader title="Connection Opened" displayBackButton={false} />
 			<View style={styles.content}>
-				<Text01S color="gray1">
+				<BodyM color="white50">
 					You succesfully opened a connection with ‘{name}’. It might take a
 					while for the connection to become ready for use.
-				</Text01S>
+				</BodyM>
 
-				<GlowImage image={imageSrc} glowColor="green" />
+				<View style={styles.imageContainer}>
+					<Image style={styles.image} source={imageSrc} />
+				</View>
 
 				<View style={styles.buttons}>
 					<Button text="OK" size="large" onPress={onContinue} />
@@ -52,6 +53,19 @@ const styles = StyleSheet.create({
 		marginTop: 8,
 		paddingHorizontal: 16,
 	},
+	imageContainer: {
+		flexShrink: 1,
+		justifyContent: 'center',
+		alignItems: 'center',
+		alignSelf: 'center',
+		width: 256,
+		aspectRatio: 1,
+		marginTop: 'auto',
+	},
+	image: {
+		flex: 1,
+		resizeMode: 'contain',
+	},
 	buttons: {
 		marginTop: 'auto',
 	},
diff --git a/src/screens/Settings/PIN/AskForBiometrics.tsx b/src/screens/Settings/PIN/AskForBiometrics.tsx
index 5a340bc17..7c8c96229 100644
--- a/src/screens/Settings/PIN/AskForBiometrics.tsx
+++ b/src/screens/Settings/PIN/AskForBiometrics.tsx
@@ -5,18 +5,23 @@ import React, {
 	useEffect,
 	useCallback,
 } from 'react';
-import { Linking, Platform, Pressable, StyleSheet, View } from 'react-native';
+import {
+	Image,
+	Linking,
+	Platform,
+	Pressable,
+	StyleSheet,
+	View,
+} from 'react-native';
 import { useTranslation } from 'react-i18next';
 
 import { Switch } from '../../../styles/components';
-import { Text01M, Text01S } from '../../../styles/text';
+import { BodyMSB, BodyM } from '../../../styles/text';
 import { FaceIdIcon, TouchIdIcon } from '../../../styles/icons';
 import BottomSheetNavigationHeader from '../../../components/BottomSheetNavigationHeader';
 import SafeAreaInset from '../../../components/SafeAreaInset';
 import GradientView from '../../../components/GradientView';
-import GlowImage from '../../../components/GlowImage';
 import Button from '../../../components/Button';
-import Glow from '../../../components/Glow';
 import { IsSensorAvailableResult } from '../../../components/Biometrics';
 import { useAppDispatch } from '../../../hooks/redux';
 import rnBiometrics from '../../../utils/biometrics';
@@ -97,24 +102,25 @@ const AskForBiometrics = ({
 	]);
 
 	return (
-		<GradientView style={styles.container}>
+		<GradientView style={styles.root}>
 			<BottomSheetNavigationHeader title={biometricsName} />
 
 			<View style={styles.content}>
-				{!biometryData && <Text01S color="gray1">{t('bio_loading')}</Text01S>}
+				{!biometryData && <BodyM color="white50">{t('bio_loading')}</BodyM>}
 
 				{!biometryData?.available && (
 					<>
-						<Text01S color="gray1">{t('bio_not_available')}</Text01S>
-						<GlowImage image={imageSrc} imageSize={200} glowColor="yellow" />
+						<BodyM color="white50">{t('bio_not_available')}</BodyM>
+						<View style={styles.imageContainer}>
+							<Image style={styles.image} source={imageSrc} />
+						</View>
 					</>
 				)}
 
 				{biometryData?.biometryType && (
 					<>
-						<Text01S color="gray1">{t('bio_ask', { biometricsName })}</Text01S>
+						<BodyM color="white50">{t('bio_ask', { biometricsName })}</BodyM>
 						<View style={styles.imageContainer} pointerEvents="none">
-							<Glow style={styles.glow} size={600} color="brand" />
 							{biometryData?.biometryType === 'FaceID' ? (
 								<FaceIdIcon />
 							) : (
@@ -124,12 +130,12 @@ const AskForBiometrics = ({
 
 						<Pressable
 							style={styles.toggle}
-							onPress={handleTogglePress}
-							testID="ToggleBiometrics">
-							<Text01M>{t('bio_use', { biometricsName })}</Text01M>
+							testID="ToggleBiometrics"
+							onPress={handleTogglePress}>
+							<BodyMSB>{t('bio_use', { biometricsName })}</BodyMSB>
 							<Switch
-								onValueChange={handleTogglePress}
 								value={shouldEnableBiometrics}
+								onValueChange={handleTogglePress}
 							/>
 						</Pressable>
 					</>
@@ -148,30 +154,29 @@ const AskForBiometrics = ({
 						<>
 							<Button
 								style={styles.button}
-								size="large"
 								text={t('skip')}
+								size="large"
 								variant="secondary"
 								testID="SkipButton"
 								onPress={onSkip}
 							/>
-							<View style={styles.divider} />
 							<Button
 								style={styles.button}
-								size="large"
 								text={t('bio_phone_settings')}
+								size="large"
 								onPress={goToSettings}
 							/>
 						</>
 					)}
 				</View>
-				<SafeAreaInset type="bottom" minPadding={16} />
 			</View>
+			<SafeAreaInset type="bottom" minPadding={16} />
 		</GradientView>
 	);
 };
 
 const styles = StyleSheet.create({
-	container: {
+	root: {
 		flex: 1,
 	},
 	content: {
@@ -179,32 +184,35 @@ const styles = StyleSheet.create({
 		paddingHorizontal: 32,
 	},
 	imageContainer: {
-		flex: 1,
-		position: 'relative',
+		flexShrink: 1,
 		justifyContent: 'center',
 		alignItems: 'center',
+		alignSelf: 'center',
+		width: 256,
+		aspectRatio: 1,
+		marginTop: 'auto',
+		marginBottom: 'auto',
 	},
-	glow: {
-		position: 'absolute',
+	image: {
+		flex: 1,
+		resizeMode: 'contain',
 	},
 	toggle: {
 		flexDirection: 'row',
 		alignItems: 'center',
 		justifyContent: 'space-between',
+		marginTop: 'auto',
 		marginBottom: 32,
 	},
 	buttonContainer: {
 		flexDirection: 'row',
 		justifyContent: 'center',
-		marginTop: 'auto',
+		gap: 16,
 	},
 	button: {
 		paddingHorizontal: 16,
 		flex: 1,
 	},
-	divider: {
-		width: 16,
-	},
 });
 
 export default memo(AskForBiometrics);
diff --git a/src/screens/Settings/PIN/ChangePin.tsx b/src/screens/Settings/PIN/ChangePin.tsx
index 3c62a5db5..959c203c4 100644
--- a/src/screens/Settings/PIN/ChangePin.tsx
+++ b/src/screens/Settings/PIN/ChangePin.tsx
@@ -11,7 +11,7 @@ import { useFocusEffect } from '@react-navigation/native';
 import { useTranslation } from 'react-i18next';
 
 import { View as ThemedView, AnimatedView } from '../../../styles/components';
-import { Text01S, Text02S } from '../../../styles/text';
+import { BodyM, BodyS } from '../../../styles/text';
 import SafeAreaInset from '../../../components/SafeAreaInset';
 import NavigationHeader from '../../../components/NavigationHeader';
 import NumberPad from '../../../components/NumberPad';
@@ -91,7 +91,7 @@ const ChangePin = ({
 			/>
 
 			<View style={styles.text}>
-				<Text01S color="gray1">{t('cp_text')}</Text01S>
+				<BodyM color="white50">{t('cp_text')}</BodyM>
 			</View>
 
 			<View style={styles.wrongPin}>
@@ -101,11 +101,11 @@ const ChangePin = ({
 							onPress={(): void => {
 								showBottomSheet('forgotPIN');
 							}}>
-							<Text02S color="brand">{t('cp_forgot')}</Text02S>
+							<BodyS color="brand">{t('cp_forgot')}</BodyS>
 						</Pressable>
 					</AnimatedView>
 				) : (
-					<Text02S> </Text02S>
+					<BodyS> </BodyS>
 				)}
 			</View>
 
diff --git a/src/screens/Settings/PIN/ChangePin2.tsx b/src/screens/Settings/PIN/ChangePin2.tsx
index e4aaf442f..10320f377 100644
--- a/src/screens/Settings/PIN/ChangePin2.tsx
+++ b/src/screens/Settings/PIN/ChangePin2.tsx
@@ -10,7 +10,7 @@ import { useFocusEffect } from '@react-navigation/native';
 import { useTranslation } from 'react-i18next';
 
 import { View as ThemedView, AnimatedView } from '../../../styles/components';
-import { Text01S, Text02S } from '../../../styles/text';
+import { BodyM, BodyS } from '../../../styles/text';
 import SafeAreaInset from '../../../components/SafeAreaInset';
 import NavigationHeader from '../../../components/NavigationHeader';
 import NumberPad from '../../../components/NumberPad';
@@ -81,9 +81,9 @@ const ChangePin2 = ({
 				}}
 			/>
 
-			<Text01S style={styles.text} color="gray1">
+			<BodyM style={styles.text} color="white50">
 				{t(origPIN ? 'cp_retype_text' : 'cp_setnew_text')}
-			</Text01S>
+			</BodyM>
 
 			<View style={styles.wrongPin}>
 				{wrongPin ? (
@@ -92,10 +92,10 @@ const ChangePin2 = ({
 						entering={FadeIn}
 						exiting={FadeOut}
 						testID="WrongPIN">
-						<Text02S color="brand">{t('cp_try_again')}</Text02S>
+						<BodyS color="brand">{t('cp_try_again')}</BodyS>
 					</AnimatedView>
 				) : (
-					<Text02S> </Text02S>
+					<BodyS> </BodyS>
 				)}
 			</View>
 
diff --git a/src/screens/Settings/PIN/ChoosePIN.tsx b/src/screens/Settings/PIN/ChoosePIN.tsx
index 99aa0a484..774785a08 100644
--- a/src/screens/Settings/PIN/ChoosePIN.tsx
+++ b/src/screens/Settings/PIN/ChoosePIN.tsx
@@ -9,7 +9,7 @@ import { StyleSheet, View } from 'react-native';
 import { useFocusEffect } from '@react-navigation/native';
 import { useTranslation } from 'react-i18next';
 
-import { Text01S, Text02S } from '../../../styles/text';
+import { BodyM, BodyS } from '../../../styles/text';
 import BottomSheetNavigationHeader from '../../../components/BottomSheetNavigationHeader';
 import GradientView from '../../../components/GradientView';
 import NumberPad from '../../../components/NumberPad';
@@ -82,17 +82,17 @@ const ChoosePIN = ({
 				title={t(origPIN ? 'pin_retype_header' : 'pin_choose_header')}
 			/>
 
-			<Text01S style={styles.text} color="gray1">
+			<BodyM style={styles.text} color="white50">
 				{t(origPIN ? 'pin_retype_text' : 'pin_choose_text')}
-			</Text01S>
+			</BodyM>
 
 			<View style={styles.tryAgain}>
 				{tryAgain ? (
-					<Text02S color="brand" testID="WrongPIN">
+					<BodyS color="brand" testID="WrongPIN">
 						{t('pin_not_match')}
-					</Text02S>
+					</BodyS>
 				) : (
-					<Text02S> </Text02S>
+					<BodyS> </BodyS>
 				)}
 			</View>
 
diff --git a/src/screens/Settings/PIN/DisablePin.tsx b/src/screens/Settings/PIN/DisablePin.tsx
index c0b980c13..57debb03d 100644
--- a/src/screens/Settings/PIN/DisablePin.tsx
+++ b/src/screens/Settings/PIN/DisablePin.tsx
@@ -1,17 +1,16 @@
 import React, { memo, ReactElement } from 'react';
-import { StyleSheet, View } from 'react-native';
+import { Image, StyleSheet, View } from 'react-native';
 import { useTranslation } from 'react-i18next';
 
 import { View as ThemedView } from '../../../styles/components';
-import { Text01S } from '../../../styles/text';
+import { BodyM } from '../../../styles/text';
 import SafeAreaInset from '../../../components/SafeAreaInset';
 import NavigationHeader from '../../../components/NavigationHeader';
-import GlowImage from '../../../components/GlowImage';
 import Button from '../../../components/Button';
 import { removePin } from '../../../utils/settings';
 import type { SettingsScreenProps } from '../../../navigation/types';
 
-const imageSrc = require('../../../assets/illustrations/padlock2.png');
+const imageSrc = require('../../../assets/illustrations/shield.png');
 
 const DisablePin = ({
 	navigation,
@@ -35,17 +34,19 @@ const DisablePin = ({
 		<ThemedView style={styles.container}>
 			<SafeAreaInset type="top" />
 			<NavigationHeader
-				title={t('')}
+				title={t('pin_disable_title')}
 				onClosePress={(): void => {
 					navigation.navigate('Wallet');
 				}}
 			/>
 
 			<View style={styles.message}>
-				<Text01S color="gray1">{t('pin_disable_text')}</Text01S>
+				<BodyM color="white50">{t('pin_disable_text')}</BodyM>
 			</View>
 
-			<GlowImage image={imageSrc} imageSize={200} />
+			<View style={styles.imageContainer}>
+				<Image style={styles.image} source={imageSrc} />
+			</View>
 
 			<View style={styles.buttonContainer}>
 				<Button
@@ -68,6 +69,17 @@ const styles = StyleSheet.create({
 		marginHorizontal: 16,
 		alignSelf: 'flex-start',
 	},
+	imageContainer: {
+		alignSelf: 'center',
+		alignItems: 'center',
+		marginTop: 'auto',
+		aspectRatio: 1,
+		height: 256,
+	},
+	image: {
+		flex: 1,
+		resizeMode: 'contain',
+	},
 	buttonContainer: {
 		marginTop: 'auto',
 		paddingHorizontal: 16,
diff --git a/src/screens/Settings/PIN/ForgotPIN.tsx b/src/screens/Settings/PIN/ForgotPIN.tsx
index b0f343363..15c151513 100644
--- a/src/screens/Settings/PIN/ForgotPIN.tsx
+++ b/src/screens/Settings/PIN/ForgotPIN.tsx
@@ -1,12 +1,11 @@
 import React, { memo, ReactElement } from 'react';
-import { StyleSheet, View } from 'react-native';
+import { Image, StyleSheet, View } from 'react-native';
 import { useTranslation } from 'react-i18next';
 
-import { Text01S } from '../../../styles/text';
+import { BodyM } from '../../../styles/text';
 import BottomSheetWrapper from '../../../components/BottomSheetWrapper';
 import BottomSheetNavigationHeader from '../../../components/BottomSheetNavigationHeader';
 import SafeAreaInset from '../../../components/SafeAreaInset';
-import GlowImage from '../../../components/GlowImage';
 import Button from '../../../components/Button';
 import { closeSheet } from '../../../store/slices/ui';
 import { wipeApp } from '../../../store/utils/settings';
@@ -40,9 +39,11 @@ const ForgotPIN = (): ReactElement => {
 					title={t('pin_forgot_title')}
 					displayBackButton={false}
 				/>
-				<Text01S color="white50">{t('pin_forgot_text')}</Text01S>
+				<BodyM color="white50">{t('pin_forgot_text')}</BodyM>
 
-				<GlowImage image={imageSrc} imageSize={192} />
+				<View style={styles.imageContainer}>
+					<Image style={styles.image} source={imageSrc} />
+				</View>
 
 				<View style={styles.buttonContainer}>
 					<Button
@@ -62,7 +63,17 @@ const styles = StyleSheet.create({
 	container: {
 		flex: 1,
 		alignItems: 'center',
-		paddingHorizontal: 32,
+		paddingHorizontal: 16,
+	},
+	imageContainer: {
+		alignItems: 'center',
+		marginTop: 'auto',
+		aspectRatio: 1,
+		width: 256,
+	},
+	image: {
+		flex: 1,
+		resizeMode: 'contain',
 	},
 	buttonContainer: {
 		marginTop: 'auto',
diff --git a/src/screens/Settings/PIN/PINPrompt.tsx b/src/screens/Settings/PIN/PINPrompt.tsx
index a396b028d..2d4c81b46 100644
--- a/src/screens/Settings/PIN/PINPrompt.tsx
+++ b/src/screens/Settings/PIN/PINPrompt.tsx
@@ -1,11 +1,10 @@
 import React, { memo, ReactElement } from 'react';
-import { StyleSheet, View } from 'react-native';
-import { useTranslation } from 'react-i18next';
+import { Image, StyleSheet, View } from 'react-native';
+import { Trans, useTranslation } from 'react-i18next';
 
-import { Text01S } from '../../../styles/text';
+import { BodyM, Display } from '../../../styles/text';
 import BottomSheetNavigationHeader from '../../../components/BottomSheetNavigationHeader';
 import SafeAreaInset from '../../../components/SafeAreaInset';
-import GlowImage from '../../../components/GlowImage';
 import Button from '../../../components/Button';
 import { useAppDispatch, useAppSelector } from '../../../hooks/redux';
 import { useBottomSheetBackPress } from '../../../hooks/bottomSheet';
@@ -38,29 +37,31 @@ const PINPrompt = ({
 				title={t('pin_security_header')}
 				displayBackButton={false}
 			/>
-			<Text01S color="white50">{t('pin_security_text')}</Text01S>
-
-			<GlowImage image={imageSrc} imageSize={150} glowColor="green" />
-
+			<Image style={styles.image} source={imageSrc} />
+			<Display>
+				<Trans
+					t={t}
+					i18nKey="pin_security_title"
+					components={{ accent: <Display color="green" /> }}
+				/>
+			</Display>
+			<BodyM color="white50">{t('pin_security_text')}</BodyM>
 			<View style={styles.buttonContainer}>
 				{showLaterButton && (
-					<>
-						<Button
-							style={styles.button}
-							size="large"
-							variant="secondary"
-							text={t('later')}
-							onPress={onDismiss}
-						/>
-						<View style={styles.divider} />
-					</>
+					<Button
+						style={styles.button}
+						size="large"
+						variant="secondary"
+						text={t('later')}
+						onPress={onDismiss}
+					/>
 				)}
 				<Button
 					style={styles.button}
 					size="large"
 					text={t('pin_security_button')}
-					onPress={onContinue}
 					testID="SecureWallet"
+					onPress={onContinue}
 				/>
 			</View>
 			<SafeAreaInset type="bottom" minPadding={16} />
@@ -71,20 +72,25 @@ const PINPrompt = ({
 const styles = StyleSheet.create({
 	container: {
 		flex: 1,
-		alignItems: 'center',
-		paddingHorizontal: 32,
+		marginHorizontal: 32,
 	},
-	buttonContainer: {
+	image: {
+		flex: 1,
+		alignSelf: 'center',
+		width: 256,
+		aspectRatio: 1,
+		resizeMode: 'contain',
 		marginTop: 'auto',
+	},
+	buttonContainer: {
 		flexDirection: 'row',
 		justifyContent: 'center',
+		marginTop: 32,
+		gap: 16,
 	},
 	button: {
 		flex: 1,
 	},
-	divider: {
-		width: 16,
-	},
 });
 
 export default memo(PINPrompt);
diff --git a/src/screens/Settings/PIN/PinChanged.tsx b/src/screens/Settings/PIN/PinChanged.tsx
index 8166bfc2e..c59acdea8 100644
--- a/src/screens/Settings/PIN/PinChanged.tsx
+++ b/src/screens/Settings/PIN/PinChanged.tsx
@@ -1,12 +1,11 @@
 import React, { memo, ReactElement } from 'react';
-import { StyleSheet, View } from 'react-native';
+import { Image, StyleSheet, View } from 'react-native';
 import { useTranslation } from 'react-i18next';
 
 import { View as ThemedView } from '../../../styles/components';
-import { Text01S } from '../../../styles/text';
+import { BodyM } from '../../../styles/text';
 import SafeAreaInset from '../../../components/SafeAreaInset';
 import NavigationHeader from '../../../components/NavigationHeader';
-import GlowImage from '../../../components/GlowImage';
 import Button from '../../../components/Button';
 import type { SettingsScreenProps } from '../../../navigation/types';
 
@@ -27,10 +26,12 @@ const PinChanged = ({
 			<NavigationHeader title={t('cp_changed_title')} />
 
 			<View style={styles.message}>
-				<Text01S color="gray1">{t('cp_changed_text')}</Text01S>
+				<BodyM color="white50">{t('cp_changed_text')}</BodyM>
 			</View>
 
-			<GlowImage image={imageSrc} imageSize={200} glowColor="green" />
+			<View style={styles.imageContainer}>
+				<Image style={styles.image} source={imageSrc} />
+			</View>
 
 			<View style={styles.buttonContainer}>
 				<Button
@@ -53,6 +54,17 @@ const styles = StyleSheet.create({
 		marginHorizontal: 16,
 		alignSelf: 'flex-start',
 	},
+	imageContainer: {
+		alignSelf: 'center',
+		alignItems: 'center',
+		marginTop: 'auto',
+		aspectRatio: 1,
+		height: 300,
+	},
+	image: {
+		flex: 1,
+		resizeMode: 'contain',
+	},
 	buttonContainer: {
 		marginTop: 'auto',
 		paddingHorizontal: 16,
diff --git a/src/screens/Settings/PIN/Result.tsx b/src/screens/Settings/PIN/Result.tsx
index bfca992e0..636b69b4b 100644
--- a/src/screens/Settings/PIN/Result.tsx
+++ b/src/screens/Settings/PIN/Result.tsx
@@ -3,17 +3,17 @@ import { StyleSheet, View, Pressable } from 'react-native';
 import { useTranslation } from 'react-i18next';
 
 import { Switch } from '../../../styles/components';
-import { Text01S, Text01M } from '../../../styles/text';
+import { BodyM, BodyMSB } from '../../../styles/text';
 import BottomSheetNavigationHeader from '../../../components/BottomSheetNavigationHeader';
 import SafeAreaInset from '../../../components/SafeAreaInset';
 import GradientView from '../../../components/GradientView';
-import GlowImage from '../../../components/GlowImage';
 import Button from '../../../components/Button';
 import { useAppDispatch, useAppSelector } from '../../../hooks/redux';
 import { closeSheet } from '../../../store/slices/ui';
 import { updateSettings } from '../../../store/slices/settings';
 import { pinForPaymentsSelector } from '../../../store/reselect/settings';
 import type { PinScreenProps } from '../../../navigation/types';
+import { Image } from 'react-native';
 
 const imageSrc = require('../../../assets/illustrations/check.png');
 
@@ -42,39 +42,40 @@ const Result = ({ route }: PinScreenProps<'Result'>): ReactElement => {
 	};
 
 	return (
-		<GradientView style={styles.container}>
+		<GradientView style={styles.root}>
 			<BottomSheetNavigationHeader
 				title={t('success_title')}
 				displayBackButton={false}
 			/>
 
-			<View style={styles.message}>
+			<View style={styles.content}>
 				{bio ? (
-					<Text01S color="gray1">
-						{t('success_bio', { biometricsName })}
-					</Text01S>
+					<BodyM color="white50">{t('success_bio', { biometricsName })}</BodyM>
 				) : (
-					<Text01S color="gray1">{t('success_no_bio')}</Text01S>
+					<BodyM color="white50">{t('success_no_bio')}</BodyM>
 				)}
-			</View>
 
-			<GlowImage image={imageSrc} imageSize={200} glowColor="green" />
+				<View style={styles.imageContainer}>
+					<Image style={styles.image} source={imageSrc} />
+				</View>
 
-			<Pressable
-				style={styles.toggle}
-				onPress={handleTogglePress}
-				testID="ToggleBioForPayments">
-				<Text01M>{t('success_payments')}</Text01M>
-				<Switch onValueChange={handleTogglePress} value={pinForPayments} />
-			</Pressable>
+				<Pressable
+					style={styles.toggle}
+					testID="ToggleBioForPayments"
+					onPress={handleTogglePress}>
+					<BodyMSB>{t('success_payments')}</BodyMSB>
+					<Switch value={pinForPayments} onValueChange={handleTogglePress} />
+				</Pressable>
 
-			<View style={styles.buttonContainer}>
-				<Button
-					size="large"
-					text={t('ok')}
-					onPress={handleButtonPress}
-					testID="OK"
-				/>
+				<View style={styles.buttonContainer}>
+					<Button
+						style={styles.button}
+						size="large"
+						text={t('ok')}
+						testID="OK"
+						onPress={handleButtonPress}
+					/>
+				</View>
 			</View>
 			<SafeAreaInset type="bottom" minPadding={16} />
 		</GradientView>
@@ -82,23 +83,42 @@ const Result = ({ route }: PinScreenProps<'Result'>): ReactElement => {
 };
 
 const styles = StyleSheet.create({
-	container: {
+	root: {
+		flex: 1,
+	},
+	content: {
 		flex: 1,
+		paddingHorizontal: 32,
 	},
-	message: {
-		marginHorizontal: 32,
-		alignSelf: 'flex-start',
+	imageContainer: {
+		flexShrink: 1,
+		justifyContent: 'center',
+		alignItems: 'center',
+		alignSelf: 'center',
+		width: 256,
+		aspectRatio: 1,
+		marginTop: 'auto',
+		marginBottom: 'auto',
+	},
+	image: {
+		flex: 1,
+		resizeMode: 'contain',
 	},
 	toggle: {
 		flexDirection: 'row',
 		alignItems: 'center',
 		justifyContent: 'space-between',
-		paddingHorizontal: 32,
+		marginTop: 'auto',
 		marginBottom: 32,
 	},
 	buttonContainer: {
-		marginTop: 'auto',
-		paddingHorizontal: 32,
+		flexDirection: 'row',
+		justifyContent: 'center',
+		gap: 16,
+	},
+	button: {
+		paddingHorizontal: 16,
+		flex: 1,
 	},
 });
 
diff --git a/src/screens/Settings/PaymentPreference/DraggableList.tsx b/src/screens/Settings/PaymentPreference/DraggableList.tsx
index b947a7dc8..2d3cd39ab 100644
--- a/src/screens/Settings/PaymentPreference/DraggableList.tsx
+++ b/src/screens/Settings/PaymentPreference/DraggableList.tsx
@@ -12,7 +12,7 @@ import DraggableFlatList, {
 	ScaleDecorator,
 } from 'react-native-draggable-flatlist';
 
-import { Text01S } from '../../../styles/text';
+import { BodyM } from '../../../styles/text';
 import { ListIcon } from '../../../styles/icons';
 
 type Item = {
@@ -46,7 +46,7 @@ const DraggableList = ({
 					disabled={isActive}
 					onPressIn={drag}
 					onLongPress={drag}>
-					<Text01S color="white">{item.title}</Text01S>
+					<BodyM color="white">{item.title}</BodyM>
 					<View>
 						<ListIcon height={24} width={24} />
 					</View>
diff --git a/src/screens/Settings/PaymentPreference/index.tsx b/src/screens/Settings/PaymentPreference/index.tsx
index 0fe1d8d8e..7b03ec75f 100644
--- a/src/screens/Settings/PaymentPreference/index.tsx
+++ b/src/screens/Settings/PaymentPreference/index.tsx
@@ -79,7 +79,7 @@ const PaymentPreference = (): ReactElement => {
 	);
 
 	return (
-		<ThemedView style={styles.container}>
+		<ThemedView style={styles.root}>
 			<SettingsView
 				title={t('adv.payment_preference')}
 				listData={settingsListData}
@@ -93,7 +93,7 @@ const PaymentPreference = (): ReactElement => {
 };
 
 const styles = StyleSheet.create({
-	container: {
+	root: {
 		flex: 1,
 	},
 });
diff --git a/src/screens/Settings/RGSServer/index.tsx b/src/screens/Settings/RGSServer/index.tsx
index 5038f4a95..d5107d01c 100644
--- a/src/screens/Settings/RGSServer/index.tsx
+++ b/src/screens/Settings/RGSServer/index.tsx
@@ -9,7 +9,7 @@ import {
 	ScrollView,
 	TouchableOpacity,
 } from '../../../styles/components';
-import { Text01S, Caption13Up } from '../../../styles/text';
+import { BodyM, Caption13Up } from '../../../styles/text';
 import { ScanIcon } from '../../../styles/icons';
 import { useAppDispatch, useAppSelector } from '../../../hooks/redux';
 import { updateSettings } from '../../../store/slices/settings';
@@ -93,7 +93,7 @@ const RGSServer = ({
 	};
 
 	return (
-		<View style={styles.container}>
+		<View style={styles.root}>
 			<SafeAreaInset type="top" />
 			<NavigationHeader
 				title={t('adv.rgs_server')}
@@ -103,18 +103,16 @@ const RGSServer = ({
 			<ScrollView contentContainerStyle={styles.content} bounces={false}>
 				<TouchableOpacity activeOpacity={1} onPress={handleConnectedPress}>
 					<>
-						<Text01S color="gray1">{t('es.connected_to')}</Text01S>
-						<View style={styles.row}>
-							<View style={styles.connectedPeer} testID="Status">
-								<Text01S color="green" testID="ConnectedUrl">
-									{rapidGossipSyncUrl}
-								</Text01S>
-							</View>
+						<BodyM color="white50">{t('es.connected_to')}</BodyM>
+						<View style={styles.connectedPeer} testID="Status">
+							<BodyM color="green" testID="ConnectedUrl">
+								{rapidGossipSyncUrl}
+							</BodyM>
 						</View>
 					</>
 				</TouchableOpacity>
 
-				<Caption13Up color="gray1" style={styles.label}>
+				<Caption13Up color="white50" style={styles.label}>
 					{t('rgs.server_url')}
 				</Caption13Up>
 				<TextInput
@@ -144,7 +142,6 @@ const RGSServer = ({
 						disabled={isEqual(defaultRGSServer, rgsUrl)}
 						onPress={resetToDefault}
 					/>
-					<View style={styles.divider} />
 					<Button
 						style={styles.button}
 						text={t('rgs.button_connect')}
@@ -162,40 +159,33 @@ const RGSServer = ({
 };
 
 const styles = StyleSheet.create({
-	container: {
+	root: {
 		flex: 1,
 	},
 	content: {
 		flexGrow: 1,
+		paddingTop: 16,
 		paddingHorizontal: 16,
 	},
-	row: {
-		flexDirection: 'row',
-		alignItems: 'flex-start',
-		paddingBottom: 16,
-		justifyContent: 'center',
+	connectedPeer: {
+		marginBottom: 16,
 	},
 	label: {
 		marginTop: 16,
 		marginBottom: 4,
 	},
-	connectedPeer: {
-		flex: 1.5,
-	},
 	textInput: {
 		minHeight: 52,
 		marginTop: 5,
 	},
 	buttons: {
-		marginTop: 16,
 		flexDirection: 'row',
+		marginTop: 'auto',
+		gap: 16,
 	},
 	button: {
 		flex: 1,
 	},
-	divider: {
-		width: 16,
-	},
 });
 
 export default memo(RGSServer);
diff --git a/src/screens/Settings/ReportIssue/FormError.tsx b/src/screens/Settings/ReportIssue/FormError.tsx
index 447205d8f..4241f8f6c 100644
--- a/src/screens/Settings/ReportIssue/FormError.tsx
+++ b/src/screens/Settings/ReportIssue/FormError.tsx
@@ -1,14 +1,13 @@
 import React, { memo, ReactElement } from 'react';
-import { View, StyleSheet } from 'react-native';
+import { View, Image, StyleSheet } from 'react-native';
 import { useTranslation } from 'react-i18next';
 
-import { Text01S } from '../../../styles/text';
+import { BodyM } from '../../../styles/text';
 import { View as ThemedView } from '../../../styles/components';
 import NavigationHeader from '../../../components/NavigationHeader';
 import SafeAreaInset from '../../../components/SafeAreaInset';
-import type { SettingsScreenProps } from '../../../navigation/types';
 import Button from '../../../components/Button';
-import GlowImage from '../../../components/GlowImage';
+import type { SettingsScreenProps } from '../../../navigation/types';
 
 const imageSrc = require('../../../assets/illustrations/cross.png');
 
@@ -22,7 +21,7 @@ const FormError = ({
 	};
 
 	return (
-		<ThemedView style={styles.fullHeight}>
+		<ThemedView style={styles.root}>
 			<SafeAreaInset type="top" />
 			<NavigationHeader
 				title={t('support.title_unsuccess')}
@@ -31,11 +30,13 @@ const FormError = ({
 				}}
 			/>
 			<View style={styles.content}>
-				<Text01S style={styles.text} color="gray1">
+				<BodyM style={styles.text} color="white50">
 					{t('support.text_unsuccess')}
-				</Text01S>
+				</BodyM>
 
-				<GlowImage image={imageSrc} imageSize={192} glowColor={'red'} />
+				<View style={styles.imageContainer}>
+					<Image style={styles.image} source={imageSrc} />
+				</View>
 
 				<View style={styles.buttonContainer}>
 					<Button
@@ -46,23 +47,37 @@ const FormError = ({
 						onPress={onTryAgain}
 					/>
 				</View>
-				<SafeAreaInset type="bottom" minPadding={16} />
 			</View>
+			<SafeAreaInset type="bottom" minPadding={16} />
 		</ThemedView>
 	);
 };
 
 const styles = StyleSheet.create({
-	fullHeight: {
+	root: {
 		flex: 1,
 	},
 	content: {
 		flexGrow: 1,
+		paddingTop: 16,
 		paddingHorizontal: 16,
 	},
 	text: {
 		paddingBottom: 32,
 	},
+	imageContainer: {
+		flexShrink: 1,
+		justifyContent: 'center',
+		alignItems: 'center',
+		alignSelf: 'center',
+		width: 256,
+		aspectRatio: 1,
+		marginTop: 'auto',
+	},
+	image: {
+		flex: 1,
+		resizeMode: 'contain',
+	},
 	buttonContainer: {
 		marginTop: 'auto',
 		flexDirection: 'row',
diff --git a/src/screens/Settings/ReportIssue/FormSuccess.tsx b/src/screens/Settings/ReportIssue/FormSuccess.tsx
index f434d705e..47507f853 100644
--- a/src/screens/Settings/ReportIssue/FormSuccess.tsx
+++ b/src/screens/Settings/ReportIssue/FormSuccess.tsx
@@ -1,14 +1,13 @@
 import React, { memo, ReactElement } from 'react';
-import { View, StyleSheet } from 'react-native';
+import { View, StyleSheet, Image } from 'react-native';
 import { useTranslation } from 'react-i18next';
 
-import { Text01S } from '../../../styles/text';
+import { BodyM } from '../../../styles/text';
 import { View as ThemedView } from '../../../styles/components';
 import NavigationHeader from '../../../components/NavigationHeader';
 import SafeAreaInset from '../../../components/SafeAreaInset';
-import type { SettingsScreenProps } from '../../../navigation/types';
 import Button from '../../../components/Button';
-import GlowImage from '../../../components/GlowImage';
+import type { SettingsScreenProps } from '../../../navigation/types';
 
 const imageSrc = require('../../../assets/illustrations/email.png');
 
@@ -22,7 +21,7 @@ const FormSuccess = ({
 	};
 
 	return (
-		<ThemedView style={styles.fullHeight}>
+		<ThemedView style={styles.root}>
 			<SafeAreaInset type="top" />
 			<NavigationHeader
 				title={t('support.title_success')}
@@ -31,11 +30,13 @@ const FormSuccess = ({
 				}}
 			/>
 			<View style={styles.content}>
-				<Text01S style={styles.text} color="gray1">
+				<BodyM style={styles.text} color="white50">
 					{t('support.text_success')}
-				</Text01S>
+				</BodyM>
 
-				<GlowImage image={imageSrc} imageSize={192} glowColor={'green'} />
+				<View style={styles.imageContainer}>
+					<Image style={styles.image} source={imageSrc} />
+				</View>
 
 				<View style={styles.buttonContainer}>
 					<Button
@@ -46,23 +47,37 @@ const FormSuccess = ({
 						onPress={onOk}
 					/>
 				</View>
-				<SafeAreaInset type="bottom" minPadding={16} />
 			</View>
+			<SafeAreaInset type="bottom" minPadding={16} />
 		</ThemedView>
 	);
 };
 
 const styles = StyleSheet.create({
-	fullHeight: {
+	root: {
 		flex: 1,
 	},
 	content: {
 		flexGrow: 1,
+		paddingTop: 16,
 		paddingHorizontal: 16,
 	},
 	text: {
 		paddingBottom: 32,
 	},
+	imageContainer: {
+		flexShrink: 1,
+		justifyContent: 'center',
+		alignItems: 'center',
+		alignSelf: 'center',
+		width: 256,
+		aspectRatio: 1,
+		marginTop: 'auto',
+	},
+	image: {
+		flex: 1,
+		resizeMode: 'contain',
+	},
 	buttonContainer: {
 		marginTop: 'auto',
 		flexDirection: 'row',
diff --git a/src/screens/Settings/ReportIssue/index.tsx b/src/screens/Settings/ReportIssue/index.tsx
index 31d394db6..00a2894f2 100644
--- a/src/screens/Settings/ReportIssue/index.tsx
+++ b/src/screens/Settings/ReportIssue/index.tsx
@@ -11,7 +11,7 @@ import { useTranslation } from 'react-i18next';
 
 import { getNodeId, getNodeVersion } from '../../../utils/lightning';
 import { zipLogs } from '../../../utils/lightning/logs';
-import { Text01S } from '../../../styles/text';
+import { BodyM } from '../../../styles/text';
 import { ScrollView, View as ThemedView } from '../../../styles/components';
 import NavigationHeader from '../../../components/NavigationHeader';
 import SafeAreaInset from '../../../components/SafeAreaInset';
@@ -70,7 +70,7 @@ const ReportIssue = ({
 				logs: logs,
 				logsFileName: logsFileName,
 			});
-			navigation.navigate('FormSuccess');
+			navigation.navigate('FormError');
 			setEmail('');
 			setMessage('');
 			setIsLoading(false);
@@ -86,7 +86,7 @@ const ReportIssue = ({
 	const isValid = validateEmail(email) && message;
 
 	return (
-		<ThemedView style={styles.fullHeight}>
+		<ThemedView style={styles.root}>
 			<KeyboardAvoidingView style={styles.content}>
 				<ScrollView
 					color="transparent"
@@ -101,9 +101,9 @@ const ReportIssue = ({
 						}}
 					/>
 					<View style={styles.form}>
-						<Text01S style={styles.text} color="gray1">
+						<BodyM style={styles.text} color="white50">
 							{t('support.report_text')}
-						</Text01S>
+						</BodyM>
 
 						<LabeledInput
 							style={styles.addressInput}
@@ -150,17 +150,17 @@ const ReportIssue = ({
 };
 
 const styles = StyleSheet.create({
-	fullHeight: {
+	root: {
 		flex: 1,
 	},
-	scrollContent: {
-		flexGrow: 1,
-	},
 	content: {
 		flex: 1,
 		justifyContent: 'space-between',
 		alignItems: 'stretch',
 	},
+	scrollContent: {
+		flexGrow: 1,
+	},
 	form: {
 		paddingHorizontal: 16,
 		flex: 1,
diff --git a/src/screens/Settings/Security/index.tsx b/src/screens/Settings/Security/index.tsx
index 308d8c09d..43e555a90 100644
--- a/src/screens/Settings/Security/index.tsx
+++ b/src/screens/Settings/Security/index.tsx
@@ -222,7 +222,6 @@ const SecuritySettings = ({
 			<SettingsView
 				title={t('security.title')}
 				listData={settingsListData}
-				showBackNavigation={true}
 				fullHeight={false}
 				footerText={footerText}
 			/>
diff --git a/src/screens/Settings/SettingsView.tsx b/src/screens/Settings/SettingsView.tsx
index 9adc37002..bacc109ec 100644
--- a/src/screens/Settings/SettingsView.tsx
+++ b/src/screens/Settings/SettingsView.tsx
@@ -3,7 +3,7 @@ import { View, StyleSheet, StyleProp, ViewStyle } from 'react-native';
 import { useNavigation } from '@react-navigation/native';
 
 import { View as ThemedView } from '../../styles/components';
-import { Text01S, Text02S } from '../../styles/text';
+import { BodyM, BodyS } from '../../styles/text';
 import SearchInput from '../../components/SearchInput';
 import List, { IListData } from '../../components/List';
 import NavigationHeader from '../../components/NavigationHeader';
@@ -77,7 +77,7 @@ const SettingsView = ({
 
 			{headerText && (
 				<View style={styles.headerText}>
-					<Text01S color="gray1">{headerText}</Text01S>
+					<BodyM color="white50">{headerText}</BodyM>
 				</View>
 			)}
 
@@ -101,7 +101,7 @@ const SettingsView = ({
 
 			{footerText && (
 				<View style={styles.footerText}>
-					<Text02S color="gray1">{footerText}</Text02S>
+					<BodyS color="white50">{footerText}</BodyS>
 				</View>
 			)}
 
@@ -109,19 +109,19 @@ const SettingsView = ({
 				<View style={styles.childrenContent}>{children}</View>
 			)}
 
-			<SafeAreaInset type="bottom" minPadding={16} />
+			{fullHeight && <SafeAreaInset type="bottom" minPadding={16} />}
 		</ThemedView>
 	);
 };
 
 const styles = StyleSheet.create({
 	searchInput: {
+		marginVertical: 16,
 		marginHorizontal: 16,
-		marginBottom: 16,
 	},
 	headerText: {
+		marginVertical: 16,
 		marginHorizontal: 16,
-		marginBottom: 27,
 	},
 	footerText: {
 		marginVertical: 16,
diff --git a/src/screens/Settings/SlashtagsSettings/index.tsx b/src/screens/Settings/SlashtagsSettings/index.tsx
index 9533d60d5..0f524a584 100644
--- a/src/screens/Settings/SlashtagsSettings/index.tsx
+++ b/src/screens/Settings/SlashtagsSettings/index.tsx
@@ -156,11 +156,7 @@ const SlashtagsSettings = (): ReactElement => {
 	);
 
 	return (
-		<SettingsView
-			title="Slashtags Settings"
-			listData={settingsListData}
-			showBackNavigation={true}
-		/>
+		<SettingsView title="Slashtags Settings" listData={settingsListData} />
 	);
 };
 
diff --git a/src/screens/Settings/SupportSettings/index.tsx b/src/screens/Settings/SupportSettings/index.tsx
index 12e88fdb5..a8c600f06 100644
--- a/src/screens/Settings/SupportSettings/index.tsx
+++ b/src/screens/Settings/SupportSettings/index.tsx
@@ -1,23 +1,14 @@
 import React, { memo, ReactElement, useMemo } from 'react';
-import { View, StyleSheet, Pressable } from 'react-native';
+import { View, StyleSheet, Image } from 'react-native';
 import { useTranslation } from 'react-i18next';
 
-import { Text01S } from '../../../styles/text';
-import {
-	DiscordIcon,
-	GithubIcon,
-	GlobeIcon,
-	MediumIcon,
-	TelegramIcon,
-	TwitterIcon,
-} from '../../../styles/icons';
 import { View as ThemedView } from '../../../styles/components';
-import NavigationHeader from '../../../components/NavigationHeader';
-import List, { EItemType, IListData } from '../../../components/List';
+import { EItemType, IListData } from '../../../components/List';
 import SafeAreaInset from '../../../components/SafeAreaInset';
+import Social from '../../../components/Social';
+import SettingsView from '../SettingsView';
+import { openURL } from '../../../utils/helpers';
 import type { SettingsScreenProps } from '../../../navigation/types';
-import GlowImage from '../../../components/GlowImage';
-import { openAppURL, openURL } from '../../../utils/helpers';
 
 const imageSrc = require('../../../assets/illustrations/question-mark.png');
 
@@ -26,7 +17,7 @@ const SupportSettings = ({
 }: SettingsScreenProps<'SupportSettings'>): ReactElement => {
 	const { t } = useTranslation('settings');
 
-	const settingsSupportListData: IListData[] = useMemo(
+	const listData: IListData[] = useMemo(
 		() => [
 			{
 				data: [
@@ -45,126 +36,51 @@ const SupportSettings = ({
 					{
 						title: t('support.status'),
 						type: EItemType.button,
-						onPress: (): void => navigation.navigate('AppStatus'),
 						testID: 'AppStatus',
+						onPress: (): void => navigation.navigate('AppStatus'),
 					},
 				],
 			},
 		],
-		// [isReviewing],
 		[t, navigation],
 	);
 
 	return (
-		<ThemedView style={styles.fullHeight}>
-			<SafeAreaInset type="top" />
-			<NavigationHeader
-				title={t('support_title')}
-				onClosePress={(): void => {
-					navigation.navigate('Wallet');
-				}}
+		<ThemedView style={styles.root}>
+			<SettingsView
+				title={t('support.title')}
+				headerText={t('support.text')}
+				listData={listData}
+				fullHeight={false}
 			/>
-			<View style={styles.content}>
-				<Text01S style={styles.text} color="gray1">
-					{t('support.text')}
-				</Text01S>
-
-				<List
-					style={styles.list}
-					data={settingsSupportListData}
-					bounces={false}
-				/>
-				<View style={styles.logoContainer}>
-					<GlowImage image={imageSrc} imageSize={192} glowColor={'green'} />
-				</View>
-
-				<View style={styles.footer}>
-					<View style={styles.socialLinks}>
-						<Pressable
-							style={styles.socialLink}
-							onPress={(): void => {
-								openAppURL('https://www.bitkit.to');
-							}}>
-							<GlobeIcon color="white" height={24} width={24} />
-						</Pressable>
-						<Pressable
-							style={styles.socialLink}
-							onPress={(): void => {
-								openAppURL('https://www.medium.com/synonym-to');
-							}}>
-							<MediumIcon color="white" height={24} width={24} />
-						</Pressable>
-						<Pressable
-							style={styles.socialLink}
-							onPress={(): void => {
-								openAppURL('https://www.twitter.com/bitkitwallet');
-							}}>
-							<TwitterIcon color="white" height={24} width={24} />
-						</Pressable>
-						<Pressable
-							style={styles.socialLink}
-							onPress={(): void => {
-								openAppURL('https://discord.gg/DxTBJXvJxn');
-							}}>
-							<DiscordIcon color="white" height={24} width={24} />
-						</Pressable>
-						<Pressable
-							style={styles.socialLink}
-							onPress={(): void => {
-								openAppURL('https://t.me/bitkitchat');
-							}}>
-							<TelegramIcon color="white" height={24} width={24} />
-						</Pressable>
-						<Pressable
-							style={styles.socialLink}
-							onPress={(): void => {
-								openAppURL('https://www.github.com/synonymdev');
-							}}>
-							<GithubIcon color="white" height={24} width={24} />
-						</Pressable>
-					</View>
-				</View>
+			<View style={styles.imageContainer}>
+				<Image style={styles.image} source={imageSrc} />
 			</View>
+			<Social style={styles.social} />
+			<SafeAreaInset type="bottom" minPadding={16} />
 		</ThemedView>
 	);
 };
 
 const styles = StyleSheet.create({
-	fullHeight: {
+	root: {
 		flex: 1,
 	},
-	content: {
-		flexGrow: 1,
-		paddingHorizontal: 16,
-	},
-	text: {
-		paddingBottom: 32,
-	},
-	list: {
-		marginBottom: 32,
-	},
-	footer: {
+	imageContainer: {
+		flexShrink: 1,
 		alignItems: 'center',
-		justifyContent: 'flex-end',
+		alignSelf: 'center',
+		width: 256,
+		aspectRatio: 1,
 		marginTop: 'auto',
-		marginBottom: 32,
-	},
-	logoContainer: {
-		position: 'relative',
-		marginBottom: 200,
-		justifyContent: 'center',
-		alignItems: 'center',
 	},
-	socialLinks: {
-		width: 375,
-		flexDirection: 'row',
-		alignItems: 'center',
-		justifyContent: 'space-evenly',
+	image: {
+		flex: 1,
+		resizeMode: 'contain',
 	},
-	socialLink: {
-		padding: 14,
-		backgroundColor: '#2a2a2a',
-		borderRadius: 32,
+	social: {
+		marginTop: 'auto',
+		paddingHorizontal: 16,
 	},
 });
 
diff --git a/src/screens/Settings/Tags/index.tsx b/src/screens/Settings/Tags/index.tsx
index c0665a77d..212189ce0 100644
--- a/src/screens/Settings/Tags/index.tsx
+++ b/src/screens/Settings/Tags/index.tsx
@@ -29,9 +29,11 @@ const TagsSettings = ({
 			<View style={styles.content}>
 				{lastUsedTags.length !== 0 && (
 					<>
-						<Caption13Up color="gray1" style={styles.section}>
-							{t('general.tags_previously')}
-						</Caption13Up>
+						<View style={styles.label}>
+							<Caption13Up color="white50">
+								{t('general.tags_previously')}
+							</Caption13Up>
+						</View>
 						<View style={styles.tagsContainer}>
 							{lastUsedTags.map((tag) => (
 								<Tag
@@ -64,8 +66,9 @@ const styles = StyleSheet.create({
 		flex: 1,
 		paddingHorizontal: 16,
 	},
-	section: {
-		marginBottom: 16,
+	label: {
+		justifyContent: 'center',
+		height: 50,
 	},
 	tagsContainer: {
 		flexDirection: 'row',
diff --git a/src/screens/Settings/TransactionSpeed/CustomFee.tsx b/src/screens/Settings/TransactionSpeed/CustomFee.tsx
index 4ba0fea5e..d309a0d2e 100644
--- a/src/screens/Settings/TransactionSpeed/CustomFee.tsx
+++ b/src/screens/Settings/TransactionSpeed/CustomFee.tsx
@@ -3,7 +3,7 @@ import { StyleSheet, View } from 'react-native';
 import { useTranslation } from 'react-i18next';
 
 import { View as ThemedView } from '../../../styles/components';
-import { Caption13Up, Text01S } from '../../../styles/text';
+import { Caption13Up, BodyM } from '../../../styles/text';
 import { customFeeRateSelector } from '../../../store/reselect/settings';
 import { updateSettings } from '../../../store/slices/settings';
 import { ETransactionSpeed } from '../../../store/types/settings';
@@ -63,15 +63,15 @@ const FeeCustom = ({
 			<SafeAreaInset type="top" />
 			<NavigationHeader title={t('general.speed_fee_custom')} />
 			<View style={styles.container} testID="CustomFee">
-				<Caption13Up color="gray1" style={styles.title}>
+				<Caption13Up color="white50" style={styles.title}>
 					{t('sat_vbyte')}
 				</Caption13Up>
 				<Amount value={feeRate} />
 
 				{isValid && (
-					<Text01S style={styles.text} color="white50">
+					<BodyM style={styles.text} color="white50">
 						{totalFeeText}
-					</Text01S>
+					</BodyM>
 				)}
 				<NumberPad style={styles.numberPad} type="simple" onPress={onPress} />
 				<View style={styles.buttonContainer}>
diff --git a/src/screens/Settings/TransactionSpeed/index.tsx b/src/screens/Settings/TransactionSpeed/index.tsx
index c15ab6530..ec1d95aea 100644
--- a/src/screens/Settings/TransactionSpeed/index.tsx
+++ b/src/screens/Settings/TransactionSpeed/index.tsx
@@ -1,5 +1,4 @@
 import React, { memo, ReactElement, useMemo } from 'react';
-import { useAppDispatch, useAppSelector } from '../../../hooks/redux';
 import { useTranslation } from 'react-i18next';
 
 import {
@@ -10,6 +9,7 @@ import {
 } from '../../../styles/icons';
 import { EItemType, IListData } from '../../../components/List';
 import SettingsView from '../SettingsView';
+import { useAppDispatch, useAppSelector } from '../../../hooks/redux';
 import { updateSettings } from '../../../store/slices/settings';
 import { transactionSpeedSelector } from '../../../store/reselect/settings';
 import { ETransactionSpeed } from '../../../store/types/settings';
@@ -50,7 +50,7 @@ const TransactionSpeedSettings = ({
 				value: ETransactionSpeed.custom,
 				description: t('fee.custom.description'),
 				Icon: SettingsIcon,
-				iconColor: 'gray1',
+				iconColor: 'white50',
 			},
 		];
 
@@ -82,7 +82,6 @@ const TransactionSpeedSettings = ({
 		<SettingsView
 			title={t('general.speed_title')}
 			listData={currencyListData}
-			showBackNavigation={true}
 		/>
 	);
 };
diff --git a/src/screens/Settings/Unit/index.tsx b/src/screens/Settings/Unit/index.tsx
index 6d74bf975..edf1d9704 100644
--- a/src/screens/Settings/Unit/index.tsx
+++ b/src/screens/Settings/Unit/index.tsx
@@ -78,11 +78,7 @@ const UnitSettings = (): ReactElement => {
 	}, [selectedUnit, selectedCurrency, selectedDenomination, t, dispatch]);
 
 	return (
-		<SettingsView
-			title={t('general.unit_title')}
-			listData={currencyListData}
-			showBackNavigation={true}
-		/>
+		<SettingsView title={t('general.unit_title')} listData={currencyListData} />
 	);
 };
 
diff --git a/src/screens/Settings/WebRelay/index.tsx b/src/screens/Settings/WebRelay/index.tsx
index 4427e7a65..168c45465 100644
--- a/src/screens/Settings/WebRelay/index.tsx
+++ b/src/screens/Settings/WebRelay/index.tsx
@@ -5,7 +5,7 @@ import Url from 'url-parse';
 import { useTranslation } from 'react-i18next';
 
 import { View, TextInput, ScrollView } from '../../../styles/components';
-import { Caption13Up, Text01S } from '../../../styles/text';
+import { Caption13Up, BodyM } from '../../../styles/text';
 import { ScanIcon } from '../../../styles/icons';
 import { updateSettings } from '../../../store/slices/settings';
 import NavigationHeader from '../../../components/NavigationHeader';
@@ -142,19 +142,17 @@ const WebRelay = ({
 				onActionPress={navigateToScanner}
 			/>
 			<ScrollView contentContainerStyle={styles.content} bounces={false}>
-				<Text01S color="gray1">{t('es.connected_to')}</Text01S>
-				<View style={styles.row}>
-					<View style={styles.connectedPeer} testID="Status">
-						<Text01S
-							color="green"
-							testID="ConnectedUrl"
-							accessibilityLabel={webRelayUrl}>
-							{webRelayUrl}
-						</Text01S>
-					</View>
+				<BodyM color="white50">{t('es.connected_to')}</BodyM>
+				<View style={styles.connectedPeer} testID="WebRelayStatus">
+					<BodyM
+						color="green"
+						testID="ConnectedUrl"
+						accessibilityLabel={webRelayUrl}>
+						{webRelayUrl}
+					</BodyM>
 				</View>
 
-				<Caption13Up color="gray1" style={styles.label}>
+				<Caption13Up color="white50" style={styles.label}>
 					{t('es.host')}
 				</Caption13Up>
 				<TextInput
@@ -180,7 +178,6 @@ const WebRelay = ({
 						testID="ResetToDefault"
 						onPress={resetToDefault}
 					/>
-					<View style={styles.divider} />
 					<Button
 						style={styles.button}
 						text={t('es.button_connect')}
@@ -205,36 +202,29 @@ const styles = StyleSheet.create({
 	},
 	content: {
 		flexGrow: 1,
+		paddingTop: 16,
 		paddingHorizontal: 16,
 	},
-	row: {
-		flexDirection: 'row',
-		alignItems: 'flex-start',
-		paddingBottom: 16,
-		justifyContent: 'center',
+	connectedPeer: {
+		marginBottom: 16,
 	},
 	label: {
 		marginTop: 16,
 		marginBottom: 4,
 	},
-	connectedPeer: {
-		flex: 1.5,
-	},
 	textInput: {
 		minHeight: 52,
 		marginTop: 12,
 		marginBottom: 16,
 	},
 	buttons: {
-		marginTop: 16,
 		flexDirection: 'row',
+		marginTop: 'auto',
+		gap: 16,
 	},
 	button: {
 		flex: 1,
 	},
-	divider: {
-		width: 16,
-	},
 });
 
 export default memo(WebRelay);
diff --git a/src/screens/Settings/Widgets/index.tsx b/src/screens/Settings/Widgets/index.tsx
new file mode 100644
index 000000000..5afbdde54
--- /dev/null
+++ b/src/screens/Settings/Widgets/index.tsx
@@ -0,0 +1,47 @@
+import React, { memo, ReactElement, useMemo } from 'react';
+import { useTranslation } from 'react-i18next';
+
+import { EItemType, IListData, ItemData } from '../../../components/List';
+import SettingsView from './../SettingsView';
+import { useAppDispatch, useAppSelector } from '../../../hooks/redux';
+import { updateSettings } from '../../../store/slices/settings';
+import {
+	showWidgetsSelector,
+	showWidgetTitlesSelector,
+} from '../../../store/reselect/settings';
+
+const WidgetSettings = (): ReactElement => {
+	const { t } = useTranslation('settings');
+	const dispatch = useAppDispatch();
+	const showWidgets = useAppSelector(showWidgetsSelector);
+	const showWidgetTitles = useAppSelector(showWidgetTitlesSelector);
+
+	const listData: IListData[] = useMemo(() => {
+		const data: ItemData[] = [
+			{
+				title: t('widgets.showWidgets'),
+				type: EItemType.switch,
+				enabled: showWidgets,
+				testID: 'ToggleWidgets',
+				onPress: (): void => {
+					dispatch(updateSettings({ showWidgets: !showWidgets }));
+				},
+			},
+			{
+				title: t('widgets.showWidgetTitles'),
+				type: EItemType.switch,
+				enabled: showWidgetTitles,
+				testID: 'ToggleWidgetTitles',
+				onPress: (): void => {
+					dispatch(updateSettings({ showWidgetTitles: !showWidgetTitles }));
+				},
+			},
+		];
+
+		return [{ data }];
+	}, [showWidgets, showWidgetTitles, dispatch, t]);
+
+	return <SettingsView title={t('widgets.nav_title')} listData={listData} />;
+};
+
+export default memo(WidgetSettings);
diff --git a/src/screens/Settings/index.tsx b/src/screens/Settings/index.tsx
index 9cf06b558..8b6eb08b0 100644
--- a/src/screens/Settings/index.tsx
+++ b/src/screens/Settings/index.tsx
@@ -1,11 +1,11 @@
 import React, { memo, ReactElement, useMemo, useState } from 'react';
-import { StyleSheet, TouchableOpacity } from 'react-native';
+import { Image, StyleSheet, TouchableOpacity } from 'react-native';
 import { useTranslation } from 'react-i18next';
 
 import { View as ThemedView } from '../../styles/components';
 import { EItemType, IListData, ItemData } from '../../components/List';
+import SafeAreaInset from '../../components/SafeAreaInset';
 import SettingsView from './SettingsView';
-import GlowImage from '../../components/GlowImage';
 import { useAppDispatch, useAppSelector } from '../../hooks/redux';
 import { updateSettings } from '../../store/slices/settings';
 import { showToast } from '../../utils/notifications';
@@ -48,35 +48,35 @@ const MainSettings = ({
 		}
 	};
 
-	const settingsListData: IListData[] = useMemo(() => {
+	const listData: IListData[] = useMemo(() => {
 		const data: ItemData[] = [
 			{
 				title: t('general_title'),
 				type: EItemType.button,
 				Icon: GeneralSettingsIcon,
-				onPress: (): void => navigation.navigate('GeneralSettings'),
 				testID: 'GeneralSettings',
+				onPress: (): void => navigation.navigate('GeneralSettings'),
 			},
 			{
 				title: t('security_title'),
 				type: EItemType.button,
 				Icon: SecurityIcon,
-				onPress: (): void => navigation.navigate('SecuritySettings'),
 				testID: 'SecuritySettings',
+				onPress: (): void => navigation.navigate('SecuritySettings'),
 			},
 			{
 				title: t('backup_title'),
 				type: EItemType.button,
 				Icon: BackupIcon,
-				onPress: (): void => navigation.navigate('BackupSettings'),
 				testID: 'BackupSettings',
+				onPress: (): void => navigation.navigate('BackupSettings'),
 			},
 			{
 				title: t('advanced_title'),
 				type: EItemType.button,
 				Icon: AdvancedIcon,
-				onPress: (): void => navigation.navigate('AdvancedSettings'),
 				testID: 'AdvancedSettings',
+				onPress: (): void => navigation.navigate('AdvancedSettings'),
 			},
 			{
 				title: t('support_title'),
@@ -106,32 +106,40 @@ const MainSettings = ({
 	}, [enableDevOptions, navigation, t]);
 
 	return (
-		<ThemedView style={styles.container}>
+		<ThemedView style={styles.root}>
 			<SettingsView
 				title={t('settings')}
-				listData={settingsListData}
-				showBackNavigation={true}
+				listData={listData}
 				fullHeight={false}
 			/>
 			<TouchableOpacity
 				style={styles.imageContainer}
 				activeOpacity={1}
-				onPress={updateDevOptions}
-				testID="DevOptions">
-				<GlowImage image={imageSrc} imageSize={200} />
+				testID="DevOptions"
+				onPress={updateDevOptions}>
+				<Image style={styles.image} source={imageSrc} />
 			</TouchableOpacity>
+			<SafeAreaInset type="bottom" minPadding={16} />
 		</ThemedView>
 	);
 };
 
 const styles = StyleSheet.create({
-	container: {
+	root: {
 		flex: 1,
 	},
 	imageContainer: {
+		flexShrink: 1,
 		alignItems: 'center',
-		justifyContent: 'center',
-		flexGrow: 1,
+		alignSelf: 'center',
+		width: 256,
+		aspectRatio: 1,
+		marginTop: 'auto',
+		marginBottom: 'auto',
+	},
+	image: {
+		flex: 1,
+		resizeMode: 'contain',
 	},
 });
 
diff --git a/src/screens/Transfer/Confirm.tsx b/src/screens/Transfer/Confirm.tsx
deleted file mode 100644
index 14eff5be2..000000000
--- a/src/screens/Transfer/Confirm.tsx
+++ /dev/null
@@ -1,187 +0,0 @@
-import React, { ReactElement, useMemo, useState } from 'react';
-import { StyleSheet, View } from 'react-native';
-import { useAppSelector } from '../../hooks/redux';
-import { Trans, useTranslation } from 'react-i18next';
-
-import { Caption13Up, Display, Text01B, Text01S } from '../../styles/text';
-import { LightningIcon } from '../../styles/icons';
-import SafeAreaInset from '../../components/SafeAreaInset';
-import GlowingBackground from '../../components/GlowingBackground';
-import NavigationHeader from '../../components/NavigationHeader';
-import AmountToggle from '../../components/AmountToggle';
-import Percentage from '../../components/Percentage';
-import SwipeToConfirm from '../../components/SwipeToConfirm';
-import PieChart from '../Lightning/PieChart';
-import { confirmChannelPurchase } from '../../store/utils/blocktank';
-import { useBalance } from '../../hooks/wallet';
-import { useCurrency, useDisplayValues } from '../../hooks/displayValues';
-import type { TransferScreenProps } from '../../navigation/types';
-import { blocktankOrdersSelector } from '../../store/reselect/blocktank';
-import {
-	selectedNetworkSelector,
-	transactionFeeSelector,
-} from '../../store/reselect/wallet';
-
-const PIE_SIZE = 140;
-const PIE_SHIFT = 70;
-
-const Confirm = ({
-	navigation,
-	route,
-}: TransferScreenProps<'Confirm'>): ReactElement => {
-	const { spendingAmount, orderId } = route.params;
-	const { t } = useTranslation('lightning');
-	const [loading, setLoading] = useState(false);
-	const { totalBalance, lightningBalance } = useBalance();
-
-	const savingsAmount = totalBalance - spendingAmount;
-	const savingsPercentage = Math.round((savingsAmount / totalBalance) * 100);
-	const spendingPercentage = Math.round((spendingAmount / totalBalance) * 100);
-	const spendingCurrentPercentage = Math.round(
-		(lightningBalance / totalBalance) * 100,
-	);
-
-	const isTransferringToSavings = spendingAmount < lightningBalance;
-
-	const selectedNetwork = useAppSelector(selectedNetworkSelector);
-	const orders = useAppSelector(blocktankOrdersSelector);
-	const order = useMemo(() => {
-		return orders.find((o) => o.id === orderId);
-	}, [orderId, orders]);
-
-	const { fiatSymbol } = useCurrency();
-	const purchaseFee = useMemo(() => order?.feeSat ?? 0, [order]);
-	const purchaseFeeValue = useDisplayValues(purchaseFee);
-	const transactionFee = useAppSelector(transactionFeeSelector);
-	const fiatTransactionFee = useDisplayValues(transactionFee);
-	const clientBalance = useDisplayValues(order?.clientBalanceSat ?? 0);
-
-	const txFee = fiatTransactionFee.fiatValue;
-	const lspFee = purchaseFeeValue.fiatValue - clientBalance.fiatValue;
-
-	const handleConfirm = async (): Promise<void> => {
-		setLoading(true);
-
-		if (order) {
-			// savings -> spending
-			setLoading(true);
-			const res = await confirmChannelPurchase({ order, selectedNetwork });
-			if (res.isErr()) {
-				setLoading(false);
-				return;
-			}
-			setLoading(false);
-			navigation.navigate('Success', { type: 'spending' });
-		} else {
-			setLoading(false);
-			// spending -> savings
-			navigation.navigate('Availability');
-		}
-	};
-
-	return (
-		<GlowingBackground topLeft="purple">
-			<SafeAreaInset type="top" />
-			<NavigationHeader
-				title={t('transfer_funds')}
-				onClosePress={(): void => {
-					navigation.navigate('Wallet');
-				}}
-			/>
-			<View style={styles.root} testID="TransferConfirm">
-				<Display color="purple">{t('transfer_header')}</Display>
-				<Text01S color="gray1" style={styles.text}>
-					{isTransferringToSavings ? (
-						t('transfer_close')
-					) : (
-						<Trans
-							t={t}
-							i18nKey="transfer_open"
-							components={{ highlight: <Text01B color="white" /> }}
-							values={{
-								txFee: `${fiatSymbol}${txFee.toFixed(2)}`,
-								lspFee: `${fiatSymbol}${lspFee.toFixed(2)}`,
-							}}
-						/>
-					)}
-				</Text01S>
-
-				<View style={styles.chartContainer}>
-					<View style={styles.chart}>
-						<PieChart
-							size={PIE_SIZE}
-							shift={PIE_SHIFT}
-							primary={spendingPercentage}
-							dashed={spendingCurrentPercentage}
-						/>
-					</View>
-					<View>
-						<Percentage
-							style={styles.percentage}
-							value={spendingPercentage}
-							type="spending"
-						/>
-						<Percentage
-							style={styles.percentage}
-							value={savingsPercentage}
-							type="savings"
-						/>
-					</View>
-				</View>
-
-				<View style={styles.amount}>
-					<Caption13Up style={styles.amountCaption} color="purple">
-						{t('spending_label')}
-					</Caption13Up>
-					<AmountToggle sats={spendingAmount} secondaryFont="text01m" />
-				</View>
-
-				<SwipeToConfirm
-					text={t('transfer_swipe')}
-					color="purple"
-					icon={<LightningIcon width={30} height={30} color="black" />}
-					loading={loading}
-					confirmed={loading}
-					onConfirm={handleConfirm}
-				/>
-			</View>
-			<SafeAreaInset type="bottom" minPadding={16} />
-		</GlowingBackground>
-	);
-};
-
-const styles = StyleSheet.create({
-	root: {
-		flex: 1,
-		marginTop: 8,
-		paddingHorizontal: 16,
-	},
-	text: {
-		marginTop: 4,
-		marginBottom: 62,
-	},
-	chartContainer: {
-		// flex: 1,
-		flexDirection: 'row',
-		alignItems: 'center',
-	},
-	chart: {
-		marginTop: -PIE_SHIFT,
-		marginLeft: -PIE_SHIFT,
-		width: PIE_SIZE + PIE_SHIFT,
-		height: PIE_SIZE + PIE_SHIFT,
-		marginRight: 32,
-	},
-	percentage: {
-		marginVertical: 8,
-	},
-	amount: {
-		marginTop: 'auto',
-		marginBottom: 16,
-	},
-	amountCaption: {
-		marginBottom: 4,
-	},
-});
-
-export default Confirm;
diff --git a/src/screens/Transfer/Interrupted.tsx b/src/screens/Transfer/Interrupted.tsx
deleted file mode 100644
index 76855369c..000000000
--- a/src/screens/Transfer/Interrupted.tsx
+++ /dev/null
@@ -1,63 +0,0 @@
-import React, { ReactElement, memo } from 'react';
-import { StyleSheet, View } from 'react-native';
-import { useTranslation } from 'react-i18next';
-
-import { Display, Text01S } from '../../styles/text';
-import SafeAreaInset from '../../components/SafeAreaInset';
-import GlowingBackground from '../../components/GlowingBackground';
-import NavigationHeader from '../../components/NavigationHeader';
-import GlowImage from '../../components/GlowImage';
-import Button from '../../components/Button';
-import type { TransferScreenProps } from '../../navigation/types';
-
-const imageSrc = require('../../assets/illustrations/exclamation-mark.png');
-
-const Interrupted = ({
-	navigation,
-}: TransferScreenProps<'Interrupted'>): ReactElement => {
-	const { t } = useTranslation('lightning');
-
-	return (
-		<GlowingBackground topLeft="purple">
-			<SafeAreaInset type="top" />
-			<NavigationHeader
-				title={t('interrupted_title')}
-				displayBackButton={false}
-			/>
-			<View style={styles.root}>
-				<Display color="purple">{t('interrupted_header')}</Display>
-				<Text01S color="gray1" style={styles.text}>
-					{t('interrupted_text')}
-				</Text01S>
-
-				<GlowImage image={imageSrc} glowColor="purple" />
-
-				<View>
-					<Button
-						text={t('ok')}
-						size="large"
-						onPress={(): void => {
-							navigation.popToTop();
-							navigation.goBack();
-						}}
-					/>
-				</View>
-			</View>
-			<SafeAreaInset type="bottom" minPadding={16} />
-		</GlowingBackground>
-	);
-};
-
-const styles = StyleSheet.create({
-	root: {
-		flex: 1,
-		marginTop: 8,
-		paddingHorizontal: 16,
-	},
-	text: {
-		marginTop: 4,
-		marginBottom: 16,
-	},
-});
-
-export default memo(Interrupted);
diff --git a/src/screens/Transfer/Setup.tsx b/src/screens/Transfer/Setup.tsx
deleted file mode 100644
index 49fbe2c00..000000000
--- a/src/screens/Transfer/Setup.tsx
+++ /dev/null
@@ -1,348 +0,0 @@
-import React, {
-	ReactElement,
-	useState,
-	useCallback,
-	useMemo,
-	useEffect,
-} from 'react';
-import { StyleSheet, View } from 'react-native';
-import { useAppSelector } from '../../hooks/redux';
-import { useFocusEffect } from '@react-navigation/native';
-import { FadeIn, FadeOut } from 'react-native-reanimated';
-import { useTranslation } from 'react-i18next';
-
-import { AnimatedView } from '../../styles/components';
-import { Caption13Up, Display, Text01S, Text02S } from '../../styles/text';
-import SafeAreaInset from '../../components/SafeAreaInset';
-import GlowingBackground from '../../components/GlowingBackground';
-import NavigationHeader from '../../components/NavigationHeader';
-import NumberPadTextField from '../../components/NumberPadTextField';
-import Button from '../../components/Button';
-import Percentage from '../../components/Percentage';
-import FancySlider from '../../components/FancySlider';
-import NumberPadLightning from '../Lightning/NumberPadLightning';
-import { useSwitchUnit } from '../../hooks/wallet';
-import {
-	refreshBlocktankInfo,
-	startChannelPurchase,
-} from '../../store/utils/blocktank';
-import { convertToSats } from '../../utils/conversion';
-import { getNumberPadText } from '../../utils/numberpad';
-import { showToast } from '../../utils/notifications';
-import { getFiatDisplayValues } from '../../utils/displayValues';
-import type { TransferScreenProps } from '../../navigation/types';
-import {
-	resetSendTransaction,
-	setupOnChainTransaction,
-} from '../../store/actions/wallet';
-import { blocktankInfoSelector } from '../../store/reselect/blocktank';
-import { lnSetupSelector } from '../../store/reselect/aggregations';
-import {
-	conversionUnitSelector,
-	denominationSelector,
-	nextUnitSelector,
-	unitSelector,
-} from '../../store/reselect/settings';
-
-const Setup = ({ navigation }: TransferScreenProps<'Setup'>): ReactElement => {
-	const { t } = useTranslation('lightning');
-	const switchUnit = useSwitchUnit();
-	const [textFieldValue, setTextFieldValue] = useState('');
-	const [showNumberPad, setShowNumberPad] = useState(false);
-	const [loading, setLoading] = useState(false);
-	const unit = useAppSelector(unitSelector);
-	const nextUnit = useAppSelector(nextUnitSelector);
-	const conversionUnit = useAppSelector(conversionUnitSelector);
-	const denomination = useAppSelector(denominationSelector);
-	const blocktankInfo = useAppSelector(blocktankInfoSelector);
-
-	const max0ConfClientBalance = blocktankInfo.options.max0ConfClientBalanceSat;
-
-	useFocusEffect(
-		useCallback(() => {
-			const setupTransfer = async (): Promise<void> => {
-				await resetSendTransaction();
-				await setupOnChainTransaction();
-				refreshBlocktankInfo().then();
-			};
-			setupTransfer();
-		}, []),
-	);
-
-	const spendingAmount = useMemo((): number => {
-		return convertToSats(textFieldValue, conversionUnit);
-	}, [textFieldValue, conversionUnit]);
-
-	const lnSetup = useAppSelector((state) => {
-		return lnSetupSelector(state, spendingAmount);
-	});
-
-	const btSpendingLimitBalancedUsd = useMemo((): string => {
-		const { fiatWhole } = getFiatDisplayValues({
-			satoshis: lnSetup.limits.lsp,
-			currency: 'USD',
-		});
-
-		return fiatWhole;
-	}, [lnSetup.limits.lsp]);
-
-	// set initial value
-	useEffect(() => {
-		const result = getNumberPadText(
-			lnSetup.initialClientBalance,
-			denomination,
-			unit,
-		);
-		setTextFieldValue(result);
-		// ignore lnSetup.initialClientBalance
-		// eslint-disable-next-line react-hooks/exhaustive-deps
-	}, []);
-
-	const onSliderChange = useCallback(
-		(value: number) => {
-			const result = getNumberPadText(Math.round(value), denomination, unit);
-			setTextFieldValue(result);
-		},
-		[denomination, unit],
-	);
-
-	const onChangeUnit = (): void => {
-		const result = getNumberPadText(spendingAmount, denomination, nextUnit);
-		setTextFieldValue(result);
-		switchUnit();
-	};
-
-	const onMax = useCallback(() => {
-		const result = getNumberPadText(
-			lnSetup.slider.maxValue,
-			denomination,
-			unit,
-		);
-		setTextFieldValue(result);
-	}, [lnSetup.slider.maxValue, denomination, unit]);
-
-	const onCustomAmount = (): void => {
-		setShowNumberPad(true);
-		setTextFieldValue('0');
-	};
-
-	const onDone = useCallback(() => {
-		setShowNumberPad(false);
-	}, []);
-
-	const onContinue = useCallback(async (): Promise<void> => {
-		const { clientBalance, lspBalance, isTransferringToSavings } = lnSetup;
-
-		if (isTransferringToSavings) {
-			navigation.push('Confirm', { spendingAmount });
-			return;
-		}
-
-		setLoading(true);
-
-		const purchaseResponse = await startChannelPurchase({
-			clientBalance,
-			lspBalance,
-			zeroConfPayment: clientBalance <= max0ConfClientBalance,
-		});
-
-		setLoading(false);
-		if (purchaseResponse.isErr()) {
-			showToast({
-				type: 'warning',
-				title: t('error_channel_purchase'),
-				description: purchaseResponse.error.message,
-			});
-		}
-		if (purchaseResponse.isOk()) {
-			navigation.push('Confirm', {
-				spendingAmount,
-				orderId: purchaseResponse.value.id,
-			});
-		}
-	}, [t, navigation, max0ConfClientBalance, lnSetup, spendingAmount]);
-
-	const showMaxSpendingNote = spendingAmount >= lnSetup.limits.local;
-	const showLspLimitNote = spendingAmount >= Math.round(lnSetup.limits.lsp);
-
-	return (
-		<GlowingBackground topLeft="purple">
-			<SafeAreaInset type="top" />
-			<NavigationHeader
-				title={t('transfer_funds')}
-				onClosePress={(): void => {
-					navigation.navigate('Wallet');
-				}}
-			/>
-			<View style={styles.root} testID="TransferSetup">
-				<View>
-					{showNumberPad ? (
-						<>
-							<Display color="purple">{t('transfer_header_keybrd')}</Display>
-							<Text01S color="gray1" style={styles.text}>
-								{t('enter_money')}
-							</Text01S>
-						</>
-					) : (
-						<>
-							<Display color="purple">{t('transfer_header_nokeybrd')}</Display>
-							<Text01S color="gray1" style={styles.text}>
-								{t('enter_amount')}
-							</Text01S>
-							<AnimatedView
-								style={styles.sliderSection}
-								color="transparent"
-								entering={FadeIn}
-								exiting={FadeOut}>
-								<View style={styles.row}>
-									<Caption13Up color="purple">{t('spending')}</Caption13Up>
-									<Caption13Up color="orange">{t('savings')}</Caption13Up>
-								</View>
-								<View style={styles.sliderContainer}>
-									<FancySlider
-										value={spendingAmount}
-										startValue={0}
-										maxValue={lnSetup.slider.maxValue}
-										endValue={lnSetup.slider.endValue}
-										snapPoint={lnSetup.slider.snapPoint}
-										onValueChange={onSliderChange}
-									/>
-								</View>
-								<View style={styles.percentages}>
-									<Percentage
-										value={lnSetup.percentage.spendings}
-										type="spending"
-									/>
-									<Percentage
-										value={lnSetup.percentage.savings}
-										type="savings"
-									/>
-								</View>
-							</AnimatedView>
-
-							{showLspLimitNote && (
-								<AnimatedView
-									style={styles.note}
-									entering={FadeIn}
-									exiting={FadeOut}>
-									<Text02S color="gray1">
-										{t('note_blocktank_limit', {
-											usdValue: btSpendingLimitBalancedUsd,
-										})}
-									</Text02S>
-								</AnimatedView>
-							)}
-
-							{showMaxSpendingNote && !showLspLimitNote && (
-								<AnimatedView
-									style={styles.note}
-									entering={FadeIn}
-									exiting={FadeOut}>
-									<Text02S color="gray1">{t('note_reserve_limit')}</Text02S>
-								</AnimatedView>
-							)}
-
-							<AnimatedView
-								color="transparent"
-								entering={FadeIn}
-								exiting={FadeOut}>
-								<Button
-									style={styles.buttonCustom}
-									text={t('enter_custom_amount')}
-									onPress={onCustomAmount}
-								/>
-							</AnimatedView>
-						</>
-					)}
-				</View>
-
-				<View style={styles.amount}>
-					{!showNumberPad && (
-						<Caption13Up style={styles.amountCaption} color="purple">
-							{t('spending_label')}
-						</Caption13Up>
-					)}
-					<NumberPadTextField
-						value={textFieldValue}
-						showPlaceholder={showNumberPad}
-						reverse={true}
-						onPress={onChangeUnit}
-					/>
-				</View>
-
-				{!showNumberPad && (
-					<AnimatedView color="transparent" entering={FadeIn} exiting={FadeOut}>
-						<Button
-							text={t('continue')}
-							size="large"
-							loading={loading}
-							disabled={!lnSetup.canContinue}
-							onPress={onContinue}
-						/>
-					</AnimatedView>
-				)}
-
-				{showNumberPad && (
-					<NumberPadLightning
-						style={styles.numberpad}
-						value={textFieldValue}
-						maxAmount={lnSetup.slider.maxValue}
-						onChange={setTextFieldValue}
-						onChangeUnit={onChangeUnit}
-						onMax={onMax}
-						onDone={onDone}
-					/>
-				)}
-			</View>
-			<SafeAreaInset type="bottom" minPadding={16} />
-		</GlowingBackground>
-	);
-};
-
-const styles = StyleSheet.create({
-	root: {
-		flex: 1,
-		marginTop: 8,
-		paddingHorizontal: 16,
-	},
-	text: {
-		marginTop: 4,
-	},
-	row: {
-		flexDirection: 'row',
-		justifyContent: 'space-between',
-		alignItems: 'center',
-		marginVertical: 4,
-	},
-	sliderSection: {
-		marginTop: 42,
-	},
-	sliderContainer: {
-		marginTop: 24,
-		marginBottom: 16,
-	},
-	percentages: {
-		flexDirection: 'row',
-		justifyContent: 'space-between',
-		alignItems: 'center',
-	},
-	note: {
-		marginTop: 16,
-	},
-	amount: {
-		marginTop: 'auto',
-		marginBottom: 32,
-	},
-	amountCaption: {
-		marginBottom: 4,
-	},
-	numberpad: {
-		marginHorizontal: -16,
-	},
-	buttonCustom: {
-		marginTop: 16,
-		alignSelf: 'flex-start',
-	},
-});
-
-export default Setup;
diff --git a/src/screens/Transfer/Success.tsx b/src/screens/Transfer/Success.tsx
deleted file mode 100644
index bee32cd29..000000000
--- a/src/screens/Transfer/Success.tsx
+++ /dev/null
@@ -1,74 +0,0 @@
-import React, { ReactElement, memo } from 'react';
-import { StyleSheet, View } from 'react-native';
-import { Trans, useTranslation } from 'react-i18next';
-
-import { Display, Text01B, Text01S } from '../../styles/text';
-import SafeAreaInset from '../../components/SafeAreaInset';
-import GlowingBackground from '../../components/GlowingBackground';
-import NavigationHeader from '../../components/NavigationHeader';
-import GlowImage from '../../components/GlowImage';
-import Button from '../../components/Button';
-import type { TransferScreenProps } from '../../navigation/types';
-
-const imageSrc = require('../../assets/illustrations/transfer.png');
-
-const Success = ({
-	navigation,
-	route,
-}: TransferScreenProps<'Success'>): ReactElement => {
-	const { t } = useTranslation('lightning');
-	const { type } = route.params;
-
-	const onContinue = (): void => {
-		navigation.popToTop();
-		navigation.goBack();
-	};
-
-	return (
-		<GlowingBackground topLeft="purple">
-			<SafeAreaInset type="top" />
-			<NavigationHeader
-				title={t('transfer_successful')}
-				displayBackButton={false}
-			/>
-			<View style={styles.root}>
-				<Display color="purple">
-					{t(type === 'savings' ? 'ts_savings_title' : 'ts_spendings_title')}
-				</Display>
-				<Text01S color="gray1" style={styles.text}>
-					<Trans
-						t={t}
-						i18nKey={
-							type === 'savings' ? 'ts_savings_text' : 'ts_spendings_text'
-						}
-						components={{ highlight: <Text01B color="white" /> }}
-					/>
-				</Text01S>
-
-				<GlowImage image={imageSrc} glowColor="purple" />
-
-				<View style={styles.buttonContainer}>
-					<Button text={t('ok')} size="large" onPress={onContinue} />
-				</View>
-			</View>
-			<SafeAreaInset type="bottom" minPadding={16} />
-		</GlowingBackground>
-	);
-};
-
-const styles = StyleSheet.create({
-	root: {
-		flex: 1,
-		marginTop: 8,
-		paddingHorizontal: 16,
-	},
-	text: {
-		marginTop: 4,
-		marginBottom: 16,
-	},
-	buttonContainer: {
-		marginTop: 'auto',
-	},
-});
-
-export default memo(Success);
diff --git a/src/screens/TreasureHunt/Airdrop.tsx b/src/screens/TreasureHunt/Airdrop.tsx
index 624f7d02b..96d318d4a 100644
--- a/src/screens/TreasureHunt/Airdrop.tsx
+++ b/src/screens/TreasureHunt/Airdrop.tsx
@@ -9,7 +9,7 @@ import { StyleSheet, View } from 'react-native';
 import { SvgXml } from 'react-native-svg';
 import { ldk } from '@synonymdev/react-native-ldk';
 
-import { Caption13M, Text01M } from '../../styles/text';
+import { CaptionB, BodyMSB } from '../../styles/text';
 import GradientView from '../../components/GradientView';
 import SafeAreaInset from '../../components/SafeAreaInset';
 import Title from './Title';
@@ -36,7 +36,7 @@ const lightningIcon = `
 			x2="8.46631"
 			y2="37.3364"
 			gradient-units="userSpaceOnUse">
-			<stop offset="0" stop-color="#FF6600" />
+			<stop offset="0" stop-color="#FF4400" />
 			<stop offset="0.4" stop-color="#FFD200" />
       	</linearGradient>
     </defs>
@@ -229,28 +229,28 @@ const Airdrop = ({
 						/>
 					</View>
 				</View>
-				<Text01M style={styles.description} color="yellow">
+				<BodyMSB style={styles.description} color="yellow">
 					{prize.description}
-				</Text01M>
+				</BodyMSB>
 				<View style={styles.note}>
 					{prize.winType === 'empty' && (
-						<Caption13M style={styles.noteText} color="yellow">
+						<CaptionB style={styles.noteText} color="yellow">
 							{prize.note}
-						</Caption13M>
+						</CaptionB>
 					)}
 					{prize.winType === 'winning' && (
-						<Caption13M style={styles.noteText} color="yellow">
+						<CaptionB style={styles.noteText} color="yellow">
 							{isPaid ? (
-								<Caption13M color="brand">
+								<CaptionB color="brand">
 									You have already received your payout.{' '}
-								</Caption13M>
+								</CaptionB>
 							) : (
-								<Caption13M color="yellow">
+								<CaptionB color="yellow">
 									The payout may take about a minute.{' '}
-								</Caption13M>
+								</CaptionB>
 							)}
 							{prize.note}
-						</Caption13M>
+						</CaptionB>
 					)}
 				</View>
 			</View>
diff --git a/src/screens/TreasureHunt/Chest.tsx b/src/screens/TreasureHunt/Chest.tsx
index 217b3b8b6..effe0550c 100644
--- a/src/screens/TreasureHunt/Chest.tsx
+++ b/src/screens/TreasureHunt/Chest.tsx
@@ -2,7 +2,7 @@ import React, { ReactElement, memo, useCallback } from 'react';
 import { StyleSheet, Platform, View, TouchableOpacity } from 'react-native';
 import { useAppSelector } from '../../hooks/redux';
 
-import { Subtitle, Text02M } from '../../styles/text';
+import { Subtitle, BodySSB } from '../../styles/text';
 import GradientView from '../../components/GradientView';
 import SafeAreaInset from '../../components/SafeAreaInset';
 import BlurView from '../../components/BlurView';
@@ -83,7 +83,7 @@ const Chest = ({
 						activeOpacity={0.8}
 						onPress={onOpen}>
 						<BlurView style={styles.buttonBlur}>
-							<Text02M style={styles.buttonText}>Try To Open</Text02M>
+							<BodySSB style={styles.buttonText}>Try To Open</BodySSB>
 						</BlurView>
 					</TouchableOpacity>
 				</View>
@@ -108,7 +108,7 @@ const styles = StyleSheet.create({
 	chestName: {
 		backgroundColor: 'black',
 		borderWidth: 4,
-		borderColor: '#FF6600',
+		borderColor: '#FF4400',
 		borderRadius: 48,
 		height: 48,
 		width: 48,
diff --git a/src/screens/TreasureHunt/Error.tsx b/src/screens/TreasureHunt/Error.tsx
index 36068bd56..c178b77a1 100644
--- a/src/screens/TreasureHunt/Error.tsx
+++ b/src/screens/TreasureHunt/Error.tsx
@@ -1,7 +1,7 @@
 import React, { ReactElement, memo } from 'react';
 import { StyleSheet, View } from 'react-native';
 
-import { Caption13M, Caption13S, Text01M } from '../../styles/text';
+import { CaptionB, Caption, BodyMSB } from '../../styles/text';
 import GradientView from '../../components/GradientView';
 import SafeAreaInset from '../../components/SafeAreaInset';
 import Title from './Title';
@@ -16,14 +16,14 @@ const Error = (): ReactElement => (
 		</View>
 		<Title text="Lost At Sea" />
 		<View style={styles.content}>
-			<Text01M style={styles.description} color="yellow">
+			<BodyMSB style={styles.description} color="yellow">
 				Arrr! A pirate intercepts your communications and you lose your way.
-			</Text01M>
+			</BodyMSB>
 			<View style={styles.note}>
-				<Caption13S style={styles.noteText} color="brand">
-					<Caption13M color="brand">Something went wrong.</Caption13M>
+				<Caption style={styles.noteText} color="brand">
+					<CaptionB color="brand">Something went wrong.</CaptionB>
 					{'\n'}Please go to the Synonym booth for support.
-				</Caption13S>
+				</Caption>
 			</View>
 		</View>
 		<SafeAreaInset type="bottom" minPadding={16} />
diff --git a/src/screens/TreasureHunt/GradientText.tsx b/src/screens/TreasureHunt/GradientText.tsx
index 265deaff2..f4d4af45e 100644
--- a/src/screens/TreasureHunt/GradientText.tsx
+++ b/src/screens/TreasureHunt/GradientText.tsx
@@ -26,7 +26,7 @@ export const GradientText = ({
 		return <></>;
 	}
 
-	const gradient = ['#FF6600', '#FFD200'];
+	const gradient = ['#FF4400', '#FFD200'];
 	const textWidth = font.getTextWidth(text);
 
 	return (
diff --git a/src/screens/TreasureHunt/Loading.tsx b/src/screens/TreasureHunt/Loading.tsx
index f2a37e96f..32195bad7 100644
--- a/src/screens/TreasureHunt/Loading.tsx
+++ b/src/screens/TreasureHunt/Loading.tsx
@@ -2,7 +2,7 @@ import React, { ReactElement, memo, useEffect } from 'react';
 import { ActivityIndicator, StyleSheet, View } from 'react-native';
 import { ldk } from '@synonymdev/react-native-ldk';
 
-import { Subtitle, Text02M } from '../../styles/text';
+import { Subtitle, BodySSB } from '../../styles/text';
 import GradientView from '../../components/GradientView';
 import SafeAreaInset from '../../components/SafeAreaInset';
 import Title from './Title';
@@ -104,7 +104,7 @@ const Loading = ({
 				<View style={styles.footer}>
 					<ActivityIndicator color="white" />
 					<View style={styles.loadingText}>
-						<Text02M color="yellow">Trying To Open...</Text02M>
+						<BodySSB color="yellow">Trying To Open...</BodySSB>
 					</View>
 				</View>
 			</View>
@@ -128,7 +128,7 @@ const styles = StyleSheet.create({
 	chestName: {
 		backgroundColor: 'black',
 		borderWidth: 4,
-		borderColor: '#FF6600',
+		borderColor: '#FF4400',
 		borderRadius: 48,
 		height: 48,
 		width: 48,
diff --git a/src/screens/TreasureHunt/Prize.tsx b/src/screens/TreasureHunt/Prize.tsx
index d7c5a92d2..770df7bf5 100644
--- a/src/screens/TreasureHunt/Prize.tsx
+++ b/src/screens/TreasureHunt/Prize.tsx
@@ -10,7 +10,7 @@ import { SvgXml } from 'react-native-svg';
 import Lottie from 'lottie-react-native';
 import { ldk } from '@synonymdev/react-native-ldk';
 
-import { Caption13M, Text01M } from '../../styles/text';
+import { CaptionB, BodyMSB } from '../../styles/text';
 import GradientView from '../../components/GradientView';
 import SafeAreaInset from '../../components/SafeAreaInset';
 import Title from './Title';
@@ -40,7 +40,7 @@ const lightningIcon = `
 			x2="8.46631"
 			y2="37.3364"
 			gradient-units="userSpaceOnUse">
-			<stop offset="0" stop-color="#FF6600" />
+			<stop offset="0" stop-color="#FF4400" />
 			<stop offset="0.4" stop-color="#FFD200" />
       	</linearGradient>
     </defs>
@@ -232,29 +232,29 @@ const Prize = ({
 						/>
 					</View>
 				</View>
-				<Text01M style={styles.description} color="yellow">
+				<BodyMSB style={styles.description} color="yellow">
 					{prize.description}
-				</Text01M>
+				</BodyMSB>
 				{/* eslint-disable-next-line react-native/no-inline-styles */}
 				<View style={{ marginTop: isSmallScreen ? 40 : 80 }}>
 					{prize.note ? (
-						<Caption13M style={styles.noteText} color="yellow">
+						<CaptionB style={styles.noteText} color="yellow">
 							{prize.note}
-						</Caption13M>
+						</CaptionB>
 					) : (
-						<Caption13M style={styles.noteText} color="yellow">
+						<CaptionB style={styles.noteText} color="yellow">
 							{isPaid ? (
-								<Caption13M color="brand">
+								<CaptionB color="brand">
 									You have already received your payout.{' '}
-								</Caption13M>
+								</CaptionB>
 							) : (
-								<Caption13M color="yellow">
+								<CaptionB color="yellow">
 									The payout may take about a minute.{' '}
-								</Caption13M>
+								</CaptionB>
 							)}
 							Each treasure chest you discover boosts the prize and odds of
 							winning!
-						</Caption13M>
+						</CaptionB>
 					)}
 				</View>
 			</View>
diff --git a/src/screens/TreasureHunt/Title.tsx b/src/screens/TreasureHunt/Title.tsx
index e7386ed89..15d334f68 100644
--- a/src/screens/TreasureHunt/Title.tsx
+++ b/src/screens/TreasureHunt/Title.tsx
@@ -24,7 +24,7 @@ export const Title = ({
 		fontSize,
 	);
 
-	const gradient = ['#FF6600', '#FFD200'];
+	const gradient = ['#FF4400', '#FFD200'];
 	const words = text.split(' ');
 	const firstWords = words.slice(0, words.length - 1).join(' ');
 	const lastWord = words.pop()!;
diff --git a/src/screens/Wallets/BoostPrompt.tsx b/src/screens/Wallets/BoostPrompt.tsx
index 0918a4bb2..73fbfe278 100644
--- a/src/screens/Wallets/BoostPrompt.tsx
+++ b/src/screens/Wallets/BoostPrompt.tsx
@@ -2,7 +2,7 @@ import React, { memo, ReactElement, useEffect, useMemo, useState } from 'react';
 import { ActivityIndicator, StyleSheet, View } from 'react-native';
 import { useTranslation } from 'react-i18next';
 
-import { Text01M, Text02M, Text02S } from '../../styles/text';
+import { BodyMSB, BodySSB, BodyS } from '../../styles/text';
 import { TimerIconAlt } from '../../styles/icons';
 import BottomSheetWrapper from '../../components/BottomSheetWrapper';
 import SwipeToConfirm from '../../components/SwipeToConfirm';
@@ -199,8 +199,8 @@ const BoostForm = ({
 
 	const Title = (
 		<View style={styles.adjustValueRow}>
-			<Money sats={transaction.satsPerByte} size="text01m" symbol={true} />
-			<Text01M> {t('sat_vbyte_compact')}</Text01M>
+			<Money sats={transaction.satsPerByte} size="bodyMSB" symbol={true} />
+			<BodyMSB> {t('sat_vbyte_compact')}</BodyMSB>
 		</View>
 	);
 
@@ -208,20 +208,20 @@ const BoostForm = ({
 		<View style={styles.adjustValueRow}>
 			<Money
 				sats={boostFee}
-				size="text02m"
-				color="gray1"
+				size="bodySSB"
+				color="white50"
 				symbol={true}
 				unitType="secondary"
 			/>
-			<Text02M color="gray1"> {duration}</Text02M>
+			<BodySSB color="white50"> {duration}</BodySSB>
 		</View>
 	);
 
 	return (
 		<>
-			<Text02S color="gray1">
+			<BodyS color="white50">
 				{t(showCustom ? 'boost_fee_custom' : 'boost_fee_recomended')}
-			</Text02S>
+			</BodyS>
 
 			<View style={styles.boostForm}>
 				{showCustom ? (
@@ -255,10 +255,10 @@ const BoostForm = ({
 					<SwipeToConfirm
 						text={t('boost_swipe')}
 						color="yellow"
-						onConfirm={handleBoost}
 						icon={<TimerIconAlt width={30} height={30} color="black" />}
 						loading={loading}
 						confirmed={loading}
+						onConfirm={handleBoost}
 					/>
 				</View>
 			</View>
diff --git a/src/screens/Wallets/Header.tsx b/src/screens/Wallets/Header.tsx
index 31bf1106a..b0cb83f82 100644
--- a/src/screens/Wallets/Header.tsx
+++ b/src/screens/Wallets/Header.tsx
@@ -5,13 +5,13 @@ import { useTranslation } from 'react-i18next';
 
 import { __DISABLE_SLASHTAGS__ } from '../../constants/env';
 import { Title } from '../../styles/text';
+import { Pressable } from '../../styles/components';
 import { ProfileIcon, SettingsIcon } from '../../styles/icons';
 import ProfileImage from '../../components/ProfileImage';
 import { truncate } from '../../utils/helpers';
 import { useProfile2, useSelectedSlashtag2 } from '../../hooks/slashtags2';
 import { RootNavigationProp } from '../../navigation/types';
 import VerticalShadow from '../../components/VerticalShadow';
-import { Pressable } from '../../styles/components';
 
 const EnabledSlashtagsProfileButton = (): ReactElement => {
 	const { t } = useTranslation('slashtags');
diff --git a/src/screens/Wallets/LNURLPay/Amount.tsx b/src/screens/Wallets/LNURLPay/Amount.tsx
index 6450cb787..294a5e8a9 100644
--- a/src/screens/Wallets/LNURLPay/Amount.tsx
+++ b/src/screens/Wallets/LNURLPay/Amount.tsx
@@ -75,8 +75,6 @@ const Amount = ({
 		...(error && { color: 'brand' as keyof IColors }),
 	};
 
-	const isMaxSendAmount = amount === max;
-
 	const onChangeUnit = (): void => {
 		const result = getNumberPadText(amount, denomination, nextUnit);
 		setText(result);
@@ -105,13 +103,13 @@ const Amount = ({
 				<View style={styles.numberPad} testID="SendAmountNumberPad">
 					<View style={styles.actions}>
 						<View>
-							<Caption13Up style={styles.maxSendableText} color="gray1">
+							<Caption13Up style={styles.maxSendableText} color="white50">
 								{t('lnurl_p_max')}
 							</Caption13Up>
 							<Money
 								key="small"
 								sats={max}
-								size="text02m"
+								size="bodySSB"
 								decimalLength="long"
 								testID="maxSendable"
 								symbol={true}
@@ -125,9 +123,7 @@ const Amount = ({
 									color="white10"
 									testID="SendNumberPadMax"
 									onPress={onMaxAmount}>
-									<Caption13Up color={isMaxSendAmount ? 'orange' : 'brand'}>
-										{t('send_max')}
-									</Caption13Up>
+									<Caption13Up color="brand">{t('send_max')}</Caption13Up>
 								</TouchableOpacity>
 							</View>
 
diff --git a/src/screens/Wallets/LNURLWithdraw/Amount.tsx b/src/screens/Wallets/LNURLWithdraw/Amount.tsx
index 3b654c207..8d79ff7ab 100644
--- a/src/screens/Wallets/LNURLWithdraw/Amount.tsx
+++ b/src/screens/Wallets/LNURLWithdraw/Amount.tsx
@@ -68,8 +68,6 @@ const Amount = ({
 		...(error && { color: 'brand' as keyof IColors }),
 	};
 
-	const isMaxSendAmount = amount === maxWithdrawable;
-
 	const onChangeUnit = (): void => {
 		const result = getNumberPadText(amount, denomination, nextUnit);
 		setText(result);
@@ -98,13 +96,13 @@ const Amount = ({
 				<View style={styles.numberPad} testID="SendAmountNumberPad">
 					<View style={styles.actions}>
 						<View>
-							<Caption13Up style={styles.maxWithdrawableText} color="gray1">
+							<Caption13Up style={styles.maxWithdrawableText} color="white50">
 								{t('lnurl_w_max')}
 							</Caption13Up>
 							<Money
 								key="small"
 								sats={maxWithdrawable}
-								size="text02m"
+								size="bodySSB"
 								testID="maxWithdrawable"
 								symbol={true}
 								{...maxWithdrawableProps}
@@ -117,9 +115,7 @@ const Amount = ({
 									color="white10"
 									testID="SendNumberPadMax"
 									onPress={onMaxAmount}>
-									<Caption13Up color={isMaxSendAmount ? 'orange' : 'brand'}>
-										{t('send_max')}
-									</Caption13Up>
+									<Caption13Up color="brand">{t('send_max')}</Caption13Up>
 								</TouchableOpacity>
 							</View>
 
diff --git a/src/screens/Wallets/LNURLWithdraw/Confirm.tsx b/src/screens/Wallets/LNURLWithdraw/Confirm.tsx
index 46a3537c1..2c36d2cb5 100644
--- a/src/screens/Wallets/LNURLWithdraw/Confirm.tsx
+++ b/src/screens/Wallets/LNURLWithdraw/Confirm.tsx
@@ -1,5 +1,5 @@
 import React, { ReactElement, memo, useState } from 'react';
-import { StyleSheet, View } from 'react-native';
+import { Image, StyleSheet, View } from 'react-native';
 import { useTranslation } from 'react-i18next';
 
 import BottomSheetNavigationHeader from '../../../components/BottomSheetNavigationHeader';
@@ -12,10 +12,9 @@ import {
 	selectedNetworkSelector,
 	selectedWalletSelector,
 } from '../../../store/reselect/wallet';
-import GlowImage from '../../../components/GlowImage';
 import { useAppDispatch, useAppSelector } from '../../../hooks/redux';
 import { handleLnurlWithdraw } from '../../../utils/lnurl';
-import { Text01S } from '../../../styles/text';
+import { BodyM } from '../../../styles/text';
 import { showToast } from '../../../utils/notifications';
 import LightningSyncing from '../../../components/LightningSyncing';
 import { closeSheet } from '../../../store/slices/ui';
@@ -61,14 +60,13 @@ const Confirm = ({ route }: LNURLWithdrawProps<'Confirm'>): ReactElement => {
 					}
 				/>
 				<View style={styles.content}>
-					<AmountToggle
-						style={styles.amountToggle}
-						sats={amount}
-						reverse={true}
-						space={12}
-					/>
-					<Text01S color="white50">{t('lnurl_w_text')}</Text01S>
-					<GlowImage image={imageSrc} imageSize={170} glowColor="brand" />
+					<AmountToggle style={styles.amountToggle} amount={amount} />
+					<BodyM color="white50">{t('lnurl_w_text')}</BodyM>
+
+					<View style={styles.imageContainer}>
+						<Image style={styles.image} source={imageSrc} />
+					</View>
+
 					<View style={styles.buttonContainer}>
 						<Button
 							size="large"
@@ -97,6 +95,19 @@ const styles = StyleSheet.create({
 	amountToggle: {
 		marginBottom: 32,
 	},
+	imageContainer: {
+		flexShrink: 1,
+		justifyContent: 'center',
+		alignItems: 'center',
+		alignSelf: 'center',
+		width: 256,
+		aspectRatio: 1,
+		marginTop: 'auto',
+	},
+	image: {
+		flex: 1,
+		resizeMode: 'contain',
+	},
 	buttonContainer: {
 		marginTop: 'auto',
 	},
diff --git a/src/screens/Wallets/NewTxPrompt.tsx b/src/screens/Wallets/NewTxPrompt.tsx
index 3cc5ad4c4..4a621df87 100644
--- a/src/screens/Wallets/NewTxPrompt.tsx
+++ b/src/screens/Wallets/NewTxPrompt.tsx
@@ -4,7 +4,6 @@ import Lottie from 'lottie-react-native';
 import { useTranslation } from 'react-i18next';
 
 import BottomSheetWrapper from '../../components/BottomSheetWrapper';
-import Glow from '../../components/Glow';
 import AmountToggle from '../../components/AmountToggle';
 import { closeSheet } from '../../store/slices/ui';
 import BottomSheetNavigationHeader from '../../components/BottomSheetNavigationHeader';
@@ -17,6 +16,7 @@ import {
 } from '../../hooks/bottomSheet';
 import { viewControllerSelector } from '../../store/reselect/ui';
 import { EActivityType } from '../../store/types/activity';
+import Button from '../../components/Button';
 
 const confettiOrangeSrc = require('../../assets/lottie/confetti-orange.json');
 const confettiPurpleSrc = require('../../assets/lottie/confetti-purple.json');
@@ -32,11 +32,15 @@ const NewTxPrompt = (): ReactElement => {
 
 	useBottomSheetBackPress('newTxPrompt');
 
-	const handlePress = (): void => {
+	const onAmountPress = (): void => {
 		dispatch(closeSheet('newTxPrompt'));
 		rootNavigation.navigate('ActivityDetail', { id: activityItem!.id });
 	};
 
+	const onButtonPress = (): void => {
+		dispatch(closeSheet('newTxPrompt'));
+	};
+
 	const isOnchainItem = activityItem?.activityType === EActivityType.onchain;
 
 	return (
@@ -44,7 +48,7 @@ const NewTxPrompt = (): ReactElement => {
 			view="newTxPrompt"
 			snapPoints={snapPoints}
 			backdrop={true}>
-			<View style={styles.container}>
+			<View style={styles.root}>
 				<View style={styles.confetti} pointerEvents="none">
 					<Lottie
 						source={isOnchainItem ? confettiOrangeSrc : confettiPurpleSrc}
@@ -62,24 +66,33 @@ const NewTxPrompt = (): ReactElement => {
 					}
 					displayBackButton={false}
 				/>
-				{activityItem && (
-					<AmountToggle
-						sats={activityItem.value}
-						reverse={true}
-						space={12}
-						testID="NewTxPrompt"
-						onPress={handlePress}
-					/>
-				)}
 
-				<View style={styles.imageContainer} pointerEvents="none">
-					<Glow style={styles.glow} size={600} color="white32" />
-					<Image source={imageSrc} style={styles.image3} />
-					<Image source={imageSrc} style={styles.image2} />
-					<Image source={imageSrc} style={styles.image1} />
-					<Image source={imageSrc} style={styles.image4} />
-				</View>
+				<View style={styles.content}>
+					{activityItem && (
+						<AmountToggle
+							amount={activityItem.value}
+							testID="NewTxPrompt"
+							onPress={onAmountPress}
+						/>
+					)}
+
+					<View style={styles.imageContainer} pointerEvents="none">
+						<Image source={imageSrc} style={styles.image1} />
+						<Image source={imageSrc} style={styles.image2} />
+						<Image source={imageSrc} style={styles.image3} />
+						<Image source={imageSrc} style={styles.image4} />
+					</View>
 
+					<View style={styles.buttonContainer}>
+						<Button
+							style={styles.button}
+							text={t('awesome')}
+							size="large"
+							testID="NewTxPromptButton"
+							onPress={onButtonPress}
+						/>
+					</View>
+				</View>
 				<SafeAreaInset type="bottom" minPadding={16} />
 			</View>
 		</BottomSheetWrapper>
@@ -87,58 +100,67 @@ const NewTxPrompt = (): ReactElement => {
 };
 
 const styles = StyleSheet.create({
-	container: {
+	root: {
 		flex: 1,
-		paddingHorizontal: 16,
 	},
 	confetti: {
 		...StyleSheet.absoluteFillObject,
-		zIndex: 1,
+		zIndex: 0,
 	},
 	lottie: {
 		height: '100%',
 	},
+	content: {
+		flex: 1,
+		paddingHorizontal: 16,
+	},
 	imageContainer: {
 		marginTop: 'auto',
-		alignSelf: 'center',
-		position: 'relative',
-		height: 200,
-		width: 200,
 		justifyContent: 'center',
 		alignItems: 'center',
-		marginBottom: 16,
+		alignSelf: 'center',
+		height: 250,
+		width: 200,
 	},
 	image1: {
 		width: 220,
 		height: 220,
 		position: 'absolute',
-		bottom: 0,
-		transform: [{ scaleX: -1 }],
+		bottom: '14%',
+		transform: [{ scaleX: -1 }, { rotate: '-10deg' }],
+		zIndex: 1,
 	},
 	image2: {
 		width: 220,
 		height: 220,
 		position: 'absolute',
-		bottom: '7%',
-		transform: [{ scaleX: -1 }, { rotate: '165deg' }],
+		bottom: '-17%',
+		transform: [{ scaleX: -1 }],
 	},
 	image3: {
 		width: 220,
 		height: 220,
 		position: 'absolute',
-		bottom: '14%',
-		transform: [{ scaleX: -1 }, { rotate: '150deg' }],
+		bottom: '12%',
+		left: '12%',
+		transform: [{ scaleX: 1 }, { rotate: '210deg' }],
+		zIndex: 2,
 	},
 	image4: {
 		width: 220,
 		height: 220,
 		position: 'absolute',
 		bottom: '75%',
-		left: '65%',
-		transform: [{ rotate: '45deg' }],
+		left: '60%',
+		transform: [{ rotate: '30deg' }],
 	},
-	glow: {
-		position: 'absolute',
+	buttonContainer: {
+		flexDirection: 'row',
+		justifyContent: 'center',
+		zIndex: 1,
+	},
+	button: {
+		flex: 1,
 	},
 });
 
diff --git a/src/screens/Wallets/NumberPadButtons.tsx b/src/screens/Wallets/NumberPadButtons.tsx
index 4fc3c5d0a..2d20fb6fe 100644
--- a/src/screens/Wallets/NumberPadButtons.tsx
+++ b/src/screens/Wallets/NumberPadButtons.tsx
@@ -9,7 +9,6 @@ import { IColors } from '../../styles/colors';
 
 type NumberPadButtons = {
 	color?: keyof IColors;
-	isMaxAmount?: boolean;
 	onMax?: () => void;
 	onChangeUnit?: () => void;
 	onDone?: () => void;
@@ -17,7 +16,6 @@ type NumberPadButtons = {
 
 const NumberPadButtons = ({
 	color = 'brand',
-	isMaxAmount = false,
 	onMax,
 	onChangeUnit,
 	onDone,
@@ -33,9 +31,7 @@ const NumberPadButtons = ({
 						color="white10"
 						testID="NumberPadButtonsMax"
 						onPressIn={onMax}>
-						<Caption13Up color={isMaxAmount ? 'orange' : color}>
-							{t('send_max')}
-						</Caption13Up>
+						<Caption13Up color={color}>{t('send_max')}</Caption13Up>
 					</Pressable>
 				)}
 			</View>
@@ -78,7 +74,7 @@ const styles = StyleSheet.create({
 		minHeight: 28,
 	},
 	button: {
-		paddingVertical: 7,
+		paddingVertical: 5,
 		paddingHorizontal: 8,
 		borderRadius: 8,
 		flexDirection: 'row',
diff --git a/src/screens/Wallets/Receive/ReceiveAmount.tsx b/src/screens/Wallets/Receive/ReceiveAmount.tsx
index 668ba267e..55f4e3638 100644
--- a/src/screens/Wallets/Receive/ReceiveAmount.tsx
+++ b/src/screens/Wallets/Receive/ReceiveAmount.tsx
@@ -88,7 +88,7 @@ const ReceiveAmount = ({
 	return (
 		<GradientView style={styles.container}>
 			<BottomSheetNavigationHeader
-				title={t('receive_instantly')}
+				title={t('receive_bitcoin')}
 				displayBackButton={true}
 			/>
 			<View style={styles.content}>
@@ -100,12 +100,12 @@ const ReceiveAmount = ({
 				<View style={styles.numberPad} testID="ReceiveNumberPad">
 					<View style={styles.actions}>
 						<TouchableOpacity onPress={onMinimum}>
-							<Caption13Up style={styles.minimumText} color="gray1">
+							<Caption13Up style={styles.minimumText} color="white50">
 								{t('minimum')}
 							</Caption13Up>
 							<Money
 								sats={minimumAmount}
-								size="text02m"
+								size="bodySSB"
 								symbol={true}
 								shouldRoundUp={true}
 							/>
diff --git a/src/screens/Wallets/Receive/ReceiveConnect.tsx b/src/screens/Wallets/Receive/ReceiveConnect.tsx
index 87ea56ec2..2124cfb2c 100644
--- a/src/screens/Wallets/Receive/ReceiveConnect.tsx
+++ b/src/screens/Wallets/Receive/ReceiveConnect.tsx
@@ -1,17 +1,15 @@
 import React, { memo, ReactElement, useEffect, useState } from 'react';
-import { StyleSheet, View } from 'react-native';
+import { StyleSheet, View, Image } from 'react-native';
 import { Trans, useTranslation } from 'react-i18next';
 
-import { Caption13Up, Text01B, Text01S } from '../../../styles/text';
+import { Caption13Up, BodyMB, BodyM } from '../../../styles/text';
 import GradientView from '../../../components/GradientView';
 import AmountToggle from '../../../components/AmountToggle';
 import BottomSheetNavigationHeader from '../../../components/BottomSheetNavigationHeader';
 import SafeAreaInset from '../../../components/SafeAreaInset';
 import Button from '../../../components/Button';
-import GlowImage from '../../../components/GlowImage';
 import Money from '../../../components/Money';
 import { useAppDispatch, useAppSelector } from '../../../hooks/redux';
-import { useScreenSize } from '../../../hooks/screen';
 import { useCurrency, useDisplayValues } from '../../../hooks/displayValues';
 import { useLightningBalance } from '../../../hooks/lightning';
 import { receiveSelector } from '../../../store/reselect/receive';
@@ -28,7 +26,7 @@ const ReceiveConnect = ({
 	navigation,
 }: ReceiveScreenProps<'ReceiveConnect'>): ReactElement => {
 	const { t } = useTranslation('wallet');
-	const { isSmallScreen } = useScreenSize();
+	// const { isSmallScreen } = useScreenSize();
 	const { fiatSymbol } = useCurrency();
 	const lightningBalance = useLightningBalance(true);
 	const [feeEstimate, setFeeEstimate] = useState(0);
@@ -79,15 +77,15 @@ const ReceiveConnect = ({
 	};
 
 	const isInitial = lightningBalance.localBalance === 0;
-	const imageSize = isSmallScreen ? 130 : 192;
+	// const imageSize = isSmallScreen ? 130 : 192;
 
 	return (
 		<GradientView style={styles.container}>
-			<BottomSheetNavigationHeader title={t('receive_instantly')} />
+			<BottomSheetNavigationHeader title={t('receive_bitcoin')} />
 			<View style={styles.content}>
-				<AmountToggle sats={amount} reverse={true} space={12} />
+				<AmountToggle amount={amount} />
 
-				<Text01S style={styles.text} color="gray1">
+				<BodyM style={styles.text} color="white50">
 					<Trans
 						t={t}
 						i18nKey={
@@ -95,13 +93,13 @@ const ReceiveConnect = ({
 								? 'receive_connect_initial'
 								: 'receive_connect_additional'
 						}
-						components={{ highlight: <Text01B color="white" /> }}
+						components={{ accent: <BodyMB color="white" /> }}
 						values={{ lspFee: `${fiatSymbol}${displayFee.fiatFormatted}` }}
 					/>
-				</Text01S>
+				</BodyM>
 
 				<View style={styles.payAmount}>
-					<Caption13Up style={styles.payAmountText} color="gray1">
+					<Caption13Up style={styles.payAmountText} color="white50">
 						{t('receive_will')}
 					</Caption13Up>
 					<Money
@@ -112,7 +110,9 @@ const ReceiveConnect = ({
 					/>
 				</View>
 
-				<GlowImage image={imageSrc} glowColor="purple" imageSize={imageSize} />
+				<View style={styles.imageContainer}>
+					<Image style={styles.image} source={imageSrc} />
+				</View>
 
 				<View style={styles.buttonContainer}>
 					<Button
@@ -146,6 +146,18 @@ const styles = StyleSheet.create({
 	payAmountText: {
 		marginBottom: 5,
 	},
+	imageContainer: {
+		flexShrink: 1,
+		alignSelf: 'center',
+		alignItems: 'center',
+		width: 256,
+		aspectRatio: 1,
+		marginTop: 'auto',
+	},
+	image: {
+		flex: 1,
+		resizeMode: 'contain',
+	},
 	buttonContainer: {
 		marginTop: 'auto',
 	},
diff --git a/src/screens/Wallets/Receive/ReceiveDetails.tsx b/src/screens/Wallets/Receive/ReceiveDetails.tsx
index ac97cbb60..08fce5cb3 100644
--- a/src/screens/Wallets/Receive/ReceiveDetails.tsx
+++ b/src/screens/Wallets/Receive/ReceiveDetails.tsx
@@ -5,7 +5,7 @@ import React, {
 	useState,
 	useEffect,
 } from 'react';
-import { StyleSheet, View } from 'react-native';
+import { Image, StyleSheet, View } from 'react-native';
 import { FadeIn, FadeOut } from 'react-native-reanimated';
 import { useTranslation } from 'react-i18next';
 
@@ -25,7 +25,6 @@ import ReceiveNumberPad from './ReceiveNumberPad';
 import UnitButton from '../UnitButton';
 import { ReceiveScreenProps } from '../../../navigation/types';
 import { receiveSelector } from '../../../store/reselect/receive';
-import GlowImage from '../../../components/GlowImage';
 import { useScreenSize } from '../../../hooks/screen';
 import { getNumberPadText } from '../../../utils/numberpad';
 import { useSwitchUnit } from '../../../hooks/wallet';
@@ -43,7 +42,7 @@ import {
 	nextUnitSelector,
 } from '../../../store/reselect/settings';
 
-const imageSrc = require('../../../assets/illustrations/coin-stack-4.png');
+const imageSrc = require('../../../assets/illustrations/coin-stack.png');
 
 // hardcoded to be above fee (1092)
 // TODO: fee is dynamic so this should be fetched from the API
@@ -172,7 +171,7 @@ const ReceiveDetails = ({
 				{!showNumberPad && (
 					<>
 						<View style={styles.inputContainer}>
-							<Caption13Up style={styles.label} color="gray1">
+							<Caption13Up style={styles.label} color="white50">
 								{t('note')}
 							</Caption13Up>
 							<View style={styles.inputWrapper}>
@@ -200,7 +199,7 @@ const ReceiveDetails = ({
 								color="transparent"
 								entering={FadeIn}
 								exiting={FadeOut}>
-								<Caption13Up style={styles.label} color="gray1">
+								<Caption13Up style={styles.label} color="white50">
 									{t('tags')}
 								</Caption13Up>
 								<View style={styles.tagsContainer}>
@@ -226,11 +225,9 @@ const ReceiveDetails = ({
 								</View>
 
 								{!isSmallScreen && (
-									<GlowImage
-										style={styles.image}
-										image={imageSrc}
-										glowColor="white30"
-									/>
+									<View style={styles.imageContainer}>
+										<Image style={styles.image} source={imageSrc} />
+									</View>
 								)}
 							</AnimatedView>
 						)}
@@ -331,13 +328,23 @@ const styles = StyleSheet.create({
 		marginRight: 8,
 		marginBottom: 8,
 	},
-	image: {
+	imageContainer: {
+		alignSelf: 'center',
+		alignItems: 'center',
+		width: 256,
+		aspectRatio: 1,
+		marginTop: 'auto',
 		position: 'absolute',
-		bottom: 0,
-		left: 0,
-		right: 0,
+		// bottom: 0,
+		bottom: -30,
+		// left: 0,
+		// right: 0,
 		zIndex: -1,
 	},
+	image: {
+		flex: 1,
+		resizeMode: 'contain',
+	},
 	buttonContainer: {
 		marginTop: 'auto',
 	},
diff --git a/src/screens/Wallets/Receive/ReceiveQR.tsx b/src/screens/Wallets/Receive/ReceiveQR.tsx
index bb475eb1e..5a9fe0344 100644
--- a/src/screens/Wallets/Receive/ReceiveQR.tsx
+++ b/src/screens/Wallets/Receive/ReceiveQR.tsx
@@ -36,7 +36,7 @@ import {
 	ShareIcon,
 	UnifiedIcon,
 } from '../../../styles/icons';
-import { Caption13Up, Text01S, Text02S, Title } from '../../../styles/text';
+import { Caption13Up, BodyM, BodyS, Headline } from '../../../styles/text';
 import { createLightningInvoice } from '../../../store/utils/lightning';
 import { updatePendingInvoice } from '../../../store/slices/metadata';
 import { generateNewReceiveAddress } from '../../../store/actions/wallet';
@@ -48,6 +48,7 @@ import { waitForLdk } from '../../../utils/lightning';
 import { getUnifiedUri } from '../../../utils/receive';
 import { ellipsis, sleep } from '../../../utils/helpers';
 import { getReceiveAddress } from '../../../utils/wallet';
+import GradientView from '../../../components/GradientView';
 import BottomSheetNavigationHeader from '../../../components/BottomSheetNavigationHeader';
 import SafeAreaInset from '../../../components/SafeAreaInset';
 import Button from '../../../components/Button';
@@ -353,7 +354,7 @@ const ReceiveQR = ({
 							{enableInstant ? (
 								<UnifiedIcon width={50} height={50} />
 							) : (
-								<BitcoinCircleIcon color="bitcoin" width={50} height={50} />
+								<BitcoinCircleIcon width={50} height={50} />
 							)}
 						</>
 					)}
@@ -399,7 +400,6 @@ const ReceiveQR = ({
 						testID="SpecifyInvoiceButton"
 						onPress={onEdit}
 					/>
-					<View style={styles.buttonSpacer} />
 					<Button
 						style={styles.actionButton}
 						color="white10"
@@ -408,7 +408,6 @@ const ReceiveQR = ({
 						testID="ReceiveCopyQR"
 						onPress={(): void => onCopy(uri, 'unified')}
 					/>
-					<View style={styles.buttonSpacer} />
 					<Button
 						style={styles.actionButton}
 						color="white10"
@@ -452,20 +451,20 @@ const ReceiveQR = ({
 			<View style={styles.slide}>
 				<ThemedView style={styles.invoices} color="white06">
 					{(!jitInvoice || !enableInstant) && (
-						<View style={styles.invoice} testID="ReceiveOnchainInvoice">
+						<View testID="ReceiveOnchainInvoice">
 							<View style={styles.invoiceLabel}>
-								<Caption13Up color="gray1">
+								<Caption13Up color="white50">
 									{t('receive_bitcoin_invoice')}
 								</Caption13Up>
 								<BitcoinSlantedIcon
 									style={styles.invoiceLabelIcon}
-									color="gray1"
+									color="white50"
 									height={14}
 									width={20}
 								/>
 							</View>
 							<View style={styles.invoiceText}>
-								<Text02S>{ellipsis(receiveAddress, 25)}</Text02S>
+								<BodyS>{ellipsis(receiveAddress, 25)}</BodyS>
 								{showTooltip.onchain && (
 									<AnimatedView
 										style={styles.tooltip}
@@ -485,7 +484,6 @@ const ReceiveQR = ({
 										onCopy(receiveAddress, 'onchain');
 									}}
 								/>
-								<View style={styles.buttonSpacer} />
 								<Button
 									style={styles.actionButton}
 									color="white10"
@@ -503,24 +501,24 @@ const ReceiveQR = ({
 					{enableInstant && lInvoice !== '' && (
 						<>
 							{!jitInvoice && <View style={styles.divider} />}
-							<View style={styles.invoice}>
+							<View>
 								<View style={styles.invoiceLabel}>
-									<Caption13Up color="gray1">
+									<Caption13Up color="white50">
 										{t('receive_lightning_invoice')}
 									</Caption13Up>
 									<LightningIcon
 										style={styles.invoiceLabelIcon}
-										color="gray1"
+										color="white50"
 										height={14}
 										width={15}
 									/>
 								</View>
 								<View style={styles.invoiceText}>
-									<Text02S
+									<BodyS
 										testID="ReceiveLightningInvoice"
 										accessibilityLabel={lInvoice}>
 										{ellipsis(lInvoice, 33)}
-									</Text02S>
+									</BodyS>
 									{showTooltip.lightning && (
 										<AnimatedView
 											style={styles.tooltip}
@@ -540,7 +538,6 @@ const ReceiveQR = ({
 											onCopy(lInvoice, 'lightning');
 										}}
 									/>
-									<View style={styles.buttonSpacer} />
 									<Button
 										style={styles.actionButton}
 										color="white10"
@@ -573,7 +570,7 @@ const ReceiveQR = ({
 	const slides = useMemo((): Slide[] => [Slide1, Slide2], [Slide1, Slide2]);
 
 	return (
-		<View style={styles.container}>
+		<GradientView style={styles.container}>
 			<BottomSheetNavigationHeader
 				title={t('receive_bitcoin')}
 				displayBackButton={false}
@@ -592,8 +589,9 @@ const ReceiveQR = ({
 						style={styles.carousel}
 						data={slides}
 						width={dimensions.width}
-						height={qrMaxHeight + 80}
+						height={qrMaxHeight + 64}
 						loop={false}
+						scrollAnimationDuration={100}
 						panGestureHandlerProps={{ activeOffsetX: [-10, 10] }}
 						testID="ReceiveSlider"
 						renderItem={({ index }): ReactElement => {
@@ -620,28 +618,27 @@ const ReceiveQR = ({
 			{displayReceiveInstantlySwitch && (
 				<View style={styles.buttonContainer}>
 					{!enableInstant && (
-						<Title style={styles.textLNfunds}>
+						<Headline>
 							<Trans
 								t={t}
 								i18nKey="receive_text_lnfunds"
-								components={{
-									purpleText: <Title color="purple" />,
-								}}
+								components={{ accent: <Headline color="purple" /> }}
 							/>
-						</Title>
+						</Headline>
 					)}
 					<SwitchRow
+						style={styles.switchRow}
 						color="purple"
 						isEnabled={enableInstant}
 						showDivider={false}
 						onPress={onToggleInstant}>
-						{!enableInstant && <ArrowLNFunds color="gray1" />}
-						<Text01S>{t('receive_instantly')}</Text01S>
+						{!enableInstant && <ArrowLNFunds color="white50" />}
+						<BodyM>{t('receive_spending')}</BodyM>
 					</SwitchRow>
 				</View>
 			)}
 			<SafeAreaInset type="bottom" minPadding={16} />
-		</View>
+		</GradientView>
 	);
 };
 
@@ -668,7 +665,7 @@ const styles = StyleSheet.create({
 		position: 'relative',
 		justifyContent: 'center',
 		alignItems: 'center',
-		marginBottom: 32,
+		marginBottom: 16,
 		overflow: 'hidden',
 	},
 	qrIconContainer: {
@@ -684,20 +681,17 @@ const styles = StyleSheet.create({
 	actions: {
 		flexDirection: 'row',
 		alignItems: 'center',
+		gap: 16,
 	},
 	actionButton: {
 		paddingHorizontal: 16,
 		minWidth: 0,
 	},
-	buttonSpacer: {
-		width: 16,
-	},
 	invoices: {
 		borderRadius: 9,
 		padding: 32,
 		width: '100%',
 	},
-	invoice: {},
 	invoiceLabel: {
 		flexDirection: 'row',
 		alignItems: 'center',
@@ -734,9 +728,8 @@ const styles = StyleSheet.create({
 		paddingHorizontal: 16,
 		marginTop: 'auto',
 	},
-	textLNfunds: {
-		marginBottom: 10,
-		width: '60%',
+	switchRow: {
+		paddingVertical: 0,
 	},
 });
 
diff --git a/src/screens/Wallets/Receive/Tags.tsx b/src/screens/Wallets/Receive/Tags.tsx
index 4f84fea6e..13cdb5fb7 100644
--- a/src/screens/Wallets/Receive/Tags.tsx
+++ b/src/screens/Wallets/Receive/Tags.tsx
@@ -45,7 +45,7 @@ const Tags = ({ navigation }: ReceiveScreenProps<'Tags'>): ReactElement => {
 			<View style={styles.content}>
 				{lastUsedTags.length !== 0 && (
 					<>
-						<Caption13Up color="gray1" style={styles.section}>
+						<Caption13Up color="white50" style={styles.section}>
 							{t('tags_previously')}
 						</Caption13Up>
 						<View style={styles.tagsContainer}>
@@ -62,7 +62,7 @@ const Tags = ({ navigation }: ReceiveScreenProps<'Tags'>): ReactElement => {
 						</View>
 					</>
 				)}
-				<Caption13Up color="gray1" style={styles.section}>
+				<Caption13Up color="white50" style={styles.section}>
 					{t('tags_new')}
 				</Caption13Up>
 				<BottomSheetTextInput
diff --git a/src/screens/Wallets/Send/Address.tsx b/src/screens/Wallets/Send/Address.tsx
index 87380405b..9822deb6e 100644
--- a/src/screens/Wallets/Send/Address.tsx
+++ b/src/screens/Wallets/Send/Address.tsx
@@ -67,7 +67,7 @@ const Address = ({}: SendScreenProps<'Address'>): ReactElement => {
 		<GradientView style={styles.container}>
 			<BottomSheetNavigationHeader title={t('send_bitcoin')} />
 			<View style={styles.content}>
-				<Caption13Up color="gray1" style={styles.label} testID="Caption">
+				<Caption13Up color="white50" style={styles.label} testID="Caption">
 					{t('send_to')}
 				</Caption13Up>
 
diff --git a/src/screens/Wallets/Send/Amount.tsx b/src/screens/Wallets/Send/Amount.tsx
index 63419d8b6..f0aea0732 100644
--- a/src/screens/Wallets/Send/Amount.tsx
+++ b/src/screens/Wallets/Send/Amount.tsx
@@ -261,15 +261,15 @@ const Amount = ({ navigation }: SendScreenProps<'Amount'>): ReactElement => {
 			/>
 			<View style={styles.content}>
 				<NumberPadTextField
-					onPress={onChangeUnit}
 					value={text}
 					testID="SendNumberField"
+					onPress={onChangeUnit}
 				/>
 
 				<View style={styles.numberPad} testID="SendAmountNumberPad">
 					<View style={styles.actions}>
 						<View>
-							<Caption13Up style={styles.availableAmountText} color="gray1">
+							<Caption13Up style={styles.availableAmountText} color="white50">
 								{t(
 									transaction.lightningInvoice
 										? 'send_availabe_spending'
@@ -278,7 +278,7 @@ const Amount = ({ navigation }: SendScreenProps<'Amount'>): ReactElement => {
 							</Caption13Up>
 							<Money
 								sats={availableAmount}
-								size="text02m"
+								size="bodySSB"
 								testID="AvailableAmount"
 								symbol={true}
 								{...availableAmountProps}
@@ -291,14 +291,7 @@ const Amount = ({ navigation }: SendScreenProps<'Amount'>): ReactElement => {
 									color="white10"
 									testID="SendNumberPadMax"
 									onPress={onMaxAmount}>
-									<Caption13Up
-										color={
-											isMaxSendAmount || transaction?.lightningInvoice
-												? 'orange'
-												: 'brand'
-										}>
-										{t('send_max')}
-									</Caption13Up>
+									<Caption13Up color="brand">{t('send_max')}</Caption13Up>
 								</TouchableOpacity>
 							</View>
 
@@ -371,7 +364,7 @@ const styles = StyleSheet.create({
 	},
 	actionButton: {
 		marginLeft: 16,
-		paddingVertical: 7,
+		paddingVertical: 5,
 		paddingHorizontal: 8,
 		borderRadius: 8,
 		flexDirection: 'row',
diff --git a/src/screens/Wallets/Send/AutoRebalance.tsx b/src/screens/Wallets/Send/AutoRebalance.tsx
index 49627bc66..6dcd55b06 100644
--- a/src/screens/Wallets/Send/AutoRebalance.tsx
+++ b/src/screens/Wallets/Send/AutoRebalance.tsx
@@ -1,14 +1,13 @@
 // TODO: screen currently unused
 
 import React, { memo, ReactElement, useMemo } from 'react';
-import { StyleSheet, View } from 'react-native';
+import { Image, StyleSheet, View } from 'react-native';
 import { useSafeAreaInsets } from 'react-native-safe-area-context';
 
 import BottomSheetNavigationHeader from '../../../components/BottomSheetNavigationHeader';
 import GradientView from '../../../components/GradientView';
-import GlowImage from '../../../components/GlowImage';
 import Button from '../../../components/Button';
-import { Text01S } from '../../../styles/text';
+import { BodyM } from '../../../styles/text';
 import { useAppDispatch } from '../../../hooks/redux';
 import { closeSheet } from '../../../store/slices/ui';
 import type { SendScreenProps } from '../../../navigation/types';
@@ -44,12 +43,14 @@ const AutoRebalance = ({
 		<GradientView style={styles.container}>
 			<BottomSheetNavigationHeader title="Auto Rebalance?" />
 
-			<Text01S color="gray1" style={styles.text}>
+			<BodyM color="white50" style={styles.text}>
 				You don’t have enough instant spending balance for this transaction.
 				Would you like Bitkit to rebalance automatically?
-			</Text01S>
+			</BodyM>
 
-			<GlowImage image={imageSrc} glowColor="green" />
+			<View style={styles.imageContainer}>
+				<Image style={styles.image} source={imageSrc} />
+			</View>
 
 			<View style={buttonContainer}>
 				<Button
@@ -59,7 +60,6 @@ const AutoRebalance = ({
 					text="No, Cancel"
 					onPress={onCancel}
 				/>
-				<View style={styles.divider} />
 				<Button
 					style={styles.button2}
 					size="large"
@@ -78,10 +78,24 @@ const styles = StyleSheet.create({
 	text: {
 		paddingHorizontal: 32,
 	},
+	imageContainer: {
+		flexShrink: 1,
+		justifyContent: 'center',
+		alignItems: 'center',
+		alignSelf: 'center',
+		width: 256,
+		aspectRatio: 1,
+		marginTop: 'auto',
+	},
+	image: {
+		flex: 1,
+		resizeMode: 'contain',
+	},
 	buttonContainer: {
 		flexDirection: 'row',
 		paddingHorizontal: 16,
 		marginTop: 'auto',
+		gap: 16,
 	},
 	button1: {
 		flex: 1,
@@ -89,9 +103,6 @@ const styles = StyleSheet.create({
 	button2: {
 		flex: 2,
 	},
-	divider: {
-		width: 16,
-	},
 });
 
 export default memo(AutoRebalance);
diff --git a/src/screens/Wallets/Send/CoinSelection.tsx b/src/screens/Wallets/Send/CoinSelection.tsx
index 020d4c8ba..bb10bb3ee 100644
--- a/src/screens/Wallets/Send/CoinSelection.tsx
+++ b/src/screens/Wallets/Send/CoinSelection.tsx
@@ -4,7 +4,7 @@ import { BottomSheetScrollView } from '@gorhom/bottom-sheet';
 import { useTranslation } from 'react-i18next';
 
 import { ScrollView, Switch } from '../../../styles/components';
-import { Subtitle, Text01M, Text02M, Caption13Up } from '../../../styles/text';
+import { Subtitle, BodyMSB, BodySSB, Caption13Up } from '../../../styles/text';
 import GradientView from '../../../components/GradientView';
 import BottomSheetNavigationHeader from '../../../components/BottomSheetNavigationHeader';
 import SafeAreaInset from '../../../components/SafeAreaInset';
@@ -51,16 +51,16 @@ const UtxoRow = ({
 	onPress: () => void;
 }): ReactElement => {
 	const displayValue = useDisplayValues(item.value);
-	const { gray4 } = useColors();
+	const { white10 } = useColors();
 	const tags = useAppSelector((store) => store.metadata.tags[item.tx_hash]);
 
 	return (
-		<View style={[styles.coinRoot, { borderBottomColor: gray4 }]}>
+		<View style={[styles.coinRoot, { borderBottomColor: white10 }]}>
 			<View>
-				<Text01M>{displayValue.bitcoinFormatted}</Text01M>
-				<Text02M color="gray">
+				<BodyMSB>{displayValue.bitcoinFormatted}</BodyMSB>
+				<BodySSB color="white50">
 					{displayValue.fiatSymbol} {displayValue.fiatFormatted}
-				</Text02M>
+				</BodySSB>
 			</View>
 
 			{tags && (
@@ -83,7 +83,7 @@ const CoinSelection = ({
 	navigation,
 }: SendScreenProps<'CoinSelection'>): ReactElement => {
 	const { t } = useTranslation('wallet');
-	const { gray4 } = useColors();
+	const { white10 } = useColors();
 
 	const transaction = useAppSelector(transactionSelector);
 	const utxos = useAppSelector(utxosSelector);
@@ -178,10 +178,10 @@ const CoinSelection = ({
 			<BottomSheetNavigationHeader title={t('selection_title')} />
 			<View style={styles.content}>
 				<BottomSheetScrollView style={styles.scroll}>
-					<View style={[styles.coinRoot, { borderBottomColor: gray4 }]}>
+					<View style={[styles.coinRoot, { borderBottomColor: white10 }]}>
 						<View style={styles.coinAmount}>
-							<Text01M>{t('selection_auto')}</Text01M>
-							<Text02M color="gray">{preference}</Text02M>
+							<BodyMSB>{t('selection_auto')}</BodyMSB>
+							<BodySSB color="white50">{preference}</BodySSB>
 						</View>
 						<Switch
 							value={autoSelectionEnabled}
@@ -219,15 +219,15 @@ const CoinSelection = ({
 						style={[
 							styles.totalRow,
 							styles.totalBorder,
-							{ borderBottomColor: gray4 },
+							{ borderBottomColor: white10 },
 						]}>
-						<Caption13Up color="gray1">
+						<Caption13Up color="white50">
 							{t('selection_total_required')}
 						</Caption13Up>
 						<Subtitle>{txOutputDV.bitcoinFormatted}</Subtitle>
 					</View>
 					<View style={styles.totalRow}>
-						<Caption13Up color="gray1">
+						<Caption13Up color="white50">
 							{t('selection_total_selected')}
 						</Caption13Up>
 						<Subtitle color="green">{txInputDV.bitcoinFormatted}</Subtitle>
diff --git a/src/screens/Wallets/Send/FeeCustom.tsx b/src/screens/Wallets/Send/FeeCustom.tsx
index 05636c529..48d2a4a12 100644
--- a/src/screens/Wallets/Send/FeeCustom.tsx
+++ b/src/screens/Wallets/Send/FeeCustom.tsx
@@ -2,7 +2,7 @@ import React, { ReactElement, memo, useMemo, useState, useEffect } from 'react';
 import { StyleSheet, View } from 'react-native';
 import { useTranslation } from 'react-i18next';
 
-import { Caption13Up, Text01S } from '../../../styles/text';
+import { Caption13Up, BodyM } from '../../../styles/text';
 import BottomSheetNavigationHeader from '../../../components/BottomSheetNavigationHeader';
 import SafeAreaInset from '../../../components/SafeAreaInset';
 import GradientView from '../../../components/GradientView';
@@ -90,15 +90,15 @@ const FeeCustom = ({
 		<GradientView style={styles.container}>
 			<BottomSheetNavigationHeader title={t('send_fee_custom')} />
 			<View style={styles.content}>
-				<Caption13Up color="gray1" style={styles.title}>
+				<Caption13Up color="white50" style={styles.title}>
 					{t('sat_vbyte')}
 				</Caption13Up>
 				<Amount value={feeRate} />
 
 				{isValid && (
-					<Text01S style={styles.text} color="white50">
+					<BodyM style={styles.text} color="white50">
 						{totalFeeText}
-					</Text01S>
+					</BodyM>
 				)}
 
 				<NumberPad style={styles.numberPad} type="simple" onPress={onPress} />
diff --git a/src/screens/Wallets/Send/FeeItem.tsx b/src/screens/Wallets/Send/FeeItem.tsx
index d399def01..a1e87ceed 100644
--- a/src/screens/Wallets/Send/FeeItem.tsx
+++ b/src/screens/Wallets/Send/FeeItem.tsx
@@ -7,9 +7,8 @@ import {
 } from 'react-native';
 import { useTranslation } from 'react-i18next';
 
-import { Text01M, Text02M } from '../../../styles/text';
+import { BodyMSB, BodySSB } from '../../../styles/text';
 import {
-	BitcoinIcon,
 	SettingsIcon,
 	SpeedFastIcon,
 	SpeedNormalIcon,
@@ -47,7 +46,7 @@ const FeeItem = ({
 			case EFeeId.slow:
 				return <SpeedSlowIcon color="brand" />;
 			case EFeeId.custom:
-				return <SettingsIcon color="gray1" width={32} height={32} />;
+				return <SettingsIcon color="white50" width={32} height={32} />;
 		}
 	}, [id]);
 
@@ -64,20 +63,21 @@ const FeeItem = ({
 
 				<View style={styles.row}>
 					<View style={styles.cell}>
-						<Text01M>{title}</Text01M>
+						<BodyMSB>{title}</BodyMSB>
 						{sats !== 0 && (
 							<View style={styles.sats}>
-								<BitcoinIcon height={14} width={16} color="gray1" />
-								<Text01M>{sats}</Text01M>
+								<BodyMSB>
+									<BodyMSB color="white50">₿</BodyMSB> {sats}
+								</BodyMSB>
 							</View>
 						)}
 					</View>
 					<View style={styles.cell}>
-						<Text02M color="gray1">{description}</Text02M>
+						<BodySSB color="white50">{description}</BodySSB>
 						{sats !== 0 && (
-							<Text02M color="gray1">
+							<BodySSB color="white50">
 								{totalFeeDisplay.fiatSymbol} {totalFeeDisplay.fiatFormatted}
-							</Text02M>
+							</BodySSB>
 						)}
 					</View>
 				</View>
diff --git a/src/screens/Wallets/Send/FeeRate.tsx b/src/screens/Wallets/Send/FeeRate.tsx
index 0f4bc7730..b6a323fa9 100644
--- a/src/screens/Wallets/Send/FeeRate.tsx
+++ b/src/screens/Wallets/Send/FeeRate.tsx
@@ -160,7 +160,7 @@ const FeeRate = ({ navigation }: SendScreenProps<'FeeRate'>): ReactElement => {
 		<GradientView style={styles.container}>
 			<BottomSheetNavigationHeader title={t('send_fee_speed')} />
 			<View style={styles.content}>
-				<Caption13Up color="gray1" style={styles.title}>
+				<Caption13Up color="white50" style={styles.title}>
 					{t('send_fee_and_speed')}
 				</Caption13Up>
 
diff --git a/src/screens/Wallets/Send/Pending.tsx b/src/screens/Wallets/Send/Pending.tsx
index 19a80f25f..809f1149a 100644
--- a/src/screens/Wallets/Send/Pending.tsx
+++ b/src/screens/Wallets/Send/Pending.tsx
@@ -2,7 +2,7 @@ import React, { memo, ReactElement } from 'react';
 import { StyleSheet, View } from 'react-native';
 import { useTranslation } from 'react-i18next';
 
-import { Text01S } from '../../../styles/text';
+import { BodyM } from '../../../styles/text';
 import BottomSheetNavigationHeader from '../../../components/BottomSheetNavigationHeader';
 import AmountToggle from '../../../components/AmountToggle';
 import SafeAreaInset from '../../../components/SafeAreaInset';
@@ -48,19 +48,17 @@ const Pending = ({ route }: SendScreenProps<'Pending'>): ReactElement => {
 			<View style={styles.content}>
 				{activityItem && (
 					<AmountToggle
-						sats={activityItem.value}
-						reverse={true}
-						space={12}
+						amount={activityItem.value}
 						testID="NewTxPrompt"
 						onPress={navigateToTxDetails}
 					/>
 				)}
 
-				<HourglassSpinner imageSize={200} glowColor="purple" />
-
-				<Text01S style={styles.note} color="gray1">
+				<BodyM style={styles.text} color="white50">
 					{t('send_pending_note')}
-				</Text01S>
+				</BodyM>
+
+				<HourglassSpinner />
 
 				<View style={styles.buttonContainer}>
 					<Button
@@ -71,7 +69,6 @@ const Pending = ({ route }: SendScreenProps<'Pending'>): ReactElement => {
 						text={t('send_details')}
 						onPress={navigateToTxDetails}
 					/>
-					<View style={styles.divider} />
 					<Button
 						style={styles.button}
 						size="large"
@@ -94,20 +91,18 @@ const styles = StyleSheet.create({
 		flex: 1,
 		paddingHorizontal: 16,
 	},
-	note: {
-		marginBottom: 32,
+	text: {
+		marginTop: 16,
 	},
 	buttonContainer: {
 		flexDirection: 'row',
 		justifyContent: 'center',
 		marginTop: 'auto',
+		gap: 16,
 	},
 	button: {
 		flex: 1,
 	},
-	divider: {
-		width: 16,
-	},
 });
 
 export default memo(Pending);
diff --git a/src/screens/Wallets/Send/PinCheck.tsx b/src/screens/Wallets/Send/PinCheck.tsx
index defe67db6..40b5702a2 100644
--- a/src/screens/Wallets/Send/PinCheck.tsx
+++ b/src/screens/Wallets/Send/PinCheck.tsx
@@ -4,7 +4,7 @@ import { useTranslation } from 'react-i18next';
 
 import BottomSheetNavigationHeader from '../../../components/BottomSheetNavigationHeader';
 import GradientView from '../../../components/GradientView';
-import { Text01S } from '../../../styles/text';
+import { BodyM } from '../../../styles/text';
 import PinPad from './SendPinPad';
 import type { SendScreenProps } from '../../../navigation/types';
 
@@ -16,9 +16,9 @@ const PinCheck = ({ route }: SendScreenProps<'PinCheck'>): ReactElement => {
 		<GradientView style={styles.container}>
 			<BottomSheetNavigationHeader title="Enter PIN Code" />
 			<View style={styles.content}>
-				<Text01S style={styles.text} color="white50">
+				<BodyM style={styles.text} color="white50">
 					{t('pin_send')}
-				</Text01S>
+				</BodyM>
 
 				<PinPad onSuccess={(): void => onSuccess()} />
 			</View>
diff --git a/src/screens/Wallets/Send/Recipient.tsx b/src/screens/Wallets/Send/Recipient.tsx
index 15321d175..a05596b13 100644
--- a/src/screens/Wallets/Send/Recipient.tsx
+++ b/src/screens/Wallets/Send/Recipient.tsx
@@ -1,10 +1,10 @@
 import React, { ReactElement, memo } from 'react';
-import { StyleSheet, View } from 'react-native';
+import { View, Image, StyleSheet } from 'react-native';
 import Clipboard from '@react-native-clipboard/clipboard';
 import { useTranslation } from 'react-i18next';
 
 import { Pressable } from '../../../styles/components';
-import { Caption13Up, Text01M } from '../../../styles/text';
+import { Caption13Up, BodyMSB } from '../../../styles/text';
 import {
 	UsersIcon,
 	PencileIcon,
@@ -15,7 +15,6 @@ import { useSlashtagsSDK } from '../../../components/SlashtagsProvider';
 import BottomSheetNavigationHeader from '../../../components/BottomSheetNavigationHeader';
 import SafeAreaInset from '../../../components/SafeAreaInset';
 import ContactImage from '../../../components/ContactImage';
-import GlowImage from '../../../components/GlowImage';
 import { processInputData } from '../../../utils/scanner';
 import { showToast } from '../../../utils/notifications';
 import { useAppSelector } from '../../../hooks/redux';
@@ -49,7 +48,7 @@ const Button = ({
 		testID={testID}
 		onPress={onPress}>
 		<View style={styles.buttonIcon}>{icon}</View>
-		<Text01M color="white">{text}</Text01M>
+		<BodyMSB color="white">{text}</BodyMSB>
 		<View style={styles.buttonActions}>{actions}</View>
 	</Pressable>
 );
@@ -117,7 +116,7 @@ const Recipient = ({
 				displayBackButton={false}
 			/>
 			<View style={styles.content}>
-				<Caption13Up color="gray1" style={styles.label} testID="Caption">
+				<Caption13Up color="white50" style={styles.label} testID="Caption">
 					{t('send_to')}
 				</Caption13Up>
 
@@ -162,8 +161,8 @@ const Recipient = ({
 
 				{!isSmallScreen && (
 					<View style={styles.bottom}>
-						<View style={styles.image}>
-							<GlowImage image={imageSrc} glowColor="white30" />
+						<View style={styles.imageContainer}>
+							<Image style={styles.image} source={imageSrc} />
 						</View>
 					</View>
 				)}
@@ -193,14 +192,23 @@ const styles = StyleSheet.create({
 		marginLeft: 16,
 	},
 	bottom: {
+		// backgroundColor: 'red',
 		position: 'relative',
 		marginTop: 'auto',
 		flex: 1,
 		justifyContent: 'flex-end',
 	},
+	imageContainer: {
+		alignItems: 'center',
+		alignSelf: 'center',
+		marginTop: 'auto',
+		aspectRatio: 1,
+		width: 256,
+		zIndex: -1,
+	},
 	image: {
 		flex: 1,
-		zIndex: -1,
+		resizeMode: 'contain',
 	},
 	button: {
 		flexDirection: 'row',
diff --git a/src/screens/Wallets/Send/Result.tsx b/src/screens/Wallets/Send/Result.tsx
index da21e254d..b1fbcb565 100644
--- a/src/screens/Wallets/Send/Result.tsx
+++ b/src/screens/Wallets/Send/Result.tsx
@@ -1,13 +1,12 @@
 import React, { memo, ReactElement, useState } from 'react';
-import { StyleSheet, View, ActivityIndicator } from 'react-native';
+import { StyleSheet, View, ActivityIndicator, Image } from 'react-native';
 import Lottie from 'lottie-react-native';
 import { useTranslation } from 'react-i18next';
 
-import { Subtitle, Text01S } from '../../../styles/text';
+import { Subtitle, BodyM } from '../../../styles/text';
 import BottomSheetNavigationHeader from '../../../components/BottomSheetNavigationHeader';
 import SafeAreaInset from '../../../components/SafeAreaInset';
 import GradientView from '../../../components/GradientView';
-import GlowImage from '../../../components/GlowImage';
 import Button from '../../../components/Button';
 import { rootNavigation } from '../../../navigation/root/RootNavigator';
 import { useAppDispatch, useAppSelector } from '../../../hooks/redux';
@@ -50,7 +49,6 @@ const Result = ({
 
 	let imageSrc;
 	let title;
-	let glowColor;
 	let retryText;
 	let error;
 
@@ -59,12 +57,10 @@ const Result = ({
 	if (success) {
 		imageSrc = require('../../../assets/illustrations/check.png');
 		title = t('send_sent');
-		glowColor = 'green';
 		error = <></>;
 	} else if (transaction.lightningInvoice && transaction.slashTagsUrl) {
 		imageSrc = require('../../../assets/illustrations/exclamation-mark.png');
 		title = t('send_instant_failed');
-		glowColor = 'yellow';
 		retryText = loading ? (
 			<>
 				<ActivityIndicator />
@@ -73,11 +69,10 @@ const Result = ({
 		) : (
 			t('send_regular')
 		);
-		error = <Text01S color="gray1">{t('send_error_slash_ln')}</Text01S>;
+		error = <BodyM color="white50">{t('send_error_slash_ln')}</BodyM>;
 	} else {
 		imageSrc = require('../../../assets/illustrations/cross.png');
 		title = t('send_error_tx_failed');
-		glowColor = 'red';
 		retryText = t('try_again');
 		error = (
 			<>
@@ -86,7 +81,7 @@ const Result = ({
 						{errorTitle}
 					</Subtitle>
 				)}
-				{errorMessage && <Text01S color="red">{errorMessage}</Text01S>}
+				{errorMessage && <BodyM color="red">{errorMessage}</BodyM>}
 			</>
 		);
 	}
@@ -146,16 +141,16 @@ const Result = ({
 	};
 
 	return (
-		<GradientView style={styles.container}>
+		<GradientView style={styles.root}>
 			<>
 				{success && (
 					<View
-						testID="SendSuccess"
 						style={styles.confetti}
-						pointerEvents="none">
+						pointerEvents="none"
+						testID="SendSuccess">
 						<Lottie
-							source={confettiSrc}
 							style={styles.lottie}
+							source={confettiSrc}
 							resizeMode="cover"
 							autoPlay
 							loop
@@ -169,9 +164,7 @@ const Result = ({
 			<View style={styles.content}>
 				{activityItem && (
 					<AmountToggle
-						sats={activityItem.value}
-						reverse={true}
-						space={12}
+						amount={activityItem.value}
 						testID="NewTxPrompt"
 						onPress={navigateToTxDetails}
 					/>
@@ -179,7 +172,9 @@ const Result = ({
 
 				{error}
 
-				<GlowImage image={imageSrc} imageSize={200} glowColor={glowColor} />
+				<View style={styles.imageContainer}>
+					<Image style={styles.image} source={imageSrc} />
+				</View>
 
 				<View style={styles.buttonContainer}>
 					{success ? (
@@ -192,7 +187,6 @@ const Result = ({
 								text={t('send_details')}
 								onPress={navigateToTxDetails}
 							/>
-							<View style={styles.divider} />
 							<Button
 								style={styles.button}
 								size="large"
@@ -204,17 +198,14 @@ const Result = ({
 					) : (
 						<>
 							{isSlashpay && (
-								<>
-									<Button
-										style={styles.button}
-										variant="secondary"
-										size="large"
-										text={t('cancel')}
-										testID="Close"
-										onPress={handleClose}
-									/>
-									<View style={styles.divider} />
-								</>
+								<Button
+									style={styles.button}
+									variant="secondary"
+									size="large"
+									text={t('cancel')}
+									testID="Close"
+									onPress={handleClose}
+								/>
 							)}
 							<Button
 								style={styles.button}
@@ -234,12 +225,12 @@ const Result = ({
 };
 
 const styles = StyleSheet.create({
-	container: {
+	root: {
 		flex: 1,
 	},
 	confetti: {
 		...StyleSheet.absoluteFillObject,
-		zIndex: 1,
+		zIndex: 0,
 	},
 	lottie: {
 		height: '100%',
@@ -251,17 +242,28 @@ const styles = StyleSheet.create({
 	errorTitle: {
 		marginBottom: 8,
 	},
+	imageContainer: {
+		flexShrink: 1,
+		justifyContent: 'center',
+		alignItems: 'center',
+		alignSelf: 'center',
+		width: 256,
+		aspectRatio: 1,
+		marginTop: 'auto',
+	},
+	image: {
+		flex: 1,
+		resizeMode: 'contain',
+	},
 	buttonContainer: {
 		flexDirection: 'row',
 		justifyContent: 'center',
 		marginTop: 'auto',
+		gap: 16,
 	},
 	button: {
 		flex: 1,
 	},
-	divider: {
-		width: 16,
-	},
 });
 
 export default memo(Result);
diff --git a/src/screens/Wallets/Send/ReviewAndSend.tsx b/src/screens/Wallets/Send/ReviewAndSend.tsx
index 4a7e86bc1..9fcc85a70 100644
--- a/src/screens/Wallets/Send/ReviewAndSend.tsx
+++ b/src/screens/Wallets/Send/ReviewAndSend.tsx
@@ -12,7 +12,7 @@ import { TInvoice } from '@synonymdev/react-native-ldk';
 import { useTranslation } from 'react-i18next';
 import { validateTransaction } from 'beignet';
 
-import { Caption13Up, Text02M } from '../../../styles/text';
+import { Caption13Up, BodySSB } from '../../../styles/text';
 import {
 	Checkmark,
 	ClockIcon,
@@ -96,7 +96,7 @@ const Section = memo(
 				activeOpacity={onPress ? 0.6 : 1}
 				onPress={onPress}>
 				<View style={styles.sText}>
-					<Caption13Up color="gray1">{title}</Caption13Up>
+					<Caption13Up color="white50">{title}</Caption13Up>
 				</View>
 				<View style={styles.sValue}>{value}</View>
 			</TouchableOpacity>
@@ -567,7 +567,7 @@ const ReviewAndSend = ({
 				return (
 					<SettingsIcon
 						style={styles.icon}
-						color="gray1"
+						color="white50"
 						width={16}
 						height={16}
 					/>
@@ -586,9 +586,7 @@ const ReviewAndSend = ({
 				<View style={styles.content}>
 					<AmountToggle
 						style={styles.amountToggle}
-						sats={amount}
-						reverse={true}
-						space={12}
+						amount={amount}
 						onPress={goBackToAmount}
 					/>
 
@@ -605,11 +603,11 @@ const ReviewAndSend = ({
 								) : (
 									<>
 										{decodedInvoice ? (
-											<Text02M>{truncate(decodedInvoice.to_str, 100)}</Text02M>
+											<BodySSB>{truncate(decodedInvoice.to_str, 100)}</BodySSB>
 										) : (
-											<Text02M numberOfLines={1} ellipsizeMode="middle">
+											<BodySSB numberOfLines={1} ellipsizeMode="middle">
 												{address}
-											</Text02M>
+											</BodySSB>
 										)}
 									</>
 								)
@@ -625,11 +623,11 @@ const ReviewAndSend = ({
 								value={
 									<View style={styles.fee}>
 										{feeIcon}
-										<Text02M>
+										<BodySSB>
 											{t(`fee:${selectedFeeId}.title`)} (
 											{fiatTransactionFee.fiatSymbol}
 											{fiatTransactionFee.fiatFormatted})
-										</Text02M>
+										</BodySSB>
 										<PencileIcon height={12} width={22} />
 									</View>
 								}
@@ -640,7 +638,7 @@ const ReviewAndSend = ({
 								value={
 									<>
 										<ClockIcon style={styles.icon} color="brand" />
-										<Text02M>{feeDescription}</Text02M>
+										<BodySSB>{feeDescription}</BodySSB>
 									</>
 								}
 							/>
@@ -652,7 +650,7 @@ const ReviewAndSend = ({
 								value={
 									<>
 										<TimerIcon style={styles.icon} color="purple" />
-										<Text02M>{FeeText.instant.title} (±$0.01)</Text02M>
+										<BodySSB>{FeeText.instant.title} (±$0.01)</BodySSB>
 									</>
 								}
 							/>
@@ -662,7 +660,7 @@ const ReviewAndSend = ({
 									value={
 										<>
 											<ClockIcon style={styles.icon} color="purple" />
-											<Text02M>
+											<BodySSB>
 												{tTime('dateTime', {
 													v: invoiceExpiryTimestamp,
 													formatParams: {
@@ -674,7 +672,7 @@ const ReviewAndSend = ({
 														},
 													},
 												})}
-											</Text02M>
+											</BodySSB>
 										</>
 									}
 								/>
@@ -686,7 +684,7 @@ const ReviewAndSend = ({
 						<View style={styles.sectionContainer}>
 							<Section
 								title={t('note')}
-								value={<Text02M>{decodedInvoice?.description}</Text02M>}
+								value={<BodySSB>{decodedInvoice?.description}</BodySSB>}
 							/>
 						</View>
 					) : null}
@@ -726,10 +724,10 @@ const ReviewAndSend = ({
 					<View style={styles.buttonContainer}>
 						<SwipeToConfirm
 							text={t('send_swipe')}
-							onConfirm={onSwipeToPay}
 							icon={<Checkmark width={30} height={30} color="black" />}
 							loading={isLoading}
 							confirmed={isLoading}
+							onConfirm={onSwipeToPay}
 						/>
 					</View>
 				</View>
diff --git a/src/screens/Wallets/Send/SendPinPad.tsx b/src/screens/Wallets/Send/SendPinPad.tsx
index 886b1d941..509397dc6 100644
--- a/src/screens/Wallets/Send/SendPinPad.tsx
+++ b/src/screens/Wallets/Send/SendPinPad.tsx
@@ -4,7 +4,7 @@ import { FadeIn, FadeOut } from 'react-native-reanimated';
 import { useTranslation } from 'react-i18next';
 
 import { AnimatedView } from '../../../styles/components';
-import { Text02S } from '../../../styles/text';
+import { BodyS } from '../../../styles/text';
 import useColors from '../../../hooks/colors';
 import { vibrate } from '../../../utils/helpers';
 import { getKeychainValue } from '../../../utils/keychain';
@@ -77,7 +77,7 @@ const SendPinPad = ({ onSuccess }: { onSuccess: () => void }): ReactElement => {
 							onPress={(): void => {
 								showBottomSheet('forgotPIN');
 							}}>
-							<Text02S color="brand">{t('cp_forgot')}</Text02S>
+							<BodyS color="brand">{t('cp_forgot')}</BodyS>
 						</Pressable>
 					</AnimatedView>
 				)}
diff --git a/src/screens/Wallets/Send/Tags.tsx b/src/screens/Wallets/Send/Tags.tsx
index 353bc71a7..190dc42dc 100644
--- a/src/screens/Wallets/Send/Tags.tsx
+++ b/src/screens/Wallets/Send/Tags.tsx
@@ -66,7 +66,7 @@ const Tags = ({ navigation }: SendScreenProps<'Tags'>): ReactElement => {
 			<View style={styles.content}>
 				{lastUsedTags.length !== 0 && (
 					<>
-						<Caption13Up color="gray1" style={styles.section}>
+						<Caption13Up color="white50" style={styles.section}>
 							{t('tags_previously')}
 						</Caption13Up>
 						<View style={styles.tagsContainer}>
@@ -83,7 +83,7 @@ const Tags = ({ navigation }: SendScreenProps<'Tags'>): ReactElement => {
 						</View>
 					</>
 				)}
-				<Caption13Up color="gray1" style={styles.section}>
+				<Caption13Up color="white50" style={styles.section}>
 					{t('tags_new')}
 				</Caption13Up>
 				<BottomSheetTextInput
diff --git a/src/screens/Wallets/UnitButton.tsx b/src/screens/Wallets/UnitButton.tsx
index 9755b0cb0..907f5132f 100644
--- a/src/screens/Wallets/UnitButton.tsx
+++ b/src/screens/Wallets/UnitButton.tsx
@@ -47,7 +47,7 @@ const UnitButton = ({
 
 const styles = StyleSheet.create({
 	root: {
-		paddingVertical: 7,
+		paddingVertical: 5,
 		paddingHorizontal: 8,
 		borderRadius: 8,
 		flexDirection: 'row',
diff --git a/src/screens/Wallets/WalletsDetail/BitcoinBreakdown.tsx b/src/screens/Wallets/WalletsDetail/BitcoinBreakdown.tsx
deleted file mode 100644
index c32a6c5e0..000000000
--- a/src/screens/Wallets/WalletsDetail/BitcoinBreakdown.tsx
+++ /dev/null
@@ -1,119 +0,0 @@
-import React, { memo, ReactElement } from 'react';
-import { View, StyleSheet, TouchableOpacity } from 'react-native';
-import { useNavigation } from '@react-navigation/native';
-import { useTranslation } from 'react-i18next';
-
-import { View as ThemedView } from '../../../styles/components';
-import {
-	TransferIcon,
-	SavingsIcon,
-	LightningHollow,
-} from '../../../styles/icons';
-import { Caption13M } from '../../../styles/text';
-import { useBalance } from '../../../hooks/wallet';
-import { useAppSelector } from '../../../hooks/redux';
-import { RootNavigationProp } from '../../../navigation/types';
-import { isGeoBlockedSelector } from '../../../store/reselect/user';
-import { accountVersionSelector } from '../../../store/reselect/lightning';
-import { showToast } from '../../../utils/notifications';
-import NetworkRow from './NetworkRow';
-
-const BitcoinBreakdown = (): ReactElement => {
-	const { t } = useTranslation('wallet');
-	const navigation = useNavigation<RootNavigationProp>();
-	const isGeoBlocked = useAppSelector(isGeoBlockedSelector);
-	const accountVersion = useAppSelector(accountVersionSelector);
-	const {
-		onchainBalance,
-		spendingBalance,
-		balanceInTransferToSpending,
-		balanceInTransferToSavings,
-	} = useBalance();
-
-	const onRebalancePress = (): void => {
-		if (accountVersion < 2) {
-			showToast({
-				type: 'warning',
-				title: t('migrating_ldk_title'),
-				description: t('migrating_ldk_description'),
-			});
-			return;
-		}
-
-		if (spendingBalance && !isGeoBlocked) {
-			navigation.navigate('Transfer', { screen: 'Setup' });
-		} else {
-			navigation.navigate('LightningRoot', { screen: 'Introduction' });
-		}
-	};
-
-	return (
-		<>
-			<NetworkRow
-				title={t('details_savings_title')}
-				balance={onchainBalance}
-				pendingBalance={balanceInTransferToSavings}
-				icon={
-					<ThemedView style={styles.icon} color="brand16">
-						<SavingsIcon color="brand" width={16} height={16} />
-					</ThemedView>
-				}
-			/>
-			<View style={styles.transferRow}>
-				<ThemedView color="brand16" style={styles.line} />
-				<TouchableOpacity testID="TransferButton" onPress={onRebalancePress}>
-					<ThemedView style={styles.transferButton} color="brand16">
-						<TransferIcon style={styles.transferIcon} color="white" />
-						<Caption13M>{t('transfer_text')}</Caption13M>
-					</ThemedView>
-				</TouchableOpacity>
-				<ThemedView color="brand16" style={styles.line} />
-			</View>
-			<NetworkRow
-				title={t('details_spending_title')}
-				balance={spendingBalance}
-				pendingBalance={balanceInTransferToSpending}
-				icon={
-					<ThemedView style={styles.icon} color="purple16">
-						<LightningHollow color="purple" width={16} height={16} />
-					</ThemedView>
-				}
-			/>
-		</>
-	);
-};
-
-const styles = StyleSheet.create({
-	icon: {
-		borderRadius: 20,
-		height: 32,
-		width: 32,
-		justifyContent: 'center',
-		alignItems: 'center',
-		alignSelf: 'center',
-		marginRight: 16,
-	},
-	transferRow: {
-		flexDirection: 'row',
-		alignItems: 'center',
-		paddingVertical: 10,
-	},
-	transferButton: {
-		paddingHorizontal: 15,
-		height: 40,
-		borderRadius: 54,
-		flexDirection: 'row',
-		justifyContent: 'center',
-		alignItems: 'center',
-		marginHorizontal: 16,
-	},
-	transferIcon: {
-		marginRight: 6,
-	},
-	line: {
-		flex: 1,
-		height: 1,
-	},
-});
-
-export default memo(BitcoinBreakdown);
diff --git a/src/screens/Wallets/WalletsDetail/index.tsx b/src/screens/Wallets/WalletsDetail/index.tsx
deleted file mode 100644
index 464c97372..000000000
--- a/src/screens/Wallets/WalletsDetail/index.tsx
+++ /dev/null
@@ -1,312 +0,0 @@
-import React, {
-	ReactElement,
-	memo,
-	useCallback,
-	useEffect,
-	useMemo,
-	useState,
-} from 'react';
-import {
-	NativeScrollEvent,
-	NativeSyntheticEvent,
-	Platform,
-	StyleSheet,
-	TouchableOpacity,
-} from 'react-native';
-
-import {
-	Easing,
-	FadeIn,
-	FadeOut,
-	SharedValue,
-	useDerivedValue,
-	useSharedValue,
-	withTiming,
-} from 'react-native-reanimated';
-import {
-	Canvas,
-	RadialGradient,
-	Rect,
-	rect,
-	vec,
-} from '@shopify/react-native-skia';
-
-import { AnimatedView, View } from '../../../styles/components';
-import { BitcoinCircleIcon, EyeIcon } from '../../../styles/icons';
-import { Title } from '../../../styles/text';
-import NavigationHeader from '../../../components/NavigationHeader';
-import useColors from '../../../hooks/colors';
-import { useAppDispatch, useAppSelector } from '../../../hooks/redux';
-import { useBalance, useSwitchUnitAnnounced } from '../../../hooks/wallet';
-import ActivityList from '../../Activity/ActivityList';
-import BitcoinBreakdown from './BitcoinBreakdown';
-import SafeAreaInset from '../../../components/SafeAreaInset';
-import Money from '../../../components/Money';
-import BlurView from '../../../components/BlurView';
-import { updateSettings } from '../../../store/slices/settings';
-import {
-	hideBalanceSelector,
-	enableSwipeToHideBalanceSelector,
-} from '../../../store/reselect/settings';
-import { capitalize } from '../../../utils/helpers';
-import DetectSwipe from '../../../components/DetectSwipe';
-import type { WalletScreenProps } from '../../../navigation/types';
-import { showToast } from '../../../utils/notifications';
-import { useTranslation } from 'react-i18next';
-import { ignoresHideBalanceToastSelector } from '../../../store/reselect/user';
-import { ignoreHideBalanceToast } from '../../../store/slices/user';
-
-const updateHeight = ({ height, toValue = 0, duration = 250 }): void => {
-	try {
-		height.value = withTiming(toValue, {
-			duration,
-			easing: Easing.inOut(Easing.ease),
-		});
-	} catch {}
-};
-
-const Glow = ({
-	color,
-	size,
-}: {
-	color: string;
-	size: SharedValue<{ width: number; height: number }>;
-}): ReactElement => {
-	const rct = useDerivedValue(
-		() => rect(0, 0, size.value.width, size.value.height),
-		[size.value.width, size.value.height],
-	);
-
-	return (
-		<Rect rect={rct}>
-			<RadialGradient
-				c={vec(-450, 0)}
-				r={Platform.OS === 'ios' ? 1050 : 900}
-				colors={[color, 'transparent']}
-			/>
-		</Rect>
-	);
-};
-
-const WalletsDetail = ({
-	route,
-}: WalletScreenProps<'WalletsDetail'>): ReactElement => {
-	const { assetType } = route.params;
-	const { totalBalance } = useBalance();
-	const dispatch = useAppDispatch();
-	const enableSwipeToHideBalance = useAppSelector(
-		enableSwipeToHideBalanceSelector,
-	);
-	const hideBalance = useAppSelector(hideBalanceSelector);
-	const ignoresHideBalanceToast = useAppSelector(
-		ignoresHideBalanceToastSelector,
-	);
-	const onSwitchUnit = useSwitchUnitAnnounced();
-	const colors = useColors();
-	const size = useSharedValue({ width: 0, height: 0 });
-	const title = capitalize(assetType);
-	const [showDetails, setShowDetails] = useState(true);
-	const [radiusContainerHeight, setRadiusContainerHeight] = useState(400);
-	const [headerHeight, setHeaderHeight] = useState(0);
-	const height = useSharedValue(0);
-	const { t } = useTranslation('wallet');
-
-	const activityPadding = useMemo(
-		() => ({ paddingTop: radiusContainerHeight, paddingBottom: 230 }),
-		[radiusContainerHeight],
-	);
-
-	useEffect(() => {
-		updateHeight({ height, toValue: headerHeight });
-	}, [height, headerHeight]);
-
-	const toggleHideBalance = (): void => {
-		const enabled = !hideBalance;
-		dispatch(updateSettings({ hideBalance: enabled }));
-		if (!ignoresHideBalanceToast && enabled) {
-			showToast({
-				type: 'info',
-				title: t('balance_hidden_title'),
-				description: t('balance_hidden_message'),
-			});
-			dispatch(ignoreHideBalanceToast());
-		}
-	};
-
-	const onScroll = useCallback(
-		(e: NativeSyntheticEvent<NativeScrollEvent>) => {
-			const { y } = e.nativeEvent.contentOffset;
-
-			//HIDE
-			if (y > 150 && showDetails) {
-				//Shrink the detail view
-				setShowDetails(false);
-				updateHeight({ height, toValue: 30 });
-			}
-
-			//SHOW
-			if (y < 100 && !showDetails) {
-				//They scrolled up so show more details now
-				setShowDetails(true);
-				updateHeight({ height, toValue: headerHeight });
-			}
-		},
-		[showDetails, height, headerHeight],
-	);
-
-	return (
-		<AnimatedView style={styles.container}>
-			<View color="transparent" style={styles.txListContainer}>
-				<ActivityList
-					style={styles.txList}
-					contentContainerStyle={activityPadding}
-					progressViewOffset={radiusContainerHeight + 10}
-					filter={{ includeTransfers: true }}
-					onScroll={onScroll}
-				/>
-			</View>
-			<View color="transparent" style={styles.radiusContainer}>
-				<BlurView>
-					<Canvas style={styles.glowCanvas} onSize={size}>
-						<Glow color={colors.brand} size={size} />
-					</Canvas>
-					<View
-						style={styles.assetDetailContainer}
-						color="white01"
-						onLayout={(e): void => {
-							const hh = e.nativeEvent.layout.height;
-							setRadiusContainerHeight((h) => (h === 400 ? hh : h));
-						}}>
-						<SafeAreaInset type="top" />
-						<NavigationHeader />
-
-						<AnimatedView
-							color="transparent"
-							style={[styles.header, { minHeight: height }]}
-							onLayout={(e): void => {
-								const hh = e.nativeEvent.layout.height;
-								setHeaderHeight((h) => (h === 0 ? hh : h));
-							}}>
-							<View color="transparent" style={styles.row}>
-								<View color="transparent" style={styles.cell}>
-									<BitcoinCircleIcon color="bitcoin" />
-									<Title style={styles.title}>{title}</Title>
-								</View>
-
-								{!showDetails && (
-									<AnimatedView
-										color="transparent"
-										style={styles.cell}
-										entering={FadeIn}
-										exiting={FadeOut}>
-										<TouchableOpacity onPress={onSwitchUnit}>
-											<Money
-												sats={totalBalance}
-												enableHide={true}
-												size="title"
-											/>
-										</TouchableOpacity>
-									</AnimatedView>
-								)}
-							</View>
-
-							{showDetails && (
-								<AnimatedView
-									color="transparent"
-									entering={FadeIn}
-									exiting={FadeOut}>
-									<View color="transparent" style={styles.balanceContainer}>
-										<DetectSwipe
-											enabled={enableSwipeToHideBalance}
-											onSwipeLeft={toggleHideBalance}
-											onSwipeRight={toggleHideBalance}>
-											<TouchableOpacity
-												onPress={onSwitchUnit}
-												style={styles.largeValueContainer}>
-												<Money
-													sats={totalBalance}
-													enableHide={true}
-													symbol={true}
-													symbolColor="white40"
-												/>
-												{hideBalance && (
-													<TouchableOpacity
-														style={styles.toggle}
-														testID="ShowBalance"
-														onPress={toggleHideBalance}>
-														<EyeIcon />
-													</TouchableOpacity>
-												)}
-											</TouchableOpacity>
-										</DetectSwipe>
-									</View>
-
-									{assetType === 'bitcoin' && <BitcoinBreakdown />}
-								</AnimatedView>
-							)}
-						</AnimatedView>
-					</View>
-				</BlurView>
-			</View>
-			<SafeAreaInset type="bottom" minPadding={16} />
-		</AnimatedView>
-	);
-};
-
-const styles = StyleSheet.create({
-	container: {
-		flex: 1,
-	},
-	assetDetailContainer: {
-		paddingBottom: 16,
-	},
-	radiusContainer: {
-		overflow: 'hidden',
-		borderBottomRightRadius: 16,
-		borderBottomLeftRadius: 16,
-		position: 'relative',
-	},
-	glowCanvas: {
-		width: '100%',
-		height: 500, // it needs to be static, otherwise android lagging
-		position: 'absolute',
-	},
-	header: {
-		paddingHorizontal: 16,
-	},
-	balanceContainer: {
-		marginTop: 8,
-		marginBottom: 30,
-	},
-	largeValueContainer: {
-		flexDirection: 'row',
-		alignItems: 'center',
-		justifyContent: 'space-between',
-	},
-	txListContainer: {
-		flex: 1,
-		position: 'absolute',
-		width: '100%',
-		height: '100%',
-	},
-	txList: {
-		paddingHorizontal: 16,
-	},
-	row: {
-		alignItems: 'center',
-		flexDirection: 'row',
-		justifyContent: 'space-between',
-	},
-	cell: {
-		alignItems: 'center',
-		flexDirection: 'row',
-	},
-	title: {
-		marginLeft: 16,
-	},
-	toggle: {
-		marginTop: 6,
-	},
-});
-
-export default memo(WalletsDetail);
diff --git a/src/screens/Wallets/index.tsx b/src/screens/Wallets/index.tsx
index 43ba114c1..3aff5dcda 100644
--- a/src/screens/Wallets/index.tsx
+++ b/src/screens/Wallets/index.tsx
@@ -3,8 +3,9 @@ import { StyleSheet, View } from 'react-native';
 import { useFocusEffect } from '@react-navigation/native';
 import { RefreshControl, ScrollView } from 'react-native-gesture-handler';
 import { useSafeAreaInsets } from 'react-native-safe-area-context';
-import { useTranslation } from 'react-i18next';
+import { Trans, useTranslation } from 'react-i18next';
 
+import { Display } from '../../styles/text';
 import { useBalance } from '../../hooks/wallet';
 import useColors from '../../hooks/colors';
 import { useAppDispatch, useAppSelector } from '../../hooks/redux';
@@ -12,14 +13,14 @@ import { updateSettings } from '../../store/slices/settings';
 import { widgetsSelector } from '../../store/reselect/widgets';
 import { refreshWallet } from '../../utils/wallet';
 import ActivityListShort from '../../screens/Activity/ActivityListShort';
-import EmptyWallet from '../../screens/Activity/EmptyWallet';
 import DetectSwipe from '../../components/DetectSwipe';
 import BalanceHeader from '../../components/BalanceHeader';
 import Suggestions from '../../components/Suggestions';
 import Widgets from '../../components/Widgets';
 import SafeAreaInset from '../../components/SafeAreaInset';
-import BetaWarning from '../../components/BetaWarning';
-import Assets from '../../components/Assets';
+import WalletOnboarding from '../../components/WalletOnboarding';
+import WalletWarning from '../../components/WalletWarning';
+import Balances from '../../components/Balances';
 import Header from './Header';
 import type { WalletScreenProps } from '../../navigation/types';
 import {
@@ -134,14 +135,26 @@ const Wallets = ({ navigation, onFocus }: Props): ReactElement => {
 						<>
 							<Suggestions />
 							<View style={styles.contentPadding}>
-								<Assets />
+								<Balances />
 								{showWidgets && <Widgets />}
 								<ActivityListShort />
-								<BetaWarning />
+								<WalletWarning />
 							</View>
 						</>
 					) : (
-						<EmptyWallet />
+						<WalletOnboarding
+							style={styles.contentPadding}
+							text={
+								<Trans
+									t={t}
+									i18nKey="onboarding:empty_wallet"
+									components={{ accent: <Display color="brand" /> }}
+								/>
+							}
+							onHide={(): void => {
+								dispatch(updateSettings({ hideOnboardingMessage: true }));
+							}}
+						/>
 					)}
 				</ScrollView>
 			</DetectSwipe>
diff --git a/src/screens/Widgets/SlashAuthModal.tsx b/src/screens/Widgets/SlashAuthModal.tsx
index 4e8d1969c..1a00a1580 100644
--- a/src/screens/Widgets/SlashAuthModal.tsx
+++ b/src/screens/Widgets/SlashAuthModal.tsx
@@ -6,7 +6,7 @@ import React, {
 	useState,
 } from 'react';
 import { NativeStackNavigationProp } from '@react-navigation/native-stack';
-import { StyleSheet, TouchableOpacity, View } from 'react-native';
+import { Image, StyleSheet, TouchableOpacity, View } from 'react-native';
 import { Client } from '@synonymdev/slashtags-auth';
 import { SlashURL } from '@synonymdev/slashtags-sdk';
 import { useTranslation } from 'react-i18next';
@@ -21,7 +21,7 @@ import { useProfile, useSelectedSlashtag } from '../../hooks/slashtags';
 import { ContactItem } from '../../components/ContactsList';
 import { IContactRecord } from '../../store/types/slashtags';
 import ProfileImage from '../../components/ProfileImage';
-import { Title, Text01S } from '../../styles/text';
+import { Title, BodyM } from '../../styles/text';
 import { Checkmark } from '../../styles/icons';
 import { showToast } from '../../utils/notifications';
 import { ellipsis } from '../../utils/helpers';
@@ -31,7 +31,6 @@ import { useSnapPoints } from '../../hooks/bottomSheet';
 import { useAppDispatch, useAppSelector } from '../../hooks/redux';
 import { rootNavigation } from '../../navigation/root/RootNavigator';
 import HourglassSpinner from '../../components/HourglassSpinner';
-import GlowImage from '../../components/GlowImage';
 import {
 	viewControllerIsOpenSelector,
 	viewControllerSelector,
@@ -181,9 +180,9 @@ const _SlashAuthModal = (): ReactElement => {
 				/>
 				<Title numberOfLines={1}>{serviceName}</Title>
 			</View>
-			<Text01S style={styles.text} color="gray1">
+			<BodyM style={styles.text} color="white50">
 				{text}
-			</Text01S>
+			</BodyM>
 			<Key
 				contact={rootContact}
 				active={!anonymous}
@@ -196,7 +195,13 @@ const _SlashAuthModal = (): ReactElement => {
 			/>*/}
 
 			{isLoading && <HourglassSpinner />}
-			{!isLoading && <GlowImage image={imageSrc} imageSize={240} />}
+			{!isLoading && (
+				<>
+					<View style={styles.imageContainer}>
+						<Image style={styles.image} source={imageSrc} />
+					</View>
+				</>
+			)}
 
 			<View style={styles.buttonContainer}>
 				<Button
@@ -207,16 +212,13 @@ const _SlashAuthModal = (): ReactElement => {
 					onPress={onCancel}
 				/>
 				{!isLoading && (
-					<>
-						<View style={styles.divider} />
-						<Button
-							style={styles.button}
-							size="large"
-							text={t('signin_title')}
-							disabled={isLoading}
-							onPress={onContinue}
-						/>
-					</>
+					<Button
+						style={styles.button}
+						size="large"
+						text={t('signin_title')}
+						disabled={isLoading}
+						onPress={onContinue}
+					/>
 				)}
 			</View>
 			<SafeAreaInset type="bottom" minPadding={16} />
@@ -256,17 +258,28 @@ const styles = StyleSheet.create({
 		marginTop: 32,
 		marginBottom: 32,
 	},
+	imageContainer: {
+		flexShrink: 1,
+		justifyContent: 'center',
+		alignItems: 'center',
+		alignSelf: 'center',
+		width: 256,
+		aspectRatio: 1,
+		marginTop: 'auto',
+	},
+	image: {
+		flex: 1,
+		resizeMode: 'contain',
+	},
 	buttonContainer: {
 		flexDirection: 'row',
 		justifyContent: 'center',
 		marginTop: 'auto',
+		gap: 16,
 	},
 	button: {
 		flex: 1,
 	},
-	divider: {
-		width: 16,
-	},
 });
 
 const keyStyles = StyleSheet.create({
diff --git a/src/screens/Widgets/Widget.tsx b/src/screens/Widgets/Widget.tsx
index 247aafedf..f02b8ea2f 100644
--- a/src/screens/Widgets/Widget.tsx
+++ b/src/screens/Widgets/Widget.tsx
@@ -8,7 +8,7 @@ import {
 	View as ThemedView,
 	TouchableOpacity,
 } from '../../styles/components';
-import { Caption13Up, Headline, Text01S } from '../../styles/text';
+import { Caption13Up, Headline, BodyM } from '../../styles/text';
 import { ChevronRight, QuestionMarkIcon } from '../../styles/icons';
 import { widgetSelector } from '../../store/reselect/widgets';
 import { deleteWidget, setFeedWidget } from '../../store/slices/widgets';
@@ -111,9 +111,9 @@ const Widget = ({
 					</View>
 
 					{config.description && (
-						<Text01S style={styles.description} color="gray1">
+						<BodyM style={styles.description} color="white50">
 							{config.description}
-						</Text01S>
+						</BodyM>
 					)}
 
 					<TouchableOpacity
@@ -122,18 +122,18 @@ const Widget = ({
 						testID="WidgetEdit"
 						onPress={onEdit}>
 						<View style={styles.columnLeft}>
-							<Text01S color="white">{t('widget_edit')}</Text01S>
+							<BodyM color="white">{t('widget_edit')}</BodyM>
 						</View>
 						<View style={styles.columnRight}>
-							<Text01S style={styles.valueText} testID="Value">
+							<BodyM style={styles.valueText} testID="Value">
 								{hasEdited ? t('widget_edit_custom') : t('widget_edit_default')}
-							</Text01S>
-							<ChevronRight color="gray1" width={24} height={24} />
+							</BodyM>
+							<ChevronRight color="white50" width={24} height={24} />
 						</View>
 					</TouchableOpacity>
 
 					<View style={styles.footer}>
-						<Caption13Up style={styles.caption} color="gray1">
+						<Caption13Up style={styles.caption} color="white50">
 							{t('widget_preview')}
 						</Caption13Up>
 
@@ -196,17 +196,14 @@ const Widget = ({
 
 						<View style={styles.buttonsContainer}>
 							{savedWidget && (
-								<>
-									<Button
-										style={styles.button}
-										text={t('delete')}
-										size="large"
-										variant="secondary"
-										testID="WidgetDelete"
-										onPress={onDelete}
-									/>
-									<View style={styles.divider} />
-								</>
+								<Button
+									style={styles.button}
+									text={t('delete')}
+									size="large"
+									variant="secondary"
+									testID="WidgetDelete"
+									onPress={onDelete}
+								/>
 							)}
 							<Button
 								style={styles.button}
@@ -230,6 +227,7 @@ const styles = StyleSheet.create({
 	},
 	content: {
 		flexGrow: 1,
+		paddingTop: 16,
 		paddingHorizontal: 16,
 	},
 	header: {
@@ -263,16 +261,14 @@ const styles = StyleSheet.create({
 		minHeight: 180,
 	},
 	buttonsContainer: {
-		paddingTop: 16,
 		flexDirection: 'row',
 		justifyContent: 'space-between',
+		paddingTop: 16,
+		gap: 16,
 	},
 	button: {
 		flex: 1,
 	},
-	divider: {
-		width: 16,
-	},
 	description: {
 		fontWeight: 'normal',
 	},
diff --git a/src/screens/Widgets/WidgetEdit.tsx b/src/screens/Widgets/WidgetEdit.tsx
index 9e5cc4fb5..9e4c18b91 100644
--- a/src/screens/Widgets/WidgetEdit.tsx
+++ b/src/screens/Widgets/WidgetEdit.tsx
@@ -4,8 +4,8 @@ import { useTranslation } from 'react-i18next';
 import isEqual from 'lodash/isEqual';
 
 import { ScrollView, View as ThemedView } from '../../styles/components';
-import { Caption13M, Text01M, Text01S, Text02M } from '../../styles/text';
-import { Checkmark, QuestionMarkIcon } from '../../styles/icons';
+import { CaptionB, BodyM, BodySSB } from '../../styles/text';
+import { Checkmark } from '../../styles/icons';
 import { SUPPORTED_FEED_TYPES } from '../../utils/widgets';
 import { useAppDispatch } from '../../hooks/redux';
 import { useSlashfeed } from '../../hooks/widgets';
@@ -21,7 +21,6 @@ import SafeAreaInset from '../../components/SafeAreaInset';
 import Divider from '../../components/Divider';
 import Button from '../../components/Button';
 import PriceChart from '../../components/PriceChart';
-import SvgImage from '../../components/SvgImage';
 import type { RootStackScreenProps } from '../../navigation/types';
 
 export const getDefaultSettings = (config?: SlashFeedJSON): TWidgetSettings => {
@@ -29,18 +28,18 @@ export const getDefaultSettings = (config?: SlashFeedJSON): TWidgetSettings => {
 		if (config.type === SUPPORTED_FEED_TYPES.PRICE_FEED) {
 			return {
 				fields: ['BTC/USD'],
-				extras: { period: '1D', showSource: false, showTitle: true },
+				extras: { period: '1D', showSource: false },
 			};
 		}
 		if (config.type === SUPPORTED_FEED_TYPES.BLOCKS_FEED) {
 			return {
 				fields: ['Block', 'Time', 'Date'],
-				extras: { showSource: false, showTitle: true },
+				extras: { showSource: false },
 			};
 		}
-		return { fields: [config.fields[0].name], extras: { showTitle: true } };
+		return { fields: [config.fields[0].name], extras: {} };
 	}
-	return { fields: [], extras: { showTitle: true } };
+	return { fields: [], extras: {} };
 };
 
 const WidgetEdit = ({
@@ -50,7 +49,7 @@ const WidgetEdit = ({
 	const { url, initialFields } = route.params;
 	const { t } = useTranslation('slashtags');
 	const dispatch = useAppDispatch();
-	const { config, fields, loading, icon } = useSlashfeed({ url });
+	const { config, fields, loading } = useSlashfeed({ url });
 	const [settings, setSettings] = useState(initialFields);
 
 	const defaultSettings = getDefaultSettings(config);
@@ -78,60 +77,22 @@ const WidgetEdit = ({
 			) : (
 				<View style={styles.content}>
 					{config.name && (
-						<Text01S style={styles.description} color="gray1">
+						<BodyM style={styles.description} color="white50">
 							{t('widget_edit_description', { name: config.name })}
-						</Text01S>
+						</BodyM>
 					)}
 
 					<ScrollView
 						showsVerticalScrollIndicator={false}
 						testID="WidgetEditScrollView">
 						{loading && (
-							<Text01S style={styles.loading} color="gray1">
+							<BodyM style={styles.loading} color="white50">
 								{t('widget_loading_options')}
-							</Text01S>
+							</BodyM>
 						)}
 
 						{!loading && (
 							<View style={styles.fields}>
-								{config.name && (
-									<Pressable
-										testID="WidgetEditTitle"
-										onPress={(): void => {
-											setSettings((prevState) => ({
-												...prevState,
-												extras: {
-													...prevState.extras,
-													showTitle: !prevState.extras?.showTitle,
-												},
-											}));
-										}}>
-										<View style={styles.fieldContainer}>
-											<View style={styles.title}>
-												<View style={styles.icon}>
-													{icon ? (
-														<SvgImage image={icon} size={32} />
-													) : (
-														<QuestionMarkIcon width={32} height={32} />
-													)}
-												</View>
-
-												<Text01M style={styles.name} numberOfLines={1}>
-													{config.name}
-												</Text01M>
-											</View>
-
-											<Checkmark
-												style={styles.checkmark}
-												color={settings.extras?.showTitle ? 'brand' : 'gray3'}
-												height={30}
-												width={30}
-											/>
-										</View>
-										<Divider />
-									</Pressable>
-								)}
-
 								{fields.length > 0 &&
 									fields.map((field) => {
 										const isSelected = settings.fields.includes(field.name);
@@ -156,12 +117,12 @@ const WidgetEdit = ({
 												}}>
 												<View style={styles.fieldContainer}>
 													<View style={styles.fieldLeftContainer}>
-														<Text02M color="gray1">{field.name}</Text02M>
+														<BodySSB color="white50">{field.name}</BodySSB>
 													</View>
 													<View style={styles.fieldRightContainer}>
-														<Text02M numberOfLines={1} ellipsizeMode="middle">
+														<BodySSB numberOfLines={1} ellipsizeMode="middle">
 															{field.value}
-														</Text02M>
+														</BodySSB>
 													</View>
 													<Checkmark
 														style={styles.checkmark}
@@ -232,11 +193,11 @@ const WidgetEdit = ({
 											}));
 										}}>
 										<View style={styles.fieldContainer}>
-											<Caption13M color="gray1">Source</Caption13M>
+											<CaptionB color="white50">Source</CaptionB>
 											<View style={styles.fieldRightContainer}>
-												<Caption13M color="gray1">
+												<CaptionB color="white50">
 													{config.source.name}
-												</Caption13M>
+												</CaptionB>
 											</View>
 											<Checkmark
 												style={styles.checkmark}
@@ -262,7 +223,6 @@ const WidgetEdit = ({
 							testID="WidgetEditReset"
 							onPress={onReset}
 						/>
-						<View style={styles.divider} />
 						<Button
 							style={styles.button}
 							text={t('widget_preview')}
@@ -284,6 +244,7 @@ const styles = StyleSheet.create({
 	},
 	content: {
 		flex: 1,
+		paddingTop: 16,
 		paddingHorizontal: 16,
 	},
 	description: {
@@ -292,20 +253,6 @@ const styles = StyleSheet.create({
 	loading: {
 		marginTop: 16,
 	},
-	title: {
-		flexDirection: 'row',
-		alignItems: 'center',
-	},
-	icon: {
-		marginRight: 16,
-		borderRadius: 6.4,
-		overflow: 'hidden',
-		height: 32,
-		width: 32,
-	},
-	name: {
-		lineHeight: 22,
-	},
 	fields: {
 		paddingBottom: 16,
 	},
@@ -329,16 +276,14 @@ const styles = StyleSheet.create({
 		marginLeft: 16,
 	},
 	buttonsContainer: {
+		flexDirection: 'row',
 		marginTop: 'auto',
 		paddingTop: 16,
-		flexDirection: 'row',
+		gap: 16,
 	},
 	button: {
 		flex: 1,
 	},
-	divider: {
-		width: 16,
-	},
 });
 
 export default WidgetEdit;
diff --git a/src/screens/Widgets/WidgetsOnboarding.tsx b/src/screens/Widgets/WidgetsOnboarding.tsx
index 73ca25015..dbef09515 100644
--- a/src/screens/Widgets/WidgetsOnboarding.tsx
+++ b/src/screens/Widgets/WidgetsOnboarding.tsx
@@ -2,75 +2,71 @@ import React, { ReactElement, ReactNode } from 'react';
 import { Image, ImageSourcePropType, StyleSheet, View } from 'react-native';
 import { Trans, useTranslation } from 'react-i18next';
 
+import { View as ThemedView } from '../../styles/components';
+import { Display, BodyM } from '../../styles/text';
 import Button from '../../components/Button';
 import DetectSwipe from '../../components/DetectSwipe';
-import GlowingBackground from '../../components/GlowingBackground';
 import NavigationHeader from '../../components/NavigationHeader';
 import SafeAreaInset from '../../components/SafeAreaInset';
-import { Display, Text01S } from '../../styles/text';
 import { useAppDispatch } from '../../hooks/redux';
 import { setWidgetsOnboarding } from '../../store/slices/widgets';
 import type { RootStackScreenProps } from '../../navigation/types';
 
-const padlockImageSrc = require('../../assets/illustrations/padlock.png');
 const puzzleImageSrc = require('../../assets/illustrations/puzzle.png');
+const padlockImageSrc = require('../../assets/illustrations/padlock.png');
 
-export const GoodbyePasswords = ({
+export const HelloWidgets = ({
 	navigation,
-}: RootStackScreenProps<'GoodbyePasswords'>): ReactElement => {
+}: RootStackScreenProps<'HelloWidgets'>): ReactElement => {
 	const { t } = useTranslation('slashtags');
+	const dispatch = useAppDispatch();
 
 	return (
 		<Layout
 			navigation={navigation}
-			illustration={padlockImageSrc}
+			image={puzzleImageSrc}
 			screenIndex={0}
 			onNext={(): void => {
-				navigation.navigate('HelloWidgets');
+				dispatch(setWidgetsOnboarding(true));
+				navigation.navigate('GoodbyePasswords');
 			}}>
 			<Display>
 				<Trans
 					t={t}
-					i18nKey="onboarding_widgets1_header"
-					components={{
-						brand: <Display color="brand" />,
-					}}
+					i18nKey="onboarding_widgets2_header"
+					components={{ accent: <Display color="brand" /> }}
 				/>
 			</Display>
-			<Text01S color="gray1" style={styles.introText}>
-				{t('onboarding_widgets1_text')}
-			</Text01S>
+			<BodyM style={styles.introText} color="white50">
+				{t('onboarding_widgets2_text')}
+			</BodyM>
 		</Layout>
 	);
 };
 
-export const HelloWidgets = ({
+export const GoodbyePasswords = ({
 	navigation,
-}: RootStackScreenProps<'HelloWidgets'>): ReactElement => {
+}: RootStackScreenProps<'GoodbyePasswords'>): ReactElement => {
 	const { t } = useTranslation('slashtags');
-	const dispatch = useAppDispatch();
 
 	return (
 		<Layout
 			navigation={navigation}
-			illustration={puzzleImageSrc}
+			image={padlockImageSrc}
 			screenIndex={1}
 			onNext={(): void => {
-				dispatch(setWidgetsOnboarding(true));
 				navigation.navigate('WidgetsSuggestions');
 			}}>
 			<Display>
 				<Trans
 					t={t}
-					i18nKey="onboarding_widgets2_header"
-					components={{
-						brand: <Display color="brand" />,
-					}}
+					i18nKey="onboarding_widgets1_header"
+					components={{ accent: <Display color="brand" /> }}
 				/>
 			</Display>
-			<Text01S color="gray1" style={styles.introText}>
-				{t('onboarding_widgets2_text')}
-			</Text01S>
+			<BodyM style={styles.introText} color="white50">
+				{t('onboarding_widgets1_text')}
+			</BodyM>
 		</Layout>
 	);
 };
@@ -78,15 +74,15 @@ export const HelloWidgets = ({
 const Layout = ({
 	navigation,
 	screenIndex,
-	illustration,
+	image,
 	children,
 	onNext,
 }: {
 	navigation:
-		| RootStackScreenProps<'GoodbyePasswords'>['navigation']
-		| RootStackScreenProps<'HelloWidgets'>['navigation'];
+		| RootStackScreenProps<'HelloWidgets'>['navigation']
+		| RootStackScreenProps<'GoodbyePasswords'>['navigation'];
 	screenIndex: number;
-	illustration: ImageSourcePropType;
+	image: ImageSourcePropType;
 	children: ReactNode;
 	onNext: () => void;
 }): ReactElement => {
@@ -97,7 +93,7 @@ const Layout = ({
 	};
 
 	return (
-		<GlowingBackground topLeft="brand">
+		<ThemedView style={styles.root}>
 			<SafeAreaInset type="top" />
 			<NavigationHeader
 				displayBackButton={true}
@@ -108,7 +104,7 @@ const Layout = ({
 			<DetectSwipe onSwipeRight={onSwipeRight}>
 				<View style={styles.content}>
 					<View style={styles.imageContainer}>
-						<Image source={illustration} style={styles.illustration} />
+						<Image source={image} style={styles.image} />
 					</View>
 					<View style={styles.middleContainer}>{children}</View>
 					<View style={styles.buttonContainer}>
@@ -123,39 +119,37 @@ const Layout = ({
 				</View>
 			</DetectSwipe>
 			<SafeAreaInset type="bottom" minPadding={16} />
-		</GlowingBackground>
+		</ThemedView>
 	);
 };
 
 const styles = StyleSheet.create({
+	root: {
+		flex: 1,
+	},
 	content: {
 		flex: 1,
 		justifyContent: 'space-between',
 		paddingHorizontal: 32,
 	},
 	imageContainer: {
-		alignSelf: 'center',
-		width: '100%',
-		flex: 1,
-		marginBottom: 16,
+		alignItems: 'center',
+		aspectRatio: 1,
+		marginTop: 'auto',
 	},
-	illustration: {
-		alignSelf: 'center',
-		width: '100%',
-		height: '100%',
+	image: {
+		flex: 1,
 		resizeMode: 'contain',
 	},
 	introText: {
-		marginTop: 8,
-		width: 280,
+		marginTop: 4,
 	},
 	middleContainer: {
-		flex: 1,
+		marginTop: 'auto',
 	},
 	buttonContainer: {
 		flexDirection: 'row',
-		justifyContent: 'space-between',
-		marginTop: 'auto',
+		marginTop: 32,
 	},
 	button: {
 		flex: 1,
diff --git a/src/screens/Widgets/WidgetsSuggestions.tsx b/src/screens/Widgets/WidgetsSuggestions.tsx
index f572f47fd..114f8830e 100644
--- a/src/screens/Widgets/WidgetsSuggestions.tsx
+++ b/src/screens/Widgets/WidgetsSuggestions.tsx
@@ -2,7 +2,7 @@ import React, { ReactElement } from 'react';
 import { StyleSheet } from 'react-native';
 import { useTranslation } from 'react-i18next';
 
-import { Caption13M, Text01M } from '../../styles/text';
+import { CaptionB, BodyMSB } from '../../styles/text';
 import { ChevronRight, QuestionMarkIcon } from '../../styles/icons';
 import { View, ScrollView, TouchableOpacity } from '../../styles/components';
 import NavigationHeader from '../../components/NavigationHeader';
@@ -80,16 +80,16 @@ const Feed = ({
 						<QuestionMarkIcon width={48} height={48} />
 					</View>
 					<View style={styles.text}>
-						<Text01M numberOfLines={1}>{url}</Text01M>
-						<Caption13M color="gray1" numberOfLines={1}>
+						<BodyMSB numberOfLines={1}>{url}</BodyMSB>
+						<CaptionB color="white50" numberOfLines={1}>
 							{failed
 								? t('widget_failed_description')
 								: t('widget_loading_description')}
-						</Caption13M>
+						</CaptionB>
 					</View>
 					<ChevronRight
 						style={styles.arrow}
-						color="gray1"
+						color="white50"
 						width={24}
 						height={24}
 					/>
@@ -113,14 +113,14 @@ const Feed = ({
 					)}
 				</View>
 				<View style={styles.text}>
-					<Text01M numberOfLines={1}>{config.name}</Text01M>
-					<Caption13M color="gray1" numberOfLines={1}>
+					<BodyMSB numberOfLines={1}>{config.name}</BodyMSB>
+					<CaptionB color="white50" numberOfLines={1}>
 						{config.description}
-					</Caption13M>
+					</CaptionB>
 				</View>
 				<ChevronRight
 					style={styles.arrow}
-					color="gray1"
+					color="white50"
 					width={24}
 					height={24}
 				/>
diff --git a/src/store/index.ts b/src/store/index.ts
index 1cf3e4741..b8f8ad725 100644
--- a/src/store/index.ts
+++ b/src/store/index.ts
@@ -40,7 +40,7 @@ const persistConfig = {
 	key: 'root',
 	storage: mmkvStorage,
 	// increase version after store shape changes
-	version: 40,
+	version: 41,
 	stateReconciler: autoMergeLevel2,
 	blacklist: ['receive', 'ui'],
 	migrate: createMigrate(migrations, { debug: __ENABLE_MIGRATION_DEBUG__ }),
diff --git a/src/store/migrations/index.ts b/src/store/migrations/index.ts
index eb01f98ce..6a70dcab1 100644
--- a/src/store/migrations/index.ts
+++ b/src/store/migrations/index.ts
@@ -561,6 +561,15 @@ const migrations = {
 			lightning: { ...state.lightning, nodes },
 		};
 	},
+	41: (state): PersistedState => {
+		return {
+			...state,
+			settings: {
+				...state.settings,
+				showWidgetTitles: false,
+			},
+		};
+	},
 };
 
 export default migrations;
diff --git a/src/store/reselect/aggregations.ts b/src/store/reselect/aggregations.ts
index 65eba39eb..b639d2f5c 100644
--- a/src/store/reselect/aggregations.ts
+++ b/src/store/reselect/aggregations.ts
@@ -36,7 +36,7 @@ export type TLnSetup = {
 		startValue: number;
 		endValue: number;
 		maxValue: number;
-		snapPoint: number;
+		snapPoint?: number;
 	};
 	percentage: {
 		spendings: number;
@@ -115,6 +115,7 @@ export const lnSetupSelector = createSelector(
 		);
 
 		const initialClientBalance = lightningBalance || defaultClientBalance;
+		const snapPoint = lightningBalance === 0 ? undefined : lightningBalance;
 		const isTransferringToSavings = spendingAmount < lightningBalance;
 		const canContinue =
 			spendingAmount !== lightningBalance && spendingAmount <= spendingLimit;
@@ -124,7 +125,7 @@ export const lnSetupSelector = createSelector(
 				startValue: 0,
 				maxValue: spendingLimit,
 				endValue: totalBalance,
-				snapPoint: lightningBalance,
+				snapPoint,
 			},
 			percentage: {
 				spendings: spendingPercentage,
diff --git a/src/store/reselect/settings.ts b/src/store/reselect/settings.ts
index d8d8c3051..f263006f6 100644
--- a/src/store/reselect/settings.ts
+++ b/src/store/reselect/settings.ts
@@ -106,6 +106,10 @@ export const showWidgetsSelector = createSelector(
 	[settingsState],
 	(settings): boolean => settings.showWidgets,
 );
+export const showWidgetTitlesSelector = createSelector(
+	[settingsState],
+	(settings): boolean => settings.showWidgetTitles,
+);
 export const receivePreferenceSelector = createSelector(
 	[settingsState],
 	(settings): TReceiveOption[] => settings.receivePreference,
diff --git a/src/store/reselect/todos.ts b/src/store/reselect/todos.ts
index 52cb3d4d4..dd395aad8 100644
--- a/src/store/reselect/todos.ts
+++ b/src/store/reselect/todos.ts
@@ -12,9 +12,11 @@ import {
 	lightningTodo,
 	pinTodo,
 	slashtagsProfileTodo,
+	supportTodo,
 	transferPendingTodo,
 	transferClosingChannelTodo,
 	btFailedTodo,
+	inviteTodo,
 } from '../shapes/todos';
 import {
 	backupVerifiedSelector,
@@ -112,10 +114,10 @@ export const todosFullSelector = createSelector(
 		} else if (showFailedBTOrder) {
 			// failed blocktank order
 			res.push(btFailedTodo);
+		} else if (transferToSpending) {
+			res.push(lightningSettingUpTodo);
 		} else if (openChannels.length === 0 && closedChannels.length === 0) {
-			if (transferToSpending) {
-				res.push(lightningSettingUpTodo);
-			} else if (transferToSavings) {
+			if (transferToSavings) {
 				const transfer = transferToSavings as TTransferToSavings;
 				const requiredConfs = 6;
 				const duration = (requiredConfs - transfer.confirmations) * 10;
@@ -127,8 +129,6 @@ export const todosFullSelector = createSelector(
 			// some channels exist
 			if (startCoopCloseTimestamp > 0) {
 				res.push(transferClosingChannelTodo);
-			} else if (transferToSpending) {
-				res.push({ ...transferPendingTodo, duration: 10 });
 			} else if (transferToSavings) {
 				const transfer = transferToSavings as TTransferToSavings;
 				const requiredConfs = 6;
@@ -140,14 +140,24 @@ export const todosFullSelector = createSelector(
 		if (!hide.pin && !pinTodoDone) {
 			res.push(pinTodo);
 		}
-
-		if (!hide.slashtagsProfile && onboardingStep !== 'Done') {
-			res.push(slashtagsProfileTodo);
-		}
-
 		if (!hide.buyBitcoin) {
 			res.push(buyBitcoinTodo);
 		}
+		if (!hide.support) {
+			res.push(supportTodo);
+		}
+		if (!hide.invite) {
+			res.push(inviteTodo);
+		}
+		// if (!hide.fastpay) {
+		// 	res.push(fastpayTodo);
+		// }
+		if (!hide.slashtagsProfile && onboardingStep !== 'Done') {
+			res.push(slashtagsProfileTodo);
+		}
+		// if (!hide.discount) {
+		// 	res.push(discountTodo);
+		// }
 
 		return res;
 	},
diff --git a/src/store/reselect/user.ts b/src/store/reselect/user.ts
index c7807d714..7e0c43c08 100644
--- a/src/store/reselect/user.ts
+++ b/src/store/reselect/user.ts
@@ -49,11 +49,6 @@ export const ignoreAppUpdateTimestampSelector = createSelector(
 	(user): number => user.ignoreAppUpdateTimestamp,
 );
 
-export const betaRiskAcceptedSelector = createSelector(
-	[userState],
-	(user): boolean => user.betaRiskAccepted,
-);
-
 export const ignoresHideBalanceToastSelector = createSelector(
 	[userState],
 	(user): boolean => user.ignoresHideBalanceToast,
diff --git a/src/store/shapes/settings.ts b/src/store/shapes/settings.ts
index 179a9b83f..ad9c42d9a 100644
--- a/src/store/shapes/settings.ts
+++ b/src/store/shapes/settings.ts
@@ -95,6 +95,7 @@ export const initialSettingsState: TSettings = {
 	receivePreference: defaultReceivePreference,
 	enableOfflinePayments: false,
 	showWidgets: true,
+	showWidgetTitles: false,
 	transactionSpeed: ETransactionSpeed.normal,
 	customFeeRate: 0,
 	hideBalance: false,
diff --git a/src/store/shapes/todos.ts b/src/store/shapes/todos.ts
index f84c4e2fa..a094de844 100644
--- a/src/store/shapes/todos.ts
+++ b/src/store/shapes/todos.ts
@@ -5,65 +5,92 @@ const imageLightning = require('../../assets/illustrations/lightning.png');
 const imageTransfer = require('../../assets/illustrations/transfer.png');
 const imageShield = require('../../assets/illustrations/shield.png');
 const imageCrown = require('../../assets/illustrations/crown-no-margins.png');
+const imageLightbulb = require('../../assets/illustrations/lightbulb.png');
 const imageBitcoin = require('../../assets/illustrations/b-emboss.png');
+const imageGift = require('../../assets/illustrations/gift.png');
+const imageGroup = require('../../assets/illustrations/group.png');
 
 export const backupSeedPhraseTodo: ITodo = {
 	id: 'backupSeedPhrase',
-	color: 'blue',
+	color: 'blue24',
 	image: imageSafe,
 	dismissable: true,
 };
+export const discountTodo: ITodo = {
+	id: 'discount',
+	color: 'purple24',
+	image: imageGift,
+	dismissable: true,
+};
+export const fastpayTodo: ITodo = {
+	id: 'fastpay',
+	color: 'green24',
+	image: imageLightning,
+	dismissable: true,
+};
+export const inviteTodo: ITodo = {
+	id: 'invite',
+	color: 'blue24',
+	image: imageGroup,
+	dismissable: true,
+};
 export const lightningTodo: ITodo = {
 	id: 'lightning',
-	color: 'purple',
+	color: 'purple24',
 	image: imageLightning,
 	dismissable: true,
 };
 export const lightningSettingUpTodo: ITodo = {
 	id: 'lightningSettingUp',
-	color: 'purple',
-	image: imageLightning,
+	color: 'purple24',
+	image: imageTransfer,
 	dismissable: false,
 };
 export const lightningReadyTodo: ITodo = {
 	id: 'lightningReady',
-	color: 'purple',
+	color: 'purple24',
 	image: imageLightning,
 	dismissable: false,
 };
 export const transferPendingTodo: ITodo = {
 	id: 'transferPending',
-	color: 'purple',
+	color: 'purple24',
 	image: imageTransfer,
 	dismissable: false,
 };
 export const transferClosingChannelTodo: ITodo = {
 	id: 'transferClosingChannel',
-	color: 'purple',
+	color: 'purple24',
 	image: imageTransfer,
 	dismissable: false,
 };
 export const pinTodo: ITodo = {
 	id: 'pin',
-	color: 'green',
+	color: 'green24',
 	image: imageShield,
 	dismissable: true,
 };
 export const slashtagsProfileTodo: ITodo = {
 	id: 'slashtagsProfile',
-	color: 'brand',
+	color: 'brand24',
 	image: imageCrown,
 	dismissable: true,
 };
+export const supportTodo: ITodo = {
+	id: 'support',
+	color: 'yellow24',
+	image: imageLightbulb,
+	dismissable: true,
+};
 export const buyBitcoinTodo: ITodo = {
 	id: 'buyBitcoin',
-	color: 'orange',
+	color: 'brand24',
 	image: imageBitcoin,
 	dismissable: true,
 };
 export const btFailedTodo: ITodo = {
 	id: 'btFailed',
-	color: 'gray',
+	color: 'purple24',
 	image: imageLightning,
 	dismissable: true,
 };
diff --git a/src/store/slices/settings.ts b/src/store/slices/settings.ts
index a4b6f87ec..bdbb1e4bd 100644
--- a/src/store/slices/settings.ts
+++ b/src/store/slices/settings.ts
@@ -35,6 +35,7 @@ export type TSettings = {
 	receivePreference: TReceiveOption[];
 	enableOfflinePayments: boolean;
 	showWidgets: boolean;
+	showWidgetTitles: boolean;
 	transactionSpeed: ETransactionSpeed;
 	customFeeRate: number;
 	hideBalance: boolean;
diff --git a/src/store/slices/user.ts b/src/store/slices/user.ts
index 063c0913d..96a7e3edc 100644
--- a/src/store/slices/user.ts
+++ b/src/store/slices/user.ts
@@ -4,7 +4,6 @@ export const MAX_WARNINGS = 3; // how many times to show high balance warning
 
 export type TUser = {
 	backupVerified: boolean;
-	betaRiskAccepted: boolean;
 	ignoreAppUpdateTimestamp: number;
 	ignoreBackupTimestamp: number;
 	ignoreHighBalanceCount: number;
@@ -19,7 +18,6 @@ export type TUser = {
 
 export const initialUserState: TUser = {
 	backupVerified: false,
-	betaRiskAccepted: false,
 	ignoreAppUpdateTimestamp: 0,
 	ignoreBackupTimestamp: 0,
 	ignoreHighBalanceCount: 0,
@@ -62,9 +60,6 @@ export const userSlice = createSlice({
 		verifyBackup: (state) => {
 			state.backupVerified = true;
 		},
-		acceptBetaRisk: (state) => {
-			state.betaRiskAccepted = true;
-		},
 		ignoreHideBalanceToast: (state) => {
 			state.ignoresHideBalanceToast = true;
 		},
@@ -86,7 +81,6 @@ export const {
 	startCoopCloseTimer,
 	clearCoopCloseTimer,
 	verifyBackup,
-	acceptBetaRisk,
 	ignoreHideBalanceToast,
 	ignoreSwitchUnitToast,
 	resetUserState,
diff --git a/src/store/types/todos.ts b/src/store/types/todos.ts
index 3fa980c55..868a1dc1b 100644
--- a/src/store/types/todos.ts
+++ b/src/store/types/todos.ts
@@ -3,16 +3,20 @@ import { IColors } from '../../styles/colors';
 
 export type TTodoType =
 	| 'backupSeedPhrase'
-	| 'pin'
+	| 'btFailed'
+	| 'buyBitcoin'
+	| 'discount'
+	| 'fastpay'
+	| 'invite'
 	| 'lightning'
 	| 'lightningSettingUp'
 	| 'lightningConnecting'
 	| 'lightningReady'
+	| 'slashtagsProfile'
+	| 'support'
 	| 'transferPending'
 	| 'transferClosingChannel'
-	| 'slashtagsProfile'
-	| 'buyBitcoin'
-	| 'btFailed';
+	| 'pin';
 
 export interface ITodo {
 	id: TTodoType;
diff --git a/src/store/types/ui.ts b/src/store/types/ui.ts
index e0b2109b1..9443c25d4 100644
--- a/src/store/types/ui.ts
+++ b/src/store/types/ui.ts
@@ -1,5 +1,6 @@
 import { LNURLWithdrawParams, LNURLPayParams } from 'js-lnurl';
 import { EActivityType, TOnchainActivityItem } from './activity';
+import { ReceiveStackParamList } from '../../navigation/bottom-sheet/ReceiveNavigation';
 import { SendStackParamList } from '../../navigation/bottom-sheet/SendNavigation';
 
 export type ViewControllerParamList = {
@@ -18,7 +19,7 @@ export type ViewControllerParamList = {
 	};
 	PINNavigation: { showLaterButton: boolean };
 	profileAddDataForm: undefined;
-	receiveNavigation: undefined;
+	receiveNavigation: { receiveScreen: keyof ReceiveStackParamList } | undefined;
 	sendNavigation: { screen: keyof SendStackParamList } | undefined;
 	slashauthModal: { url: string };
 	timeRangePrompt: undefined;
@@ -44,6 +45,7 @@ export type IViewControllerData = {
 	onchainActivityItem?: TOnchainActivityItem;
 	id?: string;
 	screen?: keyof SendStackParamList;
+	receiveScreen?: keyof ReceiveStackParamList;
 	showLaterButton?: boolean;
 	txId?: string;
 	url?: string;
diff --git a/src/store/types/wallet.ts b/src/store/types/wallet.ts
index d2f859650..0c6c9e298 100644
--- a/src/store/types/wallet.ts
+++ b/src/store/types/wallet.ts
@@ -15,7 +15,6 @@ import {
 } from 'beignet';
 
 export type TKeyDerivationAccountType = 'onchain';
-export type TAssetType = 'bitcoin' | 'tether';
 
 export enum EConversionUnit {
 	satoshi = 'satoshi',
diff --git a/src/styles/colors.ts b/src/styles/colors.ts
index 7ea5d27a0..4d421b35e 100644
--- a/src/styles/colors.ts
+++ b/src/styles/colors.ts
@@ -1,128 +1,97 @@
 export interface IColors {
-	orange: string;
-	black: string;
-	lightGray: string;
-	gray: string;
-	darkGray: string;
-	white: string;
+	// Accents
+	bitcoin: string;
+	blue: string;
+	brand: string;
 	green: string;
-	green2: string;
+	purple: string;
 	red: string;
-	brand: string;
-	tether: string;
-	blue: string;
 	yellow: string;
-	indigo: string;
-	purple: string;
-	bitcoin: string;
-	destructive: string;
+
+	// Base
+	black: string;
+	white: string;
+
+	// Gray Base
 	gray6: string;
 	gray5: string;
-	gray4: string;
 	gray3: string;
 	gray2: string;
-	gray1: string;
-	gray592: string;
-	gray336: string;
-	gray324: string;
-	gray308: string;
-	white01: string;
-	white04: string;
-	white05: string;
+
+	// Alpha
+	black50: string;
+	black92: string;
 	white06: string;
 	white08: string;
 	white10: string;
 	white16: string;
-	white30: string;
 	white32: string;
-	white40: string;
 	white50: string;
 	white80: string;
-	white84: string;
-	red16: string;
-	orange16: string;
-	orange50: string;
-	green16: string;
-	blue03: string;
-	black5: string;
-	black92: string;
+	bitcoin50: string;
+	blue24: string;
 	brand08: string;
-	yellow08: string;
-	yellow16: string;
-	purple5: string;
-	purple16: string;
-	purple32: string;
 	brand16: string;
+	brand24: string;
 	brand32: string;
+	green16: string;
+	green24: string;
+	purple50: string;
+	purple16: string;
+	purple24: string;
+	purple32: string;
+	red16: string;
+	red24: string;
+	yellow16: string;
+	yellow24: string;
 }
 
 const colors: IColors = {
-	// Brand
-	brand: '#FF6600',
-	tether: '#009393',
-
 	// Accents
+	bitcoin: '#F7931A',
 	blue: '#0085FF',
+	brand: '#FF4400',
 	green: '#75BF72',
-	green2: '#22C846',
-	yellow: '#FFD200',
-	orange: '#FF6600',
-	red: '#E95164',
-	indigo: '#2D5BFF',
 	purple: '#B95CE8',
-	bitcoin: '#F7931A',
+	red: '#E95164',
+	yellow: '#FFD200',
 
 	// Base
 	black: '#000000',
 	white: '#FFFFFF',
 
-	// System
-	destructive: '#E43B44',
-
 	// Gray Base
 	gray6: '#151515',
 	gray5: '#1C1C1D',
-	gray4: '#3A3A3C',
 	gray3: '#48484A',
-	gray: '#5F5F5F',
 	gray2: '#636366',
-	darkGray: '#6e6e6e',
-	lightGray: '#7C7C7C',
-	gray1: '#8E8E93',
 
 	// Alpha
-	gray592: 'rgba(28, 28, 29, 0.92)',
-	gray336: 'rgba(72, 72, 74, 0.36)',
-	gray324: 'rgba(72, 72, 74, 0.24)',
-	gray308: 'rgba(72, 72, 74, 0.08)',
-	white01: 'rgba(255, 255, 255, 0.01)',
-	white04: 'rgba(255, 255, 255, 0.04)',
-	white05: 'rgba(255, 255, 255, 0.05)',
+	black50: 'rgba(0, 0, 0, 0.5)',
+	black92: 'rgba(0, 0, 0, 0.92)',
 	white06: 'rgba(255, 255, 255, 0.06)',
 	white08: 'rgba(255, 255, 255, 0.08)',
 	white10: 'rgba(255, 255, 255, 0.10)',
 	white16: 'rgba(255, 255, 255, 0.16)',
-	white30: 'rgba(255, 255, 255, 0.30)',
 	white32: 'rgba(255, 255, 255, 0.32)',
-	white40: 'rgba(255, 255, 255, 0.40)',
 	white50: 'rgba(255, 255, 255, 0.50)',
 	white80: 'rgba(255, 255, 255, 0.80)',
-	white84: 'rgba(255, 255, 255, 0.84)',
-	red16: 'rgba(233, 81, 100, 0.16)',
-	orange16: 'rgba(247, 147, 26, 0.16)',
-	orange50: 'rgba(247, 147, 26, 0.50)',
+	blue24: 'rgba(0, 133, 255, 0.24)',
+	bitcoin50: 'rgba(247, 147, 26, 0.5)',
+	brand08: 'rgba(255, 68, 0, 0.08)',
+	brand16: 'rgba(255, 68, 0, 0.16)',
+	brand24: 'rgba(255, 68, 0, 0.24)',
+	brand32: 'rgba(255, 68, 0, 0.32)',
 	green16: 'rgba(117, 191, 114, 0.16)',
-	blue03: 'rgba(0, 133, 255, 0.3)',
-	black5: 'rgba(0, 0, 0, 0.5)',
-	black92: 'rgba(0, 0, 0, 0.92)',
-	brand08: 'rgba(255, 102, 0, 0.08)',
-	brand16: 'rgba(255, 102, 0, 0.16)',
-	brand32: 'rgba(255, 102, 0, 0.32)',
-	yellow08: 'rgba(255, 174, 0, 0.08)',
-	yellow16: 'rgba(255, 174, 0, 0.16)',
-	purple5: 'rgba(185, 92, 232, 0.5)',
+	green24: 'rgba(117, 191, 114, 0.24)',
 	purple16: 'rgba(185, 92, 232, 0.16)',
+	purple24: 'rgba(185, 92, 232, 0.24)',
 	purple32: 'rgba(185, 92, 232, 0.32)',
+	purple50: 'rgba(185, 92, 232, 0.5)',
+	red16: 'rgba(233, 81, 100, 0.16)',
+	red24: 'rgba(233, 81, 100, 0.24)',
+	yellow16: 'rgba(255, 210, 0, 0.16)',
+	yellow24: 'rgba(255, 210, 0, 0.24)',
 };
 
 export default colors;
diff --git a/src/styles/components.ts b/src/styles/components.ts
index 1d419bcf2..f32a44e77 100644
--- a/src/styles/components.ts
+++ b/src/styles/components.ts
@@ -105,7 +105,7 @@ export const Pressable = styled(RNPressable)<PressableProps & ColorProps>(
 		backgroundColor: props.color
 			? props.theme.colors[props.color]
 			: props.theme.colors.background,
-		opacity: props.disabled ? 0.4 : 1,
+		opacity: props.disabled ? 0.5 : 1,
 	}),
 );
 
@@ -128,9 +128,9 @@ export const TextInput = styled(RNTextInput).attrs<TextInputProps>((props) => ({
 	selectionColor: colors.brand,
 	placeholderTextColor: props.placeholderTextColor
 		? props.placeholderTextColor
-		: props.theme.colors.gray1,
+		: props.theme.colors.white50,
 }))<TextInputProps>((props) => ({
-	...props.theme.fonts.semibold,
+	...props.theme.fonts.semiBold,
 	backgroundColor: props.backgroundColor
 		? props.theme.colors[props.backgroundColor]
 		: props.theme.colors.white10,
@@ -153,10 +153,10 @@ export const TextInputNoOutline = styled(RNTextInput).attrs<TextInputProps>(
 		selectionColor: colors.brand,
 		placeholderTextColor: props.placeholderTextColor
 			? props.placeholderTextColor
-			: props.theme.colors.gray1,
+			: props.theme.colors.white50,
 	}),
 )<TextInputProps>((props) => ({
-	...props.theme.fonts.semibold,
+	...props.theme.fonts.semiBold,
 	fontSize: '15px',
 	color: props.color
 		? props.theme.colors[props.color]
@@ -173,7 +173,7 @@ export const BottomSheetTextInput = styled(
 		? props.placeholderTextColor
 		: props.theme.colors.white50,
 }))<TextInputProps>((props) => ({
-	...props.theme.fonts.semibold,
+	...props.theme.fonts.semiBold,
 	backgroundColor: props.backgroundColor
 		? props.theme.colors[props.backgroundColor]
 		: props.theme.colors.white06,
diff --git a/src/styles/icons.ts b/src/styles/icons.ts
index 488907c5d..0fa8c1eef 100644
--- a/src/styles/icons.ts
+++ b/src/styles/icons.ts
@@ -38,7 +38,6 @@ import {
 	scanIcon,
 	cameraIcon,
 	savingsIcon,
-	bIcon,
 	unitBitcoinIcon,
 	unitFiatIcon,
 	trashIcon,
@@ -66,6 +65,7 @@ import {
 	shareIosIcon,
 	shareAndroidIcon,
 	hourglassSimpleIcon,
+	qrIcon,
 	questionMarkIcon,
 	unifiedCircleIcon,
 	lightningCircleIcon,
@@ -82,7 +82,6 @@ import {
 	copyIcon,
 	faceIdIcon,
 	touchIdIcon,
-	bitkitIcon,
 	emailIcon,
 	githubIcon,
 	globeIcon,
@@ -328,7 +327,7 @@ const ShareIosIcon = styled(SvgXml).attrs((props) => ({
 	color: props.color ? props.theme.colors[props.color] : 'white',
 }));
 
-const ShareAndroidIcon = styled(SvgXml).attrs((props) => ({
+export const ShareAndroidIcon = styled(SvgXml).attrs((props) => ({
 	xml: shareAndroidIcon(
 		props.color ? props.theme.colors[props.color] : 'white',
 	),
@@ -365,14 +364,6 @@ export const SavingsIcon = styled(SvgXml).attrs((props) => ({
 	color: props.color ? props.theme.colors[props.color] : 'white',
 }));
 
-export const BitcoinIcon = styled(SvgXml).attrs((props) => ({
-	xml: bIcon(props.color ? props.theme.colors[props.color] : 'white'),
-	height: props.height ?? '42px',
-	width: props.width ?? '26px',
-}))<IconProps>((props) => ({
-	color: props.color ? props.theme.colors[props.color] : 'white',
-}));
-
 export const BitcoinSlantedIcon = styled(SvgXml).attrs((props) => ({
 	xml: bitcoinSlantedIcon(
 		props.color ? props.theme.colors[props.color] : 'white',
@@ -408,14 +399,10 @@ export const FingerPrintIcon = styled(SvgXml).attrs((props) => ({
 }));
 
 export const BitcoinCircleIcon = styled(SvgXml).attrs((props) => ({
-	xml: bitcoinCircleIcon(
-		props.color ? props.theme.colors[props.color] : 'white',
-	),
+	xml: bitcoinCircleIcon(),
 	height: props.height ?? '32px',
 	width: props.width ?? '32px',
-}))<IconProps>((props) => ({
-	color: props.color ? props.theme.colors[props.color] : 'white',
-}));
+}))<IconProps>(() => {});
 
 export const LightningCircleIcon = styled(SvgXml).attrs((props) => ({
 	xml: lightningCircleIcon(),
@@ -511,8 +498,8 @@ export const ArrowLNFunds = styled(SvgXml).attrs((props) => ({
 	xml: arrowLNfunds(
 		props.color ? props.theme.colors[props.color] : props.theme.colors.white,
 	),
-	height: props.height ?? '52px',
-	width: props.width ?? '97px',
+	height: props.height ?? '20px',
+	width: props.width ?? '45px',
 	position: 'absolute',
 	right: 15,
 	bottom: 0,
@@ -542,7 +529,7 @@ export const ArrowCounterClock = styled(SvgXml).attrs((props) => ({
 
 export const Checkmark = styled(SvgXml).attrs((props) => ({
 	xml: checkmarkIcon(
-		props.color ? props.theme.colors[props.color] : props.theme.colors.green2,
+		props.color ? props.theme.colors[props.color] : props.theme.colors.brand,
 	),
 	height: props.height ?? '16px',
 	width: props.width ?? '16px',
@@ -598,7 +585,7 @@ export const ProfileIcon = styled(SvgXml).attrs((props) => ({
 
 export const ListIcon = styled(SvgXml).attrs((props) => ({
 	xml: listIcon(
-		props.color ? props.theme.colors[props.color] : props.theme.colors.gray1,
+		props.color ? props.theme.colors[props.color] : props.theme.colors.white50,
 	),
 	height: props.height ?? '24px',
 	width: props.width ?? '24px',
@@ -664,16 +651,6 @@ export const CornersOutIcon = styled(SvgXml).attrs((props) => ({
 	color: props.color ? props.theme.colors[props.color] : 'white',
 }));
 
-export const BitkitIcon = styled(SvgXml).attrs((props) => ({
-	xml: bitkitIcon(
-		props.color ? props.theme.colors[props.color] : props.theme.colors.brand,
-	),
-	height: props.height ?? '184px',
-	width: props.width ?? '64px',
-}))<IconProps>((props) => ({
-	color: props.color ? props.theme.colors[props.color] : 'white',
-}));
-
 export const EmailIcon = styled(SvgXml).attrs((props) => ({
 	xml: emailIcon(
 		props.color ? props.theme.colors[props.color] : props.theme.colors.brand,
@@ -871,6 +848,16 @@ export const NewspaperIcon = styled(SvgXml).attrs((props) => ({
 	color: props.color ? props.theme.colors[props.color] : 'white',
 }));
 
+export const QrIcon = styled(SvgXml).attrs((props) => ({
+	xml: qrIcon(
+		props.color ? props.theme.colors[props.color] : props.theme.colors.brand,
+	),
+	height: props.height ?? '64px',
+	width: props.width ?? '64px',
+}))<IconProps>((props) => ({
+	color: props.color ? props.theme.colors[props.color] : 'white',
+}));
+
 export const QuestionMarkIcon = styled(SvgXml).attrs((props) => ({
 	xml: questionMarkIcon(),
 	height: props.height ?? '30px',
@@ -971,56 +958,56 @@ export const GeneralSettingsIcon = styled(SvgXml).attrs((props) => ({
 	xml: generalSettingsIcon(
 		props.color ? props.theme.colors[props.color] : 'white',
 	),
-	height: '40px',
-	width: '40px',
+	height: props.height ?? '33px',
+	width: props.width ?? '32px',
 }))<IconProps>((props) => ({
 	color: props.color ? props.theme.colors[props.color] : 'white',
 }));
 
 export const SecurityIcon = styled(SvgXml).attrs((props) => ({
 	xml: securityIcon(props.color ? props.theme.colors[props.color] : 'white'),
-	height: '40px',
-	width: '40px',
+	height: props.height ?? '33px',
+	width: props.width ?? '32px',
 }))<IconProps>((props) => ({
 	color: props.color ? props.theme.colors[props.color] : 'white',
 }));
 
 export const BackupIcon = styled(SvgXml).attrs((props) => ({
 	xml: backupIcon(props.color ? props.theme.colors[props.color] : 'white'),
-	height: '40px',
-	width: '40px',
+	height: props.height ?? '33px',
+	width: props.width ?? '32px',
 }))<IconProps>((props) => ({
 	color: props.color ? props.theme.colors[props.color] : 'white',
 }));
 
 export const AdvancedIcon = styled(SvgXml).attrs((props) => ({
 	xml: advancedIcon(props.color ? props.theme.colors[props.color] : 'white'),
-	height: '40px',
-	width: '40px',
+	height: props.height ?? '33px',
+	width: props.width ?? '32px',
 }))<IconProps>((props) => ({
 	color: props.color ? props.theme.colors[props.color] : 'white',
 }));
 
 export const SupportIcon = styled(SvgXml).attrs((props) => ({
 	xml: supportIcon(props.color ? props.theme.colors[props.color] : 'white'),
-	height: '40px',
-	width: '40px',
+	height: props.height ?? '33px',
+	width: props.width ?? '32px',
 }))<IconProps>((props) => ({
 	color: props.color ? props.theme.colors[props.color] : 'white',
 }));
 
 export const AboutIcon = styled(SvgXml).attrs((props) => ({
 	xml: aboutIcon(props.color ? props.theme.colors[props.color] : 'white'),
-	height: '40px',
-	width: '40px',
+	height: props.height ?? '33px',
+	width: props.width ?? '32px',
 }))<IconProps>((props) => ({
 	color: props.color ? props.theme.colors[props.color] : 'white',
 }));
 
 export const DevSettingsIcon = styled(SvgXml).attrs((props) => ({
 	xml: devSettingsIcon(props.color ? props.theme.colors[props.color] : 'white'),
-	height: '40px',
-	width: '40px',
+	height: props.height ?? '33px',
+	width: props.width ?? '32px',
 }))<IconProps>((props) => ({
 	color: props.color ? props.theme.colors[props.color] : 'white',
 }));
diff --git a/src/styles/text.ts b/src/styles/text.ts
index cb6e9c513..f21caed2a 100644
--- a/src/styles/text.ts
+++ b/src/styles/text.ts
@@ -5,31 +5,65 @@ type TextProps = {
 	color?: keyof IThemeColors;
 };
 
-export const Display = styled.Text<TextProps & { lineHeight?: string }>(
-	({ theme, color, lineHeight }) => ({
+export const DisplayT = styled.Text<TextProps & { lineHeight?: number }>(
+	({ theme, color, lineHeight = 48 }) => ({
 		...theme.fonts.bold,
 		fontSize: '48px',
-		lineHeight: lineHeight ?? '48px',
 		color: theme.colors[color ?? 'text'],
+		letterSpacing: 0,
+		// fix glyphs cut off at the top
+		lineHeight: `${lineHeight}px`,
+		paddingTop: lineHeight,
+		marginTop: -lineHeight,
+		// because of the negative margin, the component may overlap with other elements
+		pointerEvents: 'none',
 	}),
 );
 
-export const Headline = styled.Text<TextProps & { lineHeight?: string }>(
-	({ theme, color, lineHeight }) => ({
-		...theme.fonts.bold,
-		fontSize: '34px',
-		lineHeight: lineHeight ?? '34px',
+export const Display = styled.Text<TextProps & { lineHeight?: number }>(
+	({ theme, color, lineHeight = 44 }) => ({
+		...theme.fonts.black,
+		fontSize: '44px',
+		color: theme.colors[color ?? 'text'],
+		letterSpacing: -1,
+		textTransform: 'uppercase',
+		// fix glyphs cut off at the top
+		lineHeight: `${lineHeight}px`,
+		paddingTop: lineHeight,
+		marginTop: -lineHeight,
+		// because of the negative margin, the component may overlap with other elements
+		pointerEvents: 'none',
+	}),
+);
+
+export const Headline = styled.Text<TextProps & { lineHeight?: number }>(
+	({ theme, color, lineHeight = 30 }) => ({
+		...theme.fonts.black,
+		fontSize: '30px',
 		color: theme.colors[color ?? 'text'],
+		letterSpacing: -1,
+		textTransform: 'uppercase',
+		// fix glyphs cut off at the top
+		lineHeight: `${lineHeight}px`,
+		paddingTop: lineHeight,
+		marginTop: -lineHeight,
+		// because of the negative margin, the component may overlap with other elements
+		pointerEvents: 'none',
 	}),
 );
 
-export const Title = styled.Text<TextProps & { lineHeight?: string }>(
-	({ theme, color, lineHeight }) => ({
+export const Title = styled.Text<TextProps & { lineHeight?: number }>(
+	({ theme, color, lineHeight = 26 }) => ({
 		...theme.fonts.bold,
 		fontSize: '22px',
-		lineHeight: lineHeight ?? '26px',
 		color: theme.colors[color ?? 'text'],
 		letterSpacing: 0.4,
+		// fix glyphs cut off at the top
+		lineHeight: `${lineHeight}px`,
+		paddingTop: lineHeight,
+		marginTop: -lineHeight,
+		// because of the negative margin, the component may overlap with other elements
+		pointerEvents: 'none',
 	}),
 );
 
@@ -46,7 +80,7 @@ export const Text = styled.Text<TextProps>(({ theme, color }) => ({
 	letterSpacing: 0.4,
 }));
 
-export const Text01S = styled.Text<TextProps>(({ theme, color }) => ({
+export const BodyM = styled.Text<TextProps>(({ theme, color }) => ({
 	...theme.fonts.regular,
 	fontSize: '17px',
 	lineHeight: '22px',
@@ -54,15 +88,15 @@ export const Text01S = styled.Text<TextProps>(({ theme, color }) => ({
 	letterSpacing: 0.4,
 }));
 
-export const Text01M = styled.Text<TextProps>(({ theme, color }) => ({
-	...theme.fonts.semibold,
+export const BodyMSB = styled.Text<TextProps>(({ theme, color }) => ({
+	...theme.fonts.semiBold,
 	fontSize: '17px',
 	lineHeight: '22px',
 	color: theme.colors[color ?? 'text'],
 	letterSpacing: 0.4,
 }));
 
-export const Text01B = styled.Text<TextProps>(({ theme, color }) => ({
+export const BodyMB = styled.Text<TextProps>(({ theme, color }) => ({
 	...theme.fonts.bold,
 	fontSize: '17px',
 	lineHeight: '22px',
@@ -70,7 +104,7 @@ export const Text01B = styled.Text<TextProps>(({ theme, color }) => ({
 	letterSpacing: 0.4,
 }));
 
-export const Text02S = styled.Text<TextProps>(({ theme, color }) => ({
+export const BodyS = styled.Text<TextProps>(({ theme, color }) => ({
 	...theme.fonts.regular,
 	fontSize: '15px',
 	lineHeight: '20px',
@@ -78,15 +112,15 @@ export const Text02S = styled.Text<TextProps>(({ theme, color }) => ({
 	letterSpacing: 0.4,
 }));
 
-export const Text02M = styled.Text<TextProps>(({ theme, color }) => ({
-	...theme.fonts.semibold,
+export const BodySSB = styled.Text<TextProps>(({ theme, color }) => ({
+	...theme.fonts.semiBold,
 	fontSize: '15px',
 	lineHeight: '20px',
 	color: theme.colors[color ?? 'text'],
 	letterSpacing: 0.4,
 }));
 
-export const Text02B = styled.Text<TextProps>(({ theme, color }) => ({
+export const BodySB = styled.Text<TextProps>(({ theme, color }) => ({
 	...theme.fonts.bold,
 	fontSize: '15px',
 	lineHeight: '20px',
@@ -94,14 +128,6 @@ export const Text02B = styled.Text<TextProps>(({ theme, color }) => ({
 	letterSpacing: 0.4,
 }));
 
-export const Text13S = styled.Text<TextProps>(({ theme, color }) => ({
-	...theme.fonts.regular,
-	fontSize: '13px',
-	lineHeight: '18px',
-	color: theme.colors[color ?? 'text'],
-	letterSpacing: 0.4,
-}));
-
 export const Text13UP = styled.Text<TextProps>(({ theme, color }) => ({
 	...theme.fonts.medium,
 	fontSize: '13px',
@@ -111,7 +137,7 @@ export const Text13UP = styled.Text<TextProps>(({ theme, color }) => ({
 	letterSpacing: 0.4,
 }));
 
-export const Caption13S = styled.Text<TextProps>(({ theme, color }) => ({
+export const Caption = styled.Text<TextProps>(({ theme, color }) => ({
 	...theme.fonts.regular,
 	fontSize: '13px',
 	lineHeight: '18px',
@@ -119,8 +145,8 @@ export const Caption13S = styled.Text<TextProps>(({ theme, color }) => ({
 	letterSpacing: 0.4,
 }));
 
-export const Caption13M = styled.Text<TextProps>(({ theme, color }) => ({
-	...theme.fonts.semibold,
+export const CaptionB = styled.Text<TextProps>(({ theme, color }) => ({
+	...theme.fonts.semiBold,
 	fontSize: '13px',
 	lineHeight: '18px',
 	color: theme.colors[color ?? 'text'],
diff --git a/src/styles/themes.ts b/src/styles/themes.ts
index 4f760e66b..0cb16079a 100644
--- a/src/styles/themes.ts
+++ b/src/styles/themes.ts
@@ -27,20 +27,22 @@ interface IFont {
 }
 
 interface IFonts {
-	regular: IFont | undefined;
-	medium: IFont | undefined;
-	semibold: IFont | undefined;
-	bold: IFont | undefined;
+	regular: IFont;
+	medium: IFont;
+	semiBold: IFont;
+	bold: IFont;
+	extraBold: IFont;
+	black: IFont;
 }
 
-export interface ITheme {
-	id: TTheme;
-	colors: IThemeColors;
+interface IDefaultThemeValues {
+	colors: IDefaultColors;
 	fonts: IFonts;
 }
 
-interface IDefaultThemeValues {
-	colors: IDefaultColors;
+export interface ITheme extends IDefaultThemeValues {
+	id: TTheme;
+	colors: IThemeColors;
 }
 
 const defaultThemeValues: IDefaultThemeValues = {
@@ -51,13 +53,14 @@ const defaultThemeValues: IDefaultThemeValues = {
 		error: '#D87682',
 		transparent: 'transparent',
 	},
-};
-
-const defaultFontsValues: IFonts = {
-	regular: {},
-	medium: {},
-	semibold: {},
-	bold: {},
+	fonts: {
+		regular: { fontFamily: 'InterTight-Regular' },
+		medium: { fontFamily: 'InterTight-Medium' },
+		semiBold: { fontFamily: 'InterTight-SemiBold' },
+		bold: { fontFamily: 'InterTight-Bold' },
+		extraBold: { fontFamily: 'InterTight-ExtraBold' },
+		black: { fontFamily: 'InterTight-Black' },
+	},
 };
 
 const light: ITheme = {
@@ -67,7 +70,7 @@ const light: ITheme = {
 		...defaultThemeValues.colors,
 		text: '#121212',
 		primary: '#121212',
-		background: colors.white84,
+		background: colors.white80,
 		surface: '#E8E8E8',
 		onBackground: '#121212',
 		onSurface: '#D6D6D6',
@@ -75,7 +78,6 @@ const light: ITheme = {
 		refreshControl: '#121212',
 		tabBackground: '#f2f2f2',
 	},
-	fonts: defaultFontsValues,
 };
 
 const dark: ITheme = {
@@ -93,27 +95,10 @@ const dark: ITheme = {
 		refreshControl: '#FFFFFF',
 		tabBackground: '#101010',
 	},
-	fonts: defaultFontsValues,
 };
 
 export const getTheme = (theme: string): ITheme => {
-	return {
-		...(theme === 'dark' ? dark : light),
-		fonts: {
-			regular: {
-				fontFamily: 'InterTight-Regular',
-			},
-			medium: {
-				fontFamily: 'InterTight-Medium',
-			},
-			semibold: {
-				fontFamily: 'InterTight-SemiBold',
-			},
-			bold: {
-				fontFamily: 'InterTight-Bold',
-			},
-		},
-	};
+	return theme === 'dark' ? dark : light;
 };
 
 export default { light, dark };
diff --git a/src/utils/helpers.ts b/src/utils/helpers.ts
index 16cc3fcbf..88ab74ce2 100644
--- a/src/utils/helpers.ts
+++ b/src/utils/helpers.ts
@@ -328,7 +328,7 @@ export const abbreviateNumber = (
 	return { newValue: _newValue, abbreviation };
 };
 
-export const timeAgo = (timestamp: number): string => {
+export const timeAgo = (timestamp: string | number | Date): string => {
 	const date = new Date(timestamp);
 
 	const today = new Date();
diff --git a/src/utils/i18n/locales/ca/onboarding.json b/src/utils/i18n/locales/ca/onboarding.json
index e8c9cc79b..b19495873 100644
--- a/src/utils/i18n/locales/ca/onboarding.json
+++ b/src/utils/i18n/locales/ca/onboarding.json
@@ -1,8 +1,8 @@
 {
   "tos_checkbox": "Termes d'ús",
-  "tos_checkbox_value": "<gray>Declaro que he llegit i accepto <brand>les condicions d'ús.</brand></gray>",
+  "tos_checkbox_value": "Declaro que he llegit i accepto <accent>les condicions d'ús.</accent>",
   "pp_checkbox": "Política de privadesa",
-  "pp_checkbox_value": "<gray>Declaro que he llegit i accpeto <brand>les polítiques de privacitat.</brand></gray>",
+  "pp_checkbox_value": "Declaro que he llegit i accpeto <accent>les polítiques de privacitat.</accent>",
   "toolkit_text": "Bitkit et dóna les claus del teu diners, perfil, contactes i comptes web.",
   "get_started": "Començar",
   "skip_intro": "Ometre introducció",
diff --git a/src/utils/i18n/locales/ca/other.json b/src/utils/i18n/locales/ca/other.json
index 37195310e..5e4a03b34 100644
--- a/src/utils/i18n/locales/ca/other.json
+++ b/src/utils/i18n/locales/ca/other.json
@@ -9,7 +9,7 @@
   "qr_error_no_data_text": "Bitkit no ha pogut llegir les dades proporcionades.",
   "qr_error_network_header": "Xarxa incorrecta",
   "qr_paste": "Enganxa el codi QR",
-  "buy_header": "Bitcoin\n<orange>per Bitkit.</orange>",
+  "buy_header": "Bitcoin\n<accent>per Bitkit.</accent>",
   "buy_button": "Comprar Bitcoin",
   "connection_lost_title": "Connexió perduda de Bitkit",
   "connection_lost_message": "Si us plau, verifiqueu la configuració del vostre servidor Electrum.",
diff --git a/src/utils/i18n/locales/ca/security.json b/src/utils/i18n/locales/ca/security.json
index be6f19d82..47469a73c 100644
--- a/src/utils/i18n/locales/ca/security.json
+++ b/src/utils/i18n/locales/ca/security.json
@@ -8,7 +8,7 @@
   "pass": "frase de pas",
   "pass_your": "La teva frase de pas",
   "pass_text": "Has afegit una contraseña a la teva frase de recuperació durant la configuració de la cartera.",
-  "pass_never_share": "<brand>Mai comparteixis</brand> la vostra frase de contrasenya amb qualsevol persona, ja que això pot provocar la pèrdua de fons.",
+  "pass_never_share": "<accent>Mai comparteixis</accent> la vostra frase de contrasenya amb qualsevol persona, ja que això pot provocar la pèrdua de fons.",
   "pass_confirm": "Confirmar la frase de pas",
   "pass_confirm_text": "Introduïu la frase de pas que heu afegit mentre configureu i creeu la vostra cartera.",
   "mnemonic_phrase": "Frase Mnemotècnica",
diff --git a/src/utils/i18n/locales/ca/slashtags.json b/src/utils/i18n/locales/ca/slashtags.json
index fd4e26978..7bc9b4d5a 100644
--- a/src/utils/i18n/locales/ca/slashtags.json
+++ b/src/utils/i18n/locales/ca/slashtags.json
@@ -36,15 +36,15 @@
   "signin_to_success_text_noname": "Has iniciat sessió amb èxit.",
   "signin_title": "Iniciar la sessió",
   "signin_title_loading": "Iniciant la sessió ...",
-  "onboarding_header": "Dinàmic\n<brand>Contactes.</brand>",
+  "onboarding_header": "Dinàmic\n<accent>Contactes.</accent>",
   "onboarding_text": "Utilitza Bitkit per obtenir actualitzacions automàtiques dels teus contactes, pagar-los i seguir els seus perfils públics.",
   "onboarding_button": "Afegiu el vostre primer contacte",
   "onboarding_profile1_text": "Utilitzeu Bitkit per controlar el vostre perfil públic i els enllaços, de manera que els vostres contactes puguin contactar-vos o pagar-vos en qualsevol moment.",
-  "onboarding_profile2_header": "Paga els teus\n<brand>Contactes.</brand>",
+  "onboarding_profile2_header": "Paga els teus\n<accent>Contactes.</accent>",
   "onboarding_profile2_text": "Vostè i els seus contactes poden utilitzar Bitkit per enviar pagaments directament, sense bancs, en qualsevol moment i en qualsevol lloc.",
-  "onboarding_widgets1_header": "Adéu,\n<brand>Contrasenyes.</brand>",
+  "onboarding_widgets1_header": "Adéu,\n<accent>Contrasenyes.</accent>",
   "onboarding_widgets1_text": "Experimenteu la web sense contrasenyes. Utilitzeu Bitkit per iniciar la sessió als vostres serveis web preferits.",
-  "onboarding_widgets2_header": "Hola,\n<brand>Ginys.</brand>",
+  "onboarding_widgets2_header": "Hola,\n<accent>Ginys.</accent>",
   "my_profile": "El meu perfil",
   "profile": "Perfil",
   "profile_save": "Desar perfil",
diff --git a/src/utils/i18n/locales/cs/common.json b/src/utils/i18n/locales/cs/common.json
index e7ab2b73c..33721f88a 100644
--- a/src/utils/i18n/locales/cs/common.json
+++ b/src/utils/i18n/locales/cs/common.json
@@ -6,8 +6,8 @@
   "yes_proceed": "Ano, pokračovat",
   "try_again": "Zkusit znovu",
   "dialog_cancel": "Ne, zrušit",
-  "sat_vbyte": "bitcoin / vbyte",
-  "sat_vbyte_compact": "bitcoin/vbyte",
+  "sat_vbyte": "₿ / vbyte",
+  "sat_vbyte_compact": "₿/vbyte",
   "edit": "Upravit",
   "copy": "Kopírovat",
   "share": "Sdílet",
diff --git a/src/utils/i18n/locales/cs/lightning.json b/src/utils/i18n/locales/cs/lightning.json
index 2ab5e9159..c263603f7 100644
--- a/src/utils/i18n/locales/cs/lightning.json
+++ b/src/utils/i18n/locales/cs/lightning.json
@@ -20,7 +20,7 @@
   "note_blocktank_limit": "Částka, kterou můžete převést na svůj disponibilní zůstatek, je aktuálně omezena na ${usdValue}.",
   "note_reserve_limit": "Částka, kterou můžete převést na svůj disponibilní zůstatek, je omezena na 80 %. Chcete-li tento bitcoin přesunout zpět do úspor, musíte si nechat prostředky v rezervě.",
   "quick_confirm_header": "Prosím potvrďte.",
-  "quick_confirm_cost": "Stojí to <highlight>{txFee}</highlight> za síťové poplatky a <highlight>{lspFee}</highlight> za poplatky poskytovatele serveru, abychom vás připojili k lightning síti a nastavili váš výdajový zůstatek.",
+  "quick_confirm_cost": "Stojí to <accent>{txFee}</accent> za síťové poplatky a <accent>{lspFee}</accent> za poplatky poskytovatele serveru, abychom vás připojili k lightning síti a nastavili váš výdajový zůstatek.",
   "connect_swipe": "Přejetím prstem se připojíte",
   "connect_swipe_pay": "Přejetím prstem zaplatíte a připojíte se",
   "spending_header": "<purple>Peníze k útratě.</purple>",
@@ -30,7 +30,7 @@
   "receiving_amount_bitcoin": "Zadejte množství bitcoinů, které chcete být schopni přijímat okamžitě.",
   "enter_custom_amount": "Zadejte částku",
   "custom_confirm_header": "<purple>Prosím\npotvrďte.</purple>",
-  "custom_confirm_cost": "Stojí to <highlight>{txFee}</highlight> na síťových poplatcích a <highlight>{lspFee}</highlight> poplatky poskytovateli serveru za připojení a nastavení zůstatku. Připojení lightning by mělo zůstat otevřené alespoň na <highlightWithKeyboard>{weeks, plural, one {# week} dalších {# weeks}</highlightWithKeyboard> } <highlightWithKeyboard>.<penIcon/></highlightWithKeyboard>",
+  "custom_confirm_cost": "Stojí to <accent>{txFee}</accent> na síťových poplatcích a <accent>{lspFee}</accent> poplatky poskytovateli serveru za připojení a nastavení zůstatku. Připojení lightning by mělo zůstat otevřené alespoň na <highlightWithKeyboard>{weeks, plural, one {# week} dalších {# weeks}</highlightWithKeyboard> } <highlightWithKeyboard>.<penIcon/></highlightWithKeyboard>",
   "duration_header": "Délka připojení.",
   "duration_text": "Vyberte minimální počet týdnů, po které má vaše připojení zůstat otevřené.",
   "duration_week": "{count, plural, one {týden} few {týdny} many {týdny} other {týdnů}}",
@@ -50,19 +50,19 @@
   "transfer_header_keybrd": "Peníze k útratě.",
   "transfer_header_nokeybrd": "Útraty & úspory.",
   "transfer_close": "Převod celého disponibilního zůstatku zpět do úspor je malý. Přesný poplatek závisí na podmínkách sítě.",
-  "transfer_open": "Stojí to <highlight>{txFee}</highlight> za poplatky sítě a <highlight>{lspFee}</highlight> za poplatky poskytovatele serveru při převodu dalších prostředků na váš výdajový zůstatek.",
+  "transfer_open": "Stojí to <accent>{txFee}</accent> za poplatky sítě a <accent>{lspFee}</accent> za poplatky poskytovatele serveru při převodu dalších prostředků na váš výdajový zůstatek.",
   "transfer_swipe": "Přejeďte prstem k provedení převodu",
   "transfer_successful": "Přenos úspěšný",
   "ts_savings_title": "Převádění do úspor.",
-  "ts_savings_text": "Převod finančních prostředků z vašeho výdajového účtu do úspor. Tyto prostředky budete moci použít za <highlight>±1 hodinu</highlight>.",
+  "ts_savings_text": "Převod finančních prostředků z vašeho výdajového účtu do úspor. Tyto prostředky budete moci použít za <accent>±1 hodinu</accent>.",
   "ts_spendings_title": "Převádění do útrat.",
-  "ts_spendings_text": "Převod finančních prostředků z vašeho spořícího účtu na váš účet pro výdaje. Tyto prostředky budete moci použít za <highlight>±10 minut</highlight>.",
+  "ts_spendings_text": "Převod finančních prostředků z vašeho spořícího účtu na váš účet pro výdaje. Tyto prostředky budete moci použít za <accent>±10 minut</accent>.",
   "interrupted_title": "Přenos přerušen",
   "interrupted_header": "Nechte Bitkit otevřený.",
   "interrupted_text": "Prostředky dosud nebyly převedeny. Bitkit se pokusí zahájit přenos během následujících 30 minut. Nechte svou aplikaci otevřenou.",
   "availability_title": "Dostupnost prostředků",
   "availability_header": "Dostupnost vašich prostředků.",
-  "availability_text": "Převod finančních prostředků do úspor obvykle trvá přibližně <highlight>±1 hodinu</highlight>, ale v určitých síťových podmínkách může trvat až <highlight>14 dní</highlight>.",
+  "availability_text": "Převod finančních prostředků do úspor obvykle trvá přibližně <accent>±1 hodinu</accent>, ale v určitých síťových podmínkách může trvat až <accent>14 dní</accent>.",
   "node_info": "Lightning uzel",
   "node_id": "ID uzlu LDK",
   "node_disconnected": "Odpojeno",
@@ -113,7 +113,7 @@
   "close_error": "Přenos se nezdařil",
   "close_success_title": "Přenos úspěšný",
   "close_success_msg": "Vaše prostředky byly přesunuty zpět do úspor.",
-  "close_text": "S uzavřením tohoto lightning připojení a převedením celého výdajového zůstatku zpět do úspor jsou spojeny drobné náklady. Přesná výše poplatku závisí na podmínkách sítě.\n\nPřevod prostředků do úspor obvykle <white>trvá ±1 hodinu</white>, ale za určitých síťových podmínek může vypořádání trvat <white>14 dní</white>.",
+  "close_text": "S uzavřením tohoto lightning připojení a převedením celého výdajového zůstatku zpět do úspor jsou spojeny drobné náklady. Přesná výše poplatku závisí na podmínkách sítě.\n\nPřevod prostředků do úspor obvykle <accent>trvá ±1 hodinu</accent>, ale za určitých síťových podmínek může vypořádání trvat <accent>14 dní</accent>.",
   "close_button": "Zavřít",
   "force_title": "Vynutit převod",
   "force_text": "Nelze zahájit přenos. Chcete tento převod vynutit? Tyto prostředky nebudete moci použít po dobu ±14 dní (!)",
diff --git a/src/utils/i18n/locales/cs/onboarding.json b/src/utils/i18n/locales/cs/onboarding.json
index c8afe8ff8..f84da6f41 100644
--- a/src/utils/i18n/locales/cs/onboarding.json
+++ b/src/utils/i18n/locales/cs/onboarding.json
@@ -1,49 +1,49 @@
 {
-  "tos_header": "Bitkit\n<brand>Podmínky</brand><brand>\npoužití.</brand>",
-  "tos_checkbox": "Podmínky použití",
-  "tos_checkbox_value": "<gray>Prohlašuji, že jsem si přečetl a souhlasím s <brand>podmínkami použití.</brand></gray>",
-  "pp_checkbox": "Zásady ochrany osobních údajů",
-  "pp_checkbox_value": "<gray>Prohlašuji, že jsem si přečetl a přijímám <brand>zásady ochrany osobních údajů.</brand></gray>",
-  "toolkit": "Váš bitcoin\n<brand>Nástroje.</brand>",
-  "toolkit_text": "Bitkit vám předá klíče k vašim penězům, profilu, kontaktům a webovým účtům.",
-  "get_started": "Začít",
-  "skip_intro": "Přeskočit intro",
-  "skip": "Přeskočit",
-  "slide1_header": "bitcoin,\n<brand>Všude.</brand>",
-  "slide1_text": "Plaťte komukoli, kdekoli a kdykoli a utrácejte své bitcoiny za věci, kterých si v životě ceníte.",
-  "slide2_header": "Lightning,\n<purple>Rychle.</purple>",
-  "slide2_text": "Odesílejte bitcoiny rychleji než kdy jindy. Užijte si okamžité transakce s přáteli, rodinou a obchodníky.",
-  "slide3_header": "Neomezený\n<blue>Web.</blue>",
-  "slide3_text": "Podržte klávesy pro přenosné profily, dynamické kontakty, distribuované zdroje a účty bez hesla.",
-  "slide4_header": "Pojďme vytvořit <brand>vaši Peněženku.</brand>",
-  "slide4_text": "Poznámka: Bitkit je <brand>beta</brand> software.",
-  "new_wallet": "Nová peněženka",
-  "restore": "Obnovit",
-  "restore_wallet": "Obnovit peněženku",
-  "advanced_setup": "Pokročilé nastavení",
-  "advanced": "Pokročilé",
-  "passphrase_header": "Zabezpečení pomocí <brand>přístupové fráze</brand>",
-  "passphrase_text": "K 12slovné frázi pro obnovení můžete přidat tajnou přístupovou frázi. Pokud ji přidáte, nezapomeňte ji.",
-  "passphrase": "Passphrase - přístupová fráze",
-  "create_new_wallet": "Vytvořit novou peněženku",
-  "restore_header": "Obnovit\nvaší peněženka",
-  "restore_phrase": "Zadejte prosím frázi pro obnovení z jakékoli (papírové) zálohy.",
-  "restore_red_explain": "Pokud je slovo zobrazeno <red>červeně</red>, znamená to, že nebylo nalezeno ve slovníku frází pro obnovení. Zkontrolujte pravopisné chyby.",
-  "restore_inv_checksum": "Kontrolní součet pro frázi pro obnovení se zdá být nesprávný. Zkontrolujte prosím svou frázi pro obnovení.",
-  "restore_suggestions": "NÁVRHY",
-  "restore_passphrase_placeholder": "Passphrase* - přístupová fráze",
-  "restore_passphrase_meaning": "*Volitelné, zadejte pouze v případě, že jste jej nastavili.",
-  "restore_error_title": "Obnovení peněženky se nezdařilo",
-  "restore_error_description": "Bitkit se nepodařilo obnovit peněženku ze zálohy nebo z fráze pro obnovení.",
-  "loading_header": "Nastavování\n<brand>vaší peněženky.</brand>",
-  "restore_success_header": "Peněženka obnovena.",
-  "restore_success_text": "Úspěšně jste obnovili svou peněženku ze zálohy. Užijte si Bitkit!",
-  "restore_failed_header": "Problém s disponibilním zůstatkem",
-  "restore_failed_text": "Bitkit obnovil vaše úspory, ale nepodařilo se obnovit disponibilní zůstatek a data.",
-  "restore_no_backup_button": "Pokračovat bez zálohy",
-  "restore_no_backup_warn": "Pokud jste dříve měli lightning zálohu, bude přepsána a ztracena. To by mohlo vést ke ztrátě finančních prostředků.",
-  "empty_wallet": "Chcete-li začít, pošlete\n<brand>bitcoin</brand> do vaší peněženky.",
-  "error_create": "Vytvoření peněženky se nezdařilo",
-  "multiple_header": "Pozor:\n<yellow>Více zařízení</yellow>",
-  "multiple_text": "Neinstalujte frázi pro obnovení Bitkit do více telefonů současně, protože by to mohlo poškodit vaše data."
+	"tos_header": "Bitkit\n<accent>Podmínky</accent><accent>\npoužití.</accent>",
+	"tos_checkbox": "Podmínky použití",
+	"tos_checkbox_value": "Prohlašuji, že jsem si přečetl a souhlasím s <accent>podmínkami použití.</accent>",
+	"pp_checkbox": "Zásady ochrany osobních údajů",
+	"pp_checkbox_value": "Prohlašuji, že jsem si přečetl a přijímám <accent>zásady ochrany osobních údajů.</accent>",
+	"toolkit": "Váš bitcoin\n<accent>Nástroje.</accent>",
+	"toolkit_text": "Bitkit vám předá klíče k vašim penězům, profilu, kontaktům a webovým účtům.",
+	"get_started": "Začít",
+	"skip_intro": "Přeskočit intro",
+	"skip": "Přeskočit",
+	"slide1_header": "bitcoin,\n<accent>Všude.</accent>",
+	"slide1_text": "Plaťte komukoli, kdekoli a kdykoli a utrácejte své bitcoiny za věci, kterých si v životě ceníte.",
+	"slide2_header": "Lightning,\n<accent>Rychle.</accent>",
+	"slide2_text": "Odesílejte bitcoiny rychleji než kdy jindy. Užijte si okamžité transakce s přáteli, rodinou a obchodníky.",
+	"slide3_header": "Neomezený\n<accent>Web.</accent>",
+	"slide3_text": "Podržte klávesy pro přenosné profily, dynamické kontakty, distribuované zdroje a účty bez hesla.",
+	"slide4_header": "Pojďme vytvořit <accent>vaši Peněženku.</accent>",
+	"slide4_text": "Poznámka: Bitkit je <accent>beta</accent> software.",
+	"new_wallet": "Nová peněženka",
+	"restore": "Obnovit",
+	"restore_wallet": "Obnovit peněženku",
+	"advanced_setup": "Pokročilé nastavení",
+	"advanced": "Pokročilé",
+	"passphrase_header": "Zabezpečení pomocí <accent>přístupové fráze</accent>",
+	"passphrase_text": "K 12slovné frázi pro obnovení můžete přidat tajnou přístupovou frázi. Pokud ji přidáte, nezapomeňte ji.",
+	"passphrase": "Passphrase - přístupová fráze",
+	"create_new_wallet": "Vytvořit novou peněženku",
+	"restore_header": "Obnovit\nvaší peněženka",
+	"restore_phrase": "Zadejte prosím frázi pro obnovení z jakékoli (papírové) zálohy.",
+	"restore_red_explain": "Pokud je slovo zobrazeno <accent>červeně</accent>, znamená to, že nebylo nalezeno ve slovníku frází pro obnovení. Zkontrolujte pravopisné chyby.",
+	"restore_inv_checksum": "Kontrolní součet pro frázi pro obnovení se zdá být nesprávný. Zkontrolujte prosím svou frázi pro obnovení.",
+	"restore_suggestions": "NÁVRHY",
+	"restore_passphrase_placeholder": "Passphrase* - přístupová fráze",
+	"restore_passphrase_meaning": "*Volitelné, zadejte pouze v případě, že jste jej nastavili.",
+	"restore_error_title": "Obnovení peněženky se nezdařilo",
+	"restore_error_description": "Bitkit se nepodařilo obnovit peněženku ze zálohy nebo z fráze pro obnovení.",
+	"loading_header": "Nastavování\n<accent>vaší peněženky.</accent>",
+	"restore_success_header": "Peněženka obnovena.",
+	"restore_success_text": "Úspěšně jste obnovili svou peněženku ze zálohy. Užijte si Bitkit!",
+	"restore_failed_header": "Problém s disponibilním zůstatkem",
+	"restore_failed_text": "Bitkit obnovil vaše úspory, ale nepodařilo se obnovit disponibilní zůstatek a data.",
+	"restore_no_backup_button": "Pokračovat bez zálohy",
+	"restore_no_backup_warn": "Pokud jste dříve měli lightning zálohu, bude přepsána a ztracena. To by mohlo vést ke ztrátě finančních prostředků.",
+	"empty_wallet": "Chcete-li začít, pošlete\n<accent>bitcoin</accent> do vaší peněženky.",
+	"error_create": "Vytvoření peněženky se nezdařilo",
+	"multiple_header": "Pozor:\n<accent>Více zařízení</accent>",
+	"multiple_text": "Neinstalujte frázi pro obnovení Bitkit do více telefonů současně, protože by to mohlo poškodit vaše data."
 }
diff --git a/src/utils/i18n/locales/cs/other.json b/src/utils/i18n/locales/cs/other.json
index cbcb940bb..198b215e3 100644
--- a/src/utils/i18n/locales/cs/other.json
+++ b/src/utils/i18n/locales/cs/other.json
@@ -10,7 +10,7 @@
   "qr_error_network_header": "Nesprávná síť",
   "qr_error_network_text": "Bitkit je aktuálně nastaven na {selectedNetwork}, ale data jsou pro {dataNetwork}.",
   "qr_paste": "Vložit QR kód",
-  "buy_header": "bitcoin\n<orange>pro Bitkit</orange>",
+  "buy_header": "bitcoin\n<accent>pro Bitkit</accent>",
   "buy_text": "Nemáte ještě žádné bitcoiny, které byste mohli poslat do peněženky Bitkit? Kupte si nějaké bitcoiny.",
   "buy_button": "Koupit bitcoin",
   "connection_lost_title": "Bitkit spojení ztraceno",
@@ -58,7 +58,7 @@
   "lnurl_channel_host": "Host",
   "lnurl_channel_port": "Port",
   "lnurl_channel_connecting": "Připojování.",
-  "lnurl_channel_connecting_text": "Iniciováno připojení lightning. Okamžité platby budete moci používat do <highlight>±30 minut</highlight> (závisí na konfiguraci uzlu).",
+  "lnurl_channel_connecting_text": "Iniciováno připojení lightning. Okamžité platby budete moci používat do <accent>±30 minut</accent> (závisí na konfiguraci uzlu).",
   "lnurl_blocktank_error": "Bitkit se nepodařilo připojit k Blocktank.",
   "lnurl_channel_success_title": "Kanál vyžádán",
   "lnurl_channel_success_msg_peer": "Úspěšně vyžádaný kanál od: {peer}",
diff --git a/src/utils/i18n/locales/cs/security.json b/src/utils/i18n/locales/cs/security.json
index 50dad474f..4f0a19491 100644
--- a/src/utils/i18n/locales/cs/security.json
+++ b/src/utils/i18n/locales/cs/security.json
@@ -8,10 +8,10 @@
   "pass": "přístupová fráze",
   "pass_your": "Vaše přístupová fráze",
   "pass_text": "Během nastavení peněženky jste do fráze pro obnovení přidali přístupovou frázi.",
-  "pass_never_share": "<brand>Nikdy nikomu nesdělujte</brand> svou přístupovou frázi, protože to může vést ke ztrátě finančních prostředků.",
+  "pass_never_share": "<accent>Nikdy nikomu nesdělujte</accent> svou přístupovou frázi, protože to může vést ke ztrátě finančních prostředků.",
   "pass_confirm": "Potvrďte přístupovou frázi",
   "pass_confirm_text": "Zadejte přístupovou frázi, kterou jste přidali při nastavování a vytváření peněženky.",
-  "pass_recovery": "<gray>Přístupová fráze:</gray> {passphrase}",
+  "pass_recovery": "<accent>Přístupová fráze:</accent> {passphrase}",
   "mnemonic_phrase": "Mnemotechnická fráze",
   "mnemonic_your": "Vaše obnovovací fráze",
   "mnemonic_error": "Selhání peněženky",
@@ -19,11 +19,11 @@
   "mnemonic_write": "Zapište si těchto {length} slov ve správném pořadí a uložte je na bezpečném místě.",
   "mnemonic_use": "Pomocí níže uvedených 12 slov můžete později obnovit zpět své peníze.",
   "mnemonic_reveal": "Klepnutím zobrazíte",
-  "mnemonic_never_share": "<brand>Svou frázi pro obnovení nikdy nikomu nesdělujte</brand>, protože by to mohlo vést ke ztrátě finančních prostředků.",
+  "mnemonic_never_share": "<accent>Svou frázi pro obnovení nikdy nikomu nesdělujte</accent>, protože by to mohlo vést ke ztrátě finančních prostředků.",
   "mnemonic_confirm": "Potvrďte obnovovací frázi.",
   "mnemonic_confirm_tap": "Klepněte na 12 slov ve správném pořadí.",
   "mnemonic_result_header": "Úspěšné",
-  "mnemonic_result_text": "Ujistěte se, že jste si uložili frázi pro obnovení na <highlight>bezpečném místě</highlight>, protože to je <highlight>jediný způsob, jak získat zpět</highlight> své peníze (!).",
+  "mnemonic_result_text": "Ujistěte se, že jste si uložili frázi pro obnovení na <accent>bezpečném místě</accent>, protože to je <accent>jediný způsob, jak získat zpět</accent> své peníze (!).",
   "mnemonic_keep_header": "Udržujte to v tajnosti",
   "mnemonic_keep_text": "Pamatujte, že nesmíte svou frázi pro obnovení nikdy s nikým sdílet! Pokud má někdo přístup k vaší frázi pro obnovení, může ukrást vaše peníze, profil a další data.",
   "mnemonic_data_header": "Údaje o peněžence",
diff --git a/src/utils/i18n/locales/cs/settings.json b/src/utils/i18n/locales/cs/settings.json
index e9ca56995..9193db760 100644
--- a/src/utils/i18n/locales/cs/settings.json
+++ b/src/utils/i18n/locales/cs/settings.json
@@ -18,7 +18,7 @@
     "legal": "Právní",
     "version": "Verze",
     "op_title": "\"Orange Pilled\"",
-    "op_text": "Koho budete <brand>\"Orange-Pill\"?</brand>",
+    "op_text": "Koho budete <accent>\"Orange-Pill\"?</accent>",
     "op_share": "Sdílet Bitkit s přítelem",
     "op_message": "Stáhněte si Bitkit, váš ultimátní bitcoinový nástroj. Předáváme vám klíče k přetvoření vašeho digitálního života. {appStoreUrl}"
   },
@@ -41,8 +41,8 @@
     "speed_title": "Rychlost transakce",
     "speed_default": "Výchozí rychlost transakce",
     "speed_fee_custom": "Nastavit vlastní poplatek",
-    "speed_fee_total": "{feeSats} bitcoinu za průměrnou transakci",
-    "speed_fee_total_fiat": "{feeSats} bitcoinů za průměrnou transakci ({fiatSymbol}{fiatFormatted} ).",
+    "speed_fee_total": "₿ {feeSats} za průměrnou transakci",
+    "speed_fee_total_fiat": "₿ {feeSats} za průměrnou transakci ({fiatSymbol}{fiatFormatted} ).",
     "tags": "Tagy",
     "tags_previously": "Dříve použité tagy",
     "widgets": "Widgety"
diff --git a/src/utils/i18n/locales/cs/slashtags.json b/src/utils/i18n/locales/cs/slashtags.json
index 66d1402ff..3b707125d 100644
--- a/src/utils/i18n/locales/cs/slashtags.json
+++ b/src/utils/i18n/locales/cs/slashtags.json
@@ -36,16 +36,16 @@
   "signin_to_success_text_noname": "Úspěšně jste se přihlásili.",
   "signin_title": "Přihlásit se",
   "signin_title_loading": "Přihlašování...",
-  "onboarding_header": "Dynamické\n<brand>kontakty.</brand>",
+  "onboarding_header": "Dynamické\n<accent>kontakty.</accent>",
   "onboarding_text": "Použijte Bitkit k získávání automatických aktualizací od vašich kontaktů, placení jim a sledování jejich veřejných profilů.",
   "onboarding_button": "Přidejte svůj první kontakt",
-  "onboarding_profile1_header": "Vlastněte svůj\n<brand>sociální profil.</brand>",
+  "onboarding_profile1_header": "Vlastněte svůj\n<accent>sociální profil.</accent>",
   "onboarding_profile1_text": "Pomocí Bitkitu můžete ovládat svůj veřejný profil a odkazy, aby vás vaše kontakty mohly kdykoli kontaktovat nebo vám zaplatit.",
-  "onboarding_profile2_header": "Zaplaťte svým\n<brand>kontaktům.</brand>",
+  "onboarding_profile2_header": "Zaplaťte svým\n<accent>kontaktům.</accent>",
   "onboarding_profile2_text": "Vy a vaše kontakty můžete pomocí Bitkitu posílat platby přímo, bez bank, kdykoli a kdekoli.",
-  "onboarding_widgets1_header": "Ahoj,\n<brand>hesla.</brand>",
+  "onboarding_widgets1_header": "Ahoj,\n<accent>hesla.</accent>",
   "onboarding_widgets1_text": "Zažijte web bez hesel. Použijte Bitkit pro přihlášení ke svým oblíbeným webovým službám.",
-  "onboarding_widgets2_header": "Ahoj,\n<brand>widgety.</brand>",
+  "onboarding_widgets2_header": "Ahoj,\n<accent>widgety.</accent>",
   "onboarding_widgets2_text": "Užijte si decentralizované feedy z vašich oblíbených webových služeb přidáním zábavných a užitečných widgetů do vaší peněženky.",
   "my_profile": "Můj profil",
   "profile": "Profil",
diff --git a/src/utils/i18n/locales/cs/wallet.json b/src/utils/i18n/locales/cs/wallet.json
index 578914b8b..047850dc9 100644
--- a/src/utils/i18n/locales/cs/wallet.json
+++ b/src/utils/i18n/locales/cs/wallet.json
@@ -100,8 +100,8 @@
   "receive_show_qr": "Zobrazit QR kód",
   "receive_text_lnfunds": "Chcete obdržet <purpleText>lightning</purpleText> prostředky?",
   "receive_instantly": "Přijmout okamžitě",
-  "receive_connect_initial": "Pro přijímání okamžitého bitcoinu vás musí Bitkit nejprve připojit k lightning síti. Z částky, kterou jste specifikovali, bude odečten poplatek <highlight>{lspFee}</highlight> poskytovatele služby.",
-  "receive_connect_additional": "Pro přijímání více okamžitých bitcoinů musí Bitkit zvýšit vaši likviditu. Z částky, kterou jste specifikovali, bude odečten poplatek <highlight>{lspFee}</highlight> poskytovatele služby.",
+  "receive_connect_initial": "Pro přijímání okamžitého bitcoinu vás musí Bitkit nejprve připojit k lightning síti. Z částky, kterou jste specifikovali, bude odečten poplatek <accent>{lspFee}</accent> poskytovatele služby.",
+  "receive_connect_additional": "Pro přijímání více okamžitých bitcoinů musí Bitkit zvýšit vaši likviditu. Z částky, kterou jste specifikovali, bude odečten poplatek <accent>{lspFee}</accent> poskytovatele služby.",
   "receive_error_min_title": "Pod minimální částkou",
   "receive_error_min_description": "Faktura musí být minimálně {txt}",
   "receive_error_max_title": "Nad maximální částkou",
diff --git a/src/utils/i18n/locales/de/onboarding.json b/src/utils/i18n/locales/de/onboarding.json
index b5656e1e7..164d1cf75 100644
--- a/src/utils/i18n/locales/de/onboarding.json
+++ b/src/utils/i18n/locales/de/onboarding.json
@@ -1,44 +1,44 @@
 {
-  "tos_header": "Bitkit\n<brand>Allgemeine</brand><brand>Nuztungsbedingungen.</brand>",
+  "tos_header": "Bitkit\n<accent>Allgemeine</accent><accent>Nuztungsbedingungen.</accent>",
   "tos_checkbox": "Nutzungsbedingungen",
-  "tos_checkbox_value": "<gray>Ich erkläre hiermit die <brand>Nuztungsbedinungen</brand>gelesen und akzeptiert zu haben.</gray>",
+  "tos_checkbox_value": "Ich erkläre hiermit die <accent>Nuztungsbedinungen</accent>gelesen und akzeptiert zu haben.",
   "pp_checkbox": "Datenschutz-Bestimmungen",
-  "pp_checkbox_value": "<gray>Ich erkläre hiermit die <brand>Privatsphären-Erklärung </brand>gelesen und akzeptiert zu haben.</gray>",
-  "toolkit": "Dein Bitcoin\n<brand>Toolkit.</brand>",
+  "pp_checkbox_value": "Ich erkläre hiermit die <accent>Privatsphären-Erklärung </accent>gelesen und akzeptiert zu haben.",
+  "toolkit": "Dein Bitcoin\n<accent>Toolkit.</accent>",
   "toolkit_text": "Bitkit händigt dir die Keys zu deinem Geld, Profil, deinen Kontakten und Web-Accounts aus.",
   "get_started": "Lege los",
   "skip_intro": "Intro überspringen",
   "skip": "Überspringe",
-  "slide1_header": "Bitcoin,\n<brand>Überall.</brand>",
+  "slide1_header": "Bitcoin,\n<accent>Überall.</accent>",
   "slide1_text": "Bezahle jedermann, überall, jederzeit und gebe deine bitcoin für Dinge im Leben aus die du wertschätzt.",
-  "slide2_header": "Lightning,\n<purple>Schnell.</purple>",
+  "slide2_header": "Lightning,\n<accent>Schnell.</accent>",
   "slide2_text": "Verschicke Bitcoin schneller als jemals zuvor. Erfreue dich an instant Transaktionen mit Freunden, Familie und Händlern.",
-  "slide3_header": "Grenzenloses\n<blue>Web.</blue>",
+  "slide3_header": "Grenzenloses\n<accent>Web.</accent>",
   "slide3_text": "Hält die Schlüssel zu tragbaren Profilen, dynamischen Kontakten, verteilten Feeds und kennwortlosen Konten.",
-  "slide4_header": "Erstelle <brand>dein Wallet.</brand>",
-  "slide4_text": "Bitte beachte: Bitkit ist <brand>beta</brand> software.",
+  "slide4_header": "Erstelle <accent>dein Wallet.</accent>",
+  "slide4_text": "Bitte beachte: Bitkit ist <accent>beta</accent> software.",
   "new_wallet": "Neues Wallet",
   "restore": "Wiederherstellen",
   "restore_wallet": "Wallet wiederherstellen",
   "advanced_setup": "Benutzerdefiniertes Setup",
   "advanced": "Benutzerdefiniert",
-  "passphrase_header": "Absichern mit <brand>Passwort</brand>",
+  "passphrase_header": "Absichern mit <accent>Passwort</accent>",
   "passphrase_text": "Du kannst deiner 12-Wörter-langen Wiederherstellungsphrase ein geheimes Passwort hinzufügen. Wenn du das tust, stelle sicher, dass du es nicht vergisst.",
   "passphrase": "Passwort",
   "create_new_wallet": "Erstelle neues Wallet",
   "restore_header": "Stelle\ndein Waller wieder her",
   "restore_phrase": "Bitte gebe deine Wiederherstellungsphrase von jeglichem (Papier) Back-Up ein.",
-  "restore_red_explain": "Wenn eines der Wörter in <red>rot</red>, angezeigt wird, bedeutet das, dass es nicht im Wiederherstellungsphrasen-Wörterbuch zu finden ist. Überprüfe es auf Rechtschreibfehler.",
+  "restore_red_explain": "Wenn eines der Wörter in <accent>rot</accent>, angezeigt wird, bedeutet das, dass es nicht im Wiederherstellungsphrasen-Wörterbuch zu finden ist. Überprüfe es auf Rechtschreibfehler.",
   "restore_inv_checksum": "Die Checksumme der Wiederherstellungsphrase erscheint inkorrekt. Bitte überprüfe deine Wiederherstellungsphrase erneut.",
   "restore_suggestions": "VORSCHLÄGE",
   "restore_passphrase_placeholder": "Passphrase*",
   "restore_passphrase_meaning": "*Optional, nur eingeben, falls wenn du eine eingerichtet hast.",
-  "loading_header": "Einrichten\n<brand>deines Wallets.</brand>",
+  "loading_header": "Einrichten\n<accent>deines Wallets.</accent>",
   "restore_success_header": "Wallet wiederhergestellt.",
   "restore_success_text": "Du hast erfolgreich dein Wallet mittels deines Back Ups wiederhergestellt. Viel Spaß mit Bitkit!",
   "restore_no_backup_button": "Weiter ohne Back Up",
   "restore_no_backup_warn": "Falls du vorher ein Lightning Back Up eingerichtet hast, wird es überschrieben und verloren gehen. Dies könnte zu einem Verlust deines Geldes führen.",
-  "empty_wallet": "Um zu starten sende\n<brand>Bitcoin</brand>an dein Wallet.",
-  "multiple_header": "Vorsicht:\n<yellow>Mehrere Geräte</yellow>",
+  "empty_wallet": "Um zu starten sende\n<accent>Bitcoin</accent>an dein Wallet.",
+  "multiple_header": "Vorsicht:\n<accent>Mehrere Geräte</accent>",
   "multiple_text": "Füge deine Bitkit Wiederherstellungsphrase nicht mehreren Geräten gleichzeitig hinzu, da es zu unwiderruflichen Schäden deiner Daten kommen kann."
 }
diff --git a/src/utils/i18n/locales/de/settings.json b/src/utils/i18n/locales/de/settings.json
index 91c8033bd..313794359 100644
--- a/src/utils/i18n/locales/de/settings.json
+++ b/src/utils/i18n/locales/de/settings.json
@@ -14,7 +14,7 @@
     "report_bug": "Repote einen Bug oder wirke mit",
     "legal": "Rechtliches",
     "op_title": "Orange-Pilled",
-    "op_text": "Wen wirst du <brand>orangepillen?</brand>",
+    "op_text": "Wen wirst du <accent>orangepillen?</accent>",
     "op_share": "Teile Bitkit mit einem Freund",
     "op_message": "Downloade Bitkit, dein ultimatives Bitcoin Toolkit. Nimm die Keys in deine Hand und reformiere dein digitales Leben. {appStoreUrl}"
   },
diff --git a/src/utils/i18n/locales/en/cards.json b/src/utils/i18n/locales/en/cards.json
index 75f7c833d..70ae149a6 100644
--- a/src/utils/i18n/locales/en/cards.json
+++ b/src/utils/i18n/locales/en/cards.json
@@ -1,14 +1,26 @@
 {
 	"backupSeedPhrase": {
 		"title": "Back up",
-		"description": "Store your money"
+		"description": "Store your bitcoin"
+	},
+	"discount": {
+		"title": "Discount",
+		"description": "Spending Balance"
+	},
+	"fastpay": {
+		"title": "Fastpay",
+		"description": "Scan and pay"
+	},
+	"invite": {
+		"title": "Invite",
+		"description": "Share Bitkit"
 	},
 	"lightning": {
-		"title": "Pay instantly",
-		"description": "Get on Lightning"
+		"title": "Spend",
+		"description": "Balance your funds"
 	},
 	"lightningSettingUp": {
-		"title": "Setting Up",
+		"title": "Transfer",
 		"description0": "Processing Payment",
 		"description1": "Paid",
 		"description2": "Queued",
@@ -23,7 +35,7 @@
 		"description": "Connected!"
 	},
 	"transferPending": {
-		"title": "Transferring",
+		"title": "Transfer",
 		"description": "Ready in ±{duration}m"
 	},
 	"transferClosingChannel": {
@@ -31,22 +43,24 @@
 		"description": "Keep app open"
 	},
 	"pin": {
-		"title": "Better security",
+		"title": "Secure",
 		"description": "Set up a PIN code"
 	},
 	"slashtagsProfile": {
-		"title": "Public Profile",
+		"title": "Profile",
 		"description": "Add your details"
 	},
+	"support": {
+		"title": "Support",
+		"description": "Get assistance"
+	},
 	"buyBitcoin": {
-		"title": "Get Bitcoin",
+		"title": "Buy",
 		"description": "Buy some bitcoin"
 	},
 	"btFailed": {
-		"title": "Setup Failed",
+		"title": "Failed",
 		"description": "Please try again"
 	},
-	"lightning_no_funds_title": "No Funds Yet",
-	"lightning_no_funds_desc": "Before you can set up your instant spending balance, you need to send some on-chain Bitcoin to your wallet.",
 	"suggestions": "Suggestions"
 }
diff --git a/src/utils/i18n/locales/en/common.json b/src/utils/i18n/locales/en/common.json
index 15caf49dc..5cbc89dd2 100644
--- a/src/utils/i18n/locales/en/common.json
+++ b/src/utils/i18n/locales/en/common.json
@@ -1,4 +1,5 @@
 {
+	"advanced": "Advanced",
 	"continue": "Continue",
 	"cancel": "Cancel",
 	"close": "Close",
@@ -6,8 +7,8 @@
 	"yes_proceed": "Yes, Proceed",
 	"try_again": "Try Again",
 	"dialog_cancel": "No, Cancel",
-	"sat_vbyte": "bitcoin / vbyte",
-	"sat_vbyte_compact": "bitcoin/vbyte",
+	"sat_vbyte": "₿ / vbyte",
+	"sat_vbyte_compact": "₿/vbyte",
 	"edit": "Edit",
 	"copy": "Copy",
 	"share": "Share",
@@ -17,6 +18,7 @@
 	"done": "Done",
 	"delete": "Delete",
 	"ok": "OK",
+	"awesome": "Awesome!",
 	"retry": "Retry",
 	"later": "Later",
 	"skip": "Skip",
diff --git a/src/utils/i18n/locales/en/lightning.json b/src/utils/i18n/locales/en/lightning.json
index 2416f9067..6efa546ab 100644
--- a/src/utils/i18n/locales/en/lightning.json
+++ b/src/utils/i18n/locales/en/lightning.json
@@ -1,11 +1,39 @@
 {
-	"int_blocked": "Open a Lightning connection and send or receive bitcoin instantly.\n\nUnfortunately, Bitkit cannot provide automatic Lightning connections to residents of the United States & Canada (yet).",
-	"int_text": "Open a Lightning connection and send or receive bitcoin instantly.",
-	"int_header": "Instant\n<purple>Payments.</purple>",
-	"int_quick": "Quick Setup",
-	"int_custom": "Custom Setup",
-	"int_third_party": "Open Third Party Connection",
-	"add_instant_payments": "Instant Payments",
+	"introduction": {
+		"title": "Spending\n<accent>Balance</accent>",
+		"text": "Fund your spending balance to enjoy instant and cheap transactions with friends, family, and merchants.",
+		"button": "Get Started"
+	},
+	"funding": {
+		"nav_title": "Spending Balance",
+		"title": "Fund your <accent>spending balance</accent>",
+		"text": "You can use your Bitkit savings or send bitcoin from a different wallet.",
+		"text_blocked": "At this time, Bitkit cannot provide automatic Lightning connections to residents of the United States and Canada.",
+		"button1": "Transfer from Savings",
+		"button2": "Use Other Wallet",
+		"button3": "External Node (Advanced)"
+	},
+	"no_funds": {
+		"title": "No Available Funds",
+		"description": "Before you can transfer funds from your savings balance, you need to send bitcoin to your Bitkit wallet.",
+		"fund": "Fund wallet"
+	},
+	"transfer": {
+		"nav_title": "Transfer Funds",
+		"title_slider": "Balance\n<accent>your funds</accent>",
+		"title_numpad": "Spending <accent>Balance</accent>",
+		"text_slider": "Choose how much money you want to be able to spend instantly and how much you want to keep in savings.",
+		"text_numpad": "Enter the amount of money you want to be able to spend instantly.",
+		"swipe": "Swipe To Transfer"
+	},
+	"quick_setup": {
+		"nav_title": "Transfer Funds",
+		"title_slider": "Balance\n<accent>your funds</accent>",
+		"title_numpad": "Spending <accent>Balance</accent>",
+		"text_slider": "Choose how much money you want to be able to spend instantly and how much you want to keep in savings.",
+		"text_numpad": "Enter the amount of money you want to be able to spend instantly.",
+		"swipe": "Swipe To Transfer"
+	},
 	"error_channel_purchase": "Instant Payments Setup Failed",
 	"error_channel_receiving": "Receiving amount needs to be greater than ${usdValue}",
 	"error_channel_fee": "Fee estimation error",
@@ -19,50 +47,48 @@
 	"receiving_label": "Receiving capacity",
 	"note_blocktank_limit": "The amount you can transfer to your spending balance is currently limited to ${usdValue}.",
 	"note_reserve_limit": "The amount you can transfer to your spending balance is limited to 80%. You need to keep funds in reserve to move this bitcoin back to savings.",
-	"quick_confirm_header": "Please\nConfirm.",
-	"quick_confirm_cost": "It costs <highlight>{txFee}</highlight> in network fees and <highlight>{lspFee}</highlight> in service provider fees to connect you to Lightning and set up your spending balance.",
-	"connect_swipe": "Swipe To Connect",
-	"connect_swipe_pay": "Swipe To Pay & Connect",
+	"quick_setup": "Quick Setup",
+	"quick_confirm_header": "Please\n<accent>confirm</accent>",
+	"quick_confirm_cost": "It costs <accent>{txFee}</accent> in network fees and <accent>{lspFee}</accent> in service provider fees to transfer your funds.",
 	"spending_header": "<purple>Spending Money.</purple>",
 	"receiving_header": "<purple>Receiving Money.</purple>",
-	"spending_amount_bitcoin": "Choose how much bitcoin you want to be able to spend instantly.",
+	"spending_amount_bitcoin": "Choose how much money you want to be able to spend instantly.",
 	"receiving_amount_money": "Choose how much money you want to be able to receive instantly.",
 	"receiving_amount_bitcoin": "Enter the amount of Bitcoin you want to be able to receive instantly.",
 	"enter_custom_amount": "Enter Amount",
-	"custom_confirm_header": "<purple>Please\nConfirm.</purple>",
-	"custom_confirm_cost": "It costs <highlight>{txFee}</highlight> in network fees and <highlight>{lspFee}</highlight> in service provider fees to connect you and set up your balance. Your Lightning connection should stay open for at least <highlightWithKeyboard>{weeks, plural, one {# week} other {# weeks}}.<penIcon/></highlightWithKeyboard>",
-	"duration_header": "Connection Duration.",
-	"duration_text": "Choose the minimum number of weeks you want your connection to remain open.",
+	"custom_confirm_header": "Please\n<accent>confirm</accent>",
+	"custom_confirm_cost": "It costs <accent>{txFee}</accent> in network fees and <accent>{lspFee}</accent> in service provider fees  fees to transfer your funds. Your spending balance should stay active for at least <accentWithKeyboard>{weeks, plural, one {# week} other {# weeks}}.<penIcon/></accentWithKeyboard>",
+	"duration_header": "Balance <accent>duration</accent>",
+	"duration_text": "Choose the minimum number of weeks you want this part of your spending balance (Lightning Channel) to remain active.",
 	"duration_week": "{count, plural, one {week} other {weeks}}",
-	"setting_up_header": "Setting Up.",
-	"setting_up_text": "<highlight>Please wait and keep Bitkit open</highlight> while your Lightning connection is being set up. This process takes about <highlight>±10 minutes.</highlight>",
+	"setting_up_header": "In transfer",
+	"setting_up_text": "<accent>Please wait and keep Bitkit open</accent> while your Lightning connection is being set up. This process takes about <accent>±10 minutes.</accent>",
 	"setting_up_step1": "Processing Payment",
 	"setting_up_step2": "Payment Successful",
 	"setting_up_step3": "Queued For Opening",
 	"setting_up_step4": "Opening Connection",
-	"result_header": "Connected.",
-	"result_text": "Your Lightning connection is ready to use.",
-	"timeout_header": "Please keep Bitkit open.",
-	"timeout_text": "Bitkit will keep trying to open your Lightning connection in the background. Please keep the app open.",
+	"setting_up_button": "Continue Using Bitkit",
+	"result_header": "<accent>Ready</accent>",
+	"result_text": "Your funds have been transferred and your spending balance is ready to use.",
+	"timeout_header": "<accent>Keep Bitkit</accent>\nopen",
+	"timeout_text": "Funds were not transferred yet. Bitkit will try to initiate the transfer during the next <accent>30 minutes</accent>. Please keep your app open.",
 	"awesome": "Awesome!",
 	"transfer_funds": "Transfer Funds",
 	"transfer_header": "Please\nConfirm.",
 	"transfer_header_keybrd": "Spending Money.",
 	"transfer_header_nokeybrd": "Spending\n& Saving.",
-	"transfer_close": "There is a small cost to transfer your full spending balance back to your savings. The exact fee depends on network conditions.",
-	"transfer_open": "It costs <highlight>{txFee}</highlight> in network fees and <highlight>{lspFee}</highlight> in service provider fees to transfer the additional funds to your spending balance.",
-	"transfer_swipe": "Swipe To Transfer",
-	"transfer_successful": "Transfer Successful",
-	"ts_savings_title": "Transferring\nto Savings.",
-	"ts_savings_text": "Transferring funds from your spending balance to your savings. You will be able to use these funds in <highlight>±1 hour</highlight>.",
+	"transfer_close": "Transferring your spending balance back to your savings requires a network fee. The exact fee depends on network conditions.",
+	"transfer_open": "It costs <accent>{txFee}</accent> in network fees and <accent>{lspFee}</accent> in service provider fees to transfer the additional funds to your spending balance.",
+	"ts_savings_title": "Transfer\n<accent>to Savings</accent>",
+	"ts_savings_text": "Transferring funds from your spending balance to your savings. You will be able to use these funds in <accent>±1 hour</accent>.",
 	"ts_spendings_title": "Transferring\nto Spending.",
-	"ts_spendings_text": "Transferring funds from your savings to your spending balance. You will be able to use these funds in <highlight>±10 minutes</highlight>.",
+	"ts_spendings_text": "Transferring funds from your savings to your spending balance. You will be able to use these funds in <accent>±10 minutes</accent>.",
 	"interrupted_title": "Transfer Interrupted",
-	"interrupted_header": "Please keep Bitkit open.",
-	"interrupted_text": "Funds were not transferred yet. Bitkit will try to initiate the transfer during the next 30 minutes. Please keep your app open.",
+	"interrupted_header": "<accent>Keep Bitkit</accent>\nopen",
+	"interrupted_text": "Funds were not transferred yet. Bitkit will try to initiate the transfer during the next <accent>30 minutes</accent>. Please keep your app open.",
 	"availability_title": "Funds Availability",
-	"availability_header": "Availability of your Funds.",
-	"availability_text": "Transferring funds to savings usually takes\n<highlight>±1 hour</highlight>, but settlement may take <highlight>14 days</highlight> under certain network conditions.",
+	"availability_header": "Availability\n<accent>of funds</accent>",
+	"availability_text": "Transferring funds to savings usually takes\n<accent>±1 hour</accent>, but settlement may take <accent>14 days</accent> under certain network conditions.",
 	"node_info": "Lightning Node",
 	"node_id": "LDK Node ID",
 	"node_disconnected": "disconnected",
@@ -114,7 +140,7 @@
 	"close_error": "Transfer Failed",
 	"close_success_title": "Transfer Initiated",
 	"close_success_msg": "Your funds are being transferred back to your savings.",
-	"close_text": "There is a small cost to close this Lightning Connection and transfer your full spending balance back to your savings. The exact fee depends on network conditions.\n\nTransferring funds to savings usually takes <white>±1 hour</white>, but settlement may take <white>14 days</white> under certain network conditions.",
+	"close_text": "The fee to close this Lightning Connection and transfer your funds back to your savings depends on network conditions.\n\nTransferring funds to savings usually takes <accent>±1 hour</accent>, but settlement may take <accent>14 days</accent> under certain network conditions.",
 	"close_button": "Close",
 	"force_title": "Force Transfer",
 	"force_text": "Could not initiate transfer. Do you want to force this transfer? You won’t be able to use these funds for ±14 days (!)",
@@ -123,7 +149,7 @@
 	"force_init_msg": "Your funds will be accessible in ±14 days.",
 	"force_failed_title": "Force Transfer Failed",
 	"force_failed_msg": "Unable to transfer your funds back to savings. Please try again.",
-	"channel_opened_title": "Instant Payments Ready",
+	"channel_opened_title": "Spending Balance Ready",
 	"channel_opened_msg": "You can now pay anyone, anywhere, instantly.",
 	"order_given_up_title": "Instant Payments Setup Failed",
 	"order_given_up_msg": "The setup process expired. Please try again.",
diff --git a/src/utils/i18n/locales/en/onboarding.json b/src/utils/i18n/locales/en/onboarding.json
index 989f10384..937371123 100644
--- a/src/utils/i18n/locales/en/onboarding.json
+++ b/src/utils/i18n/locales/en/onboarding.json
@@ -1,49 +1,51 @@
 {
-	"tos_header": "Bitkit\n<brand>Terms</brand><brand>\nof Use.</brand>",
+	"tos_header": "Bitkit\n<accent>terms of use</accent>",
 	"tos_checkbox": "Terms of use",
-	"tos_checkbox_value": "<gray>I declare that I have read and accept the <brand>terms of use.</brand></gray>",
+	"tos_checkbox_value": "I declare that I have read and accept the <accent>terms of use.</accent>",
 	"pp_checkbox": "Privacy Policy",
-	"pp_checkbox_value": "<gray>I declare that I have read and accept the <brand>privacy policy.</brand></gray>",
-	"toolkit": "Your Bitcoin\n<brand>Toolkit.</brand>",
-	"toolkit_text": "Bitkit hands you the keys to your money, profile, contacts, and web accounts.",
+	"pp_checkbox_value": "I declare that I have read and accept the <accent>privacy policy.</accent>",
+	"welcome_title": "You can ₿ \n<accent>the change</accent>",
+	"welcome_text": "Pay anyone, anywhere, any time, and spend your money on the things you value in life. Bitcoin, everywhere.",
 	"get_started": "Get Started",
 	"skip_intro": "Skip Intro",
 	"skip": "Skip",
-	"slide1_header": "Bitcoin,\n<brand>Everywhere.</brand>",
-	"slide1_text": "Pay anyone, anywhere, any time, and spend your Bitcoin on the things you value in life.",
-	"slide2_header": "Lightning,\n<purple>Fast.</purple>",
-	"slide2_text": "Send Bitcoin faster than ever. Enjoy instant transactions with friends, family, and merchants.",
-	"slide3_header": "Limitless\n<blue>Web.</blue>",
-	"slide3_text": "Hold the keys to portable profiles, dynamic contacts, distributed feeds, and passwordless accounts.",
-	"slide4_header": "Let’s create <brand>your Wallet.</brand>",
-	"slide4_text": "Please note: Bitkit is <brand>beta</brand> software.",
+	"slide0_header": "You can ₿\n<accent>responsible</accent>",
+	"slide0_text": "Bitkit hands you the keys to your money, profile, contacts, and web accounts.",
+	"slide1_header": "You can ₿\n<accent>supersonic</accent>",
+	"slide1_text": "Send Bitcoin faster than ever. Enjoy instant transactions with friends, family, and merchants.",
+	"slide2_header": "You can ₿\n<accent>borderless</accent>",
+	"slide2_text": "Take charge of your digital life with portable profiles, dynamic contacts, and passwordless accounts.",
+	"slide3_header": "You can ₿\n<accent>protective</accent>",
+	"slide3_text": "Swipe to hide your balance and protect your wallet by enabling security features like passphrases and PIN codes.",
+	"slide4_header": "You can ₿\n<accent>your bank</accent>",
+	"slide4_text": "Let’s create your wallet. Please be aware that Bitkit is mobile software. Don’t store all your money in Bitkit.",
 	"new_wallet": "New Wallet",
 	"restore": "Restore",
 	"restore_wallet": "Restore Wallet",
 	"advanced_setup": "Advanced Setup",
 	"advanced": "Advanced",
-	"passphrase_header": "Secure with <brand>Passphrase</brand>",
+	"passphrase_header": "Secure with <accent>Passphrase</accent>",
 	"passphrase_text": "You can add a secret passphrase to the 12-word recovery phrase. If you do, make sure you don’t forget.",
 	"passphrase": "Passphrase",
 	"create_new_wallet": "Create New Wallet",
-	"restore_header": "Restore\nyour Wallet",
+	"restore_header": "<accent>Restore</accent>\nyour wallet",
 	"restore_phrase": "Please type in your recovery phrase from any (paper) backup.",
-	"restore_red_explain": "If a word is shown in <red>red</red>, it means that it was not found in the recovery phrase dictionary. Check for spelling errors.",
+	"restore_red_explain": "If a word is shown in <accent>red</accent>, it means that it was not found in the recovery phrase dictionary. Check for spelling errors.",
 	"restore_inv_checksum": "The checksum for the recovery phrase appears to be incorrect. Please double check your recovery phrase.",
 	"restore_suggestions": "SUGGESTIONS",
 	"restore_passphrase_placeholder": "Passphrase*",
 	"restore_passphrase_meaning": "*Optional, enter only if you’ve set up one.",
 	"restore_error_title": "Wallet Restore Failed",
 	"restore_error_description": "Bitkit could not restore your wallet from backup or recovery phrase.",
-	"loading_header": "Setting up\n<brand>your Wallet.</brand>",
-	"restore_success_header": "Wallet Restored.",
+	"loading_header": "Setting up\n<accent>your wallet</accent>",
+	"restore_success_header": "Wallet <accent>restored</accent>",
 	"restore_success_text": "You have successfully restored your wallet from backup. Enjoy Bitkit!",
-	"restore_failed_header": "Spending Balance Issue",
+	"restore_failed_header": "Spending balance <accent>issue</accent>",
 	"restore_failed_text": "Bitkit restored your savings, but failed to restore your spending balance and data.",
 	"restore_no_backup_button": "Proceed Without Backup",
 	"restore_no_backup_warn": "If you previously had a lightning backup it will be overwritten and lost. This could result in a loss of funds.",
-	"empty_wallet": "To get started send\n<brand>Bitcoin</brand> to your wallet.",
+	"empty_wallet": "To get started <accent>send Bitcoin</accent> to your wallet.",
 	"error_create": "Wallet Creation Failed",
-	"multiple_header": "Caution:\n<yellow>Multiple devices</yellow>",
+	"multiple_header": "<accent>Caution:</accent>\nmultiple devices",
 	"multiple_text": "Don't install your Bitkit recovery phrase into multiple phones simultaneously, as this can corrupt your data."
 }
diff --git a/src/utils/i18n/locales/en/other.json b/src/utils/i18n/locales/en/other.json
index 66071882c..8a71f3873 100644
--- a/src/utils/i18n/locales/en/other.json
+++ b/src/utils/i18n/locales/en/other.json
@@ -1,6 +1,6 @@
 {
 	"beta": "BETA",
-	"beta_software": "Bitkit is beta software.",
+	"beta_software": "Bitkit is mobile software.",
 	"beta_warn": "Don’t store all your money in Bitkit.",
 	"qr_scan": "Scan QR Code",
 	"qr_error_header": "Unable To Read QR",
@@ -10,8 +10,8 @@
 	"qr_error_network_header": "Incorrect Network",
 	"qr_error_network_text": "Bitkit is currently set to {selectedNetwork} but data is for {dataNetwork}.",
 	"qr_paste": "Paste QR Code",
-	"buy_header": "Bitcoin\n<orange>for Bitkit.</orange>",
-	"buy_text": "Don’t have any Bitcoin yet to send to your Bitkit wallet? Buy some bitcoin.",
+	"buy_header": "Bitcoin\n<accent>for Bitkit</accent>",
+	"buy_text": "Don’t have any Bitcoin or need more?",
 	"buy_button": "Buy Bitcoin",
 	"connection_lost_title": "Bitkit Connection Lost",
 	"connection_lost_message": "Please check your Electrum Server settings.",
@@ -34,10 +34,10 @@
 	"clipboard_redirect_msg": "Do you want to be redirected to the relevant screen?",
 	"pay_insufficient_savings": "Insufficient Savings",
 	"pay_insufficient_spending": "Insufficient Spending Balance",
-	"pay_insufficient_savings_description": "More bitcoin needed to pay this Bitcoin invoice.",
-	"pay_insufficient_spending_description": "More bitcoin needed to pay this Lightning invoice.",
-	"pay_insufficient_savings_amount_description": "{amount} more bitcoin needed to pay this Bitcoin invoice.",
-	"pay_insufficient_spending_amount_description": "{amount} more bitcoin needed to pay this Lightning invoice.",
+	"pay_insufficient_savings_description": "More ₿ needed to pay this Bitcoin invoice.",
+	"pay_insufficient_spending_description": "More ₿ needed to pay this Lightning invoice.",
+	"pay_insufficient_savings_amount_description": "₿ {amount} more needed to pay this Bitcoin invoice.",
+	"pay_insufficient_spending_amount_description": "₿ {amount} more needed to pay this Lightning invoice.",
 	"swipe": "Swipe To Confirm",
 	"scan_err_decoding": "Decoding Error",
 	"scan_err_interpret_title": "Unable To Interpret Provided Data",
@@ -50,15 +50,15 @@
 	"lnurl_ln_error_msg": "Could not start local Lightning node. Please try again or restart Bitkit.",
 	"lnurl_pay_error_no_capacity": "Not enough outbound/sending capacity to complete lnurl-pay request.",
 	"lnurl_channel_error": "Unable To Open Channel (LNURL)",
-	"lnurl_channel_header": "Instant Payments",
-	"lnurl_channel_title": "New\nLightning\nConnection.",
+	"lnurl_channel_header": "Lightning Connection",
+	"lnurl_channel_title": "New\nlightning\n<accent>connection</accent>",
 	"lnurl_channel_message": "Do you want open a Lightning connection with this Lightning Service Provider?",
 	"lnurl_channel_lsp": "Lightning service provider",
 	"lnurl_channel_node": "Node ID",
 	"lnurl_channel_host": "Host",
 	"lnurl_channel_port": "Port",
-	"lnurl_channel_connecting": "Connecting.",
-	"lnurl_channel_connecting_text": "Lightning connection initiated. You will be able to use instant payments in <highlight>±30 minutes</highlight> (depends on node configuration).",
+	"lnurl_channel_connecting": "Connection\n<accent>initiated</accent>",
+	"lnurl_channel_connecting_text": "Lightning connection initiated. You will be able to use your spending balance in <accent>±30 minutes</accent> (depends on node configuration).",
 	"lnurl_blocktank_error": "Bitkit could not connect to Blocktank.",
 	"lnurl_channel_success_title": "Channel Requested",
 	"lnurl_channel_success_msg_peer": "Successfully requested channel from: {peer}",
@@ -85,8 +85,7 @@
 	"update_button": "Update",
 	"high_title": "High Balance",
 	"high_text1": "Wallet balance exceeds",
-	"high_text2": "For safety reasons, we recommend moving some of your savings to an offline cold wallet or multisig solution.",
-	"high_text2_beta": "Please consider moving some of your funds. We recommend using only small amounts while Bitkit is in beta.",
+	"high_text2": "For your security, please consider moving some of your savings to an offline wallet soon.",
 	"high_button_more": "Learn More",
 	"caution_header": "Caution:\n<yellow>Beta Risk.</yellow>",
 	"caution_text": "Beta software may put your money at risk. We recommend using only small amounts while Bitkit is in beta."
diff --git a/src/utils/i18n/locales/en/security.json b/src/utils/i18n/locales/en/security.json
index 9c0fd6fa0..3f4f1cef3 100644
--- a/src/utils/i18n/locales/en/security.json
+++ b/src/utils/i18n/locales/en/security.json
@@ -1,5 +1,6 @@
 {
 	"backup_wallet": "Wallet Backup",
+	"backup_title": "<accent>Safely store</accent> your Bitcoin",
 	"backup_funds": "Now that you have some funds in your wallet, it is time to back up your money!",
 	"backup_funds_no": "There are no funds in your wallet yet, but you can create a backup if you wish.",
 	"backup_button": "Back Up",
@@ -8,10 +9,10 @@
 	"pass": "passphrase",
 	"pass_your": "Your Passphrase",
 	"pass_text": "You added a passphrase to your recovery phrase during wallet setup.",
-	"pass_never_share": "<brand>Never share</brand> your passphrase with anyone as this may result in the loss of funds.",
+	"pass_never_share": "<accent>Never share</accent> your passphrase with anyone as this may result in the loss of funds.",
 	"pass_confirm": "Confirm Passphrase",
 	"pass_confirm_text": "Enter the passphrase you added while setting up and creating your wallet.",
-	"pass_recovery": "<gray>Passphrase:</gray> {passphrase}",
+	"pass_recovery": "<accent>Passphrase:</accent> {passphrase}",
 	"mnemonic_phrase": "Mnemonic Phrase",
 	"mnemonic_your": "Your Recovery Phrase",
 	"mnemonic_error": "Wallet Failure",
@@ -19,20 +20,21 @@
 	"mnemonic_write": "Write down these {length} words in the right order and store them in a safe place.",
 	"mnemonic_use": "Use the 12 words below to recover your money at a later date.",
 	"mnemonic_reveal": "Tap To Reveal",
-	"mnemonic_never_share": "<brand>Never share</brand> your recovery phrase with anyone as this may result in the loss of funds.",
+	"mnemonic_never_share": "<accent>Never share</accent> your recovery phrase with anyone as this may result in the loss of funds.",
 	"mnemonic_confirm": "Confirm Recovery Phrase",
 	"mnemonic_confirm_tap": "Tap the 12 words in the correct order.",
 	"mnemonic_result_header": "Successful",
-	"mnemonic_result_text": "Make sure you store your recovery phrase in a <highlight>secure place</highlight>, as this is the <highlight>only way to recover</highlight> your money (!)",
+	"mnemonic_result_text": "Make sure you store your recovery phrase in a <accent>secure place</accent>, as this is the <accent>only way to recover</accent> your money!",
 	"mnemonic_keep_header": "Keep It Secret",
-	"mnemonic_keep_text": "Remember, never share your recovery phrase with anyone! If someone has access to your recovery phrase they can steal your money, profile and other data.",
+	"mnemonic_keep_text": "Remember, <accent>never share your recovery phrase</accent> with anyone! If you do, they can steal your money, profile and other data.",
 	"mnemonic_data_header": "Wallet Data",
 	"mnemonic_data_text": "Your profile, contacts, accounts, tags, and activity will be backed up automatically to our free cloud service.",
 	"mnemonic_multiple_header": "Multiple Devices",
 	"mnemonic_multiple_text": "Don't use your Bitkit recovery phrase on multiple phones simultaneously, as this can corrupt your data.",
 	"mnemonic_latest_backup": "<bold>Latest data backup:</bold> {time}",
 	"pin_security_header": "Increase Security",
-	"pin_security_text": "To increase wallet security, you can set up a PIN code and Face ID to unlock your wallet.",
+	"pin_security_title": "<accent>Protect</accent>\nyour bitcoin",
+	"pin_security_text": "To increase wallet security, you can set up a PIN code and Face ID.",
 	"pin_security_button": "Secure Wallet",
 	"pin_choose_header": "Choose 4-Digit PIN",
 	"pin_choose_text": "Please use a PIN you will remember. If you forget your PIN you can reset it, but that will require restoring your wallet.",
@@ -59,12 +61,12 @@
 	"bio_error_title": "Biometrics Setup Failed",
 	"bio_error_message": "Bitkit could not set up {type} for your device.",
 	"bio_loading": "Loading...",
-	"bio_not_available": "Looks like you haven’t set up biometric security for your device yet (or it is not supported). You can try to enable biometric security in the phone settings.",
-	"bio_ask": "PIN code set. Would you like to use {biometricsName} instead of your PIN code whenever possible?",
+	"bio_not_available": "Looks like you haven’t set up biometric security yet (or it is not supported). Try to enable it in your phone settings.",
+	"bio_ask": "PIN code set. Would you like to use {biometricsName} instead of your PIN code?",
 	"bio_use": "Use {biometricsName}",
 	"bio_phone_settings": "Phone Settings",
 	"success_title": "Wallet Secured",
-	"success_bio": "You have successfully set up a PIN code and {biometricsName} to improve your wallet security.",
+	"success_bio": "You have successfully set up a PIN code and {biometricsName} to improve wallet security.",
 	"success_no_bio": "You have successfully set up a PIN code to improve your wallet security.",
 	"success_payments": "Also require for payments",
 	"reset_title": "Reset And Restore",
@@ -73,12 +75,13 @@
 	"reset_button_reset": "Reset Wallet",
 	"reset_dialog_title": "Reset Bitkit?",
 	"reset_dialog_desc": "Are you sure you want to reset your Bitkit Wallet? Do you have a backup of your recovery phrase and wallet data?",
+	"reset_confirm": "Yes, Reset",
 	"recovery": "Recovery",
 	"recovery_text": "You've entered Bitkit's recovery mode. Here are some actions to perform when running into issues that prevent the app from fully functioning. Restart the app for a normal startup.",
 	"lightning_recovery_title": "Lightning Recovery",
 	"lightning_recovery_desc": "Warning: This will force close all of your channels ({channelCount}) and recover any funds to your on-chain wallet. Only use this option if you are unable to access your lightning wallet due to a restore error.",
 	"lightning_recovery_success": "Lightning Recovery Success",
-	"lightning_recovery_success_message": "Pending balance {sats} bitcoin recovered. Please reopen the app to see your recovered balance.",
+	"lightning_recovery_success_message": "Pending balance ₿ {sats} recovered. Please reopen the app to see your recovered balance.",
 	"lightning_recovery_error": "Lightning Recovery Error",
 	"lightning_recovery_no_channels": "No lightning channels found in this backup to recover.",
 	"display_seed": "Show Seed Phrase",
diff --git a/src/utils/i18n/locales/en/settings.json b/src/utils/i18n/locales/en/settings.json
index 321483f86..cd57d8257 100644
--- a/src/utils/i18n/locales/en/settings.json
+++ b/src/utils/i18n/locales/en/settings.json
@@ -12,15 +12,10 @@
 	"support_title": "Support",
 	"about": {
 		"title": "About Bitkit",
-		"text": "Bitkit hands you the keys to your money, profile, contacts, and web accounts.\n\nThis <easterEgg>Orange Pill</easterEgg> was carefully crafted by Synonym Software Ltd.",
-		"support": "Support",
-		"report_bug": "Report a bug or contribute",
+		"text": "Thank you for being a responsible Bitcoiner.\nChange your wallet, change the world.\n\nBitkit hands you the keys to your money, profile, contacts, and web accounts.\n\nBitkit was crafted by Synonym Software Ltd.",
 		"legal": "Legal",
-		"version": "Version",
-		"op_title": "Orange Pilled",
-		"op_text": "Who will you <brand>Orange-Pill?</brand>",
-		"op_share": "Share Bitkit With A Friend",
-		"op_message": "Download Bitkit, Your Ultimate Bitcoin Toolkit. Handing you the keys to reshape your digital life. {appStoreUrl}"
+		"share": "Share",
+		"version": "Version"
 	},
 	"dev_title": "Dev Settings",
 	"general": {
@@ -41,11 +36,15 @@
 		"speed_title": "Transaction Speed",
 		"speed_default": "Default Transaction Speed",
 		"speed_fee_custom": "Set Custom Fee",
-		"speed_fee_total": "{feeSats} bitcoin for the average transaction",
-		"speed_fee_total_fiat": "{feeSats} bitcoin for the average transaction ({fiatSymbol}{fiatFormatted})",
+		"speed_fee_total": "₿ {feeSats} for the average transaction",
+		"speed_fee_total_fiat": "₿ {feeSats} for the average transaction ({fiatSymbol}{fiatFormatted})",
 		"tags": "Tags",
-		"tags_previously": "Previously used tags",
-		"widgets": "Widgets"
+		"tags_previously": "Previously used tags"
+	},
+	"widgets": {
+		"nav_title": "Widgets",
+		"showWidgets": "Widgets",
+		"showWidgetTitles": "Show Widget Titles"
 	},
 	"security": {
 		"title": "Security And Privacy",
@@ -84,7 +83,8 @@
 		"category_contacts": "Contacts"
 	},
 	"support": {
-		"text": "Need help? Report your issue from within Bitkit, visit the help center or reach out to us on our social channels.",
+		"title": "Support",
+		"text": "Need help? Report your issue from within Bitkit, visit the help center, check the status, or reach out to us on our social channels.",
 		"report": "Report Issue",
 		"help": "Help Center",
 		"status": "App Status",
@@ -170,7 +170,7 @@
 		"lightning_connections": "Lightning Connections",
 		"lightning_node": "Lightning Node",
 		"electrum_server": "Electrum Server",
-		"rgs_server": "Rapid-Gossip-Sync Server",
+		"rgs_server": "Rapid-Gossip-Sync",
 		"web_relay": "Slashtags Web Relay",
 		"bitcoin_network": "Bitcoin Network"
 	},
@@ -205,7 +205,7 @@
 		"no_addrs_str": "No addresses found when searching for \"{searchTxt}\"",
 		"rescan_error": "Rescan Failed",
 		"rescan_error_description": "Bitkit was not able to check the address balances.",
-		"spend_number": "{count, plural, one {Spend {fundsToSpend} bitcoin From # address} other {Spend {fundsToSpend} bitcoin From # addresses}}",
+		"spend_number": "{count, plural, one {Spend ₿ {fundsToSpend} From # address} other {Spend ₿ {fundsToSpend} From # addresses}}",
 		"spend_all": "{count, plural, one {Spend All Funds From # address} other {Spend All Funds From # addresses}}",
 		"index": "Index: {index}",
 		"path": "Path: {path}",
@@ -214,7 +214,7 @@
 		"private_key": "Private Key: {privateKey}",
 		"addr_change": "Change Addresses",
 		"addr_receiving": "Receiving Addresses",
-		"sats_found": "{totalBalance} bitcoin found",
+		"sats_found": "₿ {totalBalance} found",
 		"gen_20": "Generate 20 More",
 		"check_balances": "Check Balances",
 		"copied": "Copied to clipboard"
diff --git a/src/utils/i18n/locales/en/slashtags.json b/src/utils/i18n/locales/en/slashtags.json
index f14c333f8..c32afc158 100644
--- a/src/utils/i18n/locales/en/slashtags.json
+++ b/src/utils/i18n/locales/en/slashtags.json
@@ -36,17 +36,17 @@
 	"signin_to_success_text_noname": "You successfully signed in.",
 	"signin_title": "Sign In",
 	"signin_title_loading": "Signing in...",
-	"onboarding_header": "Dynamic\n<brand>Contacts.</brand>",
-	"onboarding_text": "Use Bitkit to get automatic updates from your contacts, pay them, and follow their public profiles.",
+	"onboarding_header": "Dynamic\n<accent>contacts</accent>",
+	"onboarding_text": "Get automatic updates from your Bitkit contacts, pay them, and follow their public profiles.",
 	"onboarding_button": "Add Your First Contact",
-	"onboarding_profile1_header": "Own your\n<brand>Social Profile.</brand>",
+	"onboarding_profile1_header": "Own your\n<accent>profile</accent>",
 	"onboarding_profile1_text": "Use Bitkit to control your public profile and links, so your contacts can reach you or pay you anytime.",
-	"onboarding_profile2_header": "Pay your\n<brand>Contacts.</brand>",
+	"onboarding_profile2_header": "Pay <accent>Bitkit\ncontacts</accent>",
 	"onboarding_profile2_text": "You and your contacts can use Bitkit to send payments directly, without banks, anytime, anywhere.",
-	"onboarding_widgets1_header": "Goodbye,\n<brand>Passwords.</brand>",
-	"onboarding_widgets1_text": "Experience the web without passwords. Use Bitkit to log in to your favorite web services.",
-	"onboarding_widgets2_header": "Hello,\n<brand>Widgets.</brand>",
-	"onboarding_widgets2_text": "Enjoy decentralized feeds from your favorite web services, by adding fun and useful widgets to your wallet.",
+	"onboarding_widgets1_header": "Goodbye,\n<accent>Passwords</accent>",
+	"onboarding_widgets1_text": "Experience the web without passwords. Use Bitkit to sign in to your favorite web services, right from a widget.",
+	"onboarding_widgets2_header": "Hello,\n<accent>Widgets</accent>",
+	"onboarding_widgets2_text": "Enjoy decentralized feeds from your favorite web services, by adding fun and useful widgets to your Bitkit wallet.",
 	"my_profile": "My profile",
 	"profile": "Profile",
 	"profile_save": "Save Profile",
diff --git a/src/utils/i18n/locales/en/wallet.json b/src/utils/i18n/locales/en/wallet.json
index e74ba9f1c..2f1a22c1c 100644
--- a/src/utils/i18n/locales/en/wallet.json
+++ b/src/utils/i18n/locales/en/wallet.json
@@ -6,7 +6,6 @@
 	"balance_total_pending": "<text>Total balance (</text><pending/><text> pending)</text>",
 	"create_wallet_mnemonic_error": "Invalid recovery phrase.",
 	"create_wallet_mnemonic_restore_error": "Please double-check if your recovery phrase is accurate.",
-	"assets": "Assets",
 	"send_bitcoin": "Send Bitcoin",
 	"send_to": "To",
 	"recipient_contact": "Contact",
@@ -32,7 +31,7 @@
 	"send_dialog3": "The transaction fee appears to be over 50% of the amount you are sending. Do you want to continue?",
 	"send_dialog4": "The transaction fee appears to be over $10. Do you want to continue?",
 	"send_dialog5_title": "Fee is potentially too low",
-	"send_dialog5_description": "Current network conditions require that your fee should be greater than {minimumFee} bitcoin/vbyte. This transaction may fail, take a while to confirm, or get trimmed from the mempool. Do you wish to proceed?",
+	"send_dialog5_description": "Current network conditions require that your fee should be greater than {minimumFee} ₿/vbyte. This transaction may fail, take a while to confirm, or get trimmed from the mempool. Do you wish to proceed?",
 	"send_sent": "Bitcoin Sent",
 	"send_pending": "Payment Pending",
 	"send_pending_note": "This payment is taking a bit longer than expected. You can continue using Bitkit.",
@@ -67,8 +66,8 @@
 	"send_fee_error_half": "Unable to increase the fee. It would exceed half of your current balance.",
 	"send_fee_error_min": "Unable to decrease the fee any further.",
 	"send_fee_custom": "Set Custom Fee",
-	"send_fee_total": "{feeSats} bitcoin for this transaction",
-	"send_fee_total_fiat": "{feeSats} bitcoin for this transaction ({fiatSymbol}{fiatFormatted})",
+	"send_fee_total": "₿ {feeSats} for this transaction",
+	"send_fee_total_fiat": "₿ {feeSats} for this transaction ({fiatSymbol}{fiatFormatted})",
 	"note": "Note",
 	"tags": "Tags",
 	"tags_add": "Add Tag",
@@ -100,10 +99,10 @@
 	"receive_lightning_invoice": "Lightning invoice",
 	"receive_note_placeholder": "Optional note to payer",
 	"receive_show_qr": "Show QR Code",
-	"receive_text_lnfunds": "Want to receive <purpleText>Lightning</purpleText> funds?",
-	"receive_instantly": "Receive Instantly",
-	"receive_connect_initial": "To receive instant Bitcoin, Bitkit first has to connect you to Lightning. A <highlight>{lspFee}</highlight> service provider fee will be deducted from the amount you specified.",
-	"receive_connect_additional": "To receive more instant Bitcoin, Bitkit has to increase your liquidity. A <highlight>{lspFee}</highlight> service provider fee will be  deducted from the amount you specified.",
+	"receive_text_lnfunds": "Want to receive <accent>Lightning</accent> funds?",
+	"receive_spending": "Receive on Spending Balance",
+	"receive_connect_initial": "To set up your spending balance, a <accent>{lspFee}</accent> service provider fee will be deducted.",
+	"receive_connect_additional": "To receive more instant Bitcoin, Bitkit has to increase your liquidity. A <accent>{lspFee}</accent> service provider fee will be  deducted from the amount you specified.",
 	"receive_error_min_title": "Below Minimum Amount",
 	"receive_error_min_description": "Invoice must be at least {txt}",
 	"receive_error_max_title": "Above Maximum Amount",
@@ -119,12 +118,16 @@
 	"activity_received": "Received",
 	"activity_pending": "Pending",
 	"activity_failed": "Failed",
+	"activity_transfer": "Transfer",
 	"activity_transfer_spending": "Spending Balance",
 	"activity_transfer_savings": "Savings Balance",
-	"activity_transfer_savings_pending": "Transfer from Spending (±{duration}m)",
-	"activity_transfer_savings_done": "Transfer from Spending",
-	"activity_transfer_spending_pending": "Transfer from Savings (±{duration}m)",
-	"activity_transfer_spending_done": "Transfer from Savings",
+	"activity_transfer_savings_pending": "From Spending (±{duration}m)",
+	"activity_transfer_savings_done": "From Spending",
+	"activity_transfer_spending_pending": "From Savings (±{duration}m)",
+	"activity_transfer_spending_done": "From Savings",
+	"activity_transfer_to_savings": "To Savings",
+	"activity_transfer_to_spending": "To Spending",
+	"activity_transfer_pending": "Transfer (±{duration}m)",
 	"activity_confirms_in": "Confirms in {feeRateDescription}",
 	"activity_confirms_in_boosted": "Boosting. Confirms in {feeRateDescription}",
 	"activity_low_fee": "Fee potentially too low",
@@ -172,9 +175,15 @@
 		"other": "Other"
 	},
 	"details_savings_title": "Savings",
-	"details_savings_subtitle": "BTC",
-	"transfer_text": "Transfer",
 	"details_spending_title": "Spending",
+	"savings": {
+		"title": "Savings",
+		"onboarding": "<accent>Send bitcoin</accent> to your savings balance."
+	},
+	"spending": {
+		"title": "Spending",
+		"onboarding": "<accent>Send bitcoin</accent> to your spending balance."
+	},
 	"details_transfer_subtitle": "Incoming Transfer",
 	"tx_invalid": "Transaction Invalid",
 	"boost": "Boost",
diff --git a/src/utils/i18n/locales/es_419/onboarding.json b/src/utils/i18n/locales/es_419/onboarding.json
index 6d210c811..28ad5cb09 100644
--- a/src/utils/i18n/locales/es_419/onboarding.json
+++ b/src/utils/i18n/locales/es_419/onboarding.json
@@ -1,19 +1,19 @@
 {
   "tos_checkbox": "Condiciones de uso",
   "pp_checkbox": "Política de privacidad",
-  "toolkit": "Su Bitcoin\n<brand>Toolkit</brand>",
+  "toolkit": "Su Bitcoin\n<accent>Toolkit</accent>",
   "toolkit_text": "Bitkit le entrega las llaves de su dinero, perfil, contactos y cuentas web.",
   "get_started": "Empezar",
   "skip_intro": "Saltar introducción",
   "skip": "Saltar",
-  "slide1_header": "Bitcoin,\n<brand>en todas las partes.</brand>",
+  "slide1_header": "Bitcoin,\n<accent>en todas las partes.</accent>",
   "slide1_text": "Pague a quien quiera, donde quiera y cuando quiera, gaste sus Bitcoin en las cosas que valora en la vida.",
   "slide2_header": "Lightning,\n<purple>Rápido.</purple>",
   "slide2_text": "Envíe Bitcoin más rápido que nunca. Disfrute de transacciones instantáneas con amigos, familiares y comerciantes.",
   "slide3_header": "Sin límites\n<blue>Web.</blue>",
   "slide3_text": "Posee las claves de los perfiles portátiles, los contactos dinámicos, las fuentes distribuidas y las cuentas sin contraseña.",
-  "slide4_header": "Vamos a crear <brand>su Cartera.</brand>",
-  "slide4_text": "Nota: Bitkit es un software <brand>beta</brand>.",
+  "slide4_header": "Vamos a crear <accent>su Cartera.</accent>",
+  "slide4_text": "Nota: Bitkit es un software <accent>beta</accent>.",
   "new_wallet": "Cartera nueva",
   "restore": "Restaurar",
   "restore_wallet": "Restaurar cartera",
@@ -24,16 +24,16 @@
   "create_new_wallet": "Crear nueva cartera",
   "restore_header": "Restaurar\nsu Cartera",
   "restore_phrase": "Introduzca su frase de recuperación a partir de cualquier copia de seguridad (en papel).",
-  "restore_red_explain": "Si una palabra aparece en <red>rojo</red>, significa que no se ha encontrado en el diccionario de frases de recuperación. Compruebe si hay errores ortográficos.",
+  "restore_red_explain": "Si una palabra aparece en <accent>rojo</accent>, significa que no se ha encontrado en el diccionario de frases de recuperación. Compruebe si hay errores ortográficos.",
   "restore_inv_checksum": "La suma de comprobación de la frase de recuperación parece ser incorrecta. Por favor, vuelva a comprobar su frase de recuperación.",
   "restore_suggestions": "SUGERENCIAS",
   "restore_passphrase_placeholder": "Frase de acesso*",
-  "loading_header": "Configurar\n<brand>su Cartera.</brand>",
+  "loading_header": "Configurar\n<accent>su Cartera.</accent>",
   "restore_success_header": "Cartera restaurada.",
   "restore_success_text": "Ha restaurado con éxito su cartera desde la copia de seguridad. ¡Disfrute de Bitkit!",
   "restore_no_backup_button": "Proceder sin respaldo de la copia de seguridad",
   "restore_no_backup_warn": "Si anteriormente tenía una copia de seguridad Lightning, ésta se sobrescribirá y se perderá. Esto puede acarrear en pérdida de fondos.",
-  "empty_wallet": "Para empezar envíe\n<brand>Bitcoin</brand> a su cartera.",
+  "empty_wallet": "Para empezar envíe\n<accent>Bitcoin</accent> a su cartera.",
   "multiple_header": "Precaución:\n<yellow>Múltiples dispositivos</yellow>",
   "multiple_text": "No instale su frase de recuperación Bitkit en varios teléfonos simultáneamente, ya que podría corromper sus datos."
 }
diff --git a/src/utils/i18n/locales/es_419/other.json b/src/utils/i18n/locales/es_419/other.json
index e363c3f1a..bb3ea7068 100644
--- a/src/utils/i18n/locales/es_419/other.json
+++ b/src/utils/i18n/locales/es_419/other.json
@@ -6,7 +6,7 @@
   "qr_error_network_header": "Red incorrecta",
   "qr_error_network_text": "Bitkit está actualmente configurado para {selectedNetwork} pero los datos son para {dataNetwork}.",
   "qr_paste": "Pegar código QR",
-  "buy_header": "Bitcoin\n<orange>para Bitkit.</orange>",
+  "buy_header": "Bitcoin\n<accent>para Bitkit.</accent>",
   "buy_button": "Comprar Bitcoin",
   "connection_lost_title": "Conexión a Bitkit perdida",
   "connection_lost_message": "Por favor, verifique la configuración de servidor Electrum.",
diff --git a/src/utils/i18n/locales/es_419/security.json b/src/utils/i18n/locales/es_419/security.json
index 6eecc1884..4a875ed25 100644
--- a/src/utils/i18n/locales/es_419/security.json
+++ b/src/utils/i18n/locales/es_419/security.json
@@ -7,7 +7,7 @@
   "backup_data_text": "Su perfil, contactos, cuentas, etiquetas y actividad se cifrarán y se realizará una copia de seguridad automática en nuestro servicio gratuito en la nube.",
   "pass": "frase de acesso",
   "pass_your": "Su frase de acesso",
-  "pass_never_share": "<brand>No comparta nunca</brand> su frase de contraseña con nadie, ya que podría perder sus fondos.",
+  "pass_never_share": "<accent>No comparta nunca</accent> su frase de contraseña con nadie, ya que podría perder sus fondos.",
   "pass_confirm": "Confirmar frase de acesso",
   "pass_confirm_text": "Introduzca la frase de acesso que añadió al configurar y crear su monedero.",
   "mnemonic_phrase": "Frase mnemotécnica",
@@ -15,7 +15,7 @@
   "mnemonic_write": "Anote estas palabras {longitud} en el orden correcto y guárdelas en un lugar seguro.",
   "mnemonic_use": "Utilice las 12 palabras siguientes para recuperar su dinero más adelante.",
   "mnemonic_reveal": "Toque para revelar",
-  "mnemonic_never_share": "<brand>No comparta</brand> nunca su frase de recuperación con nadie, ya que podría perder los fondos.",
+  "mnemonic_never_share": "<accent>No comparta</accent> nunca su frase de recuperación con nadie, ya que podría perder los fondos.",
   "mnemonic_confirm": "Confirmar frase de recuperación",
   "mnemonic_confirm_tap": "Pulse las 12 palabras en el orden correcto.",
   "mnemonic_result_header": "Éxito",
diff --git a/src/utils/i18n/locales/es_419/slashtags.json b/src/utils/i18n/locales/es_419/slashtags.json
index 531753bdd..7bae74ca8 100644
--- a/src/utils/i18n/locales/es_419/slashtags.json
+++ b/src/utils/i18n/locales/es_419/slashtags.json
@@ -28,13 +28,13 @@
   "signin_to_loading": "Iniciando sesión en {serviceName}...",
   "onboarding_text": "Utilice Bitkit para recibir actualizaciones automáticas de sus contactos, pagarles y seguir sus perfiles públicos.",
   "onboarding_button": "Añada su primer contacto",
-  "onboarding_profile1_header": "Sea dueño de su\n<brand>Perfil Social.</brand>",
+  "onboarding_profile1_header": "Sea dueño de su\n<accent>Perfil Social.</accent>",
   "onboarding_profile1_text": "Utilice Bitkit para controlar su perfil público y sus enlaces, de modo que sus contactos puedan ponerse en contacto con usted o pagarle en cualquier momento.",
-  "onboarding_profile2_header": "Pague a sus\n<brand>Contactos.</brand>",
+  "onboarding_profile2_header": "Pague a sus\n<accent>Contactos.</accent>",
   "onboarding_profile2_text": "Usted y sus contactos pueden utilizar Bitkit para enviar pagos directamente, sin bancos, en cualquier momento y en cualquier lugar.",
-  "onboarding_widgets1_header": "Adiós,\n<brand>Contraseñas.</brand>",
+  "onboarding_widgets1_header": "Adiós,\n<accent>Contraseñas.</accent>",
   "onboarding_widgets1_text": "Experimente la web sin contraseñas. Utilice Bitkit para iniciar sesión en sus servicios web favoritos.",
-  "onboarding_widgets2_header": "Hola,\n<brand>Widgets.</brand>",
+  "onboarding_widgets2_header": "Hola,\n<accent>Widgets.</accent>",
   "onboarding_widgets2_text": "Disfrute de fuentes descentralizadas de sus servicios web favoritos, añadiendo widgets divertidos y útiles a su cartera.",
   "my_profile": "Mi perfil",
   "profile": "Perfil",
diff --git a/src/utils/i18n/locales/es_ES/onboarding.json b/src/utils/i18n/locales/es_ES/onboarding.json
index 86f527224..f8710a10c 100644
--- a/src/utils/i18n/locales/es_ES/onboarding.json
+++ b/src/utils/i18n/locales/es_ES/onboarding.json
@@ -1,19 +1,19 @@
 {
   "tos_checkbox": "Condiciones de uso",
   "pp_checkbox": "Política de privacidad",
-  "toolkit": "Su Bitcoin\n<brand>Toolkit</brand>",
+  "toolkit": "Su Bitcoin\n<accent>Toolkit</accent>",
   "toolkit_text": "Bitkit le entrega las llaves de su dinero, perfil, contactos y cuentas web.",
   "get_started": "Empezar",
   "skip_intro": "Saltar introducción",
   "skip": "Saltar",
-  "slide1_header": "Bitcoin,\n<brand>en todas las partes.</brand>",
+  "slide1_header": "Bitcoin,\n<accent>en todas las partes.</accent>",
   "slide1_text": "Pague a quien quiera, donde quiera y cuando quiera, gaste sus Bitcoin en las cosas que valora en la vida.",
   "slide2_header": "Lightning,\n<purple>Rápido.</purple>",
   "slide2_text": "Envíe Bitcoin más rápido que nunca. Disfrute de transacciones instantáneas con amigos, familiares y comerciantes.",
   "slide3_header": "Sin límites\n<blue>Web.</blue>",
   "slide3_text": "Posee las claves de los perfiles portátiles, los contactos dinámicos, las fuentes distribuidas y las cuentas sin contraseña.",
-  "slide4_header": "Vamos a crear <brand>su Cartera.</brand>",
-  "slide4_text": "Nota: Bitkit es un software <brand>beta</brand>.",
+  "slide4_header": "Vamos a crear <accent>su Cartera.</accent>",
+  "slide4_text": "Nota: Bitkit es un software <accent>beta</accent>.",
   "new_wallet": "Cartera nueva",
   "restore": "Restaurar",
   "restore_wallet": "Restaurar cartera",
@@ -24,14 +24,14 @@
   "create_new_wallet": "Crear nueva cartera",
   "restore_header": "Restaurar\nsu Cartera",
   "restore_phrase": "Introduzca su frase de recuperación a partir de cualquier copia de seguridad (en papel).",
-  "restore_red_explain": "Si una palabra aparece en <red>rojo</red>, significa que no se ha encontrado en el diccionario de frases de recuperación. Compruebe si hay errores ortográficos.",
+  "restore_red_explain": "Si una palabra aparece en <accent>rojo</accent>, significa que no se ha encontrado en el diccionario de frases de recuperación. Compruebe si hay errores ortográficos.",
   "restore_inv_checksum": "La suma de comprobación de la frase de recuperación parece ser incorrecta. Por favor, vuelva a comprobar su frase de recuperación.",
   "restore_suggestions": "SUGERENCIAS",
   "restore_passphrase_placeholder": "Frase de acesso*",
-  "loading_header": "Configurar\n<brand>su Cartera.</brand>",
+  "loading_header": "Configurar\n<accent>su Cartera.</accent>",
   "restore_success_header": "Cartera restaurada.",
   "restore_success_text": "Ha restaurado con éxito su cartera desde la copia de seguridad. ¡Disfrute de Bitkit!",
   "restore_no_backup_button": "Proceder sin respaldo de la copia de seguridad",
   "restore_no_backup_warn": "Si anteriormente tenía una copia de seguridad Lightning, ésta se sobrescribirá y se perderá. Esto podría provocar una pérdida de fondos.",
-  "empty_wallet": "Para empezar envíe\n<brand>Bitcoin</brand> a su cartera."
+  "empty_wallet": "Para empezar envíe\n<accent>Bitcoin</accent> a su cartera."
 }
diff --git a/src/utils/i18n/locales/es_ES/other.json b/src/utils/i18n/locales/es_ES/other.json
index 3947885cb..d35f48b3c 100644
--- a/src/utils/i18n/locales/es_ES/other.json
+++ b/src/utils/i18n/locales/es_ES/other.json
@@ -5,7 +5,7 @@
   "qr_scan": "Escanear código QR",
   "qr_error_network_header": "Red incorrecta",
   "qr_paste": "Pegar código QR",
-  "buy_header": "Bitcoin\n<orange>para Bitkit.</orange>",
+  "buy_header": "Bitcoin\n<accent>para Bitkit.</accent>",
   "buy_button": "Comprar Bitcoin",
   "connection_lost_title": "Conexión a Bitkit perdida",
   "connection_lost_message": "Por favor, verifique la configuración de servidor Electrum.",
diff --git a/src/utils/i18n/locales/es_ES/security.json b/src/utils/i18n/locales/es_ES/security.json
index fdc6bb257..24e0c47eb 100644
--- a/src/utils/i18n/locales/es_ES/security.json
+++ b/src/utils/i18n/locales/es_ES/security.json
@@ -8,14 +8,14 @@
   "pass": "frase de acesso",
   "pass_your": "Su frase de acesso",
   "pass_text": "Añadiste una passphrase a tu frase de recuperación al configurar tu wallet.",
-  "pass_never_share": "<brand>No comparta nunca</brand> su frase de contraseña con nadie, ya que podría perder sus fondos.",
+  "pass_never_share": "<accent>No comparta nunca</accent> su frase de contraseña con nadie, ya que podría perder sus fondos.",
   "pass_confirm": "Confirmar frase de acesso",
   "pass_confirm_text": "Introduzca la frase de acesso que añadió al configurar y crear su monedero.",
   "mnemonic_phrase": "Frase mnemotécnica",
   "mnemonic_your": "Su frase de recuperación",
   "mnemonic_use": "Utilice las 12 palabras siguientes para recuperar su dinero más adelante.",
   "mnemonic_reveal": "Toque para revelar",
-  "mnemonic_never_share": "<brand>No comparta</brand> nunca su frase de recuperación con nadie, ya que podría perder los fondos.",
+  "mnemonic_never_share": "<accent>No comparta</accent> nunca su frase de recuperación con nadie, ya que podría perder los fondos.",
   "mnemonic_confirm": "Confirmar frase de recuperación",
   "mnemonic_confirm_tap": "Pulse las 12 palabras en el orden correcto.",
   "mnemonic_result_header": "Éxito",
diff --git a/src/utils/i18n/locales/es_ES/slashtags.json b/src/utils/i18n/locales/es_ES/slashtags.json
index 85f1ba368..8878ec0c2 100644
--- a/src/utils/i18n/locales/es_ES/slashtags.json
+++ b/src/utils/i18n/locales/es_ES/slashtags.json
@@ -25,13 +25,13 @@
   "signin_title_loading": "accediendo",
   "onboarding_text": "Utilice Bitkit para recibir actualizaciones automáticas de sus contactos, pagarles y seguir sus perfiles públicos.",
   "onboarding_button": "Añada su primer contacto",
-  "onboarding_profile1_header": "Sea dueño de su\n<brand>perfil social.</brand>",
+  "onboarding_profile1_header": "Sea dueño de su\n<accent>perfil social.</accent>",
   "onboarding_profile1_text": "Utilice Bitkit para controlar su perfil público y sus enlaces, de modo que sus contactos puedan ponerse en contacto con usted o pagarle en cualquier momento.",
-  "onboarding_profile2_header": "Pague a sus\n<brand>Contactos.</brand>",
+  "onboarding_profile2_header": "Pague a sus\n<accent>Contactos.</accent>",
   "onboarding_profile2_text": "Usted y sus contactos pueden utilizar Bitkit para enviar pagos directamente, sin bancos, en cualquier momento y en cualquier lugar.",
-  "onboarding_widgets1_header": "Adiós,\n<brand>Contraseñas.</brand>",
+  "onboarding_widgets1_header": "Adiós,\n<accent>Contraseñas.</accent>",
   "onboarding_widgets1_text": "Experimente la web sin contraseñas. Utilice Bitkit para iniciar sesión en sus servicios web favoritos.",
-  "onboarding_widgets2_header": "Hola,\n<brand>Widgets.</brand>",
+  "onboarding_widgets2_header": "Hola,\n<accent>Widgets.</accent>",
   "onboarding_widgets2_text": "Disfrute de fuentes descentralizadas de sus servicios web favoritos, añadiendo widgets divertidos y útiles a su cartera.",
   "my_profile": "Mi perfil",
   "profile": "Perfil",
diff --git a/src/utils/i18n/locales/fr/onboarding.json b/src/utils/i18n/locales/fr/onboarding.json
index 7c8782792..d70b46b90 100644
--- a/src/utils/i18n/locales/fr/onboarding.json
+++ b/src/utils/i18n/locales/fr/onboarding.json
@@ -1,49 +1,49 @@
 {
-  "tos_header": "Bitkit\n<brand>Conditions d'utilisation</brand><brand>\nd'utilisation.</brand>",
+  "tos_header": "Bitkit\n<accent>Conditions d'utilisation</accent><accent>\nd'utilisation.</accent>",
   "tos_checkbox": "Conditions d'utilisation",
-  "tos_checkbox_value": "<gray>Je déclare avoir lu et accepté les <brand>conditions d'utilisation</brand>.</gray>",
+  "tos_checkbox_value": "Je déclare avoir lu et accepté les <accent>conditions d'utilisation</accent>.",
   "pp_checkbox": "Politique de confidentialité",
-  "pp_checkbox_value": "<gray>Je déclare avoir lu et accepté la <brand>politique de confidentialité</brand>.</gray>",
-  "toolkit": "Votre boîte à outils\n<brand>Bitcoin.</brand>",
+  "pp_checkbox_value": "Je déclare avoir lu et accepté la <accent>politique de confidentialité</accent>.",
+  "toolkit": "Votre boîte à outils\n<accent>Bitcoin.</accent>",
   "toolkit_text": "Bitkit vous donne les clés de votre argent, de votre profil, de vos contacts et de vos comptes web.",
   "get_started": "Commencez",
   "skip_intro": "Sauter l'introduction",
   "skip": "Ignorer",
-  "slide1_header": "Bitcoin,\n<brand>partout.</brand>",
+  "slide1_header": "Bitcoin,\n<accent>partout.</accent>",
   "slide1_text": "Payez n'importe qui, n'importe où, n'importe quand, et dépensez vos bitcoins pour les choses qui vous tiennent à cœur.",
-  "slide2_header": "Lightning,\n<purple>Rapide.</purple>",
+  "slide2_header": "Lightning,\n<accent>Rapide.</accent>",
   "slide2_text": "Envoyez des bitcoins plus rapidement que jamais. Profitez de transactions instantanées avec vos amis, votre famille et les commerçants.",
-  "slide3_header": "Sans limite\n<blue>Web.</blue>",
+  "slide3_header": "Sans limite\n<accent>Web.</accent>",
   "slide3_text": "Détenez les clés des profils, des contacts dynamiques, des flux distribués et de comptes sans mot de passe.",
-  "slide4_header": "Créons <brand>votre portefeuille</brand>.",
-  "slide4_text": "Veuillez noter que Bitkit est un logiciel en <brand>bêta</brand>.",
+  "slide4_header": "Créons <accent>votre portefeuille</accent>.",
+  "slide4_text": "Veuillez noter que Bitkit est un logiciel en <accent>bêta</accent>.",
   "new_wallet": "Nouveau portefeuille",
   "restore": "Restaurer",
   "restore_wallet": "Restaurer le portefeuille",
   "advanced_setup": "Configuration avancée",
   "advanced": "Avancé",
-  "passphrase_header": "Sécuriser avec une <brand>phrase secrète</brand>",
+  "passphrase_header": "Sécuriser avec une <accent>phrase secrète</accent>",
   "passphrase_text": "Vous pouvez ajouter une phrase secrète à la phrase de récupération de 12 mots. Si vous le faites, assurez-vous de ne pas l'oublier.",
   "passphrase": "Phrase secrète",
   "create_new_wallet": "Créer un nouveau portefeuille",
   "restore_header": "Restaurez\nvotre portefeuille",
   "restore_phrase": "Veuillez saisir votre phrase de récupération à partir de n'importe quelle sauvegarde (papier).",
-  "restore_red_explain": "Si un mot apparaît en <red>rouge</red>, cela signifie qu'il n'a pas été trouvé dans le dictionnaire des phrases de récupération. Vérifiez les fautes d'orthographe.",
+  "restore_red_explain": "Si un mot apparaît en <accent>rouge</accent>, cela signifie qu'il n'a pas été trouvé dans le dictionnaire des phrases de récupération. Vérifiez les fautes d'orthographe.",
   "restore_inv_checksum": "La phrase de récupération semble incorrecte. Veuillez revérifier votre phrase de récupération.",
   "restore_suggestions": "SUGGESTIONS",
   "restore_passphrase_placeholder": "Phrase secrète*",
   "restore_passphrase_meaning": "*Facultatif, n'entrez que si vous en avez créé une.",
   "restore_error_title": "Échec de la restauration du portefeuille",
   "restore_error_description": "Bitkit n'a pas pu restaurer votre portefeuille à partir d'une phrase de sauvegarde ou de récupération.",
-  "loading_header": "Configurer\n<brand>votre portefeuille.</brand>",
+  "loading_header": "Configurer\n<accent>votre portefeuille.</accent>",
   "restore_success_header": "Portefeuille restauré.",
   "restore_success_text": "Vous avez restauré avec succès votre portefeuille à partir d'une sauvegarde. Profitez de Bitkit !",
   "restore_failed_header": "Problème",
   "restore_failed_text": "Bitkit a restauré votre compte d'épargne, mais n'a pas restauré votre le compte courant et vos données.",
   "restore_no_backup_button": "Procéder sans sauvegarde",
   "restore_no_backup_warn": "Si vous disposiez auparavant d'une sauvegarde Lightning, celle-ci sera écrasée et perdue. Cela pourrait entraîner une perte de fonds.",
-  "empty_wallet": "Pour commencer, envoyez du\n<brand>Bitcoin</brand> sur votre portefeuille.",
+  "empty_wallet": "Pour commencer, envoyez du\n<accent>Bitcoin</accent> sur votre portefeuille.",
   "error_create": "Échec de la création d'un portefeuille",
-  "multiple_header": "Attention :\n<yellow>Plusieurs appareils</yellow>",
+  "multiple_header": "Attention :\n<accent>Plusieurs appareils</accent>",
   "multiple_text": "N'installez pas votre phrase de récupération Bitkit sur plusieurs téléphones simultanément, car cela pourrait corrompre vos données."
 }
diff --git a/src/utils/i18n/locales/fr/other.json b/src/utils/i18n/locales/fr/other.json
index 245f12401..910cd180a 100644
--- a/src/utils/i18n/locales/fr/other.json
+++ b/src/utils/i18n/locales/fr/other.json
@@ -10,7 +10,7 @@
   "qr_error_network_header": "Réseau incorrect",
   "qr_error_network_text": "Bitkit est actuellement réglé sur {selectedNetwork} mais les données sont pour {dataNetwork}.",
   "qr_paste": "Collez le QR code ",
-  "buy_header": "Bitcoin\n<orange>pour Bitkit.</orange>",
+  "buy_header": "Bitcoin\n<accent>pour Bitkit.</accent>",
   "buy_button": "Acheter du bitcoin",
   "connection_lost_title": "Connexion Bitkit perdue",
   "connection_lost_message": "Veuillez vérifier les paramètres de votre serveur Electrum.",
diff --git a/src/utils/i18n/locales/fr/security.json b/src/utils/i18n/locales/fr/security.json
index 58f4d1866..9953f7d7a 100644
--- a/src/utils/i18n/locales/fr/security.json
+++ b/src/utils/i18n/locales/fr/security.json
@@ -8,10 +8,10 @@
   "pass": "phrase secrète",
   "pass_your": "Votre phrase secrète",
   "pass_text": "Vous avez ajouté une phrase secrète à votre phrase de récupération lors de la configuration du portefeuille.",
-  "pass_never_share": "<brand>Ne communiquez jamais</brand> votre phrase secrète à qui que ce soit, car cela pourrait entraîner la perte des fonds.",
+  "pass_never_share": "<accent>Ne communiquez jamais</accent> votre phrase secrète à qui que ce soit, car cela pourrait entraîner la perte des fonds.",
   "pass_confirm": "Confirmer la phrase secrète",
   "pass_confirm_text": "Saisissez la phrase de récupération que vous avez ajoutée lors de la configuration et de la création de votre portefeuille.",
-  "pass_recovery": "<gray>Phrase secrète:</gray> {passphrase}",
+  "pass_recovery": "<accent>Phrase secrète:</accent> {passphrase}",
   "mnemonic_phrase": "Phrase mnémotechnique",
   "mnemonic_your": "Votre phrase de récupération",
   "mnemonic_error": "Défaillance du portefeuille",
@@ -19,7 +19,7 @@
   "mnemonic_write": "Notez ces mots {length} dans le bon ordre et conservez-les dans un endroit sûr.",
   "mnemonic_use": "Utilisez les 12 mots ci-dessous pour récupérer votre argent ultérieurement.",
   "mnemonic_reveal": "Tapez pour révéler",
-  "mnemonic_never_share": "<brand>Ne communiquez jamais</brand> votre phrase de recupération à qui que ce soit, car cela pourrait entraîner la perte des fonds.",
+  "mnemonic_never_share": "<accent>Ne communiquez jamais</accent> votre phrase de recupération à qui que ce soit, car cela pourrait entraîner la perte des fonds.",
   "mnemonic_confirm": "Confirmer la phrase de récupération",
   "mnemonic_confirm_tap": "Tapez les 12 mots dans le bon ordre.",
   "mnemonic_result_header": "Succès",
diff --git a/src/utils/i18n/locales/fr/settings.json b/src/utils/i18n/locales/fr/settings.json
index d9410a4a2..16e95502f 100644
--- a/src/utils/i18n/locales/fr/settings.json
+++ b/src/utils/i18n/locales/fr/settings.json
@@ -17,7 +17,7 @@
     "legal": "Juridique",
     "version": "Version",
     "op_title": "Pilule Orange",
-    "op_text": "À qui allez-vous <brand>faire passer à la pilule orange ?</brand>",
+    "op_text": "À qui allez-vous <accent>faire passer à la pilule orange ?</accent>",
     "op_share": "Partager Bitkit avec un ami",
     "op_message": "Téléchargez Bitkit, votre ultime boîte à outils Bitcoin. Il vous donne les clés pour remodeler votre vie numérique. {appStoreUrl}"
   },
diff --git a/src/utils/i18n/locales/fr/slashtags.json b/src/utils/i18n/locales/fr/slashtags.json
index da25b19e4..28376f04b 100644
--- a/src/utils/i18n/locales/fr/slashtags.json
+++ b/src/utils/i18n/locales/fr/slashtags.json
@@ -32,16 +32,16 @@
   "signin_to_success_text_noname": "Vous vous êtes connecté avec succès.",
   "signin_title": "S'inscrire",
   "signin_title_loading": "S'inscrire...",
-  "onboarding_header": "Dynamique\n<brand>Contacts.</brand>",
+  "onboarding_header": "Dynamique\n<accent>Contacts.</accent>",
   "onboarding_text": "Utilisez Bitkit pour recevoir des mises à jour automatiques de vos contacts, les payer et suivre leurs profils publics.",
   "onboarding_button": "Ajoutez votre premier contact",
-  "onboarding_profile1_header": "Possédez votre\n<brand>Profil Social.</brand>",
+  "onboarding_profile1_header": "Possédez votre\n<accent>Profil Social.</accent>",
   "onboarding_profile1_text": "Utilisez Bitkit pour contrôler votre profil public et vos liens, afin que vos contacts puissent vous joindre ou vous payer à tout moment.",
-  "onboarding_profile2_header": "Payez vos\n<brand>Contacts.</brand>",
+  "onboarding_profile2_header": "Payez vos\n<accent>Contacts.</accent>",
   "onboarding_profile2_text": "Vous et vos contacts pouvez utiliser Bitkit pour envoyer des paiements directement, sans banque, à tout moment et en tout lieu.",
-  "onboarding_widgets1_header": "Adieu,\n<brand>Mots de passe.</brand>",
+  "onboarding_widgets1_header": "Adieu,\n<accent>Mots de passe.</accent>",
   "onboarding_widgets1_text": "Découvrez le web sans mot de passe. Utilisez Bitkit pour vous connecter à vos services web préférés.",
-  "onboarding_widgets2_header": "Bonjour,\n<brand>Widgets.</brand>",
+  "onboarding_widgets2_header": "Bonjour,\n<accent>Widgets.</accent>",
   "onboarding_widgets2_text": "Profitez des flux décentralisés de vos services web préférés en ajoutant des widgets amusants et utiles à votre portefeuille.",
   "my_profile": "Mon profil",
   "profile": "Profil",
diff --git a/src/utils/i18n/locales/it/common.json b/src/utils/i18n/locales/it/common.json
index c21bc37d6..7eca272ac 100644
--- a/src/utils/i18n/locales/it/common.json
+++ b/src/utils/i18n/locales/it/common.json
@@ -6,8 +6,8 @@
   "yes_proceed": "Sì, Procedi",
   "try_again": "Riprova",
   "dialog_cancel": "No, Annulla",
-  "sat_vbyte": "bitcoin / vbyte",
-  "sat_vbyte_compact": "bitcoin/vbyte",
+  "sat_vbyte": "₿ / vbyte",
+  "sat_vbyte_compact": "₿/vbyte",
   "edit": "Modifica",
   "copy": "Copia",
   "share": "Condividi",
diff --git a/src/utils/i18n/locales/it/lightning.json b/src/utils/i18n/locales/it/lightning.json
index d13125d65..ef85b9c9b 100644
--- a/src/utils/i18n/locales/it/lightning.json
+++ b/src/utils/i18n/locales/it/lightning.json
@@ -20,7 +20,7 @@
   "note_blocktank_limit": "L'importo che puoi trasferire al tuo saldo da spendere è attualmente limitato a ${usdValue}.",
   "note_reserve_limit": "L'importo che puoi trasferire al tuo saldo da spendere è limitato all'80%. Devi conservare dei fondi di riserva per spostare questi bitcoin nei risparmi.",
   "quick_confirm_header": "Conferma.",
-  "quick_confirm_cost": "Costa <highlight>{txFee}</highlight> in commissioni di rete e <highlight>{lspFee}</highlight> in commissioni del fornitore di server per connetterti a Lightning e impostare il tuo saldo di spesa.",
+  "quick_confirm_cost": "Costa <accent>{txFee}</accent> in commissioni di rete e <accent>{lspFee}</accent> in commissioni del fornitore di server per connetterti a Lightning e impostare il tuo saldo di spesa.",
   "connect_swipe": "Swipe Per Connettere",
   "connect_swipe_pay": "Swipe Per Pagare & Connettere",
   "spending_header": "<purple>Soldi da Spendere.</purple>",
@@ -30,12 +30,12 @@
   "receiving_amount_bitcoin": "Inserisci l'importo di Bitcoin che vuoi ricevere istantaneamente.",
   "enter_custom_amount": "Inserire l'importo",
   "custom_confirm_header": "<purple>Conferma.</purple>",
-  "custom_confirm_cost": "Costa <highlight>{txFee}</highlight> in commissioni di rete e <highlight>{lspFee}</highlight> in commissioni del fornitore di server per connetterti e impostare il tuo saldo. La tua connessione Lightning dovrebbe rimanere aperta almeno <highlightWithKeyboard>{weeks, plural, one {# week} o {# weeks}}.<penIcon/></highlightWithKeyboard>",
+  "custom_confirm_cost": "Costa <accent>{txFee}</accent> in commissioni di rete e <accent>{lspFee}</accent> in commissioni del fornitore di server per connetterti e impostare il tuo saldo. La tua connessione Lightning dovrebbe rimanere aperta almeno <highlightWithKeyboard>{weeks, plural, one {# week} o {# weeks}}.<penIcon/></highlightWithKeyboard>",
   "duration_header": "Durata della Connessione.",
   "duration_text": "Scegli il numero minimo di settimane per cui vuoi che la connessione rimanga aperta.",
   "duration_week": "{count, plural, one {settimane} many {Tuo nome} other {settimane}}",
   "setting_up_header": "In preparazione.",
-  "setting_up_text": "<highlight>Attendi e mantieni Bitkit aperto</highlight> mentre viene configurata la connessione Lightning. Questo processo dura circa <highlight>±10 minuti.</highlight>",
+  "setting_up_text": "<accent>Attendi e mantieni Bitkit aperto</accent> mentre viene configurata la connessione Lightning. Questo processo dura circa <accent>±10 minuti.</accent>",
   "setting_up_step1": "Elaborazione del pagamento",
   "setting_up_step2": "Pagamento Riuscito",
   "setting_up_step3": "In Coda Per l'Apertura",
@@ -50,19 +50,19 @@
   "transfer_header_keybrd": "Soldi da Spendere.",
   "transfer_header_nokeybrd": "Spesa\n& Risparmio.",
   "transfer_close": "C'è un piccolo costo per trasferire l'intero saldo di spesa ai tuoi risparmi. Il costo esatto dipende dalle condizioni della rete.",
-  "transfer_open": "Costa <highlight>{txFee}</highlight> in commissioni di rete e <highlight>{lspFee}</highlight> in commissioni del fornitore di server per trasferire i fondi aggiuntivi sul tuo saldo di spesa.",
+  "transfer_open": "Costa <accent>{txFee}</accent> in commissioni di rete e <accent>{lspFee}</accent> in commissioni del fornitore di server per trasferire i fondi aggiuntivi sul tuo saldo di spesa.",
   "transfer_swipe": "Swipe Per Trasferire",
   "transfer_successful": "Trasferimento Riuscito",
   "ts_savings_title": "Trasferimento\na Risparmi.",
-  "ts_savings_text": "Trasferimento in corso dei fondi dal tuo saldo di spesa ai tuoi risparmi. Potrai utilizzare questi fondi in <highlight>±1 ora</highlight>.",
+  "ts_savings_text": "Trasferimento in corso dei fondi dal tuo saldo di spesa ai tuoi risparmi. Potrai utilizzare questi fondi in <accent>±1 ora</accent>.",
   "ts_spendings_title": "Trasferimento\na Spesa.",
-  "ts_spendings_text": "Trasferimento in corso dei fondi dai tuoi risparmi al tuo saldo di spesa. Potrai utilizzare questi fondi in <highlight>±10 minuti</highlight>.",
+  "ts_spendings_text": "Trasferimento in corso dei fondi dai tuoi risparmi al tuo saldo di spesa. Potrai utilizzare questi fondi in <accent>±10 minuti</accent>.",
   "interrupted_title": "Trasferimento Interrotto",
   "interrupted_header": "Tieni Bitkit aperto.",
   "interrupted_text": "I fondi non sono stati ancora trasferiti. Bitkit cercherà di avviare il trasferimento nei prossimi 30 minuti. Tieni aperta l'applicazione.",
   "availability_title": "Disponibilità Fondi",
   "availability_header": "Disponibilità dei tuoi Fondi.",
-  "availability_text": "Di solito trasferire i fondi in risparmi richiede\n<highlight>±1 ora</highlight>, ma potrebbe richiedere fino a <highlight>14 days</highlight> in determinate condizioni di rete.",
+  "availability_text": "Di solito trasferire i fondi in risparmi richiede\n<accent>±1 ora</accent>, ma potrebbe richiedere fino a <accent>14 days</accent> in determinate condizioni di rete.",
   "node_info": "Nodo Lightning",
   "node_id": "ID Nodo LDK",
   "node_disconnected": "disconnesso",
@@ -113,7 +113,7 @@
   "close_error": "Trasferimento non riuscito",
   "close_success_title": "Trasferimento Riuscito",
   "close_success_msg": "I tuoi fondi sono stati riportati ai tuoi risparmi.",
-  "close_text": "È previsto un piccolo costo per chiudere questa connessione Lightning e trasferire l'intero saldo di spesa nei tuoi risparmi. La tariffa esatta dipende dalle condizioni della rete.\n\nIl trasferimento di fondi al risparmio richiede solitamente <white>±1 hour</white>, ma il processo può richiedere <white>14 giorni</white> in determinate condizioni di rete.",
+  "close_text": "È previsto un piccolo costo per chiudere questa connessione Lightning e trasferire l'intero saldo di spesa nei tuoi risparmi. La tariffa esatta dipende dalle condizioni della rete.\n\nIl trasferimento di fondi al risparmio richiede solitamente <accent>±1 hour</accent>, ma il processo può richiedere <accent>14 giorni</accent> in determinate condizioni di rete.",
   "close_button": "Chiudi",
   "force_title": "Trasferimento Forzato",
   "force_text": "Non è stato possibile avviare il trasferimento. Vuoi forzare questo trasferimento? Non postrai utilizzare questi fondi per ±14 giorni (!)",
diff --git a/src/utils/i18n/locales/it/onboarding.json b/src/utils/i18n/locales/it/onboarding.json
index 41ed39700..ac3eb148a 100644
--- a/src/utils/i18n/locales/it/onboarding.json
+++ b/src/utils/i18n/locales/it/onboarding.json
@@ -1,49 +1,49 @@
 {
-  "tos_header": "Bitkit\n<brand>Termini</brand><brand>\ndi Utilizzo.</brand>",
-  "tos_checkbox": "Termini di Utilizzo",
-  "tos_checkbox_value": "<gray>Dichiaro di aver letto e accettato le <brand>condizioni di utilizzo</brand>.</gray>",
-  "pp_checkbox": "Informativa Privacy",
-  "pp_checkbox_value": "<gray>Dichiaro di aver letto e accettato l''<brand>informativa sulla privacy.</brand></gray>",
-  "toolkit": "Il tuo Bitcoin\n<brand>Toolkit.</brand>",
-  "toolkit_text": "Bitkit ti consegna le chiavi per i tuoi soldi, il tuo profilo, i tuoi contatti e i tuoi account web.",
-  "get_started": "Inizia",
-  "skip_intro": "Salta l'Intro",
-  "skip": "Salta",
-  "slide1_header": "Bitcoin,\n<brand>Ovunque.</brand>",
-  "slide1_text": "Paga chiunque, ovunque e in qualsiasi momento, e spendi i tuoi Bitcoin per le cose a cui dai valore nella vita.",
-  "slide2_header": "Lightning,\n<purple>Veloce.</purple>",
-  "slide2_text": "Invia Bitcoin più veloce che mai. Godetevi le transazioni istantanee con amici, familiari e commercianti.",
-  "slide3_header": "<blue>Web</blue>\nSenza limiti.",
-  "slide3_text": "Detieni le chiavi dei profili mobili, dei contatti dinamici, dei feed distribuiti e degli account senza password.",
-  "slide4_header": "Crea il tuo <brand>Wallet.</brand>",
-  "slide4_text": "Nota bene: Bitkit è un software <brand>beta</brand>",
-  "new_wallet": "Nuovo Wallet",
-  "restore": "Ripristina",
-  "restore_wallet": "Ripristina Wallet",
-  "advanced_setup": "Impostazioni Avanzate",
-  "advanced": "Avanzate",
-  "passphrase_header": "Proteggi con <brand>Passphrase</brand>",
-  "passphrase_text": "È possibile aggiungere una passphrase segreta alla frase di recupero di 12 parole. Se lo fai, assicurati di non dimenticarla.",
-  "passphrase": "Passphrase",
-  "create_new_wallet": "Crea Nuovo Wallet",
-  "restore_header": "Ripristina\nil tuo Wallet",
-  "restore_phrase": "Digita la frase di ripristino da qualsiasi backup (cartaceo).",
-  "restore_red_explain": "Se una parola è visualizzata in <red>rosso</red>, significa che non è stata trovata nel dizionario delle frasi di recupero. Controlla gli errori di ortografia.",
-  "restore_inv_checksum": "Il checksum della frase di recupero sembra non essere corretto. Ti preghiamo di ricontrollare la frase di recupero.",
-  "restore_suggestions": "CONSIGLI",
-  "restore_passphrase_placeholder": "Passphrase*",
-  "restore_passphrase_meaning": "*Opzionale, da inserire solo se ne hai impostata una.",
-  "restore_error_title": "Ripristino del portafoglio non riuscito",
-  "restore_error_description": "Bitkit non è riuscito a ripristinare il tuo portafoglio dalla frase di backup o ripristino.",
-  "loading_header": "Configurando\n<brand>il tuo Wallet.</brand>",
-  "restore_success_header": "Wallet ripristinato.",
-  "restore_success_text": "Hai ripristinato con successo il tuo wallet dal backup. Goditi Bitkit!",
-  "restore_failed_header": "Errore del saldo delle spese",
-  "restore_failed_text": "Bitkit ha ripristinato i tuoi risparmi, ma non è riuscito a ripristinare il saldo delle spese e i dati.",
-  "restore_no_backup_button": "Procedi Senza Backup",
-  "restore_no_backup_warn": "Se in precedenza possedevi un backup lightning, questo verrà sovrascritto e perso. Ciò potrebbe causare una perdita di fondi.",
-  "empty_wallet": "Per iniziare invia\n<brand>Bitcoin</brand> sul tuo wallet.",
-  "error_create": "Creazione del portafoglio non riuscita",
-  "multiple_header": "Attenzione:\n<yellow>Dispositivi multipli</yellow>",
-  "multiple_text": "Non installare la frase di recupero Bitkit su più telefoni contemporaneamente, per non danneggiare i dati."
+	"tos_header": "Bitkit\n<accent>Termini</accent><accent>\ndi Utilizzo.</accent>",
+	"tos_checkbox": "Termini di Utilizzo",
+	"tos_checkbox_value": "Dichiaro di aver letto e accettato le <accent>condizioni di utilizzo</accent>.",
+	"pp_checkbox": "Informativa Privacy",
+	"pp_checkbox_value": "Dichiaro di aver letto e accettato l''<accent>informativa sulla privacy.</accent>",
+	"toolkit": "Il tuo Bitcoin\n<accent>Toolkit.</accent>",
+	"toolkit_text": "Bitkit ti consegna le chiavi per i tuoi soldi, il tuo profilo, i tuoi contatti e i tuoi account web.",
+	"get_started": "Inizia",
+	"skip_intro": "Salta l'Intro",
+	"skip": "Salta",
+	"slide1_header": "Bitcoin,\n<accent>Ovunque.</accent>",
+	"slide1_text": "Paga chiunque, ovunque e in qualsiasi momento, e spendi i tuoi Bitcoin per le cose a cui dai valore nella vita.",
+	"slide2_header": "Lightning,\n<accent>Veloce.</accent>",
+	"slide2_text": "Invia Bitcoin più veloce che mai. Godetevi le transazioni istantanee con amici, familiari e commercianti.",
+	"slide3_header": "<accent>Web</accent>\nSenza limiti.",
+	"slide3_text": "Detieni le chiavi dei profili mobili, dei contatti dinamici, dei feed distribuiti e degli account senza password.",
+	"slide4_header": "Crea il tuo <accent>Wallet.</accent>",
+	"slide4_text": "Nota bene: Bitkit è un software <accent>beta</accent>",
+	"new_wallet": "Nuovo Wallet",
+	"restore": "Ripristina",
+	"restore_wallet": "Ripristina Wallet",
+	"advanced_setup": "Impostazioni Avanzate",
+	"advanced": "Avanzate",
+	"passphrase_header": "Proteggi con <accent>Passphrase</accent>",
+	"passphrase_text": "È possibile aggiungere una passphrase segreta alla frase di recupero di 12 parole. Se lo fai, assicurati di non dimenticarla.",
+	"passphrase": "Passphrase",
+	"create_new_wallet": "Crea Nuovo Wallet",
+	"restore_header": "Ripristina\nil tuo Wallet",
+	"restore_phrase": "Digita la frase di ripristino da qualsiasi backup (cartaceo).",
+	"restore_red_explain": "Se una parola è visualizzata in <accent>rosso</accent>, significa che non è stata trovata nel dizionario delle frasi di recupero. Controlla gli errori di ortografia.",
+	"restore_inv_checksum": "Il checksum della frase di recupero sembra non essere corretto. Ti preghiamo di ricontrollare la frase di recupero.",
+	"restore_suggestions": "CONSIGLI",
+	"restore_passphrase_placeholder": "Passphrase*",
+	"restore_passphrase_meaning": "*Opzionale, da inserire solo se ne hai impostata una.",
+	"restore_error_title": "Ripristino del portafoglio non riuscito",
+	"restore_error_description": "Bitkit non è riuscito a ripristinare il tuo portafoglio dalla frase di backup o ripristino.",
+	"loading_header": "Configurando\n<accent>il tuo Wallet.</accent>",
+	"restore_success_header": "Wallet ripristinato.",
+	"restore_success_text": "Hai ripristinato con successo il tuo wallet dal backup. Goditi Bitkit!",
+	"restore_failed_header": "Errore del saldo delle spese",
+	"restore_failed_text": "Bitkit ha ripristinato i tuoi risparmi, ma non è riuscito a ripristinare il saldo delle spese e i dati.",
+	"restore_no_backup_button": "Procedi Senza Backup",
+	"restore_no_backup_warn": "Se in precedenza possedevi un backup lightning, questo verrà sovrascritto e perso. Ciò potrebbe causare una perdita di fondi.",
+	"empty_wallet": "Per iniziare invia\n<accent>Bitcoin</accent> sul tuo wallet.",
+	"error_create": "Creazione del portafoglio non riuscita",
+	"multiple_header": "Attenzione:\n<accent>Dispositivi multipli</accent>",
+	"multiple_text": "Non installare la frase di recupero Bitkit su più telefoni contemporaneamente, per non danneggiare i dati."
 }
diff --git a/src/utils/i18n/locales/it/other.json b/src/utils/i18n/locales/it/other.json
index 4bd667378..83fcd792f 100644
--- a/src/utils/i18n/locales/it/other.json
+++ b/src/utils/i18n/locales/it/other.json
@@ -10,7 +10,7 @@
   "qr_error_network_header": "Rete Non Corretta",
   "qr_error_network_text": "Bitkit è attualmente impostato su {selectedNetwork} ma i dati sono per la {dataNetwork}.",
   "qr_paste": "Incolla il QR Code",
-  "buy_header": "Bitcoin\n<orange>per Bitkit.</orange>",
+  "buy_header": "Bitcoin\n<accent>per Bitkit.</accent>",
   "buy_text": "Non hai ancora Bitcoin da inviare al tuo portafoglio Bitkit? Acquista dei bitcoin.",
   "buy_button": "Compra Bitcoin",
   "connection_lost_title": "Connessione Bitkit Persa",
@@ -58,7 +58,7 @@
   "lnurl_channel_host": "Host",
   "lnurl_channel_port": "Porta",
   "lnurl_channel_connecting": "In connessione.",
-  "lnurl_channel_connecting_text": "Connessione Lightning avviata. Potrai utilizzare i pagamenti istantanei in <highlight>±30 minuti</highlight> (dipende dalla configurazione del nodo).",
+  "lnurl_channel_connecting_text": "Connessione Lightning avviata. Potrai utilizzare i pagamenti istantanei in <accent>±30 minuti</accent> (dipende dalla configurazione del nodo).",
   "lnurl_blocktank_error": "Bitkit non è riuscito a connettersi a Blocktank.",
   "lnurl_channel_success_title": "Canale Richiesto",
   "lnurl_channel_success_msg_peer": "Richiesta di canale effettuata con successo da: {peer}",
diff --git a/src/utils/i18n/locales/it/security.json b/src/utils/i18n/locales/it/security.json
index cd3ae13e6..1f19f80e2 100644
--- a/src/utils/i18n/locales/it/security.json
+++ b/src/utils/i18n/locales/it/security.json
@@ -8,10 +8,10 @@
   "pass": "passphrase",
   "pass_your": "La Tua Passphrase",
   "pass_text": "Ha aggiunto una passphrase alla tua recovery phrase durante la configurazione del wallett.",
-  "pass_never_share": "<brand>Non condividere mai</brand> la tua passphrase con nessuno. Potrebbe comportare la perdita dei fondi.",
+  "pass_never_share": "<accent>Non condividere mai</accent> la tua passphrase con nessuno. Potrebbe comportare la perdita dei fondi.",
   "pass_confirm": "Confermare la Passphrase",
   "pass_confirm_text": "Inserisci la passphrase che hai aggiunto durante la configurazione e la creazione del tuo wallet.",
-  "pass_recovery": "<gray>Passphrase:</gray> {passphrase}",
+  "pass_recovery": "<accent>Passphrase:</accent> {passphrase}",
   "mnemonic_phrase": "Frase Mnemonica",
   "mnemonic_your": "La Tua Recovery Phrase",
   "mnemonic_error": "Errore nel portafoglio",
@@ -19,11 +19,11 @@
   "mnemonic_write": "Scrivi queste {length} parole nell'ordine giusto e conservale in un luogo sicuro.",
   "mnemonic_use": "Utilizza le 12 parole che seguono per recuperare i tuoi soldi in un secondo momento.",
   "mnemonic_reveal": "Tocca Per Rivelare",
-  "mnemonic_never_share": "<brand>Non condividere mai</brand> la tua recovery phrase con nessuno. Ciò potrebbe comportare la perdita dei fondi.",
+  "mnemonic_never_share": "<accent>Non condividere mai</accent> la tua recovery phrase con nessuno. Ciò potrebbe comportare la perdita dei fondi.",
   "mnemonic_confirm": "Conferma la Recovery Phrase",
   "mnemonic_confirm_tap": "Tocca le 12 parole nell'ordine corretto.",
   "mnemonic_result_header": "Successo",
-  "mnemonic_result_text": "Assicurati di conservare la tua frase di recupero in un <highlight>luogo sicuro</highlight>, poiché questo è l' <highlight>unico modo per recuperare</highlight> i tuoi soldi (!)",
+  "mnemonic_result_text": "Assicurati di conservare la tua frase di recupero in un <accent>luogo sicuro</accent>, poiché questo è l' <accent>unico modo per recuperare</accent> i tuoi soldi (!)",
   "mnemonic_keep_header": "Mantenila Segreta",
   "mnemonic_keep_text": "Ricorda, non condividere mai la tua recovery phrase con nessuno! Se qualcuno ha accesso alla tua recovery phrase, può rubare i tuoi soldi, il tuo profilo e altri dati.",
   "mnemonic_data_header": "Dati del Wallet",
diff --git a/src/utils/i18n/locales/it/settings.json b/src/utils/i18n/locales/it/settings.json
index 534c637bf..43067d115 100644
--- a/src/utils/i18n/locales/it/settings.json
+++ b/src/utils/i18n/locales/it/settings.json
@@ -18,7 +18,7 @@
     "legal": "Termini di Utilizzo",
     "version": "Versione",
     "op_title": "Orange Pillato",
-    "op_text": "Chi <brand>Orange-Pillerai?</brand>",
+    "op_text": "Chi <accent>Orange-Pillerai?</accent>",
     "op_share": "Condividi BitKit Con Un Amico",
     "op_message": "Scarica Bitkit, il tuo kit di strumenti Bitcoin definitivo. Ti consegna le chiavi per rimodellare la tua vita digitale. {appStoreUrl}"
   },
@@ -41,8 +41,8 @@
     "speed_title": "Velocità Transazione",
     "speed_default": "Velocità Transazione di Default",
     "speed_fee_custom": "Imposta commissione personalizzata",
-    "speed_fee_total": "{feeSats} bitcoin per la transazione media",
-    "speed_fee_total_fiat": "{feeSats} bitcoin per la transazione media ({fiatSymbol}{fiatFormatted})",
+    "speed_fee_total": "₿ {feeSats} per la transazione media",
+    "speed_fee_total_fiat": "₿ {feeSats} per la transazione media ({fiatSymbol}{fiatFormatted})",
     "tags": "Tag",
     "tags_previously": "Tag usati in precedenza",
     "widgets": "Widget"
@@ -170,7 +170,7 @@
     "lightning_connections": "Connessioni Lightning",
     "lightning_node": "Nodo Lightning",
     "electrum_server": "Server Electrum",
-    "rgs_server": "Rapid-Gossip-Sync Server",
+    "rgs_server": "Rapid-Gossip-Sync",
     "web_relay": "Slashtags Web Relay",
     "bitcoin_network": "Rete Bitcoin"
   },
diff --git a/src/utils/i18n/locales/it/slashtags.json b/src/utils/i18n/locales/it/slashtags.json
index 05e4474a1..7c1fca232 100644
--- a/src/utils/i18n/locales/it/slashtags.json
+++ b/src/utils/i18n/locales/it/slashtags.json
@@ -36,16 +36,16 @@
   "signin_to_success_text_noname": "Hai effettuato l'accesso con successo.",
   "signin_title": "Accedi",
   "signin_title_loading": "Accedendo...",
-  "onboarding_header": "<brand>Contatti.</brand>\nDinamici",
+  "onboarding_header": "<accent>Contatti.</accent>\nDinamici",
   "onboarding_text": "Utilizza Bitkit per ricevere aggiornamenti automatici dai tuoi contatti, pagarli e seguire i loro profili pubblici.",
   "onboarding_button": "Aggiungi Il Tuo Primo Contatto",
-  "onboarding_profile1_header": "Possiedi i tuoi\n<brand>Profili Social.</brand>",
+  "onboarding_profile1_header": "Possiedi i tuoi\n<accent>Profili Social.</accent>",
   "onboarding_profile1_text": "Utilizza Bitkit per controllare il tuo profilo pubblico e i tuoi link, in modo che i tuoi contatti possano raggiungerti o pagarti in qualsiasi momento.",
-  "onboarding_profile2_header": "Paga i tuoi\n<brand>Contatti.</brand>",
+  "onboarding_profile2_header": "Paga i tuoi\n<accent>Contatti.</accent>",
   "onboarding_profile2_text": "Tu e i tuoi contatti potete usare BitKit per inviarvi pagamenti direttamente, senza banche, sempre, ovunque.",
-  "onboarding_widgets1_header": "Addio,\n<brand>Password.</brand>",
+  "onboarding_widgets1_header": "Addio,\n<accent>Password.</accent>",
   "onboarding_widgets1_text": "Vivi il web senza password. Utilizzi Bitkit per accedere ai tuoi servizi web preferiti.",
-  "onboarding_widgets2_header": "Ciao,\n<brand>Widget.</brand>",
+  "onboarding_widgets2_header": "Ciao,\n<accent>Widget.</accent>",
   "onboarding_widgets2_text": "Goditi i feed decentralizzati dei tuoi servizi web preferiti, aggiungendo widget divertenti e utili al tuo portafoglio.",
   "my_profile": "Il mio profilo",
   "profile": "Profilo",
diff --git a/src/utils/i18n/locales/it/wallet.json b/src/utils/i18n/locales/it/wallet.json
index 2c7849049..ef3e95f8c 100644
--- a/src/utils/i18n/locales/it/wallet.json
+++ b/src/utils/i18n/locales/it/wallet.json
@@ -100,8 +100,8 @@
   "receive_show_qr": "Visualizza QR Code",
   "receive_text_lnfunds": "Vuoi ricevere fondi <purpleText>Lightning</purpleText>?",
   "receive_instantly": "Ricevi istantaneamente",
-  "receive_connect_initial": "Per ricevere Bitcoin istantantaneamente, Bitkit deve prima connettersi a Lightning. Una commissione di <highlight>{lspFee}</highlight> del fornitore di servizi verrà detratta dall'importo specificato.",
-  "receive_connect_additional": "Per ricevere più Bitcoin istantanei, Bitkit deve aumentare la tua liquidità. Una commissione di <highlight>{lspFee}</highlight> del fornitore di servizi verrà detratta dall'importo specificato.",
+  "receive_connect_initial": "Per ricevere Bitcoin istantantaneamente, Bitkit deve prima connettersi a Lightning. Una commissione di <accent>{lspFee}</accent> del fornitore di servizi verrà detratta dall'importo specificato.",
+  "receive_connect_additional": "Per ricevere più Bitcoin istantanei, Bitkit deve aumentare la tua liquidità. Una commissione di <accent>{lspFee}</accent> del fornitore di servizi verrà detratta dall'importo specificato.",
   "receive_error_min_title": "Al di sotto dell'importo minimo",
   "receive_error_min_description": "La fattura deve essere almeno {txt}",
   "receive_error_max_title": "Sopra l'importo massimo",
diff --git a/src/utils/i18n/locales/nl/onboarding.json b/src/utils/i18n/locales/nl/onboarding.json
index 490e5ebe3..4f1fc205e 100644
--- a/src/utils/i18n/locales/nl/onboarding.json
+++ b/src/utils/i18n/locales/nl/onboarding.json
@@ -8,36 +8,36 @@
   "get_started": "Starten",
   "skip_intro": "Sla intro over",
   "skip": "Overslaan",
-  "slide1_header": "Bitcoin\n<brand>Waar je ook bent.</brand>",
+  "slide1_header": "Bitcoin\n<accent>Waar je ook bent.</accent>",
   "slide1_text": "Betaal wie u wilt, waar u wilt, wanneer u wilt. Bitcoin voor all zaken die u belangrijk acht. ",
-  "slide2_header": "Bliksem,\n<purple>Snel.</purple>",
+  "slide2_header": "Bliksem,\n<accent>Snel.</accent>",
   "slide2_text": "Verstuur Bitcoin sneller dan ooit. Directe betalingen met vrienden, familie en winkels. ",
-  "slide3_header": "Onbegrensd\n<blue>Web.</blue>",
+  "slide3_header": "Onbegrensd\n<accent>Web.</accent>",
   "slide3_text": "Alle sleutels voor draagbare profielen, mobiele contacten, gedecentralizeerde data feeds en paswoordloze accounts.",
-  "slide4_header": "Maak <brand>uw wallet</brand>aan. ",
-  "slide4_text": "Let op: Bitkit is <brand>beta</brand>software. ",
+  "slide4_header": "Maak <accent>uw wallet</accent>aan. ",
+  "slide4_text": "Let op: Bitkit is <accent>beta</accent>software. ",
   "new_wallet": "Nieuwe wallet",
   "restore": "Herstel",
   "restore_wallet": "Herstel een wallet",
   "advanced_setup": "Geavanceerde Configuratie",
   "advanced": "Geavanceerd",
-  "passphrase_header": "Beveilig met <brand>Passwoord</brand>",
+  "passphrase_header": "Beveilig met <accent>Passwoord</accent>",
   "passphrase_text": "U kunt een geheim paswoord toevoegen aan uw 12 herstelwoorden. Als u dit doet vergeet het paswoord dan niet. ",
   "passphrase": "Paswoord",
   "create_new_wallet": "Nieuwe Wallet Aanmaken",
   "restore_header": "Herstel\nuw Wallet",
   "restore_phrase": "Vul hier uw herstelwoorden in vanuit een (papieren) backup. ",
-  "restore_red_explain": "Als een woord in het <red>rood</red> wordt getoond, dan komt deze niet voor in het woordenboek van herstelwoorden. Waarschijnlijk is het een spelfout. ",
+  "restore_red_explain": "Als een woord in het <accent>rood</accent> wordt getoond, dan komt deze niet voor in het woordenboek van herstelwoorden. Waarschijnlijk is het een spelfout. ",
   "restore_inv_checksum": "De checksum van de herstelwoorden lijkt niet juist te zijn. Loop ze nogmaals na. ",
   "restore_suggestions": "SUGGESTIES",
   "restore_passphrase_placeholder": "Paswoord*",
   "restore_passphrase_meaning": "Optioneel, alleen invullen als u er één heeft gebruikt. ",
-  "loading_header": "Configureer\n<brand>uw Wallet.</brand>",
+  "loading_header": "Configureer\n<accent>uw Wallet.</accent>",
   "restore_success_header": "Wallet Herstelt",
   "restore_success_text": "Uw wallet is succesvol hersteld vanuit de backup. Veel plezier met Bitkit!",
   "restore_no_backup_button": "Doorgaan Zonder Backup",
   "restore_no_backup_warn": "Als u eerder een lightning backup heeft gemaakt zal deze overschreven worden en niet meer toegangkelijk zijn. Hierdoor kunt u geld verliezen. ",
-  "empty_wallet": "Om te beginnen, stuur\n<brand>Bitcoin</brand>naar uw wallet.",
-  "multiple_header": "Waarschuwing:\n<yellow>Meerdere apparaten</yellow>",
+  "empty_wallet": "Om te beginnen, stuur\n<accent>Bitcoin</accent>naar uw wallet.",
+  "multiple_header": "Waarschuwing:\n<accent>Meerdere apparaten</accent>",
   "multiple_text": "Installeer Bitkit niet op meerdere telefoons tegelijk met dezelfde herstelwoorden, dit kan data corruptie veroorzaken. "
 }
diff --git a/src/utils/i18n/locales/nl/other.json b/src/utils/i18n/locales/nl/other.json
index 4989cf8c9..5507048ae 100644
--- a/src/utils/i18n/locales/nl/other.json
+++ b/src/utils/i18n/locales/nl/other.json
@@ -6,7 +6,7 @@
   "qr_error_network_header": "Netwerk Onjuist",
   "qr_error_network_text": "Bitkit is momenteel aangesloten op {selectedNetwork}maar toont data voor {dataNetwork}. ",
   "qr_paste": "Plak de QR Code",
-  "buy_header": "Bitcoin\n<orange>voor Bitkit.</orange>",
+  "buy_header": "Bitcoin\n<accent>voor Bitkit.</accent>",
   "buy_button": "Koop Bitcoin",
   "connection_lost_title": "Bitkit Verbinding Verbroken",
   "connection_lost_message": "Controleer de configuraties voor uw Electrum Server.",
diff --git a/src/utils/i18n/locales/nl/security.json b/src/utils/i18n/locales/nl/security.json
index 7572f6618..fd7682a9f 100644
--- a/src/utils/i18n/locales/nl/security.json
+++ b/src/utils/i18n/locales/nl/security.json
@@ -8,16 +8,16 @@
   "pass": "Wachtwoordzin",
   "pass_your": "Uw Wachtwoordzin",
   "pass_text": "U heeft een wachtwoordzin aan de herstelwoorden toegevoegd tijdens de configuratie van uw wallet. ",
-  "pass_never_share": "<brand>Nooit</brand>uw wachtwoordzin delen met iemand anders, dit kan betekenen dat u uw geld verliest.",
+  "pass_never_share": "<accent>Nooit</accent>uw wachtwoordzin delen met iemand anders, dit kan betekenen dat u uw geld verliest.",
   "pass_confirm": "Wachtwoordzin Bevestigen",
   "pass_confirm_text": "Voer de wachtwoordzin in die u tijdens het creëren van uw wallet heeft gebruikt. ",
-  "pass_recovery": "<gray>Wachtwoordzin:</gray>{passphrase}",
+  "pass_recovery": "<accent>Wachtwoordzin:</accent>{passphrase}",
   "mnemonic_phrase": "Herstelwoorden",
   "mnemonic_your": "Herstelwoorden",
   "mnemonic_write": "Schrijf deze {length}woorden op in de juiste volgorde en bewaar ze op een veilige plek. ",
   "mnemonic_use": "De 12 woorden hieronder kunnen gebruikt worden om uw geld later weer te herstellen.",
   "mnemonic_reveal": "Tik Aan Om Weer Te Geven",
-  "mnemonic_never_share": "<brand>Deel nooit</brand>uw herstelwoorden met iemand anders, dit kan betekenen dat u uw geld verliest.",
+  "mnemonic_never_share": "<accent>Deel nooit</accent>uw herstelwoorden met iemand anders, dit kan betekenen dat u uw geld verliest.",
   "mnemonic_confirm": "Herstelwoorden Bevestigen",
   "mnemonic_confirm_tap": "Tik de 12 woorden aan in de juiste volgorde.",
   "mnemonic_result_header": "Succesvol",
diff --git a/src/utils/i18n/locales/nl/settings.json b/src/utils/i18n/locales/nl/settings.json
index 2628c09a7..7c8ca3cfd 100644
--- a/src/utils/i18n/locales/nl/settings.json
+++ b/src/utils/i18n/locales/nl/settings.json
@@ -15,7 +15,7 @@
     "legal": "Juridisch",
     "version": "Versie",
     "op_title": "Orange Pilled",
-    "op_text": "Wie gaat u <brand>Orange Pillen?",
+    "op_text": "Wie gaat u <accent>Orange Pillen?",
     "op_share": "Deel Bitkit Met Iemand",
     "op_message": "Download Bitkit, De Ultieme Bitcoin Toolkit. Alle sleutels om uw digitale leven te hervormen. {appStoreUrl}"
   },
diff --git a/src/utils/i18n/locales/nl/slashtags.json b/src/utils/i18n/locales/nl/slashtags.json
index 037281331..1a4db448c 100644
--- a/src/utils/i18n/locales/nl/slashtags.json
+++ b/src/utils/i18n/locales/nl/slashtags.json
@@ -29,16 +29,16 @@
   "signin_to": "Aanmelden voor {serviceName}met uw profiel?",
   "signin_to_loading": "Aan het aanmelden voor {serviceName}...",
   "signin_title_loading": "Aan het inloggen...",
-  "onboarding_header": "Dynamische\n<brand>Contacten.</brand>",
+  "onboarding_header": "Dynamische\n<accent>Contacten.</accent>",
   "onboarding_text": "Gebruik Bitkit om automatisch updates te krijgen van contacten, ze te betalen en om hun publieke profielen te volgen. ",
   "onboarding_button": "Voeg Uw Eerst Contact Toe",
-  "onboarding_profile1_header": "Beheer zelf uw\n<brand>Publieke Profiel.</brand>",
+  "onboarding_profile1_header": "Beheer zelf uw\n<accent>Publieke Profiel.</accent>",
   "onboarding_profile1_text": "Gebruik Bitkit om uw publieke profiel en links te beheren, zodat u altijd bereikbaar bent en betaald kan worden door uw netwerk. ",
-  "onboarding_profile2_header": "Betaal uw\n<brand>Contacten.</brand>",
+  "onboarding_profile2_header": "Betaal uw\n<accent>Contacten.</accent>",
   "onboarding_profile2_text": "U en uw contacten kunnen Bitkit gebruiken voor directe betalingen zonder banken, waar u wilt, wanneer u wilt.",
-  "onboarding_widgets1_header": "Dag,\n<brand>Wachtwoorden.</brand>",
+  "onboarding_widgets1_header": "Dag,\n<accent>Wachtwoorden.</accent>",
   "onboarding_widgets1_text": "Ervaar het Web zonder wachtwoorden. Gebruik Bitkit om in te loggen bij al uw favoriete webdiensten. ",
-  "onboarding_widgets2_header": "Hallo,\n<brand>Widgets.</brand>",
+  "onboarding_widgets2_header": "Hallo,\n<accent>Widgets.</accent>",
   "onboarding_widgets2_text": "Maak gebruik van gedecentraliseerde datafeeds van uw favoriete webdiensten door leuke, nuttige widget aan uw wallet toe te voegen. ",
   "my_profile": "Mijn profiel",
   "profile": "Profiel",
diff --git a/src/utils/i18n/locales/pl/security.json b/src/utils/i18n/locales/pl/security.json
index 96f46e83d..4c0618795 100644
--- a/src/utils/i18n/locales/pl/security.json
+++ b/src/utils/i18n/locales/pl/security.json
@@ -8,7 +8,7 @@
   "pass": "hasło",
   "pass_your": "Twoje hasło",
   "pass_text": "Dodałeś hasło do swojego mnemonika podczas tworzenia portfela",
-  "pass_never_share": "<brand>Nigdy nikomu nie udostępniaj</brand> swojego hasła, ponieważ może to skutkować stratą środków.",
+  "pass_never_share": "<accent>Nigdy nikomu nie udostępniaj</accent> swojego hasła, ponieważ może to skutkować stratą środków.",
   "pass_confirm": "Potwierdź hasło",
   "pass_confirm_text": "Wpisz hasło, które podałeś podczas tworzenia portfela.",
   "pass_recovery": "Hasło{passphrase}",
@@ -17,7 +17,7 @@
   "mnemonic_write": "Zapisz poniższe słowa{length} według kolejności i przechowuj je w bezpiecznym miejscu.",
   "mnemonic_use": "Użyj 12 poniższych słów aby odzyskać swoje środki w przyszłości.",
   "mnemonic_reveal": "Stuknij aby pokazać",
-  "mnemonic_never_share": "<brand>Nigdy nikomu nie udostępniaj</brand> swojego hasła, ponieważ może to skutkować stratą środków.",
+  "mnemonic_never_share": "<accent>Nigdy nikomu nie udostępniaj</accent> swojego hasła, ponieważ może to skutkować stratą środków.",
   "mnemonic_confirm": "Potwierdź hasło",
   "mnemonic_confirm_tap": "Wpisz 12 słów w poprawnej kolejności.",
   "mnemonic_result_header": "Sukces",
@@ -27,7 +27,7 @@
   "mnemonic_data_text": "Twój profil, kontakty, konta, tagi oraz aktywność będzie automatycznie skopiowana do naszego darmowego serwisu w chmurze.",
   "mnemonic_multiple_header": "Wiele urządzeń",
   "mnemonic_multiple_text": "Nie używaj jednego hasła Bitkit na wielu urządzeniach jednocześnie, ponieważ może to spowodować uszkodzenie danych.",
-  "mnemonic_latest_backup": "<brand>Ostatni backup danych: </brand>{time}",
+  "mnemonic_latest_backup": "<accent>Ostatni backup danych: </accent>{time}",
   "pin_security_header": "Zwieksz bezpieczeństwo",
   "pin_security_text": "Aby zwiększyć bezpieczeństwo portfela możesz ustawić kod PIN lub Face ID do odblokowania portfela.",
   "pin_security_button": "Zabezpiecz portfel",
diff --git a/src/utils/i18n/locales/pt_BR/onboarding.json b/src/utils/i18n/locales/pt_BR/onboarding.json
index e76249cd9..26ed07b7e 100644
--- a/src/utils/i18n/locales/pt_BR/onboarding.json
+++ b/src/utils/i18n/locales/pt_BR/onboarding.json
@@ -1,49 +1,49 @@
 {
-  "tos_header": "<brand>Termos</brand><brand>\nde Uso.</brand>",
+  "tos_header": "<accent>Termos</accent><accent>\nde Uso.</accent>",
   "tos_checkbox": "Termos de uso",
   "tos_checkbox_value": "Eu declaro que li e aceito os termos de uso.",
   "pp_checkbox": "Política de Privacidade",
-  "pp_checkbox_value": "<gray>Declaro que li e aceito a <brand>política de privacidade.</brand></gray>",
-  "toolkit": "Seu Bitcoin\n<brand>Toolkit.</brand>",
+  "pp_checkbox_value": "Declaro que li e aceito a <accent>política de privacidade.</accent>",
+  "toolkit": "Seu Bitcoin\n<accent>Toolkit.</accent>",
   "toolkit_text": "O Bitkit te entrega as chaves do seu dinheiro, perfil, contatos e contas da Web.",
   "get_started": "Começar",
   "skip_intro": "Pular Introdução",
   "skip": "Pular",
-  "slide1_header": "Bitcoin,\n<brand>Em qualquer lugar.</brand>",
+  "slide1_header": "Bitcoin,\n<accent>Em qualquer lugar.</accent>",
   "slide1_text": "Pague qualquer pessoa, em qualquer lugar, a qualquer momento e gaste seu Bitcoin nas coisas que você valoriza na vida.",
-  "slide2_header": "Lightning,\n<purple>Rápido.</purple>",
+  "slide2_header": "Lightning,\n<accent>Rápido.</accent>",
   "slide2_text": "Envie Bitcoin mais rápido do que nunca. Aproveite as transações instantâneas com amigos, familiares e comerciantes.",
-  "slide3_header": "Sem limites\n<blue>Web.</blue>",
+  "slide3_header": "Sem limites\n<accent>Web.</accent>",
   "slide3_text": "Tenha as chaves para perfis portáteis, contatos dinâmicos, feeds distribuídos e contas sem senha.",
-  "slide4_header": "Vamos criar <brand>sua Carteira.</brand>",
-  "slide4_text": "Observação: o Bitkit é um software <brand>beta</brand>.",
+  "slide4_header": "Vamos criar <accent>sua Carteira.</accent>",
+  "slide4_text": "Observação: o Bitkit é um software <accent>beta</accent>.",
   "new_wallet": "Nova Carteira",
   "restore": "Restaurar",
   "restore_wallet": "Restaurar Carteira",
   "advanced_setup": "Configuração Avançada",
   "advanced": "Avançado",
-  "passphrase_header": "Protegida com <brand>Frase de Acesso</brand>",
+  "passphrase_header": "Protegida com <accent>Frase de Acesso</accent>",
   "passphrase_text": "Você pode adicionar uma frase de acesso secreta à frase de recuperação de 12 palavras. Certifique-se de não esquecer.",
   "passphrase": "Frase de Acesso",
   "create_new_wallet": "Criar Nova Carteira",
   "restore_header": "Restaurar\nsua carteira",
   "restore_phrase": "Digite sua frase de recuperação de qualquer backup (em um papel).",
-  "restore_red_explain": "Se uma palavra for mostrada em <red>vermelho</red>, significa que ela não foi encontrada no dicionário de recuperação. Verifique se há erros de ortografia.",
+  "restore_red_explain": "Se uma palavra for mostrada em <accent>vermelho</accent>, significa que ela não foi encontrada no dicionário de recuperação. Verifique se há erros de ortografia.",
   "restore_inv_checksum": "O checksum da frase de recuperação parece estar incorreta. Verifique novamente sua frase de recuperação.",
   "restore_suggestions": "SUGESTÕES",
   "restore_passphrase_placeholder": "Frase Secreta*",
   "restore_passphrase_meaning": "*Opcional, insira apenas se já tiver configurado um.",
   "restore_error_title": "A Restauração da Carteira Falhou.",
   "restore_error_description": "O Bitkit não pôde restaurar sua carteira a partir do backup ou frase de recuperação.",
-  "loading_header": "Configurando\n<brand>sua Carteira.</brand>",
+  "loading_header": "Configurando\n<accent>sua Carteira.</accent>",
   "restore_success_header": "Carteira Restaurada.",
   "restore_success_text": "Sua carteira foi restauração a partir do backup. Aproveite o Bitkit!",
   "restore_failed_header": "Problema no Saldo de Gastos.",
   "restore_failed_text": "O Bitkit restaurou sua poupança, mas falhou ao restaurar seu saldo de gastos e dados.",
   "restore_no_backup_button": "Continuar sem Backup",
   "restore_no_backup_warn": "Se você já tinha um backup Lightning, ele será sobrescrito e perdido. Isso pode resultar em perda de fundos.",
-  "empty_wallet": "Para começar, envie\n<brand>Bitcoin</brand> para sua carteira.",
+  "empty_wallet": "Para começar, envie\n<accent>Bitcoin</accent> para sua carteira.",
   "error_create": "A Criação da Carteira Falhou.",
-  "multiple_header": "Cuidado:\n<yellow>Vários dispositivos</yellow>",
+  "multiple_header": "Cuidado:\n<accent>Vários dispositivos</accent>",
   "multiple_text": "Não instale sua frase de recuperação do Bitkit em vários telefones simultaneamente, isso pode corromper seus dados."
 }
diff --git a/src/utils/i18n/locales/pt_BR/other.json b/src/utils/i18n/locales/pt_BR/other.json
index e3689e5b8..5e6739ad5 100644
--- a/src/utils/i18n/locales/pt_BR/other.json
+++ b/src/utils/i18n/locales/pt_BR/other.json
@@ -10,7 +10,7 @@
   "qr_error_network_header": "Rede Incorreta",
   "qr_error_network_text": "O Bitkit está atualmente definido com a {selectedNetwork} mas os dados são para {dataNetwork}.",
   "qr_paste": "Colar código QR",
-  "buy_header": "Bitcoin\n<orange>para o Bitkit.</orange>",
+  "buy_header": "Bitcoin\n<accent>para o Bitkit.</accent>",
   "buy_button": "Comprar Bitcoin",
   "connection_lost_title": "Bitkit Perdeu a Conexão",
   "connection_lost_message": "Verifique as configurações do servidor Electrum.",
diff --git a/src/utils/i18n/locales/pt_BR/security.json b/src/utils/i18n/locales/pt_BR/security.json
index 4790b1627..a7d357f54 100644
--- a/src/utils/i18n/locales/pt_BR/security.json
+++ b/src/utils/i18n/locales/pt_BR/security.json
@@ -8,10 +8,10 @@
   "pass": "frase secreta",
   "pass_your": "Sua Frase Secreta",
   "pass_text": "Você adicionou uma frase secreta durante a configuração da carteira.",
-  "pass_never_share": "<brand>Nunca compartilhe</brand> sua senha com ninguém, isso pode resultar na perda de fundos.",
+  "pass_never_share": "<accent>Nunca compartilhe</accent> sua senha com ninguém, isso pode resultar na perda de fundos.",
   "pass_confirm": "Confirmar Frase Secreta",
   "pass_confirm_text": "Digite a frase secreta que você adicionou ao configurar e criar sua carteira.",
-  "pass_recovery": "<gray>Frase Secreta:</gray> {passphrase}",
+  "pass_recovery": "<accent>Frase Secreta:</accent> {passphrase}",
   "mnemonic_phrase": "Frase mnemônica",
   "mnemonic_your": "Sua frase de recuperação",
   "mnemonic_error": "Falha na Carteira",
@@ -19,7 +19,7 @@
   "mnemonic_write": "Anote essas palavras {comprimento} na ordem correta e guarde-as em um local seguro.",
   "mnemonic_use": "Use as 12 palavras abaixo para recuperar seu dinheiro em uma data posterior.",
   "mnemonic_reveal": "Toque para revelar",
-  "mnemonic_never_share": "<brand>Nunca compartilhe</brand> sua frase de recuperação com ninguém, pois isso pode resultar na perda de fundos.",
+  "mnemonic_never_share": "<accent>Nunca compartilhe</accent> sua frase de recuperação com ninguém, pois isso pode resultar na perda de fundos.",
   "mnemonic_confirm": "Confirmar frase de recuperação",
   "mnemonic_confirm_tap": "Insira as 12 palavras na ordem correta.",
   "mnemonic_result_header": "Sucesso",
diff --git a/src/utils/i18n/locales/pt_BR/settings.json b/src/utils/i18n/locales/pt_BR/settings.json
index 571c0a4b7..51265c3bf 100644
--- a/src/utils/i18n/locales/pt_BR/settings.json
+++ b/src/utils/i18n/locales/pt_BR/settings.json
@@ -18,7 +18,7 @@
     "legal": "Legal",
     "version": "Versão",
     "op_title": "Pílula Laranja",
-    "op_text": "Para quem você recomendará a <brand>pílula laranja?</brand>",
+    "op_text": "Para quem você recomendará a <accent>pílula laranja?</accent>",
     "op_share": "Recomende a Bitkit a um Amigo",
     "op_message": "Baixe a Bitkit, seu kit de ferramentas definitivo para o Bitcoin. Entregando as chaves para você remodelar sua vida digital. {appStoreUrl}"
   },
diff --git a/src/utils/i18n/locales/pt_BR/slashtags.json b/src/utils/i18n/locales/pt_BR/slashtags.json
index 21109422a..44875a225 100644
--- a/src/utils/i18n/locales/pt_BR/slashtags.json
+++ b/src/utils/i18n/locales/pt_BR/slashtags.json
@@ -36,16 +36,16 @@
   "signin_to_success_text_noname": "Você entrou com sucesso.",
   "signin_title": "Entrar",
   "signin_title_loading": "Fazendo login...",
-  "onboarding_header": "Dinâmico\n<brand>Contatos.</brand>",
+  "onboarding_header": "Dinâmico\n<accent>Contatos.</accent>",
   "onboarding_text": "Use o Bitkit para receber atualizações automáticas dos seus contatos, pagar a eles e seguir seus perfis públicos.",
   "onboarding_button": "Adicione Seu Primeiro Contato",
-  "onboarding_profile1_header": "Seja dono do seu\n<brand>Perfil social.</brand>",
+  "onboarding_profile1_header": "Seja dono do seu\n<accent>Perfil social.</accent>",
   "onboarding_profile1_text": "Use o Bitkit para controlar seu perfil público e seus links, assim seus contatos podem entrar em contato ou te pagar a qualquer momento.",
-  "onboarding_profile2_header": "Pague seus\n<brand>Contatos.</brand>",
+  "onboarding_profile2_header": "Pague seus\n<accent>Contatos.</accent>",
   "onboarding_profile2_text": "Você e seus contatos podem usar o Bitkit para enviar pagamentos diretamente, sem bancos, a qualquer hora, em qualquer lugar.",
-  "onboarding_widgets1_header": "Adeus,\n<brand>Senhas.</brand>",
+  "onboarding_widgets1_header": "Adeus,\n<accent>Senhas.</accent>",
   "onboarding_widgets1_text": "Experimente a Web sem senhas. Use o Bitkit para fazer login em seus serviços favoritos da Web.",
-  "onboarding_widgets2_header": "Olá,\n<brand>Widgets.</brand>",
+  "onboarding_widgets2_header": "Olá,\n<accent>Widgets.</accent>",
   "onboarding_widgets2_text": "Aproveite os feeds descentralizados de seus serviços Web favoritos, adicionando widgets divertidos e úteis à sua carteira.",
   "my_profile": "Meu perfil",
   "profile": "Perfil",
diff --git a/src/utils/i18n/locales/pt_PT/onboarding.json b/src/utils/i18n/locales/pt_PT/onboarding.json
index 7d4abd205..e2130837d 100644
--- a/src/utils/i18n/locales/pt_PT/onboarding.json
+++ b/src/utils/i18n/locales/pt_PT/onboarding.json
@@ -1,9 +1,9 @@
 {
-  "toolkit": "Seu Bitcoin\n<brand>Toolkit.</brand>",
-  "slide1_header": "Bitcoin,\n<brand>Em qualquer lugar.</brand>",
+  "toolkit": "Seu Bitcoin\n<accent>Toolkit.</accent>",
+  "slide1_header": "Bitcoin,\n<accent>Em qualquer lugar.</accent>",
   "slide2_header": "Lightning,\n<purple>Rápido.</purple>",
   "slide3_header": "Sem limites\n<blue>Web.</blue>",
-  "loading_header": "Configurando\n<brand>sua Carteira.</brand>",
-  "empty_wallet": "Para começar, envie\n<brand>Bitcoin</brand> para sua carteira.",
+  "loading_header": "Configurando\n<accent>sua Carteira.</accent>",
+  "empty_wallet": "Para começar, envie\n<accent>Bitcoin</accent> para sua carteira.",
   "multiple_header": "Cuidado:\n<yellow>Vários dispositivos</yellow>"
 }
diff --git a/src/utils/i18n/locales/pt_PT/other.json b/src/utils/i18n/locales/pt_PT/other.json
index 0f38c3e6b..d1b153ff3 100644
--- a/src/utils/i18n/locales/pt_PT/other.json
+++ b/src/utils/i18n/locales/pt_PT/other.json
@@ -1,4 +1,4 @@
 {
-  "buy_header": "Bitcoin\n<orange>para o Bitkit.</orange>",
+  "buy_header": "Bitcoin\n<accent>para o Bitkit.</accent>",
   "caution_header": "Cuidado:\n<yellow>Risco Beta.</yellow>"
 }
diff --git a/src/utils/i18n/locales/pt_PT/slashtags.json b/src/utils/i18n/locales/pt_PT/slashtags.json
index 8746a4278..7a92f2812 100644
--- a/src/utils/i18n/locales/pt_PT/slashtags.json
+++ b/src/utils/i18n/locales/pt_PT/slashtags.json
@@ -1,10 +1,10 @@
 {
   "contact_your_name": "Nome público\ndo seu perfil",
   "contact_retrieving": "Recebimento\ninformações de contato...",
-  "onboarding_header": "Dinâmico\n<brand>Contatos.</brand>",
-  "onboarding_profile1_header": "Seja dono do seu\n<brand>Perfil social.</brand>",
-  "onboarding_profile2_header": "Pague seus\n<brand>Contatos.</brand>",
-  "onboarding_widgets1_header": "Adeus,\n<brand>Senhas.</brand>",
-  "onboarding_widgets2_header": "Olá,\n<brand>Widgets.</brand>",
+  "onboarding_header": "Dinâmico\n<accent>Contatos.</accent>",
+  "onboarding_profile1_header": "Seja dono do seu\n<accent>Perfil social.</accent>",
+  "onboarding_profile2_header": "Pague seus\n<accent>Contatos.</accent>",
+  "onboarding_widgets1_header": "Adeus,\n<accent>Senhas.</accent>",
+  "onboarding_widgets2_header": "Olá,\n<accent>Widgets.</accent>",
   "profile_link_label_placeholder": "Por exemplo, \"Website\"."
 }
diff --git a/src/utils/i18n/locales/ru/onboarding.json b/src/utils/i18n/locales/ru/onboarding.json
index 81d0a9b7f..357187499 100644
--- a/src/utils/i18n/locales/ru/onboarding.json
+++ b/src/utils/i18n/locales/ru/onboarding.json
@@ -1,39 +1,39 @@
 {
   "tos_checkbox": "Условия использования",
   "pp_checkbox": "Политика Конфиденциальности",
-  "toolkit": "Биткоин\n<brand>Инструменты</brand>",
+  "toolkit": "Биткоин\n<accent>Инструменты</accent>",
   "toolkit_text": "Используя Bitkit, Вы управляете ключами к вашим деньгам, профилю, контактам и веб-аккаунтам.",
   "get_started": "Начать",
   "skip_intro": "Пропустить",
   "skip": "Пропустить",
-  "slide1_header": "Биткоин,\n<brand>Везде.</brand>",
+  "slide1_header": "Биткоин,\n<accent>Везде.</accent>",
   "slide1_text": "Платите кому угодно, где угодно и в любое время. Тратьте свои Биткоины на то, что Вы цените в жизни.",
   "slide2_header": "Лайтнинг,\n<purple>Быстрый.</purple>",
   "slide2_text": "Отправляйте Биткоины быстрее, чем когда-либо. Наслаждайтесь мгновенными транзакциями с друзьями, семьей и при покупках.",
   "slide3_header": "<blue>Сеть</blue>\nБез границ.",
   "slide3_text": "Владейте ключами к переносимым профилям, динамическим контактам, лентам и учетным записям.",
-  "slide4_header": "Давайте Создадим\n<brand>Кошелёк.</brand>",
-  "slide4_text": "Внимание: Bitkit ещё в <brand>бете</brand>.",
+  "slide4_header": "Давайте Создадим\n<accent>Кошелёк.</accent>",
+  "slide4_text": "Внимание: Bitkit ещё в <accent>бете</accent>.",
   "new_wallet": "Новый",
   "restore": "Восстановить",
   "restore_wallet": "Восстановить Кошелёк",
   "advanced_setup": "Дополнительно",
   "advanced": "Дополнительно",
-  "passphrase_header": "Защитить <brand>Кодовой Фразой</brand>",
+  "passphrase_header": "Защитить <accent>Кодовой Фразой</accent>",
   "passphrase_text": "Вы можете добавить секретную кодовую фразу к фразе восстановления из 12 слов. Убедитесь, что не забудете её.",
   "passphrase": "Кодовая фраза",
   "create_new_wallet": "Создать Новый Кошелёк",
   "restore_header": "Восстановите\nВаш Кошелёк",
   "restore_phrase": "Пожалуйста, введите фразу восстановления (резервной копии).",
-  "restore_red_explain": "Если слово выделено <red>красным</red>, это значит, что оно не найдено в словаре возможных вариантов. Проверьте правильность написания.",
+  "restore_red_explain": "Если слово выделено <accent>красным</accent>, это значит, что оно не найдено в словаре возможных вариантов. Проверьте правильность написания.",
   "restore_inv_checksum": "Контрольная сумма фразы для восстановления не верна. Пожалуйста, перепроверьте вашу фразу для восстановления.",
   "restore_suggestions": "ВАРИАНТЫ",
   "restore_passphrase_placeholder": "Кодовая фраза*",
   "restore_passphrase_meaning": "*Опционально, если использовалась при создании кошелька.",
-  "loading_header": "Настраиваем\n<brand>Кошелёк.</brand>",
+  "loading_header": "Настраиваем\n<accent>Кошелёк.</accent>",
   "restore_success_header": "Кошелёк Восстановлен.",
   "restore_success_text": "Вы успешно восстановили свой кошелек из резервной копии. Наслаждайтесь Bitkit!",
   "restore_no_backup_button": "Игнорировать Резервную Копию",
   "restore_no_backup_warn": "Если у вас ранее была резервная копия Лайтнинг, она будет перезаписана и потеряна. Это может привести к потере средств.",
-  "empty_wallet": "Отправьте\n<brand>Биткоин</brand> в ваш кошелёк."
+  "empty_wallet": "Отправьте\n<accent>Биткоин</accent> в ваш кошелёк."
 }
diff --git a/src/utils/i18n/locales/ru/other.json b/src/utils/i18n/locales/ru/other.json
index 02db75ef6..179608939 100644
--- a/src/utils/i18n/locales/ru/other.json
+++ b/src/utils/i18n/locales/ru/other.json
@@ -6,7 +6,7 @@
   "qr_error_network_header": "Неправильная сеть",
   "qr_error_network_text": "Настройки Bitkit в данный момент указывают на {selectedNetwork}, а данные предназначены для {dataNetwork}.",
   "qr_paste": "Вставить QR-код",
-  "buy_header": "Биткоин\n<orange>для Bitkit.</orange>",
+  "buy_header": "Биткоин\n<accent>для Bitkit.</accent>",
   "buy_button": "Купить Биткоин",
   "connection_lost_title": "Bitkit Подключение Потеряно",
   "connection_lost_message": "Пожалуйста, проверьте настройки вашего Electrum сервера.",
diff --git a/src/utils/i18n/locales/ru/security.json b/src/utils/i18n/locales/ru/security.json
index e18551f40..ab4d634fd 100644
--- a/src/utils/i18n/locales/ru/security.json
+++ b/src/utils/i18n/locales/ru/security.json
@@ -8,16 +8,16 @@
   "pass": "Кодовая фраза",
   "pass_your": "Ваша Кодовая Фраза",
   "pass_text": "Вы добавили кодовую фразу к фразе восстановления во время создания кошелька.",
-  "pass_never_share": "<brand>Никогда не сообщайте</brand> свою кодовую фразу никому, это может привести к потере средств.",
+  "pass_never_share": "<accent>Никогда не сообщайте</accent> свою кодовую фразу никому, это может привести к потере средств.",
   "pass_confirm": "Проверка Кодовой Фразы",
   "pass_confirm_text": "Введите кодовую фразу, которую вы указали при создании кошелька.",
-  "pass_recovery": "<gray>Кодовая Фраза:</gray> {passphrase}",
+  "pass_recovery": "<accent>Кодовая Фраза:</accent> {passphrase}",
   "mnemonic_phrase": "Фраза Восстановления",
   "mnemonic_your": "Ваша Фраза Восстановления",
   "mnemonic_write": "Запишите эти {length} слов в правильном порядке и сохраните их в надежном месте.",
   "mnemonic_use": "Используйте 12 слов ниже, для восстановления доступа к своим средствам.",
   "mnemonic_reveal": "Показать",
-  "mnemonic_never_share": "<brand>Никогда не сообщайте</brand> свою фразу восстановления никому, это может привести к потере средств.",
+  "mnemonic_never_share": "<accent>Никогда не сообщайте</accent> свою фразу восстановления никому, это может привести к потере средств.",
   "mnemonic_confirm": "Проверьте Фразу",
   "mnemonic_confirm_tap": "Нажмите на 12 слов в правильном порядке.",
   "mnemonic_result_header": "Успешно",
diff --git a/src/utils/i18n/locales/ru/settings.json b/src/utils/i18n/locales/ru/settings.json
index f9e9e7d70..1e1c9ae0d 100644
--- a/src/utils/i18n/locales/ru/settings.json
+++ b/src/utils/i18n/locales/ru/settings.json
@@ -15,7 +15,7 @@
     "legal": "Документы",
     "version": "Версия",
     "op_title": "Запилюлить",
-    "op_text": "Кому отправить <brand>Биткоин-Пилюлю?</brand>",
+    "op_text": "Кому отправить <accent>Биткоин-Пилюлю?</accent>",
     "op_share": "Поделиться Bitkit с другом",
     "op_message": "Скачай Bitkit - идеальный набор инструментов для работы с биткоинами. Управляй сам своей цифровой жизнью! {appStoreUrl}"
   },
diff --git a/src/utils/i18n/locales/ru/slashtags.json b/src/utils/i18n/locales/ru/slashtags.json
index b1facee5b..753c71e9f 100644
--- a/src/utils/i18n/locales/ru/slashtags.json
+++ b/src/utils/i18n/locales/ru/slashtags.json
@@ -29,16 +29,16 @@
   "signin_to": "Войти в {serviceName} используя Ваш профиль?",
   "signin_to_loading": "Входим в {serviceName}...",
   "signin_title_loading": "Входим...",
-  "onboarding_header": "Новые\n<brand>Контакты.</brand>",
+  "onboarding_header": "Новые\n<accent>Контакты.</accent>",
   "onboarding_text": "Используйте Bitkit, чтобы получать автоматические обновления ваших контактов, платить им и следить за их публичными профилями.",
   "onboarding_button": "Добавить Первый Контакт",
-  "onboarding_profile1_header": "Владейте Вашим\n<brand>публичным профилем.</brand>",
+  "onboarding_profile1_header": "Владейте Вашим\n<accent>публичным профилем.</accent>",
   "onboarding_profile1_text": "Используйте Bitkit для управления публичным профилем и ссылками, чтобы ваши контакты могли связаться с вами или заплатить вам в любое время.",
-  "onboarding_profile2_header": "Платите\n<brand>Контактам.</brand>",
+  "onboarding_profile2_header": "Платите\n<accent>Контактам.</accent>",
   "onboarding_profile2_text": "Вы и ваши контакты можете использовать Bitkit для отправки платежей напрямую, без банков, в любое время и в любом месте.",
-  "onboarding_widgets1_header": "Пока,\n<brand>Пароли.</brand>",
+  "onboarding_widgets1_header": "Пока,\n<accent>Пароли.</accent>",
   "onboarding_widgets1_text": "Интернет без паролей. Используйте Bitkit для входа в ваши любимые веб-сервисы.",
-  "onboarding_widgets2_header": "Привет,\n<brand>Виджеты.</brand>",
+  "onboarding_widgets2_header": "Привет,\n<accent>Виджеты.</accent>",
   "onboarding_widgets2_text": "Наслаждайтесь децентрализованными лентами ваших любимых веб-сервисов, добавляя забавные и полезные виджеты в свой кошелек.",
   "my_profile": "Мой профиль",
   "profile": "Профиль",
diff --git a/src/utils/lightning/index.ts b/src/utils/lightning/index.ts
index aab7c1a5e..eb8a1c3dd 100644
--- a/src/utils/lightning/index.ts
+++ b/src/utils/lightning/index.ts
@@ -481,7 +481,7 @@ export const subscribeToLightningPayments = ({
 
 				if (found) {
 					showToast({
-						type: 'success',
+						type: 'lightning',
 						title: i18n.t('wallet:toast_payment_success_title'),
 						description: i18n.t('wallet:toast_payment_success_description'),
 					});
@@ -535,7 +535,7 @@ export const subscribeToLightningPayments = ({
 				// If this is the first channel opened, show a toast
 				if (openChannels.length === 1 && closedChannels.length === 0) {
 					showToast({
-						type: 'success',
+						type: 'lightning',
 						title: i18n.t('lightning:channel_opened_title'),
 						description: i18n.t('lightning:channel_opened_msg'),
 					});
diff --git a/src/utils/notifications.ts b/src/utils/notifications.ts
index 94eafff48..e19a184f8 100644
--- a/src/utils/notifications.ts
+++ b/src/utils/notifications.ts
@@ -2,7 +2,7 @@ import Toast from 'react-native-toast-message';
 import { __E2E__ } from '../constants/env';
 
 export type ToastOptions = {
-	type: 'success' | 'info' | 'warning' | 'error';
+	type: 'success' | 'info' | 'lightning' | 'warning' | 'error';
 	title: string;
 	description: string;
 	autoHide?: boolean;
diff --git a/src/utils/scanner.ts b/src/utils/scanner.ts
index 0566cf78b..36137de6f 100644
--- a/src/utils/scanner.ts
+++ b/src/utils/scanner.ts
@@ -43,12 +43,13 @@ import {
 } from './lightning';
 import { EAvailableNetwork } from './networks';
 import { savePeer } from '../store/utils/lightning';
-import { TWalletName } from '../store/types/wallet';
+import { EDenomination, TWalletName } from '../store/types/wallet';
 import { sendNavigation } from '../navigation/bottom-sheet/SendNavigation';
 import { rootNavigation } from '../navigation/root/RootNavigator';
 import { findlnurl, handleLnurlAuth, isLnurlAddress } from './lnurl';
 import i18n from './i18n';
 import { parseOnChainPaymentRequest, validateAddress } from 'beignet';
+import { getBitcoinDisplayValues } from './displayValues';
 
 export enum EQRDataType {
 	bitcoinAddress = 'bitcoinAddress',
@@ -675,14 +676,18 @@ export const processBitcoinTransactionData = async ({
 			if (spendingBalance >= requestedAmount) {
 				response = filteredLightningInvoice;
 			} else {
+				const amount = requestedAmount - spendingBalance;
+				const { bitcoinFormatted } = getBitcoinDisplayValues({
+					satoshis: amount,
+					denomination: EDenomination.modern,
+				});
+
 				error = {
 					type: 'warning',
 					title: i18n.t('other:pay_insufficient_spending'),
 					description: i18n.t(
 						'other:pay_insufficient_spending_amount_description',
-						{
-							amount: requestedAmount - spendingBalance,
-						},
+						{ amount: bitcoinFormatted },
 					),
 				};
 			}
@@ -709,14 +714,18 @@ export const processBitcoinTransactionData = async ({
 					response = { ...bitcoinInvoice, sats: 0 };
 
 					if (showErrors) {
+						const amount = requestedAmount - onchainBalance;
+						const { bitcoinFormatted } = getBitcoinDisplayValues({
+							satoshis: amount,
+							denomination: EDenomination.modern,
+						});
+
 						showToast({
 							type: 'warning',
 							title: i18n.t('other:pay_insufficient_savings'),
 							description: i18n.t(
 								'other:pay_insufficient_savings_amount_description',
-								{
-									amount: requestedAmount - onchainBalance,
-								},
+								{ amount: bitcoinFormatted },
 							),
 						});
 					}
diff --git a/yarn.lock b/yarn.lock
index 244144ab7..f132ecca4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4041,11 +4041,6 @@
     colors "~1.2.1"
     string-argv "~0.3.1"
 
-"@sayem314/react-native-keep-awake@1.2.3":
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/@sayem314/react-native-keep-awake/-/react-native-keep-awake-1.2.3.tgz#e212bbd8be95296c37a75cde02c081f0e2602e46"
-  integrity sha512-Vk/1cYfEiZpKUKDH1c4NzRwSROcIRGjH/QY0/AnDoYTY01LJiqn9h7xKmLl7VtZlvgTkhcWwISpFSPYDU5TfwA==
-
 "@scure/base@^1.1.1":
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/@scure/base/-/base-1.1.1.tgz#ebb651ee52ff84f420097055f4bf46cfba403938"