diff --git a/app-tracking-protection/vpn-impl/src/main/java/com/duckduckgo/mobile/android/vpn/ui/report/DeviceShieldFragment.kt b/app-tracking-protection/vpn-impl/src/main/java/com/duckduckgo/mobile/android/vpn/ui/report/DeviceShieldFragment.kt
index 15bae6a19b99..4716f2b34341 100644
--- a/app-tracking-protection/vpn-impl/src/main/java/com/duckduckgo/mobile/android/vpn/ui/report/DeviceShieldFragment.kt
+++ b/app-tracking-protection/vpn-impl/src/main/java/com/duckduckgo/mobile/android/vpn/ui/report/DeviceShieldFragment.kt
@@ -125,18 +125,18 @@ class DeviceShieldFragment : DuckDuckGoFragment() {
             renderTrackersBlockedWhenEnabled(viewState.trackersBlocked)
         } else {
             deviceShieldCtaHeaderTextView.setText(R.string.atp_NewTabEnabled)
-            deviceShieldCtaImageView.setImageResource(R.drawable.ic_apptb_default)
+            deviceShieldCtaImageView.setImageResource(R.drawable.ic_apptp_default)
         }
     }
 
     private fun renderStateDisabled() {
         deviceShieldCtaHeaderTextView.setText(R.string.atp_NewTabDisabled)
-        deviceShieldCtaImageView.setImageResource(R.drawable.ic_apptb_warning)
+        deviceShieldCtaImageView.setImageResource(R.drawable.ic_apptp_warning)
     }
 
     private fun renderStateRevoked() {
         deviceShieldCtaHeaderTextView.setText(R.string.atp_NewTabRevoked)
-        deviceShieldCtaImageView.setImageResource(R.drawable.ic_apptb_warning)
+        deviceShieldCtaImageView.setImageResource(R.drawable.ic_apptp_warning)
     }
 
     private fun renderTrackersBlockedWhenEnabled(trackerBlocked: PrivacyReportViewModel.PrivacyReportView.TrackersBlocked) {
@@ -185,6 +185,6 @@ class DeviceShieldFragment : DuckDuckGoFragment() {
         }
 
         deviceShieldCtaHeaderTextView.text = HtmlCompat.fromHtml(textToStyle, HtmlCompat.FROM_HTML_MODE_LEGACY)
-        deviceShieldCtaImageView.setImageResource(R.drawable.ic_apptb_default)
+        deviceShieldCtaImageView.setImageResource(R.drawable.ic_apptp_default)
     }
 }
diff --git a/app-tracking-protection/vpn-impl/src/main/res/drawable-v23/ic_apptb_amazon.png b/app-tracking-protection/vpn-impl/src/main/res/drawable-v23/ic_apptb_amazon.png
deleted file mode 100644
index a3bca556acf5..000000000000
Binary files a/app-tracking-protection/vpn-impl/src/main/res/drawable-v23/ic_apptb_amazon.png and /dev/null differ
diff --git a/app-tracking-protection/vpn-impl/src/main/res/drawable-v23/ic_apptb_default.png b/app-tracking-protection/vpn-impl/src/main/res/drawable-v23/ic_apptb_default.png
deleted file mode 100644
index 3418b3e0ecc4..000000000000
Binary files a/app-tracking-protection/vpn-impl/src/main/res/drawable-v23/ic_apptb_default.png and /dev/null differ
diff --git a/app-tracking-protection/vpn-impl/src/main/res/drawable-v23/ic_apptb_facebook.png b/app-tracking-protection/vpn-impl/src/main/res/drawable-v23/ic_apptb_facebook.png
deleted file mode 100644
index 67d42f835fc4..000000000000
Binary files a/app-tracking-protection/vpn-impl/src/main/res/drawable-v23/ic_apptb_facebook.png and /dev/null differ
diff --git a/app-tracking-protection/vpn-impl/src/main/res/drawable-v23/ic_apptb_google.png b/app-tracking-protection/vpn-impl/src/main/res/drawable-v23/ic_apptb_google.png
deleted file mode 100644
index f36bb41dbb16..000000000000
Binary files a/app-tracking-protection/vpn-impl/src/main/res/drawable-v23/ic_apptb_google.png and /dev/null differ
diff --git a/app-tracking-protection/vpn-impl/src/main/res/drawable-v23/ic_apptb_warning.png b/app-tracking-protection/vpn-impl/src/main/res/drawable-v23/ic_apptb_warning.png
deleted file mode 100644
index 7c544fab60a2..000000000000
Binary files a/app-tracking-protection/vpn-impl/src/main/res/drawable-v23/ic_apptb_warning.png and /dev/null differ
diff --git a/app-tracking-protection/vpn-impl/src/main/res/drawable/ic_apptb_amazon.xml b/app-tracking-protection/vpn-impl/src/main/res/drawable/ic_apptb_amazon.xml
deleted file mode 100644
index 34a077ae603b..000000000000
--- a/app-tracking-protection/vpn-impl/src/main/res/drawable/ic_apptb_amazon.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="192dp"
-    android:height="192dp"
-    android:viewportWidth="192"
-    android:viewportHeight="192">
-  <path
-      android:pathData="M44,16C44,7.16 51.16,0 60,0H144C152.84,0 160,7.16 160,16V176C160,184.84 152.84,192 144,192H60C51.16,192 44,184.84 44,176V16Z"
-      android:fillColor="#666666"/>
-  <path
-      android:pathData="M32,16C32,7.16 39.16,0 48,0H132C140.84,0 148,7.16 148,16V176C148,184.84 140.84,192 132,192H48C39.16,192 32,184.84 32,176V16Z"
-      android:fillColor="#888888"/>
-  <path
-      android:pathData="M44,16C44,13.79 45.79,12 48,12H132C134.21,12 136,13.79 136,16V176C136,178.21 134.21,180 132,180H48C45.79,180 44,178.21 44,176V16Z"
-      android:fillColor="#FAFAFA"/>
-  <path
-      android:pathData="M92,146C92,142.69 94.69,140 98,140H118C121.31,140 124,142.69 124,146C124,149.31 121.31,152 118,152H98C94.69,152 92,149.31 92,146Z"
-      android:fillColor="#DDDDDD"/>
-  <path
-      android:pathData="M92,162C92,158.69 94.69,156 98,156H110C113.31,156 116,158.69 116,162C116,165.31 113.31,168 110,168H98C94.69,168 92,165.31 92,162Z"
-      android:fillColor="#DDDDDD"/>
-  <path
-      android:pathData="M64,140C59.58,140 56,143.58 56,148V160C56,164.42 59.58,168 64,168H76C80.42,168 84,164.42 84,160V148C84,143.58 80.42,140 76,140H64Z"
-      android:fillColor="#DDDDDD"/>
-  <path
-      android:pathData="M48,22C48,18.69 50.69,16 54,16V16C57.31,16 60,18.69 60,22V22C60,25.31 57.31,28 54,28V28C50.69,28 48,25.31 48,22V22Z"
-      android:fillColor="#666666"/>
-  <path
-      android:pathData="M10.81,44C9.89,44 8.97,44.36 8.27,45.06C6.86,46.47 6.86,48.75 8.27,50.16L15.47,57.36C16.88,58.77 19.16,58.77 20.57,57.36C21.97,55.96 21.97,53.67 20.57,52.27L13.36,45.06C12.66,44.36 11.74,44 10.82,44H10.81Z"
-      android:fillColor="#CCCCCC"/>
-  <path
-      android:pathData="M14.41,76.42H3.6C1.62,76.42 0,78.04 0,80.02C0,82 1.62,83.62 3.6,83.62H14.41C16.39,83.62 18.01,82 18.01,80.02C18.01,78.04 16.39,76.42 14.41,76.42Z"
-      android:fillColor="#CCCCCC"/>
-  <path
-      android:pathData="M20.53,102.7C19.83,102 18.91,101.64 17.99,101.64H17.97C17.05,101.64 16.14,102 15.43,102.7L8.23,109.9C6.83,111.31 6.83,113.59 8.23,115C9.63,116.4 11.92,116.4 13.33,115L20.53,107.79C21.94,106.39 21.94,104.1 20.53,102.7Z"
-      android:fillColor="#CCCCCC"/>
-  <path
-      android:pathData="M124,82C124,100.78 108.78,116 90,116C71.22,116 56,100.78 56,82C56,63.22 71.22,48 90,48C108.78,48 124,63.22 124,82Z"
-      android:fillColor="#E7853D"/>
-  <path
-      android:pathData="M76.64,85.04C76.64,75.1 88.46,73.72 93.22,73.55H93.16C93.16,73.15 93.17,72.75 93.18,72.37C93.22,69.12 93.25,66.78 89.7,66.78C89.7,66.78 85.98,66.78 84.39,71.63L77.26,70.97C77.26,66.14 81.84,60.75 90.43,60.75C99.02,60.75 101.42,66.33 101.42,68.8V83.15C101.42,85.89 104.57,88.37 104.57,88.37L99.02,93.85C97.43,92.43 95.95,90.9 94.59,89.27C90.17,96.2 76.64,95.77 76.64,85.04ZM84.98,83.73C84.98,88.7 93.22,89.87 93.22,82.04V78.06C89.92,78.17 84.98,79.11 84.98,83.73ZM106.55,98.05C105.81,99.03 99.71,104.58 89.49,104.58C79.27,104.58 71.36,97.61 69.01,94.67C68.35,93.93 69.11,93.58 69.54,93.87L69.94,94.1C77.12,98.48 88.24,105.25 106.04,96.83C106.71,96.51 107.28,97.07 106.55,98.05ZM108.39,101.3C109.3,100.46 110.01,99.42 110.46,98.26H110.41C111.05,96.66 111.54,94.69 111.05,94.05C110.55,93.41 108.1,93.29 106.55,93.49C105,93.68 102.64,94.67 102.93,95.22C102.98,95.37 103.11,95.35 103.65,95.29C103.82,95.27 104.03,95.25 104.3,95.22C104.4,95.21 104.53,95.2 104.68,95.18C105.95,95.05 108.4,94.78 108.99,95.54C109.64,96.37 108.04,100.29 107.75,100.92C107.46,101.56 107.85,101.73 108.39,101.3Z"
-      android:fillColor="#ffffff"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M56.34,48.34C59.47,45.22 64.53,45.22 67.66,48.34L123.66,104.34C126.78,107.47 126.78,112.53 123.66,115.66C120.53,118.78 115.47,118.78 112.34,115.66L56.34,59.66C53.22,56.53 53.22,51.47 56.34,48.34Z"
-      android:fillColor="#ffffff"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M59.17,51.17C60.73,49.61 63.27,49.61 64.83,51.17L120.83,107.17C122.39,108.73 122.39,111.27 120.83,112.83C119.27,114.39 116.73,114.39 115.17,112.83L59.17,56.83C57.61,55.27 57.61,52.73 59.17,51.17Z"
-      android:fillColor="#EB102D"
-      android:fillType="evenOdd"/>
-</vector>
diff --git a/app-tracking-protection/vpn-impl/src/main/res/drawable/ic_apptb_facebook.xml b/app-tracking-protection/vpn-impl/src/main/res/drawable/ic_apptb_facebook.xml
deleted file mode 100644
index 1fe0d6237e3d..000000000000
--- a/app-tracking-protection/vpn-impl/src/main/res/drawable/ic_apptb_facebook.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="192dp"
-    android:height="192dp"
-    android:viewportWidth="192"
-    android:viewportHeight="192">
-  <path
-      android:pathData="M44,16C44,7.16 51.16,0 60,0H144C152.84,0 160,7.16 160,16V176C160,184.84 152.84,192 144,192H60C51.16,192 44,184.84 44,176V16Z"
-      android:fillColor="#666666"/>
-  <path
-      android:pathData="M32,16C32,7.16 39.16,0 48,0H132C140.84,0 148,7.16 148,16V176C148,184.84 140.84,192 132,192H48C39.16,192 32,184.84 32,176V16Z"
-      android:fillColor="#888888"/>
-  <path
-      android:pathData="M44,16C44,13.79 45.79,12 48,12H132C134.21,12 136,13.79 136,16V176C136,178.21 134.21,180 132,180H48C45.79,180 44,178.21 44,176V16Z"
-      android:fillColor="#FAFAFA"/>
-  <path
-      android:pathData="M92,146C92,142.69 94.69,140 98,140H118C121.31,140 124,142.69 124,146C124,149.31 121.31,152 118,152H98C94.69,152 92,149.31 92,146Z"
-      android:fillColor="#DDDDDD"/>
-  <path
-      android:pathData="M92,162C92,158.69 94.69,156 98,156H110C113.31,156 116,158.69 116,162C116,165.31 113.31,168 110,168H98C94.69,168 92,165.31 92,162Z"
-      android:fillColor="#DDDDDD"/>
-  <path
-      android:pathData="M64,140C59.58,140 56,143.58 56,148V160C56,164.42 59.58,168 64,168H76C80.42,168 84,164.42 84,160V148C84,143.58 80.42,140 76,140H64Z"
-      android:fillColor="#DDDDDD"/>
-  <path
-      android:pathData="M48,22C48,18.69 50.69,16 54,16V16C57.31,16 60,18.69 60,22V22C60,25.31 57.31,28 54,28V28C50.69,28 48,25.31 48,22V22Z"
-      android:fillColor="#666666"/>
-  <path
-      android:pathData="M10.81,44C9.89,44 8.97,44.36 8.27,45.06C6.86,46.47 6.86,48.75 8.27,50.16L15.47,57.36C16.88,58.77 19.16,58.77 20.57,57.36C21.97,55.96 21.97,53.67 20.57,52.27L13.36,45.06C12.66,44.36 11.74,44 10.82,44H10.81Z"
-      android:fillColor="#CCCCCC"/>
-  <path
-      android:pathData="M14.41,76.42H3.6C1.62,76.42 0,78.04 0,80.02C0,82 1.62,83.62 3.6,83.62H14.41C16.39,83.62 18.01,82 18.01,80.02C18.01,78.04 16.39,76.42 14.41,76.42Z"
-      android:fillColor="#CCCCCC"/>
-  <path
-      android:pathData="M20.53,102.7C19.83,102 18.91,101.64 17.99,101.64H17.97C17.05,101.64 16.14,102 15.43,102.7L8.23,109.9C6.83,111.31 6.83,113.59 8.23,115C9.63,116.4 11.92,116.4 13.33,115L20.53,107.79C21.94,106.39 21.94,104.1 20.53,102.7Z"
-      android:fillColor="#CCCCCC"/>
-  <path
-      android:pathData="M124,82C124,100.78 108.78,116 90,116C71.22,116 56,100.78 56,82C56,63.22 71.22,48 90,48C108.78,48 124,63.22 124,82Z"
-      android:fillColor="#ffffff"/>
-  <path
-      android:pathData="M124,82.19C124,63.29 108.8,48 90.03,48C71.25,48 56,63.29 56,82.19C56,99.28 68.46,113.41 84.71,116V92.08H76.04V82.19H84.71V74.67C84.71,66.1 89.76,61.34 97.55,61.34C101.28,61.34 105.12,62.08 105.12,62.08V70.44H100.86C96.65,70.44 95.29,73.08 95.29,75.78V82.19H104.75L103.23,92.08H95.29V116C111.54,113.46 124,99.28 124,82.19Z"
-      android:fillColor="#3969EF"/>
-  <path
-      android:pathData="M56.34,48.34C59.47,45.22 64.53,45.22 67.66,48.34L123.66,104.34C126.78,107.47 126.78,112.53 123.66,115.66C120.53,118.78 115.47,118.78 112.34,115.66L56.34,59.66C53.22,56.53 53.22,51.47 56.34,48.34Z"
-      android:fillColor="#ffffff"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M59.17,51.17C60.73,49.61 63.27,49.61 64.83,51.17L120.83,107.17C122.39,108.73 122.39,111.27 120.83,112.83C119.27,114.39 116.73,114.39 115.17,112.83L59.17,56.83C57.61,55.27 57.61,52.73 59.17,51.17Z"
-      android:fillColor="#EB102D"
-      android:fillType="evenOdd"/>
-</vector>
diff --git a/app-tracking-protection/vpn-impl/src/main/res/drawable/ic_apptb_google.xml b/app-tracking-protection/vpn-impl/src/main/res/drawable/ic_apptb_google.xml
deleted file mode 100644
index 8f3d06a1d068..000000000000
--- a/app-tracking-protection/vpn-impl/src/main/res/drawable/ic_apptb_google.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="192dp"
-    android:height="192dp"
-    android:viewportWidth="192"
-    android:viewportHeight="192">
-  <path
-      android:pathData="M44,16C44,7.16 51.16,0 60,0H144C152.84,0 160,7.16 160,16V176C160,184.84 152.84,192 144,192H60C51.16,192 44,184.84 44,176V16Z"
-      android:fillColor="#666666"/>
-  <path
-      android:pathData="M32,16C32,7.16 39.16,0 48,0H132C140.84,0 148,7.16 148,16V176C148,184.84 140.84,192 132,192H48C39.16,192 32,184.84 32,176V16Z"
-      android:fillColor="#888888"/>
-  <path
-      android:pathData="M44,16C44,13.79 45.79,12 48,12H132C134.21,12 136,13.79 136,16V176C136,178.21 134.21,180 132,180H48C45.79,180 44,178.21 44,176V16Z"
-      android:fillColor="#FAFAFA"/>
-  <path
-      android:pathData="M92,146C92,142.69 94.69,140 98,140H118C121.31,140 124,142.69 124,146C124,149.31 121.31,152 118,152H98C94.69,152 92,149.31 92,146Z"
-      android:fillColor="#DDDDDD"/>
-  <path
-      android:pathData="M92,162C92,158.69 94.69,156 98,156H110C113.31,156 116,158.69 116,162C116,165.31 113.31,168 110,168H98C94.69,168 92,165.31 92,162Z"
-      android:fillColor="#DDDDDD"/>
-  <path
-      android:pathData="M64,140C59.58,140 56,143.58 56,148V160C56,164.42 59.58,168 64,168H76C80.42,168 84,164.42 84,160V148C84,143.58 80.42,140 76,140H64Z"
-      android:fillColor="#DDDDDD"/>
-  <path
-      android:pathData="M48,22C48,18.69 50.69,16 54,16V16C57.31,16 60,18.69 60,22V22C60,25.31 57.31,28 54,28V28C50.69,28 48,25.31 48,22V22Z"
-      android:fillColor="#666666"/>
-  <path
-      android:pathData="M10.81,44C9.89,44 8.97,44.36 8.27,45.06C6.86,46.47 6.86,48.75 8.27,50.16L15.47,57.36C16.88,58.77 19.16,58.77 20.57,57.36C21.97,55.96 21.97,53.67 20.57,52.27L13.36,45.06C12.66,44.36 11.74,44 10.82,44H10.81Z"
-      android:fillColor="#CCCCCC"/>
-  <path
-      android:pathData="M14.41,76.42H3.6C1.62,76.42 0,78.04 0,80.02C0,82 1.62,83.62 3.6,83.62H14.41C16.39,83.62 18.01,82 18.01,80.02C18.01,78.04 16.39,76.42 14.41,76.42Z"
-      android:fillColor="#CCCCCC"/>
-  <path
-      android:pathData="M20.53,102.7C19.83,102 18.91,101.64 17.99,101.64H17.97C17.05,101.64 16.14,102 15.43,102.7L8.23,109.9C6.83,111.31 6.83,113.59 8.23,115C9.63,116.4 11.92,116.4 13.33,115L20.53,107.79C21.94,106.39 21.94,104.1 20.53,102.7Z"
-      android:fillColor="#CCCCCC"/>
-  <path
-      android:pathData="M124,82C124,100.78 108.78,116 90,116C71.22,116 56,100.78 56,82C56,63.22 71.22,48 90,48C108.78,48 124,63.22 124,82Z"
-      android:fillColor="#F5F5F5"/>
-  <path
-      android:pathData="M90,112C106.57,112 120,98.57 120,82C120,65.43 106.57,52 90,52C73.43,52 60,65.43 60,82C60,98.57 73.43,112 90,112ZM90,116C108.78,116 124,100.78 124,82C124,63.22 108.78,48 90,48C71.22,48 56,63.22 56,82C56,100.78 71.22,116 90,116Z"
-      android:fillColor="#ABABAB"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M112.64,82.42C112.64,80.57 112.49,79.21 112.16,77.81H90.45V86.19H103.19C102.94,88.27 101.55,91.41 98.47,93.52L98.42,93.8L105.29,98.99L105.76,99.04C110.13,95.1 112.64,89.3 112.64,82.42Z"
-      android:fillColor="#4285F4"/>
-  <path
-      android:pathData="M90.45,104.51C96.69,104.51 101.93,102.5 105.76,99.04L98.46,93.52C96.51,94.85 93.89,95.78 90.45,95.78C84.34,95.78 79.15,91.84 77.3,86.39L77.03,86.41L69.89,91.81L69.8,92.06C73.6,99.44 81.41,104.51 90.45,104.51Z"
-      android:fillColor="#34A853"/>
-  <path
-      android:pathData="M77.3,86.39C76.81,84.98 76.53,83.48 76.53,81.92C76.53,80.37 76.81,78.86 77.28,77.45L77.26,77.15L70.04,71.67L69.8,71.78C68.23,74.84 67.34,78.28 67.34,81.92C67.34,85.56 68.23,89 69.8,92.06L77.3,86.39Z"
-      android:fillColor="#FBBC05"/>
-  <path
-      android:pathData="M90.45,68.07C94.79,68.07 97.72,69.9 99.39,71.43L105.91,65.21C101.91,61.57 96.69,59.33 90.45,59.33C81.41,59.33 73.6,64.4 69.8,71.78L77.27,77.46C79.15,72.01 84.34,68.07 90.45,68.07Z"
-      android:fillColor="#EB4335"/>
-  <path
-      android:pathData="M56.34,48.34C59.47,45.22 64.53,45.22 67.66,48.34L123.66,104.34C126.78,107.47 126.78,112.53 123.66,115.66C120.53,118.78 115.47,118.78 112.34,115.66L56.34,59.66C53.22,56.53 53.22,51.47 56.34,48.34Z"
-      android:fillColor="#ffffff"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M59.17,51.17C60.73,49.61 63.27,49.61 64.83,51.17L120.83,107.17C122.39,108.73 122.39,111.27 120.83,112.83C119.27,114.39 116.73,114.39 115.17,112.83L59.17,56.83C57.61,55.27 57.61,52.73 59.17,51.17Z"
-      android:fillColor="#EB102D"
-      android:fillType="evenOdd"/>
-</vector>
diff --git a/app-tracking-protection/vpn-impl/src/main/res/drawable/ic_apptb_default.xml b/app-tracking-protection/vpn-impl/src/main/res/drawable/ic_apptp_default.xml
similarity index 100%
rename from app-tracking-protection/vpn-impl/src/main/res/drawable/ic_apptb_default.xml
rename to app-tracking-protection/vpn-impl/src/main/res/drawable/ic_apptp_default.xml
diff --git a/app-tracking-protection/vpn-impl/src/main/res/drawable/ic_apptb_warning.xml b/app-tracking-protection/vpn-impl/src/main/res/drawable/ic_apptp_warning.xml
similarity index 100%
rename from app-tracking-protection/vpn-impl/src/main/res/drawable/ic_apptb_warning.xml
rename to app-tracking-protection/vpn-impl/src/main/res/drawable/ic_apptp_warning.xml
diff --git a/app-tracking-protection/vpn-impl/src/main/res/layout/dialog_tracking_protection_restore_defaults.xml b/app-tracking-protection/vpn-impl/src/main/res/layout/dialog_tracking_protection_restore_defaults.xml
index 7782d72f5191..d2df6f4e06b8 100644
--- a/app-tracking-protection/vpn-impl/src/main/res/layout/dialog_tracking_protection_restore_defaults.xml
+++ b/app-tracking-protection/vpn-impl/src/main/res/layout/dialog_tracking_protection_restore_defaults.xml
@@ -36,7 +36,7 @@
                     android:layout_width="@dimen/listItemImageContainerSize"
                     android:layout_height="@dimen/listItemImageContainerSize"
                     android:importantForAccessibility="no"
-                    android:src="@drawable/ic_apptb_default"
+                    android:src="@drawable/ic_apptp_default"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
                     app:layout_constraintTop_toTopOf="parent" />
diff --git a/app-tracking-protection/vpn-impl/src/main/res/layout/fragment_device_shield_cta.xml b/app-tracking-protection/vpn-impl/src/main/res/layout/fragment_device_shield_cta.xml
index b51da54cbec5..5d71e0567ebe 100644
--- a/app-tracking-protection/vpn-impl/src/main/res/layout/fragment_device_shield_cta.xml
+++ b/app-tracking-protection/vpn-impl/src/main/res/layout/fragment_device_shield_cta.xml
@@ -37,7 +37,7 @@
         android:layout_marginEnd="16dp"
         android:layout_marginBottom="16dp"
         android:scaleType="centerCrop"
-        android:src="@drawable/ic_apptb_default"
+        android:src="@drawable/ic_apptp_default"
         app:layout_constraintBottom_toTopOf="@+id/deviceShieldCtaSplitter"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent"
diff --git a/app/lint-baseline.xml b/app/lint-baseline.xml
index 3458b7849919..1045799ab6b7 100644
--- a/app/lint-baseline.xml
+++ b/app/lint-baseline.xml
@@ -3154,74 +3154,6 @@
             column="1"/>
     </issue>
 
-    <issue
-        id="UnusedResources"
-        message="The resource `R.drawable.ic_launcher_background` appears to be unused"
-        errorLine1="&lt;vector xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;"
-        errorLine2="^">
-        <location
-            file="src/main/res/drawable/ic_launcher_background.xml"
-            line="2"
-            column="1"/>
-    </issue>
-
-    <issue
-        id="UnusedResources"
-        message="The resource `R.drawable.ic_launcher_background_blue` appears to be unused">
-        <location
-            file="src/main/res/drawable-hdpi/ic_launcher_background_blue.png"/>
-    </issue>
-
-    <issue
-        id="UnusedResources"
-        message="The resource `R.drawable.ic_launcher_background_red` appears to be unused">
-        <location
-            file="src/main/res/drawable-hdpi/ic_launcher_background_red.png"/>
-    </issue>
-
-    <issue
-        id="UnusedResources"
-        message="The resource `R.drawable.ic_launcher_foreground_blue` appears to be unused">
-        <location
-            file="src/main/res/drawable-hdpi/ic_launcher_foreground_blue.png"/>
-    </issue>
-
-    <issue
-        id="UnusedResources"
-        message="The resource `R.drawable.ic_launcher_foreground_red` appears to be unused">
-        <location
-            file="src/main/res/drawable-hdpi/ic_launcher_foreground_red.png"/>
-    </issue>
-
-    <issue
-        id="UnusedResources"
-        message="The resource `R.mipmap.ic_launcher_red` appears to be unused"
-        errorLine1="&lt;adaptive-icon xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;>"
-        errorLine2="^">
-        <location
-            file="src/main/res/mipmap-anydpi-v26/ic_launcher_red.xml"
-            line="18"
-            column="1"/>
-    </issue>
-
-    <issue
-        id="UnusedResources"
-        message="The resource `R.mipmap.ic_launcher_red_foreground` appears to be unused">
-        <location
-            file="src/main/res/mipmap-hdpi/ic_launcher_red_foreground.png"/>
-    </issue>
-
-    <issue
-        id="UnusedResources"
-        message="The resource `R.mipmap.ic_launcher_red_round` appears to be unused"
-        errorLine1="&lt;adaptive-icon xmlns:android=&quot;http://schemas.android.com/apk/res/android&quot;>"
-        errorLine2="^">
-        <location
-            file="src/main/res/mipmap-anydpi-v26/ic_launcher_red_round.xml"
-            line="18"
-            column="1"/>
-    </issue>
-
     <issue
         id="UnusedResources"
         message="The resource `R.drawable.ic_more_trackers` appears to be unused"
@@ -4600,90 +4532,6 @@
             column="45"/>
     </issue>
 
-    <issue
-        id="IconLauncherShape"
-        message="Launcher icons should not fill every pixel of their square region; see the design guide for details">
-        <location
-            file="src/main/res/drawable-hdpi/ic_launcher_background_blue.png"/>
-    </issue>
-
-    <issue
-        id="IconLauncherShape"
-        message="Launcher icons should not fill every pixel of their square region; see the design guide for details">
-        <location
-            file="src/main/res/drawable-mdpi/ic_launcher_background_blue.png"/>
-    </issue>
-
-    <issue
-        id="IconLauncherShape"
-        message="Launcher icons should not fill every pixel of their square region; see the design guide for details">
-        <location
-            file="src/main/res/drawable-xhdpi/ic_launcher_background_blue.png"/>
-    </issue>
-
-    <issue
-        id="IconLauncherShape"
-        message="Launcher icons should not fill every pixel of their square region; see the design guide for details">
-        <location
-            file="src/main/res/drawable-xxhdpi/ic_launcher_background_blue.png"/>
-    </issue>
-
-    <issue
-        id="IconLauncherShape"
-        message="Launcher icons should not fill every pixel of their square region; see the design guide for details">
-        <location
-            file="src/main/res/drawable-xxxhdpi/ic_launcher_background_blue.png"/>
-    </issue>
-
-    <issue
-        id="IconLauncherShape"
-        message="Launcher icons should not fill every pixel of their square region; see the design guide for details">
-        <location
-            file="src/main/res/drawable-hdpi/ic_launcher_background_red.png"/>
-    </issue>
-
-    <issue
-        id="IconLauncherShape"
-        message="Launcher icons should not fill every pixel of their square region; see the design guide for details">
-        <location
-            file="src/main/res/drawable-mdpi/ic_launcher_background_red.png"/>
-    </issue>
-
-    <issue
-        id="IconLauncherShape"
-        message="Launcher icons should not fill every pixel of their square region; see the design guide for details">
-        <location
-            file="src/main/res/drawable-xhdpi/ic_launcher_background_red.png"/>
-    </issue>
-
-    <issue
-        id="IconLauncherShape"
-        message="Launcher icons should not fill every pixel of their square region; see the design guide for details">
-        <location
-            file="src/main/res/drawable-xxhdpi/ic_launcher_background_red.png"/>
-    </issue>
-
-    <issue
-        id="IconLauncherShape"
-        message="Launcher icons should not fill every pixel of their square region; see the design guide for details">
-        <location
-            file="src/main/res/drawable-xxxhdpi/ic_launcher_background_red.png"/>
-    </issue>
-
-    <issue
-        id="IconDensities"
-        message="Missing the following drawables in `drawable-hdpi`: ic_app_icon_black_round.png, ic_app_icon_blue_round.png, ic_app_icon_gold_round.png, ic_app_icon_green_round.png, ic_app_icon_purple_round.png... (2 more)">
-        <location
-            file="src/main/res/drawable-hdpi"/>
-    </issue>
-
-    <issue
-        id="IconDensities"
-        message="Missing the following drawables in `drawable-mdpi`: ic_app_icon_black_round.png, ic_app_icon_blue_round.png, ic_app_icon_gold_round.png, ic_app_icon_green_round.png, ic_app_icon_purple_round.png... (4 more)">
-        <location
-            file="src/main/res/drawable-mdpi"/>
-    </issue>
-
     <issue
         id="IconDensities"
         message="Missing the following drawables in `drawable-xhdpi`: onboarding_background_large.png, onboarding_background_small.png">
@@ -4691,97 +4539,6 @@
             file="src/main/res/drawable-xhdpi"/>
     </issue>
 
-    <issue
-        id="IconDensities"
-        message="Missing the following drawables in `drawable-xxhdpi`: ic_app_icon_black_round.png, ic_app_icon_blue_round.png, ic_app_icon_gold_round.png, ic_app_icon_green_round.png, ic_app_icon_purple_round.png... (4 more)">
-        <location
-            file="src/main/res/drawable-xxhdpi"/>
-    </issue>
-
-    <issue
-        id="IconDuplicates"
-        message="The following unrelated icon files have identical contents: ic_launcher_black_foreground.png, ic_launcher_blue_foreground.png, ic_launcher_gold_foreground.png, ic_launcher_green_foreground.png, ic_launcher_purple_foreground.png">
-        <location
-            file="src/main/res/mipmap-hdpi/ic_launcher_purple_foreground.png"/>
-        <location
-            file="src/main/res/mipmap-hdpi/ic_launcher_green_foreground.png"/>
-        <location
-            file="src/main/res/mipmap-hdpi/ic_launcher_gold_foreground.png"/>
-        <location
-            file="src/main/res/mipmap-hdpi/ic_launcher_blue_foreground.png"/>
-        <location
-            file="src/main/res/mipmap-hdpi/ic_launcher_black_foreground.png"/>
-    </issue>
-
-    <issue
-        id="IconDuplicates"
-        message="The following unrelated icon files have identical contents: ic_launcher_black_foreground.png, ic_launcher_blue_foreground.png, ic_launcher_gold_foreground.png, ic_launcher_green_foreground.png, ic_launcher_purple_foreground.png">
-        <location
-            file="src/main/res/mipmap-mdpi/ic_launcher_purple_foreground.png"/>
-        <location
-            file="src/main/res/mipmap-mdpi/ic_launcher_green_foreground.png"/>
-        <location
-            file="src/main/res/mipmap-mdpi/ic_launcher_gold_foreground.png"/>
-        <location
-            file="src/main/res/mipmap-mdpi/ic_launcher_blue_foreground.png"/>
-        <location
-            file="src/main/res/mipmap-mdpi/ic_launcher_black_foreground.png"/>
-    </issue>
-
-    <issue
-        id="IconDuplicates"
-        message="The following unrelated icon files have identical contents: ic_launcher_black_foreground.png, ic_launcher_blue_foreground.png, ic_launcher_gold_foreground.png, ic_launcher_green_foreground.png, ic_launcher_purple_foreground.png">
-        <location
-            file="src/main/res/mipmap-xhdpi/ic_launcher_purple_foreground.png"/>
-        <location
-            file="src/main/res/mipmap-xhdpi/ic_launcher_green_foreground.png"/>
-        <location
-            file="src/main/res/mipmap-xhdpi/ic_launcher_gold_foreground.png"/>
-        <location
-            file="src/main/res/mipmap-xhdpi/ic_launcher_blue_foreground.png"/>
-        <location
-            file="src/main/res/mipmap-xhdpi/ic_launcher_black_foreground.png"/>
-    </issue>
-
-    <issue
-        id="IconDuplicates"
-        message="The following unrelated icon files have identical contents: ic_launcher_black_foreground.png, ic_launcher_blue_foreground.png, ic_launcher_gold_foreground.png, ic_launcher_green_foreground.png, ic_launcher_purple_foreground.png">
-        <location
-            file="src/main/res/mipmap-xxhdpi/ic_launcher_purple_foreground.png"/>
-        <location
-            file="src/main/res/mipmap-xxhdpi/ic_launcher_green_foreground.png"/>
-        <location
-            file="src/main/res/mipmap-xxhdpi/ic_launcher_gold_foreground.png"/>
-        <location
-            file="src/main/res/mipmap-xxhdpi/ic_launcher_blue_foreground.png"/>
-        <location
-            file="src/main/res/mipmap-xxhdpi/ic_launcher_black_foreground.png"/>
-    </issue>
-
-    <issue
-        id="IconDuplicates"
-        message="The following unrelated icon files have identical contents: ic_launcher_black_foreground.png, ic_launcher_blue_foreground.png, ic_launcher_gold_foreground.png, ic_launcher_green_foreground.png, ic_launcher_purple_foreground.png">
-        <location
-            file="src/main/res/mipmap-xxxhdpi/ic_launcher_purple_foreground.png"/>
-        <location
-            file="src/main/res/mipmap-xxxhdpi/ic_launcher_green_foreground.png"/>
-        <location
-            file="src/main/res/mipmap-xxxhdpi/ic_launcher_gold_foreground.png"/>
-        <location
-            file="src/main/res/mipmap-xxxhdpi/ic_launcher_blue_foreground.png"/>
-        <location
-            file="src/main/res/mipmap-xxxhdpi/ic_launcher_black_foreground.png"/>
-    </issue>
-
-    <issue
-        id="IconDuplicates"
-        message="The following unrelated icon files have identical contents: ic_app_icon_silhouette_round.png, ic_launcher_silhouette_round.png">
-        <location
-            file="src/main/res/mipmap-xhdpi/ic_launcher_silhouette_round.png"/>
-        <location
-            file="src/main/res/drawable-xhdpi/ic_app_icon_silhouette_round.png"/>
-    </issue>
-
     <issue
         id="AlwaysShowAction"
         message="Prefer &quot;`ifRoom`&quot; instead of &quot;`always`&quot;"
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_black.xml b/app/src/main/res/mipmap-anydpi/ic_launcher_black.xml
similarity index 100%
rename from app/src/main/res/mipmap-anydpi-v26/ic_launcher_black.xml
rename to app/src/main/res/mipmap-anydpi/ic_launcher_black.xml
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_black_round.xml b/app/src/main/res/mipmap-anydpi/ic_launcher_black_round.xml
similarity index 100%
rename from app/src/main/res/mipmap-anydpi-v26/ic_launcher_black_round.xml
rename to app/src/main/res/mipmap-anydpi/ic_launcher_black_round.xml
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_blue.xml b/app/src/main/res/mipmap-anydpi/ic_launcher_blue.xml
similarity index 100%
rename from app/src/main/res/mipmap-anydpi-v26/ic_launcher_blue.xml
rename to app/src/main/res/mipmap-anydpi/ic_launcher_blue.xml
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_blue_round.xml b/app/src/main/res/mipmap-anydpi/ic_launcher_blue_round.xml
similarity index 100%
rename from app/src/main/res/mipmap-anydpi-v26/ic_launcher_blue_round.xml
rename to app/src/main/res/mipmap-anydpi/ic_launcher_blue_round.xml
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_gold.xml b/app/src/main/res/mipmap-anydpi/ic_launcher_gold.xml
similarity index 100%
rename from app/src/main/res/mipmap-anydpi-v26/ic_launcher_gold.xml
rename to app/src/main/res/mipmap-anydpi/ic_launcher_gold.xml
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_gold_round.xml b/app/src/main/res/mipmap-anydpi/ic_launcher_gold_round.xml
similarity index 100%
rename from app/src/main/res/mipmap-anydpi-v26/ic_launcher_gold_round.xml
rename to app/src/main/res/mipmap-anydpi/ic_launcher_gold_round.xml
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_green.xml b/app/src/main/res/mipmap-anydpi/ic_launcher_green.xml
similarity index 100%
rename from app/src/main/res/mipmap-anydpi-v26/ic_launcher_green.xml
rename to app/src/main/res/mipmap-anydpi/ic_launcher_green.xml
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_green_round.xml b/app/src/main/res/mipmap-anydpi/ic_launcher_green_round.xml
similarity index 100%
rename from app/src/main/res/mipmap-anydpi-v26/ic_launcher_green_round.xml
rename to app/src/main/res/mipmap-anydpi/ic_launcher_green_round.xml
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_purple.xml b/app/src/main/res/mipmap-anydpi/ic_launcher_purple.xml
similarity index 100%
rename from app/src/main/res/mipmap-anydpi-v26/ic_launcher_purple.xml
rename to app/src/main/res/mipmap-anydpi/ic_launcher_purple.xml
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_purple_round.xml b/app/src/main/res/mipmap-anydpi/ic_launcher_purple_round.xml
similarity index 100%
rename from app/src/main/res/mipmap-anydpi-v26/ic_launcher_purple_round.xml
rename to app/src/main/res/mipmap-anydpi/ic_launcher_purple_round.xml
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_red.xml b/app/src/main/res/mipmap-anydpi/ic_launcher_red.xml
similarity index 100%
rename from app/src/main/res/mipmap-anydpi-v26/ic_launcher_red.xml
rename to app/src/main/res/mipmap-anydpi/ic_launcher_red.xml
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_red_round.xml b/app/src/main/res/mipmap-anydpi/ic_launcher_red_round.xml
similarity index 100%
rename from app/src/main/res/mipmap-anydpi-v26/ic_launcher_red_round.xml
rename to app/src/main/res/mipmap-anydpi/ic_launcher_red_round.xml
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_silhouette.xml b/app/src/main/res/mipmap-anydpi/ic_launcher_silhouette.xml
similarity index 100%
rename from app/src/main/res/mipmap-anydpi-v26/ic_launcher_silhouette.xml
rename to app/src/main/res/mipmap-anydpi/ic_launcher_silhouette.xml
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_silhouette_round.xml b/app/src/main/res/mipmap-anydpi/ic_launcher_silhouette_round.xml
similarity index 100%
rename from app/src/main/res/mipmap-anydpi-v26/ic_launcher_silhouette_round.xml
rename to app/src/main/res/mipmap-anydpi/ic_launcher_silhouette_round.xml
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_black.png b/app/src/main/res/mipmap-hdpi/ic_launcher_black.png
deleted file mode 100644
index 89c421a2bfff..000000000000
Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_black.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_black_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_black_round.png
deleted file mode 100644
index e20ba739a493..000000000000
Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_black_round.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_blue.png b/app/src/main/res/mipmap-hdpi/ic_launcher_blue.png
deleted file mode 100644
index 56ab419d08ff..000000000000
Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_blue.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_blue_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_blue_round.png
deleted file mode 100644
index e6d3d2c5bd19..000000000000
Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_blue_round.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_gold.png b/app/src/main/res/mipmap-hdpi/ic_launcher_gold.png
deleted file mode 100644
index 9d66e2d358b9..000000000000
Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_gold.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_gold_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_gold_round.png
deleted file mode 100644
index 2d98fb3d86b7..000000000000
Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_gold_round.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_green.png b/app/src/main/res/mipmap-hdpi/ic_launcher_green.png
deleted file mode 100644
index 7c0f1f9610c8..000000000000
Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_green.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_green_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_green_round.png
deleted file mode 100644
index a8605876e19c..000000000000
Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_green_round.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_purple.png b/app/src/main/res/mipmap-hdpi/ic_launcher_purple.png
deleted file mode 100644
index 81e95e93f10b..000000000000
Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_purple.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_purple_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_purple_round.png
deleted file mode 100644
index 85f68b9496f9..000000000000
Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_purple_round.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_red.png b/app/src/main/res/mipmap-hdpi/ic_launcher_red.png
deleted file mode 100644
index 00ce4f0f33a1..000000000000
Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_red.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_red_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_red_round.png
deleted file mode 100644
index 266356a369d3..000000000000
Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_red_round.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_silhouette.png b/app/src/main/res/mipmap-hdpi/ic_launcher_silhouette.png
deleted file mode 100644
index 713d231a2c72..000000000000
Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_silhouette.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_silhouette_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_silhouette_round.png
deleted file mode 100644
index 7e8abd7e087e..000000000000
Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_silhouette_round.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_black.png b/app/src/main/res/mipmap-mdpi/ic_launcher_black.png
deleted file mode 100644
index c19d8f6481e3..000000000000
Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher_black.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_black_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_black_round.png
deleted file mode 100644
index 336f5a447644..000000000000
Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher_black_round.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_blue.png b/app/src/main/res/mipmap-mdpi/ic_launcher_blue.png
deleted file mode 100644
index 11f32ede1b35..000000000000
Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher_blue.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_blue_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_blue_round.png
deleted file mode 100644
index a91a2e85a69b..000000000000
Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher_blue_round.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_gold.png b/app/src/main/res/mipmap-mdpi/ic_launcher_gold.png
deleted file mode 100644
index 219a4ea0bf4a..000000000000
Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher_gold.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_gold_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_gold_round.png
deleted file mode 100644
index 560ac84ec341..000000000000
Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher_gold_round.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_green.png b/app/src/main/res/mipmap-mdpi/ic_launcher_green.png
deleted file mode 100644
index c48e2cc80a45..000000000000
Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher_green.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_green_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_green_round.png
deleted file mode 100644
index 47de4435b380..000000000000
Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher_green_round.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_purple.png b/app/src/main/res/mipmap-mdpi/ic_launcher_purple.png
deleted file mode 100644
index 6a9ad52cd190..000000000000
Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher_purple.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_purple_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_purple_round.png
deleted file mode 100644
index d6b1429da1a8..000000000000
Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher_purple_round.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_red.png b/app/src/main/res/mipmap-mdpi/ic_launcher_red.png
deleted file mode 100644
index d8b81bd90add..000000000000
Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher_red.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_red_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_red_round.png
deleted file mode 100644
index 0f2db3360c46..000000000000
Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher_red_round.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_silhouette.png b/app/src/main/res/mipmap-mdpi/ic_launcher_silhouette.png
deleted file mode 100644
index 7fe08530e9fd..000000000000
Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher_silhouette.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_silhouette_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_silhouette_round.png
deleted file mode 100644
index c84e3d2d4edc..000000000000
Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher_silhouette_round.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_black.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_black.png
deleted file mode 100644
index 2f107bdead9a..000000000000
Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_black.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_black_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_black_round.png
deleted file mode 100644
index 9a8b822c57f1..000000000000
Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_black_round.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_blue.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_blue.png
deleted file mode 100644
index 6312bd50aa63..000000000000
Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_blue.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_blue_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_blue_round.png
deleted file mode 100644
index c6225f068f7d..000000000000
Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_blue_round.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_gold.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_gold.png
deleted file mode 100644
index 89962d526ae9..000000000000
Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_gold.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_gold_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_gold_round.png
deleted file mode 100644
index f7444074bd60..000000000000
Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_gold_round.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_green.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_green.png
deleted file mode 100644
index 79b5c5c96955..000000000000
Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_green.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_green_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_green_round.png
deleted file mode 100644
index b3537c141705..000000000000
Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_green_round.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_purple.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_purple.png
deleted file mode 100644
index c4dfb4c8f81c..000000000000
Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_purple.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_purple_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_purple_round.png
deleted file mode 100644
index 45f9f7dd3f66..000000000000
Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_purple_round.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_red.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_red.png
deleted file mode 100644
index 5b52e2303f02..000000000000
Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_red.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_red_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_red_round.png
deleted file mode 100644
index e539e526985e..000000000000
Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_red_round.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_silhouette.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_silhouette.png
deleted file mode 100644
index 722319c17422..000000000000
Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_silhouette.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_silhouette_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_silhouette_round.png
deleted file mode 100644
index 4a435c9281dc..000000000000
Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_silhouette_round.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_black.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_black.png
deleted file mode 100644
index 62df6e3ec3bc..000000000000
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_black.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_black_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_black_round.png
deleted file mode 100644
index a037da1be036..000000000000
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_black_round.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_blue.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_blue.png
deleted file mode 100644
index 34995c0ec7eb..000000000000
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_blue.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_blue_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_blue_round.png
deleted file mode 100644
index 326a0127b3a1..000000000000
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_blue_round.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_gold.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_gold.png
deleted file mode 100644
index 069174854938..000000000000
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_gold.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_gold_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_gold_round.png
deleted file mode 100644
index 1aec14b96a42..000000000000
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_gold_round.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_green.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_green.png
deleted file mode 100644
index 8b9aefaa188c..000000000000
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_green.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_green_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_green_round.png
deleted file mode 100644
index 51d28d6a0f52..000000000000
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_green_round.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_purple.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_purple.png
deleted file mode 100644
index e304b11fb951..000000000000
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_purple.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_purple_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_purple_round.png
deleted file mode 100644
index a23c28b37628..000000000000
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_purple_round.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_red.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_red.png
deleted file mode 100644
index 7a1b70ee708d..000000000000
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_red.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_red_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_red_round.png
deleted file mode 100644
index c37eace3c3dc..000000000000
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_red_round.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_silhouette.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_silhouette.png
deleted file mode 100644
index 53052f4cf4dc..000000000000
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_silhouette.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_silhouette_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_silhouette_round.png
deleted file mode 100644
index ef24075c4102..000000000000
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_silhouette_round.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_black.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_black.png
deleted file mode 100644
index 2c2ab2cf6ba4..000000000000
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_black.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_black_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_black_round.png
deleted file mode 100644
index 521121c4721e..000000000000
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_black_round.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_blue.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_blue.png
deleted file mode 100644
index 557ff860bcdb..000000000000
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_blue.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_blue_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_blue_round.png
deleted file mode 100644
index d9858f88bffe..000000000000
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_blue_round.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_gold.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_gold.png
deleted file mode 100644
index 07f8ce172962..000000000000
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_gold.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_gold_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_gold_round.png
deleted file mode 100644
index de10cc4cb7f6..000000000000
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_gold_round.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_green.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_green.png
deleted file mode 100644
index 456d83591457..000000000000
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_green.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_green_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_green_round.png
deleted file mode 100644
index 02d1bb730c3c..000000000000
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_green_round.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_purple.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_purple.png
deleted file mode 100644
index fbe878cef14c..000000000000
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_purple.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_purple_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_purple_round.png
deleted file mode 100644
index e4a20f71b598..000000000000
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_purple_round.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_red.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_red.png
deleted file mode 100644
index 4d4282747a40..000000000000
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_red.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_red_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_red_round.png
deleted file mode 100644
index 73ad847ef89a..000000000000
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_red_round.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_silhouette.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_silhouette.png
deleted file mode 100644
index dec636176351..000000000000
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_silhouette.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_silhouette_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_silhouette_round.png
deleted file mode 100644
index 67e7d5c92c9b..000000000000
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_silhouette_round.png and /dev/null differ
diff --git a/common/common-ui/src/main/res/values-v23/design-system-theming.xml b/common/common-ui/src/main/res/values-v23/design-system-theming.xml
deleted file mode 100644
index 4711a26269db..000000000000
--- a/common/common-ui/src/main/res/values-v23/design-system-theming.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<!--
-  ~ Copyright (c) 2018 DuckDuckGo
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<resources xmlns:tools="http://schemas.android.com/tools">
-
-    <style name="Platform.V23.Theme.DuckDuckGo" parent="Theme.MaterialComponents.DayNight.NoActionBar">
-        <!-- Controls whether status bar icons are light/dark - `minSdkVersion 23`-->
-        <item name="android:windowLightStatusBar">?attr/preferDarkStatusBarIcons</item>
-        <item name="preferDarkNavigationBarIcons">false</item>
-        <item name="preferredNavigationBarColor">@color/black</item>
-    </style>
-
-    <style name="Platform.Theme.DuckDuckGo" parent="Platform.V23.Theme.DuckDuckGo"/>
-
-</resources>
diff --git a/common/common-ui/src/main/res/values-v23/widgets.xml b/common/common-ui/src/main/res/values-v23/widgets.xml
deleted file mode 100644
index 00832d088f51..000000000000
--- a/common/common-ui/src/main/res/values-v23/widgets.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (c) 2022 DuckDuckGo
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~     http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<resources>
-
-    <style name="Widget.DuckDuckGo.DialogFullScreen">
-        <item name="android:windowIsFloating">false</item>
-    </style>
-
-</resources>
\ No newline at end of file
diff --git a/common/common-ui/src/main/res/values-v27/design-system-theming.xml b/common/common-ui/src/main/res/values-v27/design-system-theming.xml
index 66c44c3102e5..a254e070dafb 100644
--- a/common/common-ui/src/main/res/values-v27/design-system-theming.xml
+++ b/common/common-ui/src/main/res/values-v27/design-system-theming.xml
@@ -18,13 +18,13 @@
 
 <resources xmlns:tools="http://schemas.android.com/tools">
 
-    <style name="Platform.V27.Theme.DuckDuckGo" parent="Platform.V23.Theme.DuckDuckGo">
+    <style name="Platform.Theme.DuckDuckGo" parent="Theme.MaterialComponents.DayNight.NoActionBar">
         <item name="android:windowLightStatusBar" >?attr/preferDarkStatusBarIcons</item>
         <item name="android:windowLightNavigationBar">?attr/preferDarkNavigationBarIcons</item>
         <item name="android:statusBarColor">?attr/preferredStatusBarColor</item>
-        <item name="android:navigationBarColor" tools:ignore="NewApi">?attr/preferredNavigationBarColor</item>
+        <item name="android:navigationBarColor">?attr/preferredNavigationBarColor</item>
+        <item name="preferDarkNavigationBarIcons">false</item>
+        <item name="preferredNavigationBarColor">?attr/daxColorBlack</item>
     </style>
 
-    <style name="Platform.Theme.DuckDuckGo" parent="Platform.V27.Theme.DuckDuckGo" />
-
 </resources>
diff --git a/common/common-ui/src/main/res/values/design-system-theming.xml b/common/common-ui/src/main/res/values/design-system-theming.xml
index cc6e59e04b68..d4b1429420c3 100644
--- a/common/common-ui/src/main/res/values/design-system-theming.xml
+++ b/common/common-ui/src/main/res/values/design-system-theming.xml
@@ -23,14 +23,10 @@
     <attr name="preferredNavigationBarColor" format="color" />
 
     <!-- The platform theme is where OS version specific flags are used. -->
-    <style name="Platform.V23.Theme.DuckDuckGo" parent="Theme.MaterialComponents.DayNight.NoActionBar"/>
-
-    <style name="Platform.Theme.DuckDuckGo" parent="Platform.V23.Theme.DuckDuckGo">
-        <item name="android:windowActivityTransitions" tools:ignore="NewApi">true</item>
-        <item name="android:windowLightStatusBar" tools:ignore="NewApi">?attr/preferDarkStatusBarIcons</item>
-        <item name="android:windowLightNavigationBar" tools:ignore="NewApi">?attr/preferDarkNavigationBarIcons</item>
-        <item name="android:statusBarColor" tools:ignore="NewApi">?attr/preferredStatusBarColor</item>
-        <item name="android:navigationBarColor" tools:ignore="NewApi">?attr/preferredNavigationBarColor</item>
+    <style name="Platform.Theme.DuckDuckGo" parent="Theme.MaterialComponents.DayNight.NoActionBar">
+        <item name="android:windowLightStatusBar">?attr/preferDarkStatusBarIcons</item>
+        <item name="preferDarkNavigationBarIcons">false</item>
+        <item name="preferredNavigationBarColor">?attr/daxColorBlack</item>
     </style>
 
     <!--  Our base theme, Base.Theme.DuckDuckGo,
diff --git a/common/common-ui/src/main/res/values/widgets.xml b/common/common-ui/src/main/res/values/widgets.xml
index bf34ddd11084..cbb19c4aaaf5 100644
--- a/common/common-ui/src/main/res/values/widgets.xml
+++ b/common/common-ui/src/main/res/values/widgets.xml
@@ -286,7 +286,6 @@
 
     <style name="Widget.DuckDuckGo.DialogFullScreen">
         <item name="android:windowIsFloating">false</item>
-        <item name="android:windowTranslucentStatus">true</item>
     </style>
 
     <!-- Dax Dialog -->