ADS: Code and Attributes cleanup (#2746)

Task/Issue URL:
https://app.asana.com/0/1174433894299346/1203720277615468

### Description

### Steps to test this PR
Background
Task to track the work of removing unnecessary code in the app

Scope:
Attributes no longer in use
Remove old ButtonPrimaryRounded, ButtonSecondaryRounded, etc
Remove unused styles

app-tracking-protection/vpn-impl/src/main/java/com/duckduckgo/mobile/android/vpn/ui/tracker_activity/DeviceShieldTrackerActivity.kt

@@ -635,7 +635,7 @@ class DeviceShieldTrackerActivity :
 
     private fun launchKonfetti() {
         val magenta = ResourcesCompat.getColor(getResources(), com.duckduckgo.mobile.android.R.color.magenta, null)
-        val blue = ResourcesCompat.getColor(getResources(), com.duckduckgo.mobile.android.R.color.accentBlue, null)
+        val blue = ResourcesCompat.getColor(getResources(), com.duckduckgo.mobile.android.R.color.blue30, null)
         val purple = ResourcesCompat.getColor(getResources(), com.duckduckgo.mobile.android.R.color.purple, null)
         val green = ResourcesCompat.getColor(getResources(), com.duckduckgo.mobile.android.R.color.green, null)
         val yellow = ResourcesCompat.getColor(getResources(), com.duckduckgo.mobile.android.R.color.yellow, null)

app-tracking-protection/vpn-impl/src/main/res/drawable/ic_arrow_down.xml

@@ -5,6 +5,6 @@
     android:viewportHeight="6">
     <path
         android:fillAlpha="0.8"
-        android:fillColor="?attr/primaryIconColor"
+        android:fillColor="?attr/daxColorPrimaryIcon"
         android:pathData="M4.4999,5.25C4.3205,5.2498 4.1469,5.186 4.0099,5.07L0.4999,2.07C0.3487,1.9374 0.2564,1.7502 0.2433,1.5495C0.2302,1.3489 0.2973,1.1512 0.4299,1C0.5625,0.8489 0.7498,0.7566 0.9504,0.7434C1.1511,0.7303 1.3487,0.7974 1.4999,0.93L4.4999,3.51L7.4999,0.93C7.5748,0.8644 7.6618,0.8141 7.7561,0.7821C7.8504,0.7501 7.9501,0.7369 8.0494,0.7434C8.1488,0.7499 8.2459,0.7759 8.3352,0.82C8.4245,0.864 8.5043,0.9252 8.5699,1C8.6356,1.0749 8.6859,1.1619 8.7179,1.2562C8.7499,1.3505 8.763,1.4502 8.7565,1.5495C8.75,1.6489 8.724,1.746 8.68,1.8353C8.636,1.9246 8.5748,2.0044 8.4999,2.07L4.9999,5.07C4.8604,5.1883 4.6828,5.2522 4.4999,5.25Z" />
 </vector>

app-tracking-protection/vpn-impl/src/main/res/drawable/ic_block.xml

@@ -27,6 +27,6 @@
             android:fillColor="@color/whiteFive"/>
         <path
             android:pathData="M20,12C20,16.4183 16.4183,20 12,20C7.5817,20 4,16.4183 4,12C4,7.5817 7.5817,4 12,4C16.4183,4 20,7.5817 20,12ZM17,12C17,11.1655 16.7956,10.3788 16.4341,9.6872L9.6872,16.4341C10.3788,16.7956 11.1655,17 12,17C14.7614,17 17,14.7614 17,12ZM7.5659,14.3127L14.3127,7.5659C13.6211,7.2044 12.8344,7 12,7C9.2386,7 7,9.2386 7,12C7,12.8344 7.2044,13.6211 7.5659,14.3127Z"
-            android:fillColor="@color/marketing_red"/>
+            android:fillColor="?attr/daxColorDestructive"/>
     </group>
 </vector>

app-tracking-protection/vpn-impl/src/main/res/drawable/ic_green_key.xml

@@ -22,7 +22,7 @@
     <group>
         <clip-path android:pathData="M54,0L54,0A54,54 0,0 1,108 54L108,54A54,54 0,0 1,54 108L54,108A54,54 0,0 1,0 54L0,54A54,54 0,0 1,54 0z" />
         <path
-            android:fillColor="?attr/listItemImageBackground"
+            android:fillColor="?attr/daxColorContainer"
             android:pathData="M0,0h108v108h-108z" />
         <group>
             <clip-path android:pathData="M18,23h72v85h-72z" />

app-tracking-protection/vpn-impl/src/main/res/drawable/ic_oval_background.xml

@@ -16,7 +16,7 @@
 
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="oval">
-    <solid android:color="?attr/listItemImageBackground" />
+    <solid android:color="?attr/daxColorContainer" />
     <size
         android:width="@dimen/listItemImageContainerSize"
         android:height="@dimen/listItemImageContainerSize" />

app-tracking-protection/vpn-impl/src/main/res/drawable/ic_signal_advertising_id.xml

@@ -21,5 +21,5 @@
         android:viewportHeight="16">
     <path
         android:pathData="M5.86,6.16V3.6667C5.86,2.7467 6.6067,2 7.5267,2C8.4467,2 9.1933,2.7467 9.1933,3.6667V6.16C10,5.62 10.5267,4.7067 10.5267,3.6667C10.5267,2.0067 9.1867,0.6667 7.5267,0.6667C5.8667,0.6667 4.5267,2.0067 4.5267,3.6667C4.5267,4.7067 5.0533,5.62 5.86,6.16ZM9.5267,7.8067C9.34,7.7133 9.14,7.6667 8.9333,7.6667H8.5267V3.6667C8.5267,3.1133 8.08,2.6667 7.5267,2.6667C6.9733,2.6667 6.5267,3.1133 6.5267,3.6667V10.8267L4.2333,10.3467C3.9867,10.2933 3.7267,10.3733 3.5467,10.5533C3.26,10.8467 3.26,11.3133 3.5467,11.6067L6.22,14.28C6.4733,14.5267 6.8133,14.6667 7.1667,14.6667H11.2333C11.9,14.6667 12.46,14.18 12.5533,13.52L12.9733,10.54C13.0533,9.9733 12.76,9.4133 12.2467,9.16L9.5267,7.8067Z"
-        android:fillColor="?attr/primaryIconColor"/>
+        android:fillColor="?attr/daxColorPrimaryIcon"/>
 </vector>

app-tracking-protection/vpn-impl/src/main/res/drawable/ic_signal_app.xml

@@ -21,5 +21,5 @@
     android:viewportHeight="16">
   <path
       android:pathData="M8.6624,9.1341V12.7334C8.6624,13.0634 8.9322,13.3333 9.262,13.3333H12.8594C13.1892,13.3333 13.459,13.0634 13.459,12.7334V9.1341C13.459,8.8042 13.1892,8.5343 12.8594,8.5343H9.262C8.9322,8.5343 8.6624,8.8042 8.6624,9.1341ZM3.2663,13.3333H6.8637C7.1935,13.3333 7.4633,13.0634 7.4633,12.7334V9.1341C7.4633,8.8042 7.1935,8.5343 6.8637,8.5343H3.2663C2.9365,8.5343 2.6667,8.8042 2.6667,9.1341V12.7334C2.6667,13.0634 2.9365,13.3333 3.2663,13.3333ZM2.6667,3.1353V6.7346C2.6667,7.0645 2.9365,7.3345 3.2663,7.3345H6.8637C7.1935,7.3345 7.4633,7.0645 7.4633,6.7346V3.1353C7.4633,2.8054 7.1935,2.5354 6.8637,2.5354H3.2663C2.9365,2.5354 2.6667,2.8054 2.6667,3.1353ZM10.4312,2.1755L7.883,4.719C7.6492,4.9529 7.6492,5.3309 7.883,5.5648L10.4312,8.1143C10.665,8.3483 11.0427,8.3483 11.2765,8.1143L13.8247,5.5648C14.0585,5.3309 14.0585,4.9529 13.8247,4.719L11.2825,2.1755C11.0487,1.9415 10.665,1.9415 10.4312,2.1755Z"
-      android:fillColor="?attr/primaryIconColor"/>
+      android:fillColor="?attr/daxColorPrimaryIcon"/>
 </vector>

app-tracking-protection/vpn-impl/src/main/res/drawable/ic_signal_battery.xml

@@ -21,5 +21,5 @@
     android:viewportHeight="16">
   <path
       android:pathData="M10.4467,3.3333H9.3334V2.6667C9.3334,2.3 9.0334,2 8.6667,2H7.3334C6.9668,2 6.6667,2.3 6.6667,2.6667V3.3333H5.5534C5.0668,3.3333 4.6667,3.7333 4.6667,4.22V13.1067C4.6667,13.6 5.0668,14 5.5601,14H10.4401C10.9334,14 11.3334,13.6 11.3334,13.1133V4.22C11.3334,3.7333 10.9334,3.3333 10.4467,3.3333Z"
-      android:fillColor="?attr/primaryIconColor"/>
+      android:fillColor="?attr/daxColorPrimaryIcon"/>
 </vector>

app-tracking-protection/vpn-impl/src/main/res/drawable/ic_signal_brightness.xml

@@ -21,5 +21,5 @@
     android:viewportHeight="16">
   <path
       android:pathData="M8.2597,2.5027C6.911,2.1683 5.6075,2.3497 4.5025,2.8654C4.3041,2.956 4.2701,3.228 4.4458,3.3527C5.9192,4.3728 6.8826,6.0729 6.8826,7.9997C6.8826,9.9264 5.9192,11.6265 4.4458,12.6466C4.2645,12.7713 4.2985,13.0433 4.4968,13.1339C5.2222,13.474 6.0326,13.6666 6.8826,13.6666C10.3111,13.6666 13.0313,10.6178 12.4759,7.0929C12.1302,4.8715 10.4415,3.0354 8.2597,2.5027Z"
-      android:fillColor="?attr/primaryIconColor"/>
+      android:fillColor="?attr/daxColorPrimaryIcon"/>
 </vector>

app-tracking-protection/vpn-impl/src/main/res/drawable/ic_signal_cookie.xml

@@ -21,5 +21,5 @@
     android:viewportHeight="16">
   <path
       android:pathData="M13.2397,7.3843C12.5548,7.1975 11.9323,6.558 11.9436,5.7486C11.9492,5.4317 11.7172,5.1713 11.4002,5.177C10.1607,5.194 9.125,4.1695 9.125,2.9244C9.125,2.6471 8.9269,2.415 8.6496,2.3811C4.8971,1.9056 2.3333,5.0695 2.3333,8.0069C2.3333,11.1311 4.8688,13.6667 7.993,13.6667C11.1682,13.6667 13.7151,11.0519 13.6528,7.905C13.6472,7.656 13.4774,7.4466 13.2397,7.3843ZM6.0121,9.7048C5.5423,9.7048 5.1631,9.3256 5.1631,8.8559C5.1631,8.3861 5.5423,8.0069 6.0121,8.0069C6.4819,8.0069 6.8611,8.3861 6.8611,8.8559C6.8611,9.3256 6.4819,9.7048 6.0121,9.7048ZM7.1441,6.8749C6.6743,6.8749 6.2951,6.4957 6.2951,6.026C6.2951,5.5562 6.6743,5.177 7.1441,5.177C7.6138,5.177 7.993,5.5562 7.993,6.026C7.993,6.4957 7.6138,6.8749 7.1441,6.8749ZM9.691,10.2708C9.3797,10.2708 9.125,10.0161 9.125,9.7048C9.125,9.3935 9.3797,9.1389 9.691,9.1389C10.0023,9.1389 10.257,9.3935 10.257,9.7048C10.257,10.0161 10.0023,10.2708 9.691,10.2708Z"
-      android:fillColor="?attr/primaryIconColor"/>
+      android:fillColor="?attr/daxColorPrimaryIcon"/>
 </vector>

app-tracking-protection/vpn-impl/src/main/res/drawable/ic_signal_device.xml

@@ -21,5 +21,5 @@
     android:viewportHeight="16">
   <path
       android:pathData="M10.6667,1.34L5.3333,1.3333C4.6,1.3333 4,1.9333 4,2.6667V13.3333C4,14.0667 4.6,14.6667 5.3333,14.6667H10.6667C11.4,14.6667 12,14.0667 12,13.3333V2.6667C12,1.9333 11.4,1.34 10.6667,1.34ZM10.6667,11.3333H5.3333V4.6667H10.6667V11.3333Z"
-      android:fillColor="?attr/primaryIconColor"/>
+      android:fillColor="?attr/daxColorPrimaryIcon"/>
 </vector>

app-tracking-protection/vpn-impl/src/main/res/drawable/ic_signal_gps.xml

@@ -21,5 +21,5 @@
     android:viewportHeight="16">
   <path
       android:pathData="M12.5,2.6267L2.7133,6.72C2.16,6.9534 2.1733,7.74 2.7267,7.9534L6.2867,9.3334C6.46,9.4 6.6,9.54 6.6667,9.7134L8.04,13.2667C8.2533,13.8267 9.0467,13.84 9.28,13.2867L13.38,3.5067C13.6,2.9534 13.0467,2.4 12.5,2.6267V2.6267Z"
-      android:fillColor="?attr/primaryIconColor"/>
+      android:fillColor="?attr/daxColorPrimaryIcon"/>
 </vector>

app-tracking-protection/vpn-impl/src/main/res/drawable/ic_signal_identifiers.xml

@@ -21,5 +21,5 @@
     android:viewportHeight="16">
   <path
       android:pathData="M3.2386,13.3333H12.1856C12.8169,13.3333 13.3334,12.817 13.3334,12.186V3.2426C13.3334,2.7321 12.7136,2.4739 12.3521,2.8353L2.8369,12.3524C2.4753,12.7138 2.7278,13.3333 3.2386,13.3333Z"
-      android:fillColor="?attr/primaryIconColor"/>
+      android:fillColor="?attr/daxColorPrimaryIcon"/>
 </vector>

app-tracking-protection/vpn-impl/src/main/res/drawable/ic_signal_os.xml

@@ -21,5 +21,5 @@
     android:viewportHeight="16">
   <path
       android:pathData="M12.0491,6.0392H10.762V2.1176C10.762,1.6863 10.3977,1.3333 9.9525,1.3333H6.7144C6.2691,1.3333 5.9048,1.6863 5.9048,2.1176V6.0392H4.6177C3.8972,6.0392 3.5329,6.8863 4.0429,7.3804L7.7586,10.9804C8.0744,11.2863 8.5844,11.2863 8.9001,10.9804L12.6158,7.3804C13.1258,6.8863 12.7696,6.0392 12.0491,6.0392ZM2.6667,13.8823C2.6667,14.3137 3.031,14.6667 3.4763,14.6667H13.1906C13.6358,14.6667 14.0001,14.3137 14.0001,13.8823C14.0001,13.451 13.6358,13.098 13.1906,13.098H3.4763C3.031,13.098 2.6667,13.451 2.6667,13.8823Z"
-      android:fillColor="?attr/primaryIconColor"/>
+      android:fillColor="?attr/daxColorPrimaryIcon"/>
 </vector>

app-tracking-protection/vpn-impl/src/main/res/drawable/ic_signal_person.xml

@@ -21,5 +21,5 @@
     android:viewportHeight="16">
   <path
       android:pathData="M7.9999,8C9.5653,8 10.8333,6.7321 10.8333,5.1667C10.8333,3.6013 9.5653,2.3334 7.9999,2.3334C6.4345,2.3334 5.1666,3.6013 5.1666,5.1667C5.1666,6.7321 6.4345,8 7.9999,8ZM7.9999,9.4167C6.1087,9.4167 2.3333,10.3659 2.3333,12.25V12.9584C2.3333,13.348 2.652,13.6667 3.0416,13.6667H12.9583C13.3478,13.6667 13.6666,13.348 13.6666,12.9584V12.25C13.6666,10.3659 9.8912,9.4167 7.9999,9.4167Z"
-      android:fillColor="?attr/primaryIconColor"/>
+      android:fillColor="?attr/daxColorPrimaryIcon"/>
 </vector>

app-tracking-protection/vpn-impl/src/main/res/drawable/ic_signal_pin.xml

@@ -5,6 +5,6 @@
     android:viewportHeight="16">
   <path
       android:pathData="M13.3333,7.407C13.3333,3.8603 10.669,2 8.3333,2C5.9975,2 3.3333,3.8603 3.3333,7.407C3.3333,9.6605 4.8547,12.0275 7.8975,14.5079C8.1547,14.7196 8.5118,14.7196 8.769,14.5079C11.8118,12.035 13.3333,9.6605 13.3333,7.407ZM8.3333,8.6667C9.2537,8.6667 9.9999,7.9205 9.9999,7C9.9999,6.0795 9.2537,5.3333 8.3333,5.3333C7.4128,5.3333 6.6666,6.0795 6.6666,7C6.6666,7.9205 7.4128,8.6667 8.3333,8.6667Z"
-      android:fillColor="?attr/primaryIconColor"
+      android:fillColor="?attr/daxColorPrimaryIcon"
       android:fillType="evenOdd"/>
 </vector>

app-tracking-protection/vpn-impl/src/main/res/drawable/ic_signal_sensor.xml

@@ -21,8 +21,8 @@
     android:viewportHeight="16">
   <path
       android:pathData="M9.9581,7.9871L9.2592,6.5956L7.301,10.5056C7.2003,10.7197 6.9799,10.8519 6.7407,10.8519C6.5014,10.8519 6.281,10.7197 6.1803,10.5056L5.091,8.3334H2.3333V11.4815C2.3333,12.1741 2.8999,12.7408 3.5925,12.7408H12.4073C13.0999,12.7408 13.6666,12.1741 13.6666,11.4815V8.3334H10.5184C10.2792,8.3334 10.0588,8.2011 9.9581,7.9871Z"
-      android:fillColor="?attr/primaryIconColor"/>
+      android:fillColor="?attr/daxColorPrimaryIcon"/>
   <path
       android:pathData="M12.4073,2.6667H3.5925C2.8999,2.6667 2.3333,3.2334 2.3333,3.926V7.0741H5.4814C5.7207,7.0741 5.941,7.2063 6.0418,7.4204L6.7407,8.8119L8.6988,4.9019C8.9129,4.4737 9.6118,4.4737 9.8258,4.9019L10.9088,7.0741H13.6666V3.926C13.6666,3.2334 13.0999,2.6667 12.4073,2.6667Z"
-      android:fillColor="?attr/primaryIconColor"/>
+      android:fillColor="?attr/daxColorPrimaryIcon"/>
 </vector>

app-tracking-protection/vpn-impl/src/main/res/drawable/ic_signal_settings.xml

@@ -21,5 +21,5 @@
     android:viewportHeight="16">
   <path
       android:pathData="M12.6281,8C12.6281,7.862 12.6219,7.73 12.6095,7.592L13.7573,6.746C14.0041,6.566 14.072,6.23 13.9177,5.966L12.7638,4.028C12.6095,3.764 12.2763,3.656 11.9925,3.776L10.6658,4.322C10.4374,4.166 10.1968,4.028 9.9438,3.914L9.7648,2.528C9.7278,2.228 9.4625,2 9.1539,2H6.8522C6.5375,2 6.2722,2.228 6.2352,2.528L6.0562,3.914C5.8032,4.028 5.5626,4.166 5.3342,4.322L4.0075,3.776C3.7237,3.656 3.3905,3.764 3.2362,4.028L2.0823,5.972C1.928,6.236 1.9959,6.566 2.2427,6.752L3.3905,7.598C3.3781,7.73 3.3719,7.862 3.3719,8C3.3719,8.138 3.3781,8.27 3.3905,8.408L2.2427,9.254C1.9959,9.434 1.928,9.77 2.0823,10.034L3.2362,11.972C3.3905,12.236 3.7237,12.344 4.0075,12.224L5.3342,11.678C5.5626,11.834 5.8032,11.972 6.0562,12.086L6.2352,13.472C6.2722,13.772 6.5375,14 6.8461,14H9.1478C9.4563,14 9.7216,13.772 9.7587,13.472L9.9376,12.086C10.1906,11.972 10.4313,11.834 10.6596,11.678L11.9863,12.224C12.2702,12.344 12.6034,12.236 12.7576,11.972L13.9116,10.034C14.0658,9.77 13.998,9.44 13.7511,9.254L12.6034,8.408C12.6219,8.27 12.6281,8.138 12.6281,8ZM8.0247,10.1C6.8337,10.1 5.8649,9.158 5.8649,8C5.8649,6.842 6.8337,5.9 8.0247,5.9C9.2156,5.9 10.1844,6.842 10.1844,8C10.1844,9.158 9.2156,10.1 8.0247,10.1Z"
-      android:fillColor="?attr/primaryIconColor"/>
+      android:fillColor="?attr/daxColorPrimaryIcon"/>
 </vector>

app-tracking-protection/vpn-impl/src/main/res/drawable/ic_signal_storage.xml

@@ -21,5 +21,5 @@
     android:viewportHeight="16">
   <path
       android:pathData="M11.4999,2.3333H7.3174C7.0083,2.3333 6.7108,2.4593 6.4891,2.6873L3.6832,5.5853C3.4674,5.8073 3.3333,6.1133 3.3333,6.4253V12.4667C3.3333,13.1267 3.8582,13.6667 4.4999,13.6667H11.4999C12.1416,13.6667 12.6666,13.1267 12.6666,12.4667V3.5333C12.6666,2.8733 12.1416,2.3333 11.4999,2.3333ZM7.4166,5.9333C7.0957,5.9333 6.8333,5.6633 6.8333,5.3333V4.1333C6.8333,3.8033 7.0957,3.5333 7.4166,3.5333C7.7374,3.5333 7.9999,3.8033 7.9999,4.1333V5.3333C7.9999,5.6633 7.7374,5.9333 7.4166,5.9333ZM9.1666,5.9333C8.8457,5.9333 8.5833,5.6633 8.5833,5.3333V4.1333C8.5833,3.8033 8.8457,3.5333 9.1666,3.5333C9.4874,3.5333 9.7499,3.8033 9.7499,4.1333V5.3333C9.7499,5.6633 9.4874,5.9333 9.1666,5.9333ZM10.9166,5.9333C10.5958,5.9333 10.3333,5.6633 10.3333,5.3333V4.1333C10.3333,3.8033 10.5958,3.5333 10.9166,3.5333C11.2374,3.5333 11.4999,3.8033 11.4999,4.1333V5.3333C11.4999,5.6633 11.2374,5.9333 10.9166,5.9333Z"
-      android:fillColor="?attr/primaryIconColor"/>
+      android:fillColor="?attr/daxColorPrimaryIcon"/>
 </vector>

app-tracking-protection/vpn-impl/src/main/res/drawable/ic_signal_time.xml

@@ -21,5 +21,5 @@
     android:viewportHeight="16">
   <path
       android:pathData="M7.9942,2.3333C4.8663,2.3333 2.3333,4.872 2.3333,8C2.3333,11.128 4.8663,13.6666 7.9942,13.6666C11.1279,13.6666 13.6666,11.128 13.6666,8C13.6666,4.872 11.1279,2.3333 7.9942,2.3333ZM10.2666,10.2666C10.0456,10.4876 9.6886,10.4876 9.4676,10.2666L7.6033,8.4023C7.4956,8.2947 7.4332,8.153 7.4332,8V5.7333C7.4332,5.4216 7.6883,5.1666 7.9999,5.1666C8.3116,5.1666 8.5666,5.4216 8.5666,5.7333V7.7677L10.2666,9.4677C10.4876,9.6887 10.4876,10.0456 10.2666,10.2666Z"
-      android:fillColor="?attr/primaryIconColor"/>
+      android:fillColor="?attr/daxColorPrimaryIcon"/>
 </vector>

app-tracking-protection/vpn-impl/src/main/res/drawable/ic_signal_volume.xml

@@ -21,5 +21,5 @@
     android:viewportHeight="16">
   <path
       android:pathData="M3.3333,6.1833V9.8258C3.3333,10.3266 3.7999,10.7364 4.3703,10.7364H7.4814L10.8933,13.7323C11.5466,14.306 12.6666,13.8962 12.6666,13.0857V2.9143C12.6666,2.1038 11.5466,1.694 10.8933,2.2677L7.4814,5.2727H4.3703C3.7999,5.2727 3.3333,5.6825 3.3333,6.1833Z"
-      android:fillColor="?attr/primaryIconColor"/>
+      android:fillColor="?attr/daxColorPrimaryIcon"/>
 </vector>

app-tracking-protection/vpn-impl/src/main/res/drawable/ic_signal_wifi.xml

@@ -21,5 +21,5 @@
     android:viewportHeight="16">
   <path
       android:pathData="M14.0221,6.4273C14.375,5.9877 14.3023,5.334 13.8247,5.0344C12.736,4.3513 10.6781,3.3333 7.9999,3.3333C5.3184,3.3333 3.2624,4.3509 2.1748,5.0339C1.6974,5.3337 1.6249,5.9877 1.9777,6.4273L7.1065,12.8179C7.5646,13.3906 8.4352,13.3906 8.8934,12.8179L14.0221,6.4273Z"
-      android:fillColor="?attr/primaryIconColor"/>
+      android:fillColor="?attr/daxColorPrimaryIcon"/>
 </vector>

app-tracking-protection/vpn-impl/src/main/res/drawable/rounded_top_corners_bottom_sheet_background.xml

@@ -19,5 +19,5 @@
     <corners
         android:topLeftRadius="@dimen/mediumShapeCornerRadius"
         android:topRightRadius="@dimen/mediumShapeCornerRadius" />
-    <solid android:color="?attr/daxDialogBackgroundColor" />
+    <solid android:color="?attr/daxColorSurface" />
 </shape>

app-tracking-protection/vpn-impl/src/main/res/layout/include_company_trackers_toolbar.xml

@@ -27,7 +27,7 @@
         android:id="@+id/default_toolbar"
         android:layout_width="match_parent"
         android:layout_height="?attr/actionBarSize"
-        android:background="?attr/toolbarBgColor"
+        android:background="?attr/daxColorSurface"
         android:theme="@style/Widget.DuckDuckGo.ToolbarTheme"
         app:popupTheme="@style/Widget.DuckDuckGo.PopUpOverflowMenu">
 

app-tracking-protection/vpn-impl/src/main/res/layout/include_trackers_toolbar.xml

@@ -28,7 +28,7 @@
         android:id="@+id/trackers_toolbar"
         android:layout_width="match_parent"
         android:layout_height="?attr/actionBarSize"
-        android:background="?attr/toolbarBgColor"
+        android:background="?attr/daxColorSurface"
         android:theme="@style/Widget.DuckDuckGo.ToolbarTheme"
         app:popupTheme="@style/Widget.DuckDuckGo.PopUpOverflowMenu" />
 

app-tracking-protection/vpn-internal/src/main/res/layout/exception_rule_domain_view.xml

@@ -45,6 +45,6 @@
         android:layout_gravity="center"
         android:button="@null"
         android:drawableEnd="?android:attr/listChoiceIndicatorMultiple"
-        android:theme="@style/PopUpMenuCheckBoxTheme" />
+        android:theme="@style/Widget.DuckDuckGo.PopUpMenuCheckBox" />
 
 </LinearLayout>