diff --git a/app/src/main/res/drawable/ux_file_request.xml b/app/src/main/res/drawable/ux_file_request.xml
index 845797a5..a932eb8c 100644
--- a/app/src/main/res/drawable/ux_file_request.xml
+++ b/app/src/main/res/drawable/ux_file_request.xml
@@ -6,24 +6,24 @@
   <path
       android:pathData="M4.557,40.125a38.721,40.125 0,1 0,77.443 0a38.721,40.125 0,1 0,-77.443 0z"
       android:strokeWidth="7.76499"
-      android:fillColor="@color/material_dynamic_primary100"
+      android:fillColor="?attr/colorSurface"
       android:fillAlpha="0.196078"/>
   <path
       android:pathData="M13.333,40.125a29.945,31.031 0,1 0,59.891 0a29.945,31.031 0,1 0,-59.891 0z"
       android:strokeWidth="6.00512"
-      android:fillColor="@color/material_dynamic_primary100"
+      android:fillColor="?attr/colorSurface"
       android:fillAlpha="0.196078"/>
   <path
       android:pathData="M24.1,40.125a19.179,19.874 0,1 0,38.358 0a19.179,19.874 0,1 0,-38.358 0z"
       android:strokeWidth="3.84605"
-      android:fillColor="@color/material_dynamic_primary100"
+      android:fillColor="?attr/colorSurface"
       android:fillAlpha="0.196078"/>
   <path
       android:pathData="m70.658,10.102 l-13.704,-3.441c-2.535,-0.637 -5.078,0.886 -5.715,3.421L44.356,37.489a4.71,4.71 0,0 0,3.421 5.715l36.543,9.177a4.71,4.71 0,0 0,5.715 -3.421l5.736,-22.84c0.637,-2.535 -0.908,-5.084 -3.421,-5.715l-18.272,-4.589z"
       android:strokeWidth="2.35489"
-      android:fillColor="#db4e5b"/>
+      android:fillColor="?attr/colorTertiary"/>
   <path
       android:pathData="m11.386,55.62 l4.774,3.257 3.159,-7.823 8.836,6.717 -19.927,5.672m23.179,-5.059 l-5.672,-19.927c-0.45,-1.58 -2.091,-2.482 -3.657,-2.036l-19.927,5.672a2.96,2.96 0,0 0,-2.036 3.657l5.672,19.927a2.96,2.96 0,0 0,3.657 2.036l19.927,-5.672a2.96,2.96 0,0 0,2.036 -3.657z"
       android:strokeWidth="1.47992"
-      android:fillColor="@color/foreground"/>
+      android:fillColor="?attr/colorPrimary"/>
 </vector>
diff --git a/app/src/main/res/drawable/ux_file_unpartialise_request.xml b/app/src/main/res/drawable/ux_file_unpartialise_request.xml
index f4734bb6..a3e899ef 100644
--- a/app/src/main/res/drawable/ux_file_unpartialise_request.xml
+++ b/app/src/main/res/drawable/ux_file_unpartialise_request.xml
@@ -4,11 +4,11 @@
     android:viewportWidth="32.604"
     android:viewportHeight="25.573">
   <path
-      android:fillColor="@color/foreground"
+      android:fillColor="?attr/colorPrimary"
       android:pathData="m7.88,7.088 l-6.274,1.681c-1.161,0.311 -1.842,1.491 -1.531,2.652l3.362,12.547a2.165,2.165 0,0 0,2.652 1.531l16.73,-4.483a2.165,2.165 0,0 0,1.531 -2.652l-2.802,-10.456c-0.311,-1.161 -1.501,-1.839 -2.652,-1.531l-8.365,2.241z"
       android:strokeWidth="1.08249"/>
   <path
       android:pathData="m30.724,0 l1.88,0.186 -1.027,10.339 -1.88,-0.186zM31.297,13.346 L31.11,15.226 29.23,15.04 29.417,13.16z"
       android:strokeWidth="0.944576"
-      android:fillColor="#db4e5b"/>
+      android:fillColor="?attr/colorTertiary"/>
 </vector>
diff --git a/app/src/main/res/drawable/ux_mfa_restore.xml b/app/src/main/res/drawable/ux_mfa_restore.xml
index d953b03e..8861f582 100644
--- a/app/src/main/res/drawable/ux_mfa_restore.xml
+++ b/app/src/main/res/drawable/ux_mfa_restore.xml
@@ -5,47 +5,47 @@
     android:viewportHeight="25.031">
     <path
         android:fillAlpha="0.33"
-        android:fillColor="@color/material_dynamic_neutral_variant60"
+        android:fillColor="?attr/colorSurface"
         android:pathData="M2.216,0L55.521,0A2.216,2.216 0,0 1,57.738 2.216L57.738,13.369A2.216,2.216 0,0 1,55.521 15.585L2.216,15.585A2.216,2.216 0,0 1,0 13.369L0,2.216A2.216,2.216 0,0 1,2.216 0z" />
     <path
         android:fillAlpha="0.33"
-        android:fillColor="@color/foreground"
+        android:fillColor="?attr/colorOnSurface"
         android:pathData="m52.855,13.718h0.606v-11.851h-0.606z" />
     <path
-        android:fillColor="@color/foreground"
+        android:fillColor="?attr/colorOnSurface"
         android:pathData="m6.61,9.673h0.878l-1.134,-1.684 1.081,-1.592h-0.839l-0.701,1.042 -0.688,-1.042h-0.878l1.081,1.619 -1.134,1.658h0.852l0.74,-1.101z" />
     <path
-        android:fillColor="@color/foreground"
+        android:fillColor="?attr/colorOnSurface"
         android:pathData="m10.811,9.673h0.878l-1.134,-1.684 1.081,-1.592h-0.839l-0.701,1.042 -0.688,-1.042h-0.878l1.081,1.619 -1.134,1.658h0.852l0.74,-1.101z" />
     <path
-        android:fillColor="@color/foreground"
+        android:fillColor="?attr/colorOnSurface"
         android:pathData="m15.012,9.673h0.878l-1.134,-1.684 1.081,-1.592h-0.839l-0.701,1.042 -0.688,-1.042h-0.878l1.081,1.619 -1.134,1.658h0.852l0.74,-1.101z" />
     <path
-        android:fillColor="@color/foreground"
+        android:fillColor="?attr/colorOnSurface"
         android:pathData="m19.213,9.673h0.878l-1.134,-1.684 1.081,-1.592h-0.839l-0.701,1.042 -0.688,-1.042h-0.878l1.081,1.619 -1.134,1.658h0.852l0.74,-1.101z" />
     <path
-        android:fillColor="@color/foreground"
+        android:fillColor="?attr/colorOnSurface"
         android:pathData="m23.415,9.673h0.878l-1.134,-1.684 1.081,-1.592h-0.839l-0.701,1.042 -0.688,-1.042h-0.878l1.081,1.619 -1.134,1.658h0.852l0.74,-1.101z" />
     <path
-        android:fillColor="@color/foreground"
+        android:fillColor="?attr/colorOnSurface"
         android:pathData="m25.119,8.316h2.097v-0.695h-2.097z" />
     <path
-        android:fillColor="@color/foreground"
+        android:fillColor="?attr/colorOnSurface"
         android:pathData="m30.375,9.673h0.878l-1.134,-1.684 1.081,-1.592h-0.839l-0.701,1.042 -0.688,-1.042h-0.878l1.081,1.619 -1.134,1.658h0.852l0.74,-1.101z" />
     <path
-        android:fillColor="@color/foreground"
+        android:fillColor="?attr/colorOnSurface"
         android:pathData="m34.576,9.673h0.878l-1.134,-1.684 1.081,-1.592h-0.839l-0.701,1.042 -0.688,-1.042h-0.878l1.081,1.619 -1.134,1.658h0.852l0.74,-1.101z" />
     <path
-        android:fillColor="@color/foreground"
+        android:fillColor="?attr/colorOnSurface"
         android:pathData="m38.778,9.673h0.878l-1.134,-1.684 1.081,-1.592h-0.839l-0.701,1.042 -0.688,-1.042h-0.878l1.081,1.619 -1.134,1.658h0.852l0.74,-1.101z" />
     <path
-        android:fillColor="@color/foreground"
+        android:fillColor="?attr/colorOnSurface"
         android:pathData="m42.979,9.673h0.878l-1.134,-1.684 1.081,-1.592h-0.839l-0.701,1.042 -0.688,-1.042h-0.878l1.081,1.619 -1.134,1.658h0.852l0.74,-1.101z" />
     <path
-        android:fillColor="@color/foreground"
+        android:fillColor="?attr/colorOnSurface"
         android:pathData="m47.18,9.673h0.878l-1.134,-1.684 1.081,-1.592h-0.839l-0.701,1.042 -0.688,-1.042h-0.878l1.081,1.619 -1.134,1.658h0.852l0.74,-1.101z" />
     <path
-        android:fillColor="@color/material_dynamic_tertiary60"
+        android:fillColor="?attr/colorPrimaryVariant"
         android:pathData="m52.855,11.198a6.917,6.917 0,0 0,-6.917 6.917h-2.306l3.074,3.074 3.074,-3.074h-2.306a5.38,5.38 0,0 1,5.38 -5.38,5.38 5.38,0 0,1 5.38,5.38 5.38,5.38 0,0 1,-5.38 5.38c-1.153,0 -2.236,-0.384 -3.12,-0.999l-1.107,1.107c1.184,0.891 2.644,1.429 4.227,1.429a6.917,6.917 0,0 0,6.917 -6.917,6.917 6.917,0 0,0 -6.917,-6.917m1.537,6.917a1.537,1.537 0,0 0,-1.537 -1.537,1.537 1.537,0 0,0 -1.537,1.537 1.537,1.537 0,0 0,1.537 1.537,1.537 1.537,0 0,0 1.537,-1.537z"
         android:strokeWidth="0.768531" />
 </vector>
diff --git a/app/src/main/res/drawable/ux_mfa_totp.xml b/app/src/main/res/drawable/ux_mfa_totp.xml
index db7c3b73..b56edd96 100644
--- a/app/src/main/res/drawable/ux_mfa_totp.xml
+++ b/app/src/main/res/drawable/ux_mfa_totp.xml
@@ -5,31 +5,31 @@
     android:viewportHeight="24.337">
   <path
       android:pathData="M2.216,0L50.518,0A2.216,2.216 0,0 1,52.735 2.216L52.735,13.369A2.216,2.216 0,0 1,50.518 15.585L2.216,15.585A2.216,2.216 0,0 1,0 13.369L0,2.216A2.216,2.216 0,0 1,2.216 0z"
-      android:fillColor="@color/material_dynamic_neutral_variant60"
+      android:fillColor="?attr/colorSurface"
       android:fillAlpha="0.33"/>
   <path
       android:pathData="m7.381,6.643q0.246,0 0.457,0.094 0.211,0.088 0.364,0.246 0.158,0.152 0.246,0.364 0.088,0.211 0.088,0.452 0,0.235 -0.088,0.446 -0.088,0.205 -0.246,0.364 -0.152,0.152 -0.364,0.24 -0.211,0.094 -0.457,0.094 -0.235,0 -0.44,-0.094 -0.205,-0.088 -0.358,-0.24 -0.152,-0.158 -0.24,-0.364 -0.088,-0.211 -0.088,-0.446 0,-0.24 0.088,-0.452 0.088,-0.211 0.24,-0.364 0.152,-0.158 0.358,-0.246 0.205,-0.094 0.44,-0.094z"
-      android:fillColor="@color/foreground"/>
+      android:fillColor="?attr/colorOnSurface"/>
   <path
       android:pathData="m13.984,6.643q0.246,0 0.457,0.094 0.211,0.088 0.364,0.246 0.158,0.152 0.246,0.364 0.088,0.211 0.088,0.452 0,0.235 -0.088,0.446 -0.088,0.205 -0.246,0.364 -0.152,0.152 -0.364,0.24 -0.211,0.094 -0.457,0.094 -0.235,0 -0.44,-0.094 -0.205,-0.088 -0.358,-0.24 -0.152,-0.158 -0.24,-0.364 -0.088,-0.211 -0.088,-0.446 0,-0.24 0.088,-0.452 0.088,-0.211 0.24,-0.364 0.152,-0.158 0.358,-0.246 0.205,-0.094 0.44,-0.094z"
-      android:fillColor="@color/foreground"/>
+      android:fillColor="?attr/colorOnSurface"/>
   <path
       android:pathData="m20.587,6.643q0.246,0 0.457,0.094 0.211,0.088 0.364,0.246 0.158,0.152 0.246,0.364 0.088,0.211 0.088,0.452 0,0.235 -0.088,0.446 -0.088,0.205 -0.246,0.364 -0.152,0.152 -0.364,0.24 -0.211,0.094 -0.457,0.094 -0.235,0 -0.44,-0.094 -0.205,-0.088 -0.358,-0.24 -0.152,-0.158 -0.24,-0.364 -0.088,-0.211 -0.088,-0.446 0,-0.24 0.088,-0.452 0.088,-0.211 0.24,-0.364 0.152,-0.158 0.358,-0.246 0.205,-0.094 0.44,-0.094z"
-      android:fillColor="@color/foreground"/>
+      android:fillColor="?attr/colorOnSurface"/>
   <path
       android:pathData="m27.19,6.643q0.246,0 0.457,0.094 0.211,0.088 0.364,0.246 0.158,0.152 0.246,0.364 0.088,0.211 0.088,0.452 0,0.235 -0.088,0.446 -0.088,0.205 -0.246,0.364 -0.152,0.152 -0.364,0.24 -0.211,0.094 -0.457,0.094 -0.235,0 -0.44,-0.094 -0.205,-0.088 -0.358,-0.24 -0.152,-0.158 -0.24,-0.364 -0.088,-0.211 -0.088,-0.446 0,-0.24 0.088,-0.452 0.088,-0.211 0.24,-0.364 0.152,-0.158 0.358,-0.246 0.205,-0.094 0.44,-0.094z"
-      android:fillColor="@color/foreground"/>
+      android:fillColor="?attr/colorOnSurface"/>
   <path
       android:pathData="m33.794,6.643q0.246,0 0.457,0.094 0.211,0.088 0.364,0.246 0.158,0.152 0.246,0.364 0.088,0.211 0.088,0.452 0,0.235 -0.088,0.446 -0.088,0.205 -0.246,0.364 -0.152,0.152 -0.364,0.24 -0.211,0.094 -0.457,0.094 -0.235,0 -0.44,-0.094 -0.205,-0.088 -0.358,-0.24 -0.152,-0.158 -0.24,-0.364 -0.088,-0.211 -0.088,-0.446 0,-0.24 0.088,-0.452 0.088,-0.211 0.24,-0.364 0.152,-0.158 0.358,-0.246 0.205,-0.094 0.44,-0.094z"
-      android:fillColor="@color/foreground"/>
+      android:fillColor="?attr/colorOnSurface"/>
   <path
       android:pathData="m40.397,6.643q0.246,0 0.457,0.094 0.211,0.088 0.364,0.246 0.158,0.152 0.246,0.364 0.088,0.211 0.088,0.452 0,0.235 -0.088,0.446 -0.088,0.205 -0.246,0.364 -0.152,0.152 -0.364,0.24 -0.211,0.094 -0.457,0.094 -0.235,0 -0.44,-0.094 -0.205,-0.088 -0.358,-0.24 -0.152,-0.158 -0.24,-0.364 -0.088,-0.211 -0.088,-0.446 0,-0.24 0.088,-0.452 0.088,-0.211 0.24,-0.364 0.152,-0.158 0.358,-0.246 0.205,-0.094 0.44,-0.094z"
-      android:fillColor="@color/foreground"/>
+      android:fillColor="?attr/colorOnSurface"/>
   <path
       android:pathData="m45.874,13.718h0.606v-11.851h-0.606z"
-      android:fillColor="@color/foreground"
+      android:fillColor="?attr/colorOnSurface"
       android:fillAlpha="0.33"/>
   <path
       android:pathData="m37.163,18.874 l5.463,5.463 1.378,-1.388 -5.453,-5.453m19.946,-6.274 l-10.339,10.349 -4.065,-4.075 -1.397,1.378 5.463,5.463 11.727,-11.727m-5.531,0 l-1.378,-1.388 -6.206,6.206 1.388,1.378z"
-      android:fillColor="@color/material_dynamic_primary60"/>
+      android:fillColor="?attr/colorTertiary"/>
 </vector>