diff --git a/android/app/src/main/res/drawable/ic_home.xml b/android/app/src/main/res/drawable/ic_home.xml
index eb6624a..0e63bfe 100644
--- a/android/app/src/main/res/drawable/ic_home.xml
+++ b/android/app/src/main/res/drawable/ic_home.xml
@@ -6,7 +6,7 @@
     <group>
         <clip-path android:pathData="M0,0h24v24h-24z" />
         <path
-            android:fillColor="#212121"
+            android:fillColor="@color/on_surface"
             android:fillType="evenOdd"
             android:pathData="M10.772,0.688C11.123,0.415 11.555,0.267 12,0.267C12.445,0.267 12.877,0.415 13.228,0.688L21.612,7.208C22.365,7.795 21.949,9 20.997,9H20V17C20,17.53 19.789,18.039 19.414,18.414C19.039,18.789 18.53,19 18,19H6C5.47,19 4.961,18.789 4.586,18.414C4.211,18.039 4,17.53 4,17V9H3.003C2.05,9 1.636,7.794 2.388,7.209L10.772,0.688ZM5.625,7.225C5.854,7.41 6,7.693 6,8.01V17H18V8.01C18,7.693 18.146,7.41 18.375,7.225L12,2.267L5.625,7.225Z" />
     </group>
diff --git a/android/app/src/main/res/drawable/ic_home_filled.xml b/android/app/src/main/res/drawable/ic_home_filled.xml
index ad31a63..6b54e97 100644
--- a/android/app/src/main/res/drawable/ic_home_filled.xml
+++ b/android/app/src/main/res/drawable/ic_home_filled.xml
@@ -6,7 +6,7 @@
     <group>
         <clip-path android:pathData="M0,0h24v24h-24z" />
         <path
-            android:fillColor="#212121"
+            android:fillColor="@color/on_surface"
             android:fillType="evenOdd"
             android:pathData="M10.772,2.688C11.123,2.415 11.555,2.267 12,2.267C12.445,2.267 12.877,2.415 13.228,2.688L21.612,9.208C22.365,9.795 21.949,11 20.997,11H20V19C20,19.53 19.789,20.039 19.414,20.414C19.039,20.789 18.53,21 18,21H6C5.47,21 4.961,20.789 4.586,20.414C4.211,20.039 4,19.53 4,19V11H3.003C2.05,11 1.636,9.794 2.388,9.209L10.772,2.688Z" />
     </group>
diff --git a/android/core/ui/src/main/res/drawable/ic_more.xml b/android/core/ui/src/main/res/drawable/ic_more.xml
index 2fe5b80..45b0f50 100644
--- a/android/core/ui/src/main/res/drawable/ic_more.xml
+++ b/android/core/ui/src/main/res/drawable/ic_more.xml
@@ -1,4 +1,9 @@
-<vector android:height="24dp" android:viewportHeight="16"
-    android:viewportWidth="16" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#ffffff" android:pathData="M8.75,8C8.75,8.148 8.706,8.293 8.624,8.417C8.541,8.54 8.424,8.636 8.287,8.693C8.15,8.75 7.999,8.765 7.854,8.736C7.708,8.707 7.575,8.635 7.47,8.53C7.365,8.425 7.293,8.292 7.264,8.146C7.235,8.001 7.25,7.85 7.307,7.713C7.364,7.576 7.46,7.459 7.583,7.376C7.707,7.294 7.852,7.25 8,7.25C8.199,7.25 8.39,7.329 8.53,7.47C8.671,7.61 8.75,7.801 8.75,8ZM8,4.5C8.148,4.5 8.293,4.456 8.417,4.374C8.54,4.291 8.636,4.174 8.693,4.037C8.75,3.9 8.765,3.749 8.736,3.604C8.707,3.458 8.635,3.325 8.53,3.22C8.425,3.115 8.292,3.043 8.146,3.014C8.001,2.985 7.85,3 7.713,3.057C7.576,3.114 7.459,3.21 7.376,3.333C7.294,3.457 7.25,3.602 7.25,3.75C7.25,3.949 7.329,4.14 7.47,4.28C7.61,4.421 7.801,4.5 8,4.5ZM8,11.5C7.852,11.5 7.707,11.544 7.583,11.626C7.46,11.709 7.364,11.826 7.307,11.963C7.25,12.1 7.235,12.251 7.264,12.396C7.293,12.542 7.365,12.675 7.47,12.78C7.575,12.885 7.708,12.957 7.854,12.986C7.999,13.014 8.15,13 8.287,12.943C8.424,12.886 8.541,12.79 8.624,12.667C8.706,12.543 8.75,12.398 8.75,12.25C8.75,12.051 8.671,11.86 8.53,11.72C8.39,11.579 8.199,11.5 8,11.5Z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="16"
+    android:viewportHeight="16">
+    <path
+        android:fillColor="@color/on_surface"
+        android:pathData="M8.75,8C8.75,8.148 8.706,8.293 8.624,8.417C8.541,8.54 8.424,8.636 8.287,8.693C8.15,8.75 7.999,8.765 7.854,8.736C7.708,8.707 7.575,8.635 7.47,8.53C7.365,8.425 7.293,8.292 7.264,8.146C7.235,8.001 7.25,7.85 7.307,7.713C7.364,7.576 7.46,7.459 7.583,7.376C7.707,7.294 7.852,7.25 8,7.25C8.199,7.25 8.39,7.329 8.53,7.47C8.671,7.61 8.75,7.801 8.75,8ZM8,4.5C8.148,4.5 8.293,4.456 8.417,4.374C8.54,4.291 8.636,4.174 8.693,4.037C8.75,3.9 8.765,3.749 8.736,3.604C8.707,3.458 8.635,3.325 8.53,3.22C8.425,3.115 8.292,3.043 8.146,3.014C8.001,2.985 7.85,3 7.713,3.057C7.576,3.114 7.459,3.21 7.376,3.333C7.294,3.457 7.25,3.602 7.25,3.75C7.25,3.949 7.329,4.14 7.47,4.28C7.61,4.421 7.801,4.5 8,4.5ZM8,11.5C7.852,11.5 7.707,11.544 7.583,11.626C7.46,11.709 7.364,11.826 7.307,11.963C7.25,12.1 7.235,12.251 7.264,12.396C7.293,12.542 7.365,12.675 7.47,12.78C7.575,12.885 7.708,12.957 7.854,12.986C7.999,13.014 8.15,13 8.287,12.943C8.424,12.886 8.541,12.79 8.624,12.667C8.706,12.543 8.75,12.398 8.75,12.25C8.75,12.051 8.671,11.86 8.53,11.72C8.39,11.579 8.199,11.5 8,11.5Z" />
 </vector>