diff --git a/app/src/main/res/drawable/bg_add_variation_button.xml b/app/src/main/res/drawable/bg_add_variation_button.xml
index 1c0078527..f0ab5c726 100644
--- a/app/src/main/res/drawable/bg_add_variation_button.xml
+++ b/app/src/main/res/drawable/bg_add_variation_button.xml
@@ -3,13 +3,13 @@
     <item android:state_pressed="true">
         <shape android:shape="rectangle">
             <solid android:color="@color/color_text_secondary" />
-            <corners android:radius="10dp" />
+            <corners android:radius="@dimen/radius_s" />
         </shape>
     </item>
     <item>
         <shape android:shape="rectangle">
             <solid android:color="@color/color_text_primary" />
-            <corners android:radius="10dp" />
+            <corners android:radius="@dimen/radius_s" />
         </shape>
     </item>
 </selector>
diff --git a/app/src/main/res/drawable/bg_avatar_placeholder.xml b/app/src/main/res/drawable/bg_avatar_placeholder.xml
index c370b41a5..89ed974cd 100644
--- a/app/src/main/res/drawable/bg_avatar_placeholder.xml
+++ b/app/src/main/res/drawable/bg_avatar_placeholder.xml
@@ -2,6 +2,6 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <solid android:color="@color/color_bg_tertiary" />
-    <corners android:radius="10dp" />
+    <corners android:radius="@dimen/radius_s" />
     <stroke android:width="2dp" android:color="@color/color_bg_white" />
 </shape>
diff --git a/app/src/main/res/drawable/bg_badge_lightning.xml b/app/src/main/res/drawable/bg_badge_lightning.xml
index ea7ed4f43..568f8b83d 100644
--- a/app/src/main/res/drawable/bg_badge_lightning.xml
+++ b/app/src/main/res/drawable/bg_badge_lightning.xml
@@ -2,5 +2,5 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <solid android:color="@color/color_badge_lightning_bg" />
-    <corners android:radius="20dp" />
+    <corners android:radius="@dimen/radius_search" />
 </shape>
diff --git a/app/src/main/res/drawable/bg_badge_success.xml b/app/src/main/res/drawable/bg_badge_success.xml
index 29dccdfdc..06aaec9cc 100644
--- a/app/src/main/res/drawable/bg_badge_success.xml
+++ b/app/src/main/res/drawable/bg_badge_success.xml
@@ -2,5 +2,5 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <solid android:color="@color/color_success_green" />
-    <corners android:radius="4dp" />
+    <corners android:radius="@dimen/radius_xs" />
 </shape>
diff --git a/app/src/main/res/drawable/bg_badge_success_pill.xml b/app/src/main/res/drawable/bg_badge_success_pill.xml
index 9f3b9e4a4..6bdaa7fb0 100644
--- a/app/src/main/res/drawable/bg_badge_success_pill.xml
+++ b/app/src/main/res/drawable/bg_badge_success_pill.xml
@@ -2,5 +2,5 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <solid android:color="@color/color_success_green" />
-    <corners android:radius="100dp" />
+    <corners android:radius="@dimen/radius_button_pill" />
 </shape>
diff --git a/app/src/main/res/drawable/bg_basket_name_chip.xml b/app/src/main/res/drawable/bg_basket_name_chip.xml
index 8af288a1a..e7c35cef1 100644
--- a/app/src/main/res/drawable/bg_basket_name_chip.xml
+++ b/app/src/main/res/drawable/bg_basket_name_chip.xml
@@ -3,14 +3,14 @@
     <!-- Pressed state -->
     <item android:state_pressed="true">
         <shape android:shape="rectangle">
-            <corners android:radius="18dp" />
+            <corners android:radius="@dimen/radius_chip" />
             <solid android:color="@color/color_accent_blue_light" />
         </shape>
     </item>
     <!-- Default state -->
     <item>
         <shape android:shape="rectangle">
-            <corners android:radius="18dp" />
+            <corners android:radius="@dimen/radius_chip" />
             <solid android:color="@color/color_bg_secondary" />
         </shape>
     </item>
diff --git a/app/src/main/res/drawable/bg_bottom_sheet.xml b/app/src/main/res/drawable/bg_bottom_sheet.xml
index 0c1dd9c0b..90587ecdc 100644
--- a/app/src/main/res/drawable/bg_bottom_sheet.xml
+++ b/app/src/main/res/drawable/bg_bottom_sheet.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
     <solid android:color="@color/color_bg_white"/>
-    <corners android:topLeftRadius="16dp" android:topRightRadius="16dp"/>
+    <corners android:topLeftRadius="@dimen/radius_button" android:topRightRadius="@dimen/radius_button"/>
 </shape>
diff --git a/app/src/main/res/drawable/bg_bottom_sheet_handle.xml b/app/src/main/res/drawable/bg_bottom_sheet_handle.xml
index f91bbfe18..8f4414138 100644
--- a/app/src/main/res/drawable/bg_bottom_sheet_handle.xml
+++ b/app/src/main/res/drawable/bg_bottom_sheet_handle.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
     <solid android:color="@color/color_divider"/>
-    <corners android:radius="2dp"/>
+    <corners android:radius="@dimen/radius_micro"/>
 </shape>
diff --git a/app/src/main/res/drawable/bg_btcmap_banner.xml b/app/src/main/res/drawable/bg_btcmap_banner.xml
index 5fa45277a..da2176e1d 100644
--- a/app/src/main/res/drawable/bg_btcmap_banner.xml
+++ b/app/src/main/res/drawable/bg_btcmap_banner.xml
@@ -2,5 +2,5 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <solid android:color="@android:color/white" />
-    <corners android:radius="16dp" />
+    <corners android:radius="@dimen/radius_card" />
 </shape>
diff --git a/app/src/main/res/drawable/bg_button_black.xml b/app/src/main/res/drawable/bg_button_black.xml
index 73ecd5d82..ba4af12eb 100644
--- a/app/src/main/res/drawable/bg_button_black.xml
+++ b/app/src/main/res/drawable/bg_button_black.xml
@@ -3,21 +3,21 @@
     <!-- Disabled state - black with 20% opacity -->
     <item android:state_enabled="false">
         <shape android:shape="rectangle">
-            <corners android:radius="26dp" />
+            <corners android:radius="@dimen/radius_pill" />
             <solid android:color="@color/color_black_20" />
         </shape>
     </item>
     <!-- Pressed state - slightly lighter black -->
     <item android:state_pressed="true">
         <shape android:shape="rectangle">
-            <corners android:radius="26dp" />
+            <corners android:radius="@dimen/radius_pill" />
             <solid android:color="@color/color_button_primary_pressed" />
         </shape>
     </item>
     <!-- Enabled state - 100% black -->
     <item>
         <shape android:shape="rectangle">
-            <corners android:radius="26dp" />
+            <corners android:radius="@dimen/radius_pill" />
             <solid android:color="@color/black" />
         </shape>
     </item>
diff --git a/app/src/main/res/drawable/bg_button_charge.xml b/app/src/main/res/drawable/bg_button_charge.xml
index 8e9d8d9b0..fb8a2a5c1 100644
--- a/app/src/main/res/drawable/bg_button_charge.xml
+++ b/app/src/main/res/drawable/bg_button_charge.xml
@@ -3,21 +3,21 @@
     <!-- Disabled state - black with 30% opacity (brighter than before) -->
     <item android:state_enabled="false">
         <shape android:shape="rectangle">
-            <corners android:radius="26dp" />
+            <corners android:radius="@dimen/radius_pill" />
             <solid android:color="@color/color_black_30" />
         </shape>
     </item>
     <!-- Pressed state - white with 15% opacity (slightly less for feedback) -->
     <item android:state_pressed="true">
         <shape android:shape="rectangle">
-            <corners android:radius="26dp" />
+            <corners android:radius="@dimen/radius_pill" />
             <solid android:color="@color/color_white_15" />
         </shape>
     </item>
     <!-- Enabled state - white with 15% opacity (darker than before) with border -->
     <item>
         <shape android:shape="rectangle">
-            <corners android:radius="26dp" />
+            <corners android:radius="@dimen/radius_pill" />
             <solid android:color="@color/color_white_34" />
         </shape>
     </item>
diff --git a/app/src/main/res/drawable/bg_button_destructive.xml b/app/src/main/res/drawable/bg_button_destructive.xml
index ae7d9e3c0..8a13cce4c 100644
--- a/app/src/main/res/drawable/bg_button_destructive.xml
+++ b/app/src/main/res/drawable/bg_button_destructive.xml
@@ -4,7 +4,7 @@
     <item>
         <shape android:shape="rectangle">
             <solid android:color="@color/color_warning_red" />
-            <corners android:radius="28dp" />
+            <corners android:radius="@dimen/radius_button" />
         </shape>
     </item>
 </ripple>
diff --git a/app/src/main/res/drawable/bg_button_empty_state_primary.xml b/app/src/main/res/drawable/bg_button_empty_state_primary.xml
index 4e4263004..bb631d120 100644
--- a/app/src/main/res/drawable/bg_button_empty_state_primary.xml
+++ b/app/src/main/res/drawable/bg_button_empty_state_primary.xml
@@ -3,7 +3,7 @@
     <!-- Pressed state -->
     <item android:state_pressed="true">
         <shape android:shape="rectangle">
-            <corners android:radius="26dp" />
+            <corners android:radius="@dimen/radius_pill" />
             <solid android:color="@color/empty_state_button_primary_bg" />
             <stroke android:width="0dp" android:color="@android:color/transparent" />
         </shape>
@@ -11,7 +11,7 @@
     <!-- Default state -->
     <item>
         <shape android:shape="rectangle">
-            <corners android:radius="26dp" />
+            <corners android:radius="@dimen/radius_pill" />
             <solid android:color="@color/empty_state_button_primary_bg" />
         </shape>
     </item>
diff --git a/app/src/main/res/drawable/bg_button_icon.xml b/app/src/main/res/drawable/bg_button_icon.xml
index c5f778557..a201ebdf6 100644
--- a/app/src/main/res/drawable/bg_button_icon.xml
+++ b/app/src/main/res/drawable/bg_button_icon.xml
@@ -4,7 +4,7 @@
     <item>
         <shape android:shape="rectangle">
             <solid android:color="@color/color_bg_secondary" />
-            <corners android:radius="12dp" />
+            <corners android:radius="@dimen/radius_input" />
             <stroke
                 android:width="1dp"
                 android:color="@color/color_divider" />
diff --git a/app/src/main/res/drawable/bg_button_primary_black.xml b/app/src/main/res/drawable/bg_button_primary_black.xml
index 50b333c5d..0488c6796 100644
--- a/app/src/main/res/drawable/bg_button_primary_black.xml
+++ b/app/src/main/res/drawable/bg_button_primary_black.xml
@@ -4,7 +4,7 @@
     <item>
         <shape android:shape="rectangle">
             <solid android:color="@color/color_text_primary" />
-            <corners android:radius="14dp" />
+            <corners android:radius="@dimen/radius_button_compact" />
         </shape>
     </item>
 </ripple>
diff --git a/app/src/main/res/drawable/bg_button_primary_green.xml b/app/src/main/res/drawable/bg_button_primary_green.xml
index 1815759f0..c1b7ba0e6 100644
--- a/app/src/main/res/drawable/bg_button_primary_green.xml
+++ b/app/src/main/res/drawable/bg_button_primary_green.xml
@@ -3,21 +3,21 @@
     <!-- Disabled state -->
     <item android:state_enabled="false">
         <shape android:shape="rectangle">
-            <corners android:radius="100dp" />
+            <corners android:radius="@dimen/radius_button_pill" />
             <solid android:color="@color/color_button_primary_disabled" />
         </shape>
     </item>
     <!-- Pressed state -->
     <item android:state_pressed="true">
         <shape android:shape="rectangle">
-            <corners android:radius="100dp" />
+            <corners android:radius="@dimen/radius_button_pill" />
             <solid android:color="@color/color_button_primary_pressed" />
         </shape>
     </item>
     <!-- Enabled state -->
     <item>
         <shape android:shape="rectangle">
-            <corners android:radius="100dp" />
+            <corners android:radius="@dimen/radius_button_pill" />
             <solid android:color="@color/color_primary_green" />
         </shape>
     </item>
diff --git a/app/src/main/res/drawable/bg_button_secondary.xml b/app/src/main/res/drawable/bg_button_secondary.xml
index 2e2be6ab4..d08cd5734 100644
--- a/app/src/main/res/drawable/bg_button_secondary.xml
+++ b/app/src/main/res/drawable/bg_button_secondary.xml
@@ -4,7 +4,7 @@
     <item>
         <shape android:shape="rectangle">
             <solid android:color="@color/color_bg_tertiary" />
-            <corners android:radius="10dp" />
+            <corners android:radius="@dimen/radius_s" />
         </shape>
     </item>
 </ripple>
diff --git a/app/src/main/res/drawable/bg_button_secondary_gray.xml b/app/src/main/res/drawable/bg_button_secondary_gray.xml
index 631ca9ac9..f80428565 100644
--- a/app/src/main/res/drawable/bg_button_secondary_gray.xml
+++ b/app/src/main/res/drawable/bg_button_secondary_gray.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
-    <corners android:radius="26dp" />
+    <corners android:radius="@dimen/radius_pill" />
     <solid android:color="@color/color_text_secondary" />
 </shape>
diff --git a/app/src/main/res/drawable/bg_button_secondary_outlined.xml b/app/src/main/res/drawable/bg_button_secondary_outlined.xml
index a6aa67116..5acf4390c 100644
--- a/app/src/main/res/drawable/bg_button_secondary_outlined.xml
+++ b/app/src/main/res/drawable/bg_button_secondary_outlined.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
-    <corners android:radius="12dp" />
+    <corners android:radius="@dimen/radius_input" />
     <solid android:color="@android:color/transparent" />
     <stroke android:width="1dp" android:color="@color/color_divider"
         android:dashWidth="6dp" android:dashGap="4dp" />
diff --git a/app/src/main/res/drawable/bg_button_secondary_pill.xml b/app/src/main/res/drawable/bg_button_secondary_pill.xml
index 075343052..771e18dfc 100644
--- a/app/src/main/res/drawable/bg_button_secondary_pill.xml
+++ b/app/src/main/res/drawable/bg_button_secondary_pill.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <corners android:radius="26dp" />
+    <corners android:radius="@dimen/radius_pill" />
     <solid android:color="@color/color_bg_white" />
     <stroke
         android:width="1dp"
diff --git a/app/src/main/res/drawable/bg_button_tertiary_dark.xml b/app/src/main/res/drawable/bg_button_tertiary_dark.xml
index 836a7b4d9..dd4b2c885 100644
--- a/app/src/main/res/drawable/bg_button_tertiary_dark.xml
+++ b/app/src/main/res/drawable/bg_button_tertiary_dark.xml
@@ -3,14 +3,14 @@
     <!-- Pressed state -->
     <item android:state_pressed="true">
         <shape android:shape="rectangle">
-            <corners android:radius="28dp" />
+            <corners android:radius="@dimen/radius_button" />
             <solid android:color="@color/color_white_10" />
         </shape>
     </item>
     <!-- Default state -->
     <item>
         <shape android:shape="rectangle">
-            <corners android:radius="28dp" />
+            <corners android:radius="@dimen/radius_button" />
             <solid android:color="@android:color/transparent" />
         </shape>
     </item>
diff --git a/app/src/main/res/drawable/bg_button_white.xml b/app/src/main/res/drawable/bg_button_white.xml
index 2cc476fe7..7e79975c2 100644
--- a/app/src/main/res/drawable/bg_button_white.xml
+++ b/app/src/main/res/drawable/bg_button_white.xml
@@ -3,21 +3,21 @@
     <!-- Disabled state — subtle on dark bg -->
     <item android:state_enabled="false">
         <shape android:shape="rectangle">
-            <corners android:radius="28dp" />
+            <corners android:radius="@dimen/radius_button" />
             <solid android:color="@color/color_white_10" />
         </shape>
     </item>
     <!-- Pressed state -->
     <item android:state_pressed="true">
         <shape android:shape="rectangle">
-            <corners android:radius="28dp" />
+            <corners android:radius="@dimen/radius_button" />
             <solid android:color="@color/color_white_80" />
         </shape>
     </item>
     <!-- Enabled state -->
     <item>
         <shape android:shape="rectangle">
-            <corners android:radius="28dp" />
+            <corners android:radius="@dimen/radius_button" />
             <solid android:color="@color/white" />
         </shape>
     </item>
diff --git a/app/src/main/res/drawable/bg_card_rounded.xml b/app/src/main/res/drawable/bg_card_rounded.xml
index ba8b38355..b646b6d5d 100644
--- a/app/src/main/res/drawable/bg_card_rounded.xml
+++ b/app/src/main/res/drawable/bg_card_rounded.xml
@@ -2,5 +2,5 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <solid android:color="@color/color_bg_card" />
-    <corners android:radius="12dp" />
+    <corners android:radius="@dimen/radius_input" />
 </shape>
diff --git a/app/src/main/res/drawable/bg_category_badge.xml b/app/src/main/res/drawable/bg_category_badge.xml
index 18fc61e3a..5347a9336 100644
--- a/app/src/main/res/drawable/bg_category_badge.xml
+++ b/app/src/main/res/drawable/bg_category_badge.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <corners android:radius="6dp" />
+    <corners android:radius="@dimen/radius_badge" />
     <solid android:color="@color/color_text_primary" />
 </shape>
diff --git a/app/src/main/res/drawable/bg_category_chip.xml b/app/src/main/res/drawable/bg_category_chip.xml
index 4d2bbe96e..535920e4d 100644
--- a/app/src/main/res/drawable/bg_category_chip.xml
+++ b/app/src/main/res/drawable/bg_category_chip.xml
@@ -3,7 +3,7 @@
     <!-- Selected state: green background like bg_category_tag_selected -->
     <item android:state_selected="true">
         <shape android:shape="rectangle">
-            <corners android:radius="16dp" />
+            <corners android:radius="@dimen/radius_card" />
             <solid android:color="@color/color_primary_green" />
             <padding
                 android:left="12dp"
@@ -15,7 +15,7 @@
     <!-- Pressed state -->
     <item android:state_pressed="true">
         <shape android:shape="rectangle">
-            <corners android:radius="16dp" />
+            <corners android:radius="@dimen/radius_card" />
             <solid android:color="@color/color_bg_secondary" />
             <padding
                 android:left="12dp"
@@ -27,7 +27,7 @@
     <!-- Default state: tertiary background like bg_category_tag -->
     <item>
         <shape android:shape="rectangle">
-            <corners android:radius="16dp" />
+            <corners android:radius="@dimen/radius_card" />
             <solid android:color="@color/color_bg_tertiary" />
             <padding
                 android:left="12dp"
diff --git a/app/src/main/res/drawable/bg_category_tag.xml b/app/src/main/res/drawable/bg_category_tag.xml
index d8d32c573..f968d1da6 100644
--- a/app/src/main/res/drawable/bg_category_tag.xml
+++ b/app/src/main/res/drawable/bg_category_tag.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <corners android:radius="16dp" />
+    <corners android:radius="@dimen/radius_card" />
     <solid android:color="@color/color_bg_tertiary" />
     <padding
         android:left="12dp"
diff --git a/app/src/main/res/drawable/bg_category_tag_add.xml b/app/src/main/res/drawable/bg_category_tag_add.xml
index 93eeb41ec..6a239108a 100644
--- a/app/src/main/res/drawable/bg_category_tag_add.xml
+++ b/app/src/main/res/drawable/bg_category_tag_add.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <corners android:radius="16dp" />
+    <corners android:radius="@dimen/radius_card" />
     <stroke
         android:width="1dp"
         android:color="@color/color_primary_green"
diff --git a/app/src/main/res/drawable/bg_category_tag_selected.xml b/app/src/main/res/drawable/bg_category_tag_selected.xml
index 4e24d5099..248dd9544 100644
--- a/app/src/main/res/drawable/bg_category_tag_selected.xml
+++ b/app/src/main/res/drawable/bg_category_tag_selected.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <corners android:radius="16dp" />
+    <corners android:radius="@dimen/radius_card" />
     <solid android:color="@color/color_primary_green" />
     <padding
         android:left="12dp"
diff --git a/app/src/main/res/drawable/bg_checkout_button.xml b/app/src/main/res/drawable/bg_checkout_button.xml
index a63e4f7b8..4a73d6ada 100644
--- a/app/src/main/res/drawable/bg_checkout_button.xml
+++ b/app/src/main/res/drawable/bg_checkout_button.xml
@@ -4,7 +4,7 @@
     <item>
         <shape android:shape="rectangle">
             <solid android:color="@color/color_success_green" />
-            <corners android:radius="100dp" />
+            <corners android:radius="@dimen/radius_button_pill" />
         </shape>
     </item>
 </ripple>
diff --git a/app/src/main/res/drawable/bg_chip_outlined.xml b/app/src/main/res/drawable/bg_chip_outlined.xml
index 9c15400a9..a90c1ee7d 100644
--- a/app/src/main/res/drawable/bg_chip_outlined.xml
+++ b/app/src/main/res/drawable/bg_chip_outlined.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <corners android:radius="18dp" />
+    <corners android:radius="@dimen/radius_chip" />
     <solid android:color="@color/color_bg_white" />
     <stroke android:width="1dp" android:color="@color/color_chip_border" />
 </shape>
diff --git a/app/src/main/res/drawable/bg_close_button_scanner.xml b/app/src/main/res/drawable/bg_close_button_scanner.xml
index b4ad7227c..366bc313b 100644
--- a/app/src/main/res/drawable/bg_close_button_scanner.xml
+++ b/app/src/main/res/drawable/bg_close_button_scanner.xml
@@ -4,7 +4,7 @@
     <item>
         <shape android:shape="rectangle">
             <solid android:color="@color/color_black_80" />
-            <corners android:radius="28dp" />
+            <corners android:radius="@dimen/radius_button" />
         </shape>
     </item>
 </ripple>
diff --git a/app/src/main/res/drawable/bg_dialog_rounded.xml b/app/src/main/res/drawable/bg_dialog_rounded.xml
index e49ef9498..f7dece99a 100644
--- a/app/src/main/res/drawable/bg_dialog_rounded.xml
+++ b/app/src/main/res/drawable/bg_dialog_rounded.xml
@@ -2,5 +2,5 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <solid android:color="@color/color_bg_white" />
-    <corners android:radius="20dp" />
+    <corners android:radius="@dimen/radius_button" />
 </shape>
diff --git a/app/src/main/res/drawable/bg_dynamic_island.xml b/app/src/main/res/drawable/bg_dynamic_island.xml
index 0a49646c5..69cf29cd8 100644
--- a/app/src/main/res/drawable/bg_dynamic_island.xml
+++ b/app/src/main/res/drawable/bg_dynamic_island.xml
@@ -2,5 +2,5 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <solid android:color="@color/black" />
-    <corners android:radius="28dp" />
+    <corners android:radius="@dimen/radius_button" />
 </shape>
diff --git a/app/src/main/res/drawable/bg_dynamic_island_error.xml b/app/src/main/res/drawable/bg_dynamic_island_error.xml
index 8a7a14e5b..0f7da1560 100644
--- a/app/src/main/res/drawable/bg_dynamic_island_error.xml
+++ b/app/src/main/res/drawable/bg_dynamic_island_error.xml
@@ -2,5 +2,5 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <solid android:color="@color/color_dynamic_island_error" />
-    <corners android:radius="28dp" />
+    <corners android:radius="@dimen/radius_button" />
 </shape>
diff --git a/app/src/main/res/drawable/bg_dynamic_island_success.xml b/app/src/main/res/drawable/bg_dynamic_island_success.xml
index 6a7f44bb7..69e30851d 100644
--- a/app/src/main/res/drawable/bg_dynamic_island_success.xml
+++ b/app/src/main/res/drawable/bg_dynamic_island_success.xml
@@ -2,5 +2,5 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <solid android:color="@color/color_dynamic_island_success" />
-    <corners android:radius="28dp" />
+    <corners android:radius="@dimen/radius_button" />
 </shape>
diff --git a/app/src/main/res/drawable/bg_empty_state_action_button.xml b/app/src/main/res/drawable/bg_empty_state_action_button.xml
index 921129519..4cfbbc98f 100644
--- a/app/src/main/res/drawable/bg_empty_state_action_button.xml
+++ b/app/src/main/res/drawable/bg_empty_state_action_button.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
     <solid android:color="@android:color/transparent" />
-    <corners android:radius="100dp" />
+    <corners android:radius="@dimen/radius_button_pill" />
     <stroke
         android:width="1dp"
         android:color="@color/color_divider"
diff --git a/app/src/main/res/drawable/bg_empty_state_icon.xml b/app/src/main/res/drawable/bg_empty_state_icon.xml
index c2d35972f..bb3013ee8 100644
--- a/app/src/main/res/drawable/bg_empty_state_icon.xml
+++ b/app/src/main/res/drawable/bg_empty_state_icon.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
     <solid android:color="@color/color_bg_surface" />
-    <corners android:radius="16dp" />
+    <corners android:radius="@dimen/radius_card" />
     <size android:width="56dp" android:height="56dp" />
 </shape>
diff --git a/app/src/main/res/drawable/bg_error_card.xml b/app/src/main/res/drawable/bg_error_card.xml
index 61737dbf8..ce382dbdd 100644
--- a/app/src/main/res/drawable/bg_error_card.xml
+++ b/app/src/main/res/drawable/bg_error_card.xml
@@ -2,5 +2,5 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <solid android:color="@color/color_error_card_bg" />
-    <corners android:radius="8dp" />
+    <corners android:radius="@dimen/radius_small" />
 </shape>
diff --git a/app/src/main/res/drawable/bg_hero_gradient.xml b/app/src/main/res/drawable/bg_hero_gradient.xml
index 9b9dc6df8..f92e870f6 100644
--- a/app/src/main/res/drawable/bg_hero_gradient.xml
+++ b/app/src/main/res/drawable/bg_hero_gradient.xml
@@ -6,5 +6,5 @@
         android:startColor="@color/white"
         android:endColor="@color/color_hero_gradient_end"
         android:angle="135" />
-    <corners android:radius="24dp" />
+    <corners android:radius="@dimen/radius_xl" />
 </shape>
diff --git a/app/src/main/res/drawable/bg_hero_gradient_active.xml b/app/src/main/res/drawable/bg_hero_gradient_active.xml
index faeaf9137..27dbe9826 100644
--- a/app/src/main/res/drawable/bg_hero_gradient_active.xml
+++ b/app/src/main/res/drawable/bg_hero_gradient_active.xml
@@ -6,5 +6,5 @@
         android:startColor="@color/white"
         android:endColor="@color/color_hero_gradient_active_end"
         android:angle="135" />
-    <corners android:radius="24dp" />
+    <corners android:radius="@dimen/radius_xl" />
 </shape>
diff --git a/app/src/main/res/drawable/bg_hero_gradient_dark.xml b/app/src/main/res/drawable/bg_hero_gradient_dark.xml
index eb1c1b7d2..5e2724769 100644
--- a/app/src/main/res/drawable/bg_hero_gradient_dark.xml
+++ b/app/src/main/res/drawable/bg_hero_gradient_dark.xml
@@ -9,5 +9,5 @@
     <stroke
         android:width="1dp"
         android:color="#1A5EFFC2" />
-    <corners android:radius="20dp" />
+    <corners android:radius="@dimen/radius_search" />
 </shape>
diff --git a/app/src/main/res/drawable/bg_hero_gradient_green.xml b/app/src/main/res/drawable/bg_hero_gradient_green.xml
index 91c9dfe6a..e9a8c479b 100644
--- a/app/src/main/res/drawable/bg_hero_gradient_green.xml
+++ b/app/src/main/res/drawable/bg_hero_gradient_green.xml
@@ -6,5 +6,5 @@
         android:startColor="@color/white"
         android:endColor="@color/color_hero_gradient_green_end"
         android:angle="135" />
-    <corners android:radius="20dp" />
+    <corners android:radius="@dimen/radius_search" />
 </shape>
diff --git a/app/src/main/res/drawable/bg_info_card.xml b/app/src/main/res/drawable/bg_info_card.xml
index cea7289cb..dc25b5f32 100644
--- a/app/src/main/res/drawable/bg_info_card.xml
+++ b/app/src/main/res/drawable/bg_info_card.xml
@@ -2,5 +2,5 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <solid android:color="@color/color_info_card_bg" />
-    <corners android:radius="16dp" />
+    <corners android:radius="@dimen/radius_card" />
 </shape>
diff --git a/app/src/main/res/drawable/bg_keypad_button_tip.xml b/app/src/main/res/drawable/bg_keypad_button_tip.xml
index b5a7630f1..99a9edd49 100644
--- a/app/src/main/res/drawable/bg_keypad_button_tip.xml
+++ b/app/src/main/res/drawable/bg_keypad_button_tip.xml
@@ -2,5 +2,5 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <solid android:color="@color/color_bg_surface" />
-    <corners android:radius="12dp" />
+    <corners android:radius="@dimen/radius_input" />
 </shape>
diff --git a/app/src/main/res/drawable/bg_mint_add_button.xml b/app/src/main/res/drawable/bg_mint_add_button.xml
index 4dbbacec2..c41ae7e94 100644
--- a/app/src/main/res/drawable/bg_mint_add_button.xml
+++ b/app/src/main/res/drawable/bg_mint_add_button.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <corners android:radius="12dp" />
+    <corners android:radius="@dimen/radius_input" />
     <stroke
         android:width="1dp"
         android:color="@color/color_stroke_on_dark"
diff --git a/app/src/main/res/drawable/bg_mint_item.xml b/app/src/main/res/drawable/bg_mint_item.xml
index 322e4bc4e..9cf024fa4 100644
--- a/app/src/main/res/drawable/bg_mint_item.xml
+++ b/app/src/main/res/drawable/bg_mint_item.xml
@@ -2,5 +2,5 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <solid android:color="@color/numo_navy" />
-    <corners android:radius="12dp" />
+    <corners android:radius="@dimen/radius_input" />
 </shape>
diff --git a/app/src/main/res/drawable/bg_onboarding_option_card.xml b/app/src/main/res/drawable/bg_onboarding_option_card.xml
index c0f4f3a1b..c345f28f1 100644
--- a/app/src/main/res/drawable/bg_onboarding_option_card.xml
+++ b/app/src/main/res/drawable/bg_onboarding_option_card.xml
@@ -3,7 +3,7 @@
     android:color="@color/color_divider">
     <item>
         <shape android:shape="rectangle">
-            <corners android:radius="16dp" />
+            <corners android:radius="@dimen/radius_card" />
             <solid android:color="@color/color_bg_light" />
         </shape>
     </item>
diff --git a/app/src/main/res/drawable/bg_pill_badge.xml b/app/src/main/res/drawable/bg_pill_badge.xml
index e952a6712..28f907f5c 100644
--- a/app/src/main/res/drawable/bg_pill_badge.xml
+++ b/app/src/main/res/drawable/bg_pill_badge.xml
@@ -2,5 +2,5 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <solid android:color="@color/color_bg_secondary" />
-    <corners android:radius="12dp" />
+    <corners android:radius="@dimen/radius_input" />
 </shape>
diff --git a/app/src/main/res/drawable/bg_pin_info_card.xml b/app/src/main/res/drawable/bg_pin_info_card.xml
index d9468586b..0f37c369a 100644
--- a/app/src/main/res/drawable/bg_pin_info_card.xml
+++ b/app/src/main/res/drawable/bg_pin_info_card.xml
@@ -2,5 +2,5 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <solid android:color="@color/color_pin_info_card_bg" />
-    <corners android:radius="16dp" />
+    <corners android:radius="@dimen/radius_card" />
 </shape>
diff --git a/app/src/main/res/drawable/bg_popup_menu.xml b/app/src/main/res/drawable/bg_popup_menu.xml
index 393ba8726..a55877956 100644
--- a/app/src/main/res/drawable/bg_popup_menu.xml
+++ b/app/src/main/res/drawable/bg_popup_menu.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <corners android:radius="12dp" />
+    <corners android:radius="@dimen/radius_input" />
     <solid android:color="@color/color_bg_white" />
     <stroke android:width="1dp" android:color="@color/color_chip_border" />
     <padding
diff --git a/app/src/main/res/drawable/bg_price_breakdown.xml b/app/src/main/res/drawable/bg_price_breakdown.xml
index 38882df48..f88cf1337 100644
--- a/app/src/main/res/drawable/bg_price_breakdown.xml
+++ b/app/src/main/res/drawable/bg_price_breakdown.xml
@@ -2,5 +2,5 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <solid android:color="@color/color_bg_tertiary" />
-    <corners android:radius="12dp" />
+    <corners android:radius="@dimen/radius_input" />
 </shape>
diff --git a/app/src/main/res/drawable/bg_processing_card.xml b/app/src/main/res/drawable/bg_processing_card.xml
index 6c374f3c9..f0e42fa98 100644
--- a/app/src/main/res/drawable/bg_processing_card.xml
+++ b/app/src/main/res/drawable/bg_processing_card.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <corners android:radius="24dp" />
+    <corners android:radius="@dimen/radius_xl" />
     <solid android:color="@color/color_bg_white" />
     <padding
         android:bottom="0dp"
diff --git a/app/src/main/res/drawable/bg_qr_card.xml b/app/src/main/res/drawable/bg_qr_card.xml
index 7c2a1a570..560a42d98 100644
--- a/app/src/main/res/drawable/bg_qr_card.xml
+++ b/app/src/main/res/drawable/bg_qr_card.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <corners android:radius="24dp" />
+    <corners android:radius="@dimen/radius_xl" />
     <solid android:color="@color/color_bg_white" />
     <stroke
         android:width="1dp"
diff --git a/app/src/main/res/drawable/bg_quantity_badge.xml b/app/src/main/res/drawable/bg_quantity_badge.xml
index f3d97c21f..0ec2e47a1 100644
--- a/app/src/main/res/drawable/bg_quantity_badge.xml
+++ b/app/src/main/res/drawable/bg_quantity_badge.xml
@@ -2,5 +2,5 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <solid android:color="@color/color_bg_tertiary" />
-    <corners android:radius="8dp" />
+    <corners android:radius="@dimen/radius_small" />
 </shape>
diff --git a/app/src/main/res/drawable/bg_rounded_card.xml b/app/src/main/res/drawable/bg_rounded_card.xml
index 1a06cc635..984ccb5d9 100644
--- a/app/src/main/res/drawable/bg_rounded_card.xml
+++ b/app/src/main/res/drawable/bg_rounded_card.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <corners android:radius="16dp" />
+    <corners android:radius="@dimen/radius_card" />
     <solid android:color="@color/color_bg_light" />
 </shape>
diff --git a/app/src/main/res/drawable/bg_rounded_card_large.xml b/app/src/main/res/drawable/bg_rounded_card_large.xml
index 3565bfc92..c96b90e25 100644
--- a/app/src/main/res/drawable/bg_rounded_card_large.xml
+++ b/app/src/main/res/drawable/bg_rounded_card_large.xml
@@ -2,5 +2,5 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <solid android:color="@color/color_bg_secondary" />
-    <corners android:radius="16dp" />
+    <corners android:radius="@dimen/radius_card" />
 </shape>
diff --git a/app/src/main/res/drawable/bg_row_ripple.xml b/app/src/main/res/drawable/bg_row_ripple.xml
index c2dc7e0f7..d172ffe7a 100644
--- a/app/src/main/res/drawable/bg_row_ripple.xml
+++ b/app/src/main/res/drawable/bg_row_ripple.xml
@@ -3,7 +3,7 @@
     android:color="@color/color_ripple">
     <item android:id="@android:id/mask">
         <shape android:shape="rectangle">
-            <corners android:radius="12dp" />
+            <corners android:radius="@dimen/radius_input" />
             <solid android:color="@android:color/white" />
         </shape>
     </item>
diff --git a/app/src/main/res/drawable/bg_save_button.xml b/app/src/main/res/drawable/bg_save_button.xml
index a19530b89..cd16f3e8e 100644
--- a/app/src/main/res/drawable/bg_save_button.xml
+++ b/app/src/main/res/drawable/bg_save_button.xml
@@ -4,7 +4,7 @@
     <item>
         <shape android:shape="rectangle">
             <solid android:color="@color/color_accent_blue" />
-            <corners android:radius="100dp" />
+            <corners android:radius="@dimen/radius_button_pill" />
         </shape>
     </item>
 </ripple>
diff --git a/app/src/main/res/drawable/bg_scanner_item_overlay.xml b/app/src/main/res/drawable/bg_scanner_item_overlay.xml
index 5c4077ed2..312d25178 100644
--- a/app/src/main/res/drawable/bg_scanner_item_overlay.xml
+++ b/app/src/main/res/drawable/bg_scanner_item_overlay.xml
@@ -3,6 +3,6 @@
     android:shape="rectangle">
     <solid android:color="@color/color_white_90" />
     <corners
-        android:topLeftRadius="24dp"
-        android:topRightRadius="24dp" />
+        android:topLeftRadius="@dimen/radius_xl"
+        android:topRightRadius="@dimen/radius_xl" />
 </shape>
diff --git a/app/src/main/res/drawable/bg_search_field.xml b/app/src/main/res/drawable/bg_search_field.xml
index a648bbb37..e5a6c3266 100644
--- a/app/src/main/res/drawable/bg_search_field.xml
+++ b/app/src/main/res/drawable/bg_search_field.xml
@@ -2,5 +2,5 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <solid android:color="@color/color_search_bg" />
-    <corners android:radius="12dp" />
+    <corners android:radius="@dimen/radius_input" />
 </shape>
diff --git a/app/src/main/res/drawable/bg_segment_tab_selected.xml b/app/src/main/res/drawable/bg_segment_tab_selected.xml
index 64b2df09f..02de3a320 100644
--- a/app/src/main/res/drawable/bg_segment_tab_selected.xml
+++ b/app/src/main/res/drawable/bg_segment_tab_selected.xml
@@ -2,7 +2,7 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <solid android:color="@color/color_bg_card" />
-    <corners android:radius="20dp" />
+    <corners android:radius="@dimen/radius_search" />
     <!-- <stroke
         android:width="1dp"
         android:color="#1A000000" /> -->
diff --git a/app/src/main/res/drawable/bg_status_pill_error.xml b/app/src/main/res/drawable/bg_status_pill_error.xml
index 786437bee..1b72efec5 100644
--- a/app/src/main/res/drawable/bg_status_pill_error.xml
+++ b/app/src/main/res/drawable/bg_status_pill_error.xml
@@ -2,5 +2,5 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <solid android:color="@color/color_status_error_bg" />
-    <corners android:radius="100dp" />
+    <corners android:radius="@dimen/radius_button_pill" />
 </shape>
diff --git a/app/src/main/res/drawable/bg_status_pill_pending.xml b/app/src/main/res/drawable/bg_status_pill_pending.xml
index 0f5ca7fe7..08f4e4b49 100644
--- a/app/src/main/res/drawable/bg_status_pill_pending.xml
+++ b/app/src/main/res/drawable/bg_status_pill_pending.xml
@@ -2,5 +2,5 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <solid android:color="@color/color_status_pending_bg" />
-    <corners android:radius="100dp" />
+    <corners android:radius="@dimen/radius_button_pill" />
 </shape>
diff --git a/app/src/main/res/drawable/bg_status_pill_success.xml b/app/src/main/res/drawable/bg_status_pill_success.xml
index 557aba648..d25daf13a 100644
--- a/app/src/main/res/drawable/bg_status_pill_success.xml
+++ b/app/src/main/res/drawable/bg_status_pill_success.xml
@@ -2,5 +2,5 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <solid android:color="@color/color_status_success_bg" />
-    <corners android:radius="100dp" />
+    <corners android:radius="@dimen/radius_button_pill" />
 </shape>
diff --git a/app/src/main/res/drawable/bg_success_card.xml b/app/src/main/res/drawable/bg_success_card.xml
index d9468586b..0f37c369a 100644
--- a/app/src/main/res/drawable/bg_success_card.xml
+++ b/app/src/main/res/drawable/bg_success_card.xml
@@ -2,5 +2,5 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <solid android:color="@color/color_pin_info_card_bg" />
-    <corners android:radius="16dp" />
+    <corners android:radius="@dimen/radius_card" />
 </shape>
diff --git a/app/src/main/res/drawable/bg_tip_button_large.xml b/app/src/main/res/drawable/bg_tip_button_large.xml
index 300686e05..79dd3d31a 100644
--- a/app/src/main/res/drawable/bg_tip_button_large.xml
+++ b/app/src/main/res/drawable/bg_tip_button_large.xml
@@ -2,7 +2,7 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <solid android:color="@color/color_bg_surface" />
-    <corners android:radius="16dp" />
+    <corners android:radius="@dimen/radius_card" />
     <stroke
         android:width="1dp"
         android:color="@color/color_divider" />
diff --git a/app/src/main/res/drawable/bg_tip_button_large_selected.xml b/app/src/main/res/drawable/bg_tip_button_large_selected.xml
index 094036c36..8d8f67cae 100644
--- a/app/src/main/res/drawable/bg_tip_button_large_selected.xml
+++ b/app/src/main/res/drawable/bg_tip_button_large_selected.xml
@@ -2,5 +2,5 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <solid android:color="@color/color_success_green" />
-    <corners android:radius="16dp" />
+    <corners android:radius="@dimen/radius_card" />
 </shape>
diff --git a/app/src/main/res/drawable/bg_tip_button_selected.xml b/app/src/main/res/drawable/bg_tip_button_selected.xml
index a907e22bc..dfce1a675 100644
--- a/app/src/main/res/drawable/bg_tip_button_selected.xml
+++ b/app/src/main/res/drawable/bg_tip_button_selected.xml
@@ -2,5 +2,5 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <solid android:color="@color/color_primary_green" />
-    <corners android:radius="18dp" />
+    <corners android:radius="@dimen/radius_chip" />
 </shape>
diff --git a/app/src/main/res/drawable/bg_tip_button_unselected.xml b/app/src/main/res/drawable/bg_tip_button_unselected.xml
index 3962145a2..aee52c4c3 100644
--- a/app/src/main/res/drawable/bg_tip_button_unselected.xml
+++ b/app/src/main/res/drawable/bg_tip_button_unselected.xml
@@ -2,7 +2,7 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <solid android:color="@color/color_bg_card" />
-    <corners android:radius="18dp" />
+    <corners android:radius="@dimen/radius_chip" />
     <stroke
         android:width="1dp"
         android:color="@color/color_divider" />
diff --git a/app/src/main/res/drawable/bg_warning_card.xml b/app/src/main/res/drawable/bg_warning_card.xml
index 64afdcbb5..33d0b2eea 100644
--- a/app/src/main/res/drawable/bg_warning_card.xml
+++ b/app/src/main/res/drawable/bg_warning_card.xml
@@ -2,5 +2,5 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <solid android:color="@color/color_warning_card_bg" />
-    <corners android:radius="16dp" />
+    <corners android:radius="@dimen/radius_card" />
 </shape>
diff --git a/app/src/main/res/drawable/contactless.png b/app/src/main/res/drawable/contactless.png
deleted file mode 100644
index 56240e9d1..000000000
Binary files a/app/src/main/res/drawable/contactless.png and /dev/null differ
diff --git a/app/src/main/res/drawable/contactless.xml b/app/src/main/res/drawable/contactless.xml
new file mode 100644
index 000000000..6a52b8d69
--- /dev/null
+++ b/app/src/main/res/drawable/contactless.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <group
+        android:scaleX="0.025"
+        android:scaleY="0.025"
+        android:translateY="24">
+        <path android:fillColor="@color/color_text_primary" android:pathData="M336-374q9-24 14.5-50.5T356-480q0-29-5.5-55.5T336-586l-74 30q6 18 10 37t4 39q0 20-4 39t-10 37l74 30Zm128 54q17-38 24.5-78t7.5-82q0-42-7.5-82T464-640l-74 30q14 30 20 62.5t6 67.5q0 35-6 67.5T390-350l74 30Zm130 54q21-50 31.5-103.5T636-480q0-57-10.5-110.5T594-694l-74 32q18 42 27 88t9 94q0 48-9 94t-27 88l74 32ZM480-80q-83 0-156-31.5T197-197q-54-54-85.5-127T80-480q0-83 31.5-156T197-763q54-54 127-85.5T480-880q83 0 156 31.5T763-763q54 54 85.5 127T880-480q0 83-31.5 156T763-197q-54 54-127 85.5T480-80Zm0-80q134 0 227-93t93-227q0-134-93-227t-227-93q-134 0-227 93t-93 227q0 134 93 227t227 93Zm0-320Z" />
+    </group>
+</vector>
diff --git a/app/src/main/res/drawable/ic_add.xml b/app/src/main/res/drawable/ic_add.xml
index 30c95f75f..1ce81dbab 100644
--- a/app/src/main/res/drawable/ic_add.xml
+++ b/app/src/main/res/drawable/ic_add.xml
@@ -4,7 +4,10 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>
+    <group
+        android:scaleX="0.025"
+        android:scaleY="0.025"
+        android:translateY="24">
+        <path android:fillColor="@android:color/white" android:pathData="M440-440H200v-80h240v-240h80v240h240v80H520v240h-80v-240Z" />
+    </group>
 </vector>
diff --git a/app/src/main/res/drawable/ic_add_circle.xml b/app/src/main/res/drawable/ic_add_circle.xml
index c4c3571e0..a7d269584 100644
--- a/app/src/main/res/drawable/ic_add_circle.xml
+++ b/app/src/main/res/drawable/ic_add_circle.xml
@@ -4,7 +4,10 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="#000000"
-        android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM17,13h-4v4h-2v-4H7v-2h4V7h2v4h4v2z"/>
+    <group
+        android:scaleX="0.025"
+        android:scaleY="0.025"
+        android:translateY="24">
+        <path android:fillColor="@color/black" android:pathData="M440-280h80v-160h160v-80H520v-160h-80v160H280v80h160v160Zm40 200q-83 0-156-31.5T197-197q-54-54-85.5-127T80-480q0-83 31.5-156T197-763q54-54 127-85.5T480-880q83 0 156 31.5T763-763q54 54 85.5 127T880-480q0 83-31.5 156T763-197q-54 54-127 85.5T480-80Zm0-80q134 0 227-93t93-227q0-134-93-227t-227-93q-134 0-227 93t-93 227q0 134 93 227t227 93Zm0-320Z" />
+    </group>
 </vector>
diff --git a/app/src/main/res/drawable/ic_arrow_back.xml b/app/src/main/res/drawable/ic_arrow_back.xml
index c5b42265f..e4d23fec9 100644
--- a/app/src/main/res/drawable/ic_arrow_back.xml
+++ b/app/src/main/res/drawable/ic_arrow_back.xml
@@ -1,4 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
-    <path android:fillColor="@android:color/white" android:pathData="M19 11H7.14l3.63-4.36a1 1 0 1 0-1.54-1.28l-5 6a1.19 1.19 0 0 0-.09.15c0 .05 0 .08-.07.13A1 1 0 0 0 4 12a1 1 0 0 0 .07.36c0 .05 0 .08.07.13a1.19 1.19 0 0 0 .09.15l5 6A1 1 0 0 0 10 19a1 1 0 0 0 .64-.23 1 1 0 0 0 .13-1.41L7.14 13H19a1 1 0 0 0 0-2z" />
-</vector>
\ No newline at end of file
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <group
+        android:scaleX="0.025"
+        android:scaleY="0.025"
+        android:translateY="24">
+        <path android:fillColor="@android:color/white" android:pathData="m313-440 224 224-57 56-320-320 320-320 57 56-224 224h487v80H313Z" />
+    </group>
+</vector>
diff --git a/app/src/main/res/drawable/ic_arrow_down_receive.xml b/app/src/main/res/drawable/ic_arrow_down_receive.xml
index 577015fd9..fd3b4d188 100644
--- a/app/src/main/res/drawable/ic_arrow_down_receive.xml
+++ b/app/src/main/res/drawable/ic_arrow_down_receive.xml
@@ -4,7 +4,10 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="@color/white"
-        android:pathData="M12,4a1,1 0,0 1,1 1v11.59l4.29,-4.3a1,1 0,0 1,1.42 1.42l-6,6a1,1 0,0 1,-1.42 0l-6,-6a1,1 0,0 1,1.42 -1.42L11,16.59V5A1,1 0,0 1,12 4z" />
+    <group
+        android:scaleX="0.025"
+        android:scaleY="0.025"
+        android:translateY="24">
+        <path android:fillColor="@color/white" android:pathData="M440-800v487L216-537l-56 57 320 320 320-320-56-57-224 224v-487h-80Z" />
+    </group>
 </vector>
diff --git a/app/src/main/res/drawable/ic_arrow_up_send.xml b/app/src/main/res/drawable/ic_arrow_up_send.xml
index ed254b7ca..67ca36f2f 100644
--- a/app/src/main/res/drawable/ic_arrow_up_send.xml
+++ b/app/src/main/res/drawable/ic_arrow_up_send.xml
@@ -4,7 +4,10 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="@color/white"
-        android:pathData="M12,20a1,1 0,0 1,-1 -1V7.41l-4.29,4.3A1,1 0,0 1,5.29 10.29l6,-6a1,1 0,0 1,1.42 0l6,6a1,1 0,0 1,-1.42 1.42L13,7.41V19A1,1 0,0 1,12 20z" />
+    <group
+        android:scaleX="0.025"
+        android:scaleY="0.025"
+        android:translateY="24">
+        <path android:fillColor="@color/white" android:pathData="M440-160v-487L216-423l-56-57 320-320 320 320-56 57-224-224v487h-80Z" />
+    </group>
 </vector>
diff --git a/app/src/main/res/drawable/ic_autoplay.xml b/app/src/main/res/drawable/ic_autoplay.xml
index 2c56171e4..89ce4c026 100644
--- a/app/src/main/res/drawable/ic_autoplay.xml
+++ b/app/src/main/res/drawable/ic_autoplay.xml
@@ -1,9 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="@color/black"
-        android:pathData="M12,6v3l4,-4 -4,-4v3c-4.42,0 -8,3.58 -8,8 0,1.57 0.46,3.03 1.24,4.26L6.7,14.8C6.25,13.97 6,13.01 6,12c0,-3.31 2.69,-6 6,-6zM18.76,7.74L17.3,9.2C17.74,10.04 18,10.99 18,12c0,3.31 -2.69,6 -6,6v-3l-4,4 4,4v-3c4.42,0 8,-3.58 8,-8 0,-1.57 -0.46,-3.03 -1.24,-4.26z"/>
+    <group
+        android:scaleX="0.025"
+        android:scaleY="0.025"
+        android:translateY="24">
+        <path android:fillColor="@color/black" android:pathData="M380-300v-360l280 180-280 180ZM480-40q-108 0-202.5-49.5T120-228v108H40v-240h240v80h-98q51 75 129.5 117.5T480-120q115 0 208.5-66T820-361l78 18q-45 136-160 219.5T480-40ZM42-520q7-67 32-128.5T143-762l57 57q-32 41-52 87.5T123-520H42Zm214-241-57-57q53-44 114-69.5T440-918v80q-51 5-97 25t-87 52Zm449 0q-41-32-87.5-52T520-838v-80q67 6 128.5 31T762-818l-57 57Zm133 241q-5-51-25-97.5T761-705l57-57q44 52 69 113.5T918-520h-80Z" />
+    </group>
 </vector>
diff --git a/app/src/main/res/drawable/ic_backspace.xml b/app/src/main/res/drawable/ic_backspace.xml
index 0ab4a2bb5..814397443 100644
--- a/app/src/main/res/drawable/ic_backspace.xml
+++ b/app/src/main/res/drawable/ic_backspace.xml
@@ -4,7 +4,10 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="@android:color/black"
-        android:pathData="M22,3H7c-0.69,0 -1.23,0.35 -1.59,0.88L0,12l5.41,8.11c0.36,0.53 0.9,0.89 1.59,0.89h15c1.1,0 2,-0.9 2,-2V5c0,-1.1 -0.9,-2 -2,-2zM19,15.59L17.59,17 14,13.41 10.41,17 9,15.59 12.59,12 9,8.41 10.41,7 14,10.59 17.59,7 19,8.41 15.41,12 19,15.59z"/>
+    <group
+        android:scaleX="0.025"
+        android:scaleY="0.025"
+        android:translateY="24">
+        <path android:fillColor="@android:color/black" android:pathData="M360-200q-20 0-37.5-9T294-234L120-480l174-246q11-16 28.5-25t37.5-9h400q33 0 56.5 23.5T840-680v400q0 33-23.5 56.5T760-200H360Zm400-80v-400 400Zm-400 0h400v-400H360L218-480l142 200Zm96-40 104-104 104 104 56-56-104-104 104-104-56-56-104 104-104-104-56 56 104 104-104 104 56 56Z" />
+    </group>
 </vector>
diff --git a/app/src/main/res/drawable/ic_bank.xml b/app/src/main/res/drawable/ic_bank.xml
index adfb556fa..8e9e2cd68 100644
--- a/app/src/main/res/drawable/ic_bank.xml
+++ b/app/src/main/res/drawable/ic_bank.xml
@@ -4,7 +4,10 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="@color/black"
-        android:pathData="M4,10h3v7H4V10zM10.5,10h3v7h-3V10zM2,19h20v3H2V19zM17,10h3v7h-3V10zM12,1L2,6v2h20V6L12,1z" />
+    <group
+        android:scaleX="0.025"
+        android:scaleY="0.025"
+        android:translateY="24">
+        <path android:fillColor="@color/black" android:pathData="M200-280v-280h80v280h-80Zm240 0v-280h80v280h-80ZM80-120v-80h800v80H80Zm600-160v-280h80v280h-80ZM80-640v-80l400-200 400 200v80H80Zm178-80h444-444Zm0 0h444L480-830 258-720Z" />
+    </group>
 </vector>
diff --git a/app/src/main/res/drawable/ic_barcode_scan.xml b/app/src/main/res/drawable/ic_barcode_scan.xml
index 70dc0fe2a..d5907c34c 100644
--- a/app/src/main/res/drawable/ic_barcode_scan.xml
+++ b/app/src/main/res/drawable/ic_barcode_scan.xml
@@ -4,11 +4,10 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <!-- Barcode scan icon -->
-    <path
-        android:fillColor="@color/black"
-        android:pathData="M2,4h4V2H2C0.9,2 0,2.9 0,4v4h2V4z M22,2h-4v2h4v4h2V4C24,2.9 23.1,2 22,2z M2,16H0v4c0,1.1 0.9,2 2,2h4v-2H2V16z M22,20h-4v2h4c1.1,0 2,-0.9 2,-2v-4h-2V20z"/>
-    <path
-        android:fillColor="@color/black"
-        android:pathData="M4,7h2v10H4V7z M8,7h1v10H8V7z M11,7h2v10h-2V7z M15,7h1v10h-1V7z M18,7h2v10h-2V7z"/>
+    <group
+        android:scaleX="0.025"
+        android:scaleY="0.025"
+        android:translateY="24">
+        <path android:fillColor="@color/black" android:pathData="M40-120v-200h80v120h120v80H40Zm680 0v-80h120v-120h80v200H720ZM160-240v-480h80v480h-80Zm120 0v-480h40v480h-40Zm120 0v-480h80v480h-80Zm120 0v-480h120v480H520Zm160 0v-480h40v480h-40Zm80 0v-480h40v480h-40ZM40-640v-200h200v80H120v120H40Zm800 0v-120H720v-80h200v200h-80Z" />
+    </group>
 </vector>
diff --git a/app/src/main/res/drawable/ic_bitcoin.xml b/app/src/main/res/drawable/ic_bitcoin.xml
index 6c8cf313c..06abb87ad 100644
--- a/app/src/main/res/drawable/ic_bitcoin.xml
+++ b/app/src/main/res/drawable/ic_bitcoin.xml
@@ -1,4 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
-    <path android:fillColor="@android:color/white" android:pathData="M19 5H5a3 3 0 0 0-3 3v8a3 3 0 0 0 3 3h14a3 3 0 0 0 3-3V8a3 3 0 0 0-3-3zm-8 10H7a1 1 0 0 1 0-2h4a1 1 0 0 1 0 2zm6 0h-2a1 1 0 0 1 0-2h2a1 1 0 0 1 0 2zm3-6H4V8a1 1 0 0 1 1-1h14a1 1 0 0 1 1 1z" />
-</vector>
\ No newline at end of file
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <group
+        android:scaleX="0.025"
+        android:scaleY="0.025"
+        android:translateY="24">
+        <path android:fillColor="@android:color/white" android:pathData="M360-120v-80H240v-80h80v-400h-80v-80h120v-80h80v80h80v-80h80v85q52 14 86 56.5t34 98.5q0 29-10 55.5T682-497q35 21 56.5 57t21.5 80q0 66-47 113t-113 47v80h-80v-80h-80v80h-80Zm40-400h160q33 0 56.5-23.5T640-600q0-33-23.5-56.5T560-680H400v160Zm0 240h200q33 0 56.5-23.5T680-360q0-33-23.5-56.5T600-440H400v160Z" />
+    </group>
+</vector>
diff --git a/app/src/main/res/drawable/ic_camera.xml b/app/src/main/res/drawable/ic_camera.xml
index 92c39332c..f95470e7d 100644
--- a/app/src/main/res/drawable/ic_camera.xml
+++ b/app/src/main/res/drawable/ic_camera.xml
@@ -4,10 +4,10 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="@android:color/black"
-        android:pathData="M12,15.2a3.2,3.2 0,1 0,0 -6.4a3.2,3.2 0,0 0,0 6.4z"/>
-    <path
-        android:fillColor="@android:color/black"
-        android:pathData="M9,2L7.17,4H4C2.9,4 2,4.9 2,6v12c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2V6c0,-1.1 -0.9,-2 -2,-2h-3.17L15,2H9zM12,17c-2.76,0 -5,-2.24 -5,-5s2.24,-5 5,-5 5,2.24 5,5 -2.24,5 -5,5z"/>
+    <group
+        android:scaleX="0.025"
+        android:scaleY="0.025"
+        android:translateY="24">
+        <path android:fillColor="@android:color/black" android:pathData="M480-260q75 0 127.5-52.5T660-440q0-75-52.5-127.5T480-620q-75 0-127.5 52.5T300-440q0 75 52.5 127.5T480-260Zm0-80q-42 0-71-29t-29-71q0-42 29-71t71-29q42 0 71 29t29 71q0 42-29 71t-71 29ZM160-120q-33 0-56.5-23.5T80-200v-480q0-33 23.5-56.5T160-760h126l74-80h240l74 80h126q33 0 56.5 23.5T880-680v480q0 33-23.5 56.5T800-120H160Zm0-80h640v-480H638l-73-80H395l-73 80H160v480Zm320-240Z" />
+    </group>
 </vector>
diff --git a/app/src/main/res/drawable/ic_card.xml b/app/src/main/res/drawable/ic_card.xml
index 408b818ab..b7ade784e 100644
--- a/app/src/main/res/drawable/ic_card.xml
+++ b/app/src/main/res/drawable/ic_card.xml
@@ -1,4 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
-    <path android:fillColor="@android:color/white" android:pathData="M19 5H5a3 3 0 0 0-3 3v8a3 3 0 0 0 3 3h14a3 3 0 0 0 3-3V8a3 3 0 0 0-3-3zm-8 10H7a1 1 0 0 1 0-2h4a1 1 0 0 1 0 2zm6 0h-2a1 1 0 0 1 0-2h2a1 1 0 0 1 0 2zm3-6H4V8a1 1 0 0 1 1-1h14a1 1 0 0 1 1 1z" />
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <group
+        android:scaleX="0.025"
+        android:scaleY="0.025"
+        android:translateY="24">
+        <path android:fillColor="@android:color/white" android:pathData="M880-720v480q0 33-23.5 56.5T800-160H160q-33 0-56.5-23.5T80-240v-480q0-33 23.5-56.5T160-800h640q33 0 56.5 23.5T880-720Zm-720 80h640v-80H160v80Zm0 160v240h640v-240H160Zm0 240v-480 480Z" />
+    </group>
 </vector>
diff --git a/app/src/main/res/drawable/ic_catalog.xml b/app/src/main/res/drawable/ic_catalog.xml
index 53b206696..e81ee91d9 100644
--- a/app/src/main/res/drawable/ic_catalog.xml
+++ b/app/src/main/res/drawable/ic_catalog.xml
@@ -1,7 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
-    <path android:fillColor="@color/black" android:pathData="M9 3H5a2 2 0 0 0-2 2v4a2 2 0 0 0 2 2h4a2 2 0 0 0 2-2V5a2 2 0 0 0-2-2z" />
-    <path android:fillColor="@color/black" android:pathData="M19 3h-4a2 2 0 0 0-2 2v4a2 2 0 0 0 2 2h4a2 2 0 0 0 2-2V5a2 2 0 0 0-2-2z" />
-    <path android:fillColor="@color/black" android:pathData="M9 13H5a2 2 0 0 0-2 2v4a2 2 0 0 0 2 2h4a2 2 0 0 0 2-2v-4a2 2 0 0 0-2-2z" />
-    <path android:fillColor="@color/black" android:pathData="M19 13h-4a2 2 0 0 0-2 2v4a2 2 0 0 0 2 2h4a2 2 0 0 0 2-2v-4a2 2 0 0 0-2-2z" />
-</vector>
\ No newline at end of file
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <group
+        android:scaleX="0.025"
+        android:scaleY="0.025"
+        android:translateY="24">
+        <path android:fillColor="@color/black" android:pathData="M120-520v-320h320v320H120Zm0 400v-320h320v320H120Zm400-400v-320h320v320H520Zm0 400v-320h320v320H520ZM200-600h160v-160H200v160Zm400 0h160v-160H600v160Zm0 400h160v-160H600v160Zm-400 0h160v-160H200v160Zm400-400Zm0 240Zm-240 0Zm0-240Z" />
+    </group>
+</vector>
diff --git a/app/src/main/res/drawable/ic_check.xml b/app/src/main/res/drawable/ic_check.xml
index dac94b4fe..665834962 100644
--- a/app/src/main/res/drawable/ic_check.xml
+++ b/app/src/main/res/drawable/ic_check.xml
@@ -1,4 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
-    <path android:fillColor="@color/black" android:pathData="M9.86 18a1 1 0 0 1-.73-.32l-4.86-5.17a1 1 0 1 1 1.46-1.37l4.12 4.39 8.41-9.2a1 1 0 1 1 1.48 1.34l-9.14 10a1 1 0 0 1-.73.33z" />
-</vector>
\ No newline at end of file
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <group
+        android:scaleX="0.025"
+        android:scaleY="0.025"
+        android:translateY="24">
+        <path android:fillColor="@color/black" android:pathData="M382-240 154-468l57-57 171 171 367-367 57 57-424 424Z" />
+    </group>
+</vector>
diff --git a/app/src/main/res/drawable/ic_check_small.xml b/app/src/main/res/drawable/ic_check_small.xml
index dfdb6be37..fbda392de 100644
--- a/app/src/main/res/drawable/ic_check_small.xml
+++ b/app/src/main/res/drawable/ic_check_small.xml
@@ -4,8 +4,10 @@
     android:height="12dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <!-- Bold checkmark with thick rounded strokes -->
-    <path
-        android:fillColor="@color/white"
-        android:pathData="M9.55,18l-5.7,-5.7 2.15,-2.15 3.55,3.55 7.95,-7.95 2.15,2.15z" />
+    <group
+        android:scaleX="0.025"
+        android:scaleY="0.025"
+        android:translateY="24">
+        <path android:fillColor="@color/white" android:pathData="M400-304 240-464l56-56 104 104 264-264 56 56-320 320Z" />
+    </group>
 </vector>
diff --git a/app/src/main/res/drawable/ic_checkbox_checked.xml b/app/src/main/res/drawable/ic_checkbox_checked.xml
index 7b848257a..1de3c34ff 100644
--- a/app/src/main/res/drawable/ic_checkbox_checked.xml
+++ b/app/src/main/res/drawable/ic_checkbox_checked.xml
@@ -4,7 +4,10 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="@color/black"
-        android:pathData="M19,3H5C3.89,3 3,3.9 3,5v14c0,1.1 0.89,2 2,2h14c1.11,0 2,-0.9 2,-2V5c0,-1.1 -0.89,-2 -2,-2zM10,17l-5,-5 1.41,-1.41L10,14.17l7.59,-7.59L19,8l-9,9z" />
+    <group
+        android:scaleX="0.025"
+        android:scaleY="0.025"
+        android:translateY="24">
+        <path android:fillColor="@color/black" android:pathData="m424-312 282-282-56-56-226 226-114-114-56 56 170 170ZM200-120q-33 0-56.5-23.5T120-200v-560q0-33 23.5-56.5T200-840h560q33 0 56.5 23.5T840-760v560q0 33-23.5 56.5T760-120H200Zm0-80h560v-560H200v560Zm0-560v560-560Z" />
+    </group>
 </vector>
diff --git a/app/src/main/res/drawable/ic_checkbox_unchecked.xml b/app/src/main/res/drawable/ic_checkbox_unchecked.xml
index dde36109d..02103e313 100644
--- a/app/src/main/res/drawable/ic_checkbox_unchecked.xml
+++ b/app/src/main/res/drawable/ic_checkbox_unchecked.xml
@@ -4,7 +4,10 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="@color/black"
-        android:pathData="M19,5v14H5V5h14m0,-2H5c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2V5c0,-1.1 -0.9,-2 -2,-2z" />
+    <group
+        android:scaleX="0.025"
+        android:scaleY="0.025"
+        android:translateY="24">
+        <path android:fillColor="@color/black" android:pathData="M200-120q-33 0-56.5-23.5T120-200v-560q0-33 23.5-56.5T200-840h560q33 0 56.5 23.5T840-760v560q0 33-23.5 56.5T760-120H200Zm0-80h560v-560H200v560Z" />
+    </group>
 </vector>
diff --git a/app/src/main/res/drawable/ic_checkmark_circle.xml b/app/src/main/res/drawable/ic_checkmark_circle.xml
index 98bd84850..7afde1d0a 100644
--- a/app/src/main/res/drawable/ic_checkmark_circle.xml
+++ b/app/src/main/res/drawable/ic_checkmark_circle.xml
@@ -1,4 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
-    <path android:fillColor="@color/color_primary_green" android:pathData="M12 2a10 10 0 1 0 10 10A10 10 0 0 0 12 2zm4.3 7.61l-4.57 6a1 1 0 0 1-.79.39 1 1 0 0 1-.79-.38l-2.44-3.11a1 1 0 0 1 1.58-1.23l1.63 2.08 3.78-5a1 1 0 1 1 1.6 1.22z" />
-</vector>
\ No newline at end of file
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <group
+        android:scaleX="0.025"
+        android:scaleY="0.025"
+        android:translateY="24">
+        <path android:fillColor="@color/color_primary_green" android:pathData="m424-296 282-282-56-56-226 226-114-114-56 56 170 170Zm56 216q-83 0-156-31.5T197-197q-54-54-85.5-127T80-480q0-83 31.5-156T197-763q54-54 127-85.5T480-880q83 0 156 31.5T763-763q54 54 85.5 127T880-480q0 83-31.5 156T763-197q-54 54-127 85.5T480-80Zm0-80q134 0 227-93t93-227q0-134-93-227t-227-93q-134 0-227 93t-93 227q0 134 93 227t227 93Zm0-320Z" />
+    </group>
+</vector>
diff --git a/app/src/main/res/drawable/ic_checkmark_circle_2.xml b/app/src/main/res/drawable/ic_checkmark_circle_2.xml
index f0ae7a8e1..7afde1d0a 100644
--- a/app/src/main/res/drawable/ic_checkmark_circle_2.xml
+++ b/app/src/main/res/drawable/ic_checkmark_circle_2.xml
@@ -4,13 +4,10 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <!-- Solid circle background -->
-    <path
-        android:fillColor="@color/color_primary_green"
-        android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2z" />
-    <!-- Checkmark -->
-    <path
-        android:fillColor="@color/color_bg_white"
-        android:pathData="M9,16.17L4.83,12l-1.42,1.41L9,19 21,7l-1.41,-1.41z" />
+    <group
+        android:scaleX="0.025"
+        android:scaleY="0.025"
+        android:translateY="24">
+        <path android:fillColor="@color/color_primary_green" android:pathData="m424-296 282-282-56-56-226 226-114-114-56 56 170 170Zm56 216q-83 0-156-31.5T197-197q-54-54-85.5-127T80-480q0-83 31.5-156T197-763q54-54 127-85.5T480-880q83 0 156 31.5T763-763q54 54 85.5 127T880-480q0 83-31.5 156T763-197q-54 54-127 85.5T480-80Zm0-80q134 0 227-93t93-227q0-134-93-227t-227-93q-134 0-227 93t-93 227q0 134 93 227t227 93Zm0-320Z" />
+    </group>
 </vector>
-
diff --git a/app/src/main/res/drawable/ic_checkmark_dark.xml b/app/src/main/res/drawable/ic_checkmark_dark.xml
index 4522f9a15..2936ca1ea 100644
--- a/app/src/main/res/drawable/ic_checkmark_dark.xml
+++ b/app/src/main/res/drawable/ic_checkmark_dark.xml
@@ -4,11 +4,10 @@
     android:height="14dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:pathData="M5,13l4,4L19,7"
-        android:strokeColor="@color/color_bg_white"
-        android:strokeWidth="2.5"
-        android:strokeLineCap="round"
-        android:strokeLineJoin="round"
-        android:fillColor="@android:color/transparent" />
+    <group
+        android:scaleX="0.025"
+        android:scaleY="0.025"
+        android:translateY="24">
+        <path android:fillColor="@color/color_bg_white" android:pathData="M382-240 154-468l57-57 171 171 367-367 57 57-424 424Z" />
+    </group>
 </vector>
diff --git a/app/src/main/res/drawable/ic_chevron_back.xml b/app/src/main/res/drawable/ic_chevron_back.xml
index 6b8c0cde4..68a348465 100644
--- a/app/src/main/res/drawable/ic_chevron_back.xml
+++ b/app/src/main/res/drawable/ic_chevron_back.xml
@@ -1,4 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
-    <path android:fillColor="@color/white" android:pathData="M13.36 17a1 1 0 0 1-.72-.31l-3.86-4a1 1 0 0 1 0-1.4l4-4a1 1 0 1 1 1.42 1.42L10.9 12l3.18 3.3a1 1 0 0 1 0 1.41 1 1 0 0 1-.72.29z" />
-</vector>
\ No newline at end of file
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <group
+        android:scaleX="0.025"
+        android:scaleY="0.025"
+        android:translateY="24">
+        <path android:fillColor="@color/white" android:pathData="M560-240 320-480l240-240 56 56-184 184 184 184-56 56Z" />
+    </group>
+</vector>
diff --git a/app/src/main/res/drawable/ic_chevron_down.xml b/app/src/main/res/drawable/ic_chevron_down.xml
index 947098dcf..5c8c16b3d 100644
--- a/app/src/main/res/drawable/ic_chevron_down.xml
+++ b/app/src/main/res/drawable/ic_chevron_down.xml
@@ -4,7 +4,10 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="@color/black"
-        android:pathData="M7.41,8.59L12,13.17l4.59,-4.58L18,10l-6,6 -6,-6 1.41,-1.41z"/>
+    <group
+        android:scaleX="0.025"
+        android:scaleY="0.025"
+        android:translateY="24">
+        <path android:fillColor="@color/black" android:pathData="M480-345 240-585l56-56 184 184 184-184 56 56-240 240Z" />
+    </group>
 </vector>
diff --git a/app/src/main/res/drawable/ic_chevron_down_hint.xml b/app/src/main/res/drawable/ic_chevron_down_hint.xml
index b7ae66f3f..b16033934 100644
--- a/app/src/main/res/drawable/ic_chevron_down_hint.xml
+++ b/app/src/main/res/drawable/ic_chevron_down_hint.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
-    android:height="14dp"
+    android:height="24dp"
     android:viewportWidth="24"
-    android:viewportHeight="14">
-    <path
-        android:pathData="M4,4L12,11L20,4"
-        android:strokeWidth="2"
-        android:strokeColor="@color/numo_fluorescent_green"
-        android:strokeLineCap="round"
-        android:strokeLineJoin="round" />
+    android:viewportHeight="24">
+    <group
+        android:scaleX="0.025"
+        android:scaleY="0.025"
+        android:translateY="24">
+        <path android:fillColor="@color/numo_fluorescent_green" android:pathData="M480-345 240-585l56-56 184 184 184-184 56 56-240 240Z" />
+    </group>
 </vector>
diff --git a/app/src/main/res/drawable/ic_chevron_forward.xml b/app/src/main/res/drawable/ic_chevron_forward.xml
index 7c1f55bc9..ca8a2f6d9 100644
--- a/app/src/main/res/drawable/ic_chevron_forward.xml
+++ b/app/src/main/res/drawable/ic_chevron_forward.xml
@@ -1,4 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
-    <path android:fillColor="@color/black" android:pathData="M10.5 17a1 1 0 0 1-.71-.29 1 1 0 0 1 0-1.42L13.1 12 9.92 8.69a1 1 0 0 1 0-1.41 1 1 0 0 1 1.42 0l3.86 4a1 1 0 0 1 0 1.4l-4 4a1 1 0 0 1-.7.32z" />
-</vector>
\ No newline at end of file
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <group
+        android:scaleX="0.025"
+        android:scaleY="0.025"
+        android:translateY="24">
+        <path android:fillColor="@color/black" android:pathData="M504-480 320-664l56-56 240 240-240 240-56-56 184-184Z" />
+    </group>
+</vector>
diff --git a/app/src/main/res/drawable/ic_chevron_right.xml b/app/src/main/res/drawable/ic_chevron_right.xml
index 0b1f1a0cc..ca8a2f6d9 100644
--- a/app/src/main/res/drawable/ic_chevron_right.xml
+++ b/app/src/main/res/drawable/ic_chevron_right.xml
@@ -4,7 +4,10 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="@color/black"
-        android:pathData="M10,6L8.59,7.41 13.17,12l-4.58,4.59L10,18l6,-6z"/>
+    <group
+        android:scaleX="0.025"
+        android:scaleY="0.025"
+        android:translateY="24">
+        <path android:fillColor="@color/black" android:pathData="M504-480 320-664l56-56 240 240-240 240-56-56 184-184Z" />
+    </group>
 </vector>
diff --git a/app/src/main/res/drawable/ic_chevron_up.xml b/app/src/main/res/drawable/ic_chevron_up.xml
index a20819033..bf00e8dd6 100644
--- a/app/src/main/res/drawable/ic_chevron_up.xml
+++ b/app/src/main/res/drawable/ic_chevron_up.xml
@@ -1,9 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="@color/black"
-        android:pathData="M7.41,15.41L12,10.83l4.59,4.58L18,14l-6,-6 -6,6 1.41,1.41z"/>
+    <group
+        android:scaleX="0.025"
+        android:scaleY="0.025"
+        android:translateY="24">
+        <path android:fillColor="@color/black" android:pathData="m296-345-56-56 240-240 240 240-56 56-184-184-184 184Z" />
+    </group>
 </vector>
diff --git a/app/src/main/res/drawable/ic_clock_small.xml b/app/src/main/res/drawable/ic_clock_small.xml
index ef9941feb..224380ea3 100644
--- a/app/src/main/res/drawable/ic_clock_small.xml
+++ b/app/src/main/res/drawable/ic_clock_small.xml
@@ -4,18 +4,10 @@
     android:height="12dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <!-- Clock circle - thick stroke -->
-    <path
-        android:pathData="M12,12m-9,0a9,9 0,1 1,18 0a9,9 0,1 1,-18 0"
-        android:strokeWidth="3"
-        android:fillColor="#00000000"
-        android:strokeColor="@color/white" />
-    <!-- Clock hands - thick strokes -->
-    <path
-        android:pathData="M12,7L12,12L15.5,14"
-        android:strokeWidth="3"
-        android:fillColor="#00000000"
-        android:strokeColor="@color/white"
-        android:strokeLineCap="round"
-        android:strokeLineJoin="round" />
+    <group
+        android:scaleX="0.025"
+        android:scaleY="0.025"
+        android:translateY="24">
+        <path android:fillColor="@color/white" android:pathData="m612-292 56-56-148-148v-184h-80v216l172 172ZM480-80q-83 0-156-31.5T197-197q-54-54-85.5-127T80-480q0-83 31.5-156T197-763q54-54 127-85.5T480-880q83 0 156 31.5T763-763q54 54 85.5 127T880-480q0 83-31.5 156T763-197q-54 54-127 85.5T480-80Zm0-400Zm0 320q133 0 226.5-93.5T800-480q0-133-93.5-226.5T480-800q-133 0-226.5 93.5T160-480q0 133 93.5 226.5T480-160Z" />
+    </group>
 </vector>
diff --git a/app/src/main/res/drawable/ic_close.xml b/app/src/main/res/drawable/ic_close.xml
index 0913e0cfa..8c76d3508 100644
--- a/app/src/main/res/drawable/ic_close.xml
+++ b/app/src/main/res/drawable/ic_close.xml
@@ -1,4 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
-    <path android:fillColor="@android:color/white" android:pathData="M13.41 12l4.3-4.29a1 1 0 1 0-1.42-1.42L12 10.59l-4.29-4.3a1 1 0 0 0-1.42 1.42l4.3 4.29-4.3 4.29a1 1 0 0 0 0 1.42 1 1 0 0 0 1.42 0l4.29-4.3 4.29 4.3a1 1 0 0 0 1.42 0 1 1 0 0 0 0-1.42z" />
-</vector>
\ No newline at end of file
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <group
+        android:scaleX="0.025"
+        android:scaleY="0.025"
+        android:translateY="24">
+        <path android:fillColor="@android:color/white" android:pathData="m256-200-56-56 224-224-224-224 56-56 224 224 224-224 56 56-224 224 224 224-56 56-224-224-224 224Z" />
+    </group>
+</vector>
diff --git a/app/src/main/res/drawable/ic_close_circle.xml b/app/src/main/res/drawable/ic_close_circle.xml
index 566527578..556286ab3 100644
--- a/app/src/main/res/drawable/ic_close_circle.xml
+++ b/app/src/main/res/drawable/ic_close_circle.xml
@@ -4,7 +4,10 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="@color/black"
-        android:pathData="M12,2C6.47,2 2,6.47 2,12s4.47,10 10,10 10,-4.47 10,-10S17.53,2 12,2zM17,15.59L15.59,17 12,13.41 8.41,17 7,15.59 10.59,12 7,8.41 8.41,7 12,10.59 15.59,7 17,8.41 13.41,12 17,15.59z" />
+    <group
+        android:scaleX="0.025"
+        android:scaleY="0.025"
+        android:translateY="24">
+        <path android:fillColor="@color/black" android:pathData="m336-280 144-144 144 144 56-56-144-144 144-144-56-56-144 144-144-144-56 56 144 144-144 144 56 56ZM480-80q-83 0-156-31.5T197-197q-54-54-85.5-127T80-480q0-83 31.5-156T197-763q54-54 127-85.5T480-880q83 0 156 31.5T763-763q54 54 85.5 127T880-480q0 83-31.5 156T763-197q-54 54-127 85.5T480-80Zm0-80q134 0 227-93t93-227q0-134-93-227t-227-93q-134 0-227 93t-93 227q0 134 93 227t227 93Zm0-320Z" />
+    </group>
 </vector>
diff --git a/app/src/main/res/drawable/ic_cloud_done.xml b/app/src/main/res/drawable/ic_cloud_done.xml
index f67a950d4..cf3a4f161 100644
--- a/app/src/main/res/drawable/ic_cloud_done.xml
+++ b/app/src/main/res/drawable/ic_cloud_done.xml
@@ -4,7 +4,10 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="@color/black"
-        android:pathData="M19.35,10.04C18.67,6.59 15.64,4 12,4 9.11,4 6.6,5.64 5.35,8.04 2.34,8.36 0,10.91 0,14c0,3.31 2.69,6 6,6h13c2.76,0 5,-2.24 5,-5 0,-2.64 -2.05,-4.78 -4.65,-4.96zM10,17l-3.5,-3.5 1.41,-1.41L10,14.17l4.59,-4.59L16,11l-6,6z" />
+    <group
+        android:scaleX="0.025"
+        android:scaleY="0.025"
+        android:translateY="24">
+        <path android:fillColor="@color/black" android:pathData="m414-280 226-226-58-58-169 169-84-84-57 57 142 142ZM260-160q-91 0-155.5-63T40-377q0-78 47-139t123-78q25-92 100-149t170-57q117 0 198.5 81.5T760-520q69 8 114.5 59.5T920-340q0 75-52.5 127.5T740-160H260Zm0-80h480q42 0 71-29t29-71q0-42-29-71t-71-29h-60v-80q0-83-58.5-141.5T480-720q-83 0-141.5 58.5T280-520h-20q-58 0-99 41t-41 99q0 58 41 99t99 41Zm220-240Z" />
+    </group>
 </vector>
diff --git a/app/src/main/res/drawable/ic_cloud_off.xml b/app/src/main/res/drawable/ic_cloud_off.xml
index f4ef95e16..cb19cd9a0 100644
--- a/app/src/main/res/drawable/ic_cloud_off.xml
+++ b/app/src/main/res/drawable/ic_cloud_off.xml
@@ -4,7 +4,10 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="@color/black"
-        android:pathData="M19.35,10.04C18.67,6.59 15.64,4 12,4c-1.48,0 -2.85,0.43 -4.01,1.17l1.46,1.46C10.21,6.23 11.08,6 12,6c3.04,0 5.5,2.46 5.5,5.5v0.5H19c1.66,0 3,1.34 3,3 0,1.13 -0.64,2.11 -1.56,2.62l1.45,1.45C23.16,18.16 24,16.68 24,15c0,-2.64 -2.05,-4.78 -4.65,-4.96zM3,5.27l2.75,2.74C2.56,8.15 0,10.77 0,14c0,3.31 2.69,6 6,6h11.73l2,2L21,20.73 4.27,4 3,5.27zM7.73,10l8,8H6c-2.21,0 -4,-1.79 -4,-4s1.79,-4 4,-4h1.73z" />
+    <group
+        android:scaleX="0.025"
+        android:scaleY="0.025"
+        android:translateY="24">
+        <path android:fillColor="@color/black" android:pathData="M792-56 686-160H260q-92 0-156-64T40-380q0-77 47.5-137T210-594q3-8 6-15.5t6-16.5L56-792l56-56 736 736-56 56ZM260-240h346L284-562q-2 11-3 21t-1 21h-20q-58 0-99 41t-41 99q0 58 41 99t99 41Zm185-161Zm419 191-58-56q17-14 25.5-32.5T840-340q0-42-29-71t-71-29h-60v-80q0-83-58.5-141.5T480-720q-27 0-52 6.5T380-693l-58-58q35-24 74.5-36.5T480-800q117 0 198.5 81.5T760-520q69 8 114.5 59.5T920-340q0 39-15 72.5T864-210ZM593-479Z" />
+    </group>
 </vector>
diff --git a/app/src/main/res/drawable/ic_contactless.xml b/app/src/main/res/drawable/ic_contactless.xml
index f8d738cf2..6a7e9ad95 100644
--- a/app/src/main/res/drawable/ic_contactless.xml
+++ b/app/src/main/res/drawable/ic_contactless.xml
@@ -1,8 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
-    <path android:fillColor="@color/black" android:pathData="M12 8a3 3 0 0 0-1 5.83 1 1 0 0 0 0 .17v6a1 1 0 0 0 2 0v-6a1 1 0 0 0 0-.17A3 3 0 0 0 12 8z" />
-    <path android:fillColor="@color/black" android:pathData="M3.5 11a6.87 6.87 0 0 1 2.64-5.23 1 1 0 1 0-1.28-1.54A8.84 8.84 0 0 0 1.5 11a8.84 8.84 0 0 0 3.36 6.77 1 1 0 1 0 1.28-1.54A6.87 6.87 0 0 1 3.5 11z" />
-    <path android:fillColor="@color/black" android:pathData="M16.64 6.24a1 1 0 0 0-1.28 1.52A4.28 4.28 0 0 1 17 11a4.28 4.28 0 0 1-1.64 3.24A1 1 0 0 0 16 16a1 1 0 0 0 .64-.24A6.2 6.2 0 0 0 19 11a6.2 6.2 0 0 0-2.36-4.76z" />
-    <path android:fillColor="@color/black" android:pathData="M8.76 6.36a1 1 0 0 0-1.4-.12A6.2 6.2 0 0 0 5 11a6.2 6.2 0 0 0 2.36 4.76 1 1 0 0 0 1.4-.12 1 1 0 0 0-.12-1.4A4.28 4.28 0 0 1 7 11a4.28 4.28 0 0 1 1.64-3.24 1 1 0 0 0 .12-1.4z" />
-    <path android:fillColor="@color/black" android:pathData="M19.14 4.23a1 1 0 1 0-1.28 1.54A6.87 6.87 0 0 1 20.5 11a6.87 6.87 0 0 1-2.64 5.23 1 1 0 0 0 1.28 1.54A8.84 8.84 0 0 0 22.5 11a8.84 8.84 0 0 0-3.36-6.77z" />
-</vector>
\ No newline at end of file
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <group
+        android:scaleX="0.025"
+        android:scaleY="0.025"
+        android:translateY="24">
+        <path android:fillColor="@color/black" android:pathData="M336-374q9-24 14.5-50.5T356-480q0-29-5.5-55.5T336-586l-74 30q6 18 10 37t4 39q0 20-4 39t-10 37l74 30Zm128 54q17-38 24.5-78t7.5-82q0-42-7.5-82T464-640l-74 30q14 30 20 62.5t6 67.5q0 35-6 67.5T390-350l74 30Zm130 54q21-50 31.5-103.5T636-480q0-57-10.5-110.5T594-694l-74 32q18 42 27 88t9 94q0 48-9 94t-27 88l74 32ZM480-80q-83 0-156-31.5T197-197q-54-54-85.5-127T80-480q0-83 31.5-156T197-763q54-54 127-85.5T480-880q83 0 156 31.5T763-763q54 54 85.5 127T880-480q0 83-31.5 156T763-197q-54 54-127 85.5T480-80Zm0-80q134 0 227-93t93-227q0-134-93-227t-227-93q-134 0-227 93t-93 227q0 134 93 227t227 93Zm0-320Z" />
+    </group>
+</vector>
diff --git a/app/src/main/res/drawable/ic_content_copy.xml b/app/src/main/res/drawable/ic_content_copy.xml
index 02e491908..797308e90 100644
--- a/app/src/main/res/drawable/ic_content_copy.xml
+++ b/app/src/main/res/drawable/ic_content_copy.xml
@@ -1,4 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
-    <path android:fillColor="@color/black" android:pathData="M18 9h-3V5.67A2.68 2.68 0 0 0 12.33 3H5.67A2.68 2.68 0 0 0 3 5.67v6.66A2.68 2.68 0 0 0 5.67 15H9v3a3 3 0 0 0 3 3h6a3 3 0 0 0 3-3v-6a3 3 0 0 0-3-3zm-9 3v1H5.67a.67.67 0 0 1-.67-.67V5.67A.67.67 0 0 1 5.67 5h6.66a.67.67 0 0 1 .67.67V9h-1a3 3 0 0 0-3 3z" />
-</vector>
\ No newline at end of file
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <group
+        android:scaleX="0.025"
+        android:scaleY="0.025"
+        android:translateY="24">
+        <path android:fillColor="@color/black" android:pathData="M360-240q-33 0-56.5-23.5T280-320v-480q0-33 23.5-56.5T360-880h360q33 0 56.5 23.5T800-800v480q0 33-23.5 56.5T720-240H360Zm0-80h360v-480H360v480ZM200-80q-33 0-56.5-23.5T120-160v-560h80v560h440v80H200Zm160-240v-480 480Z" />
+    </group>
+</vector>
diff --git a/app/src/main/res/drawable/ic_copy.xml b/app/src/main/res/drawable/ic_copy.xml
index 182135f1c..797308e90 100644
--- a/app/src/main/res/drawable/ic_copy.xml
+++ b/app/src/main/res/drawable/ic_copy.xml
@@ -4,18 +4,10 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:strokeWidth="2"
-        android:strokeColor="@color/black"
-        android:strokeLineCap="round"
-        android:strokeLineJoin="round"
-        android:fillColor="#00000000"
-        android:pathData="M20,9h-9a2,2 0,0 0,-2 2v9a2,2 0,0 0,2 2h9a2,2 0,0 0,2 -2v-9a2,2 0,0 0,-2 -2z" />
-    <path
-        android:strokeWidth="2"
-        android:strokeColor="@color/black"
-        android:strokeLineCap="round"
-        android:strokeLineJoin="round"
-        android:fillColor="#00000000"
-        android:pathData="M5,15H4a2,2 0,0 1,-2 -2V4a2,2 0,0 1,2 -2h9a2,2 0,0 1,2 2v1" />
+    <group
+        android:scaleX="0.025"
+        android:scaleY="0.025"
+        android:translateY="24">
+        <path android:fillColor="@color/black" android:pathData="M360-240q-33 0-56.5-23.5T280-320v-480q0-33 23.5-56.5T360-880h360q33 0 56.5 23.5T800-800v480q0 33-23.5 56.5T720-240H360Zm0-80h360v-480H360v480ZM200-80q-33 0-56.5-23.5T120-160v-560h80v560h440v80H200Zm160-240v-480 480Z" />
+    </group>
 </vector>
diff --git a/app/src/main/res/drawable/ic_dark_mode.xml b/app/src/main/res/drawable/ic_dark_mode.xml
index 8cc2fcc42..eca6952cb 100644
--- a/app/src/main/res/drawable/ic_dark_mode.xml
+++ b/app/src/main/res/drawable/ic_dark_mode.xml
@@ -1,4 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
-    <path android:fillColor="@color/black" android:pathData="M12.3 22h-.1a10.31 10.31 0 0 1-7.34-3.15 10.46 10.46 0 0 1-.26-14 10.13 10.13 0 0 1 4-2.74 1 1 0 0 1 1.06.22 1 1 0 0 1 .24 1 8.4 8.4 0 0 0 1.94 8.81 8.47 8.47 0 0 0 8.83 1.94 1 1 0 0 1 1.27 1.29A10.16 10.16 0 0 1 19.6 19a10.28 10.28 0 0 1-7.3 3z" />
-</vector>
\ No newline at end of file
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <group
+        android:scaleX="0.025"
+        android:scaleY="0.025"
+        android:translateY="24">
+        <path android:fillColor="@color/black" android:pathData="M480-120q-150 0-255-105T120-480q0-150 105-255t255-105q14 0 27.5 1t26.5 3q-41 29-65.5 75.5T444-660q0 90 63 153t153 63q55 0 101-24.5t75-65.5q2 13 3 26.5t1 27.5q0 150-105 255T480-120Zm0-80q88 0 158-48.5T740-375q-20 5-40 8t-40 3q-123 0-209.5-86.5T364-660q0-20 3-40t8-40q-78 32-126.5 102T200-480q0 116 82 198t198 82Zm-10-270Z" />
+    </group>
+</vector>
diff --git a/app/src/main/res/drawable/ic_delete.xml b/app/src/main/res/drawable/ic_delete.xml
index 701f4b781..c5b9d499d 100644
--- a/app/src/main/res/drawable/ic_delete.xml
+++ b/app/src/main/res/drawable/ic_delete.xml
@@ -1,4 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
-    <path android:fillColor="@color/black" android:pathData="M21 6h-5V4.33A2.42 2.42 0 0 0 13.5 2h-3A2.42 2.42 0 0 0 8 4.33V6H3a1 1 0 0 0 0 2h1v11a3 3 0 0 0 3 3h10a3 3 0 0 0 3-3V8h1a1 1 0 0 0 0-2zM10 4.33c0-.16.21-.33.5-.33h3c.29 0 .5.17.5.33V6h-4z" />
-</vector>
\ No newline at end of file
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <group
+        android:scaleX="0.025"
+        android:scaleY="0.025"
+        android:translateY="24">
+        <path android:fillColor="@color/black" android:pathData="M280-120q-33 0-56.5-23.5T200-200v-520h-40v-80h200v-40h240v40h200v80h-40v520q0 33-23.5 56.5T680-120H280Zm400-600H280v520h400v-520ZM360-280h80v-360h-80v360Zm160 0h80v-360h-80v360ZM280-720v520-520Z" />
+    </group>
+</vector>
diff --git a/app/src/main/res/drawable/ic_document.xml b/app/src/main/res/drawable/ic_document.xml
index 0a9760294..d41d2cc0d 100644
--- a/app/src/main/res/drawable/ic_document.xml
+++ b/app/src/main/res/drawable/ic_document.xml
@@ -4,7 +4,10 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="@color/black"
-        android:pathData="M14,2H6C4.9,2 4.01,2.9 4.01,4L4,20C4,21.1 4.89,22 5.99,22H18C19.1,22 20,21.1 20,20V8L14,2ZM16,18H8V16H16V18ZM16,14H8V12H16V14ZM13,9V3.5L18.5,9H13Z"/>
+    <group
+        android:scaleX="0.025"
+        android:scaleY="0.025"
+        android:translateY="24">
+        <path android:fillColor="@color/black" android:pathData="M320-240h320v-80H320v80Zm0-160h320v-80H320v80ZM240-80q-33 0-56.5-23.5T160-160v-640q0-33 23.5-56.5T240-880h320l240 240v480q0 33-23.5 56.5T720-80H240Zm280-520v-200H240v640h480v-440H520ZM240-800v200-200 640-640Z" />
+    </group>
 </vector>
diff --git a/app/src/main/res/drawable/ic_drag_handle.xml b/app/src/main/res/drawable/ic_drag_handle.xml
index 845191149..0b1106f9d 100644
--- a/app/src/main/res/drawable/ic_drag_handle.xml
+++ b/app/src/main/res/drawable/ic_drag_handle.xml
@@ -4,7 +4,10 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="@color/black"
-        android:pathData="M20,9H4v2h16V9zM4,15h16v-2H4v2z" />
+    <group
+        android:scaleX="0.025"
+        android:scaleY="0.025"
+        android:translateY="24">
+        <path android:fillColor="@color/black" android:pathData="M160-360v-80h640v80H160Zm0-160v-80h640v80H160Z" />
+    </group>
 </vector>
diff --git a/app/src/main/res/drawable/ic_edit.xml b/app/src/main/res/drawable/ic_edit.xml
index 55320bc72..45982d901 100644
--- a/app/src/main/res/drawable/ic_edit.xml
+++ b/app/src/main/res/drawable/ic_edit.xml
@@ -1,4 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
-    <path android:fillColor="@color/black" android:pathData="M19.4 7.34L16.66 4.6A2 2 0 0 0 14 4.53l-9 9a2 2 0 0 0-.57 1.21L4 18.91a1 1 0 0 0 .29.8A1 1 0 0 0 5 20h.09l4.17-.38a2 2 0 0 0 1.21-.57l9-9a1.92 1.92 0 0 0-.07-2.71zM16 10.68L13.32 8l1.95-2L18 8.73z" />
-</vector>
\ No newline at end of file
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <group
+        android:scaleX="0.025"
+        android:scaleY="0.025"
+        android:translateY="24">
+        <path android:fillColor="@color/black" android:pathData="M200-200h57l391-391-57-57-391 391v57Zm-80 80v-170l528-527q12-11 26.5-17t30.5-6q16 0 31 6t26 18l55 56q12 11 17.5 26t5.5 30q0 16-5.5 30.5T817-647L290-120H120Zm640-584-56-56 56 56Zm-141 85-28-29 57 57-29-28Z" />
+    </group>
+</vector>
diff --git a/app/src/main/res/drawable/ic_email.xml b/app/src/main/res/drawable/ic_email.xml
index c6920a3a0..1c9c717b9 100644
--- a/app/src/main/res/drawable/ic_email.xml
+++ b/app/src/main/res/drawable/ic_email.xml
@@ -4,18 +4,10 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:strokeWidth="2"
-        android:strokeColor="@color/black"
-        android:strokeLineCap="round"
-        android:strokeLineJoin="round"
-        android:fillColor="#00000000"
-        android:pathData="M4,4h16c1.1,0 2,0.9 2,2v12c0,1.1 -0.9,2 -2,2H4c-1.1,0 -2,-0.9 -2,-2V6c0,-1.1 0.9,-2 2,-2z" />
-    <path
-        android:strokeWidth="2"
-        android:strokeColor="@color/black"
-        android:strokeLineCap="round"
-        android:strokeLineJoin="round"
-        android:fillColor="#00000000"
-        android:pathData="M22,6l-10,7L2,6" />
+    <group
+        android:scaleX="0.025"
+        android:scaleY="0.025"
+        android:translateY="24">
+        <path android:fillColor="@color/black" android:pathData="M160-160q-33 0-56.5-23.5T80-240v-480q0-33 23.5-56.5T160-800h640q33 0 56.5 23.5T880-720v480q0 33-23.5 56.5T800-160H160Zm320-280L160-640v400h640v-400L480-440Zm0-80 320-200H160l320 200ZM160-640v-80 480-400Z" />
+    </group>
 </vector>
diff --git a/app/src/main/res/drawable/ic_history.xml b/app/src/main/res/drawable/ic_history.xml
index c5ca6eb11..3a9962793 100644
--- a/app/src/main/res/drawable/ic_history.xml
+++ b/app/src/main/res/drawable/ic_history.xml
@@ -1,4 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
-    <path android:fillColor="@color/black" android:pathData="M12 2a10 10 0 1 0 10 10A10 10 0 0 0 12 2zm4 11h-4a1 1 0 0 1-1-1V8a1 1 0 0 1 2 0v3h3a1 1 0 0 1 0 2z" />
-</vector>
\ No newline at end of file
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <group
+        android:scaleX="0.025"
+        android:scaleY="0.025"
+        android:translateY="24">
+        <path android:fillColor="@color/black" android:pathData="M480-120q-138 0-240.5-91.5T122-440h82q14 104 92.5 172T480-200q117 0 198.5-81.5T760-480q0-117-81.5-198.5T480-760q-69 0-129 32t-101 88h110v80H120v-240h80v94q51-64 124.5-99T480-840q75 0 140.5 28.5t114 77q48.5 48.5 77 114T840-480q0 75-28.5 140.5t-77 114q-48.5 48.5-114 77T480-120Zm112-192L440-464v-216h80v184l128 128-56 56Z" />
+    </group>
+</vector>
diff --git a/app/src/main/res/drawable/ic_image_placeholder.xml b/app/src/main/res/drawable/ic_image_placeholder.xml
index 323c662f0..c365f29a4 100644
--- a/app/src/main/res/drawable/ic_image_placeholder.xml
+++ b/app/src/main/res/drawable/ic_image_placeholder.xml
@@ -4,8 +4,10 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <!-- Simple box/package icon for product placeholder -->
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M20,4H4C2.9,4 2,4.9 2,6v12c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2V6C22,4.9 21.1,4 20,4zM20,18H4V6h16V18zM6,10l2,2.5L11,9l5,6H6V10z"/>
+    <group
+        android:scaleX="0.025"
+        android:scaleY="0.025"
+        android:translateY="24">
+        <path android:fillColor="@android:color/white" android:pathData="M200-120q-33 0-56.5-23.5T120-200v-560q0-33 23.5-56.5T200-840h560q33 0 56.5 23.5T840-760v560q0 33-23.5 56.5T760-120H200Zm0-80h560v-560H200v560Zm40-80h480L570-480 450-320l-90-120-120 160Zm-40 80v-560 560Z" />
+    </group>
 </vector>
diff --git a/app/src/main/res/drawable/ic_info.xml b/app/src/main/res/drawable/ic_info.xml
index 02a96864d..e9b8daf1c 100644
--- a/app/src/main/res/drawable/ic_info.xml
+++ b/app/src/main/res/drawable/ic_info.xml
@@ -4,16 +4,10 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="@color/black"
-        android:pathData="M12,12m-10,0a10,10 0,1 1,20 0a10,10 0,1 1,-20 0" 
-        android:strokeWidth="2"
-        android:strokeColor="@color/black"
-        android:fillType="nonZero"
-        android:fillAlpha="0" />
-    <path
-        android:strokeWidth="2"
-        android:strokeColor="@color/black"
-        android:strokeLineCap="round"
-        android:pathData="M12,16v-4M12,8h0.01" />
+    <group
+        android:scaleX="0.025"
+        android:scaleY="0.025"
+        android:translateY="24">
+        <path android:fillColor="@color/black" android:pathData="M440-280h80v-240h-80v240Zm40-320q17 0 28.5-11.5T520-640q0-17-11.5-28.5T480-680q-17 0-28.5 11.5T440-640q0 17 11.5 28.5T480-600Zm0 520q-83 0-156-31.5T197-197q-54-54-85.5-127T80-480q0-83 31.5-156T197-763q54-54 127-85.5T480-880q83 0 156 31.5T763-763q54 54 85.5 127T880-480q0 83-31.5 156T763-197q-54 54-127 85.5T480-80Zm0-80q134 0 227-93t93-227q0-134-93-227t-227-93q-134 0-227 93t-93 227q0 134 93 227t227 93Zm0-320Z" />
+    </group>
 </vector>
diff --git a/app/src/main/res/drawable/ic_insights.xml b/app/src/main/res/drawable/ic_insights.xml
index 858420271..5b47bf678 100644
--- a/app/src/main/res/drawable/ic_insights.xml
+++ b/app/src/main/res/drawable/ic_insights.xml
@@ -1,10 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M5,9.2h3V19H5V9.2zM10.6,5h2.8v14h-2.8V5zM16.2,13H19v6h-2.8V13z" />
+    <group
+        android:scaleX="0.025"
+        android:scaleY="0.025"
+        android:translateY="24">
+        <path android:fillColor="@android:color/white" android:pathData="M3 20q-.825 0-1.412-.587Q1 18.825 1 18q0-.825.588-1.413Q2.175 16 3 16h.263q.112 0 .237.05l4.55-4.55Q8 11.375 8 11.262V11q0-.825.588-1.413Q9.175 9 10 9t1.413.587Q12 10.175 12 11q0 .05-.05.5l2.55 2.55q.125-.05.238-.05h.524q.113 0 .238.05l3.55-3.55q-.05-.125-.05-.238V10q0-.825.587-1.413Q20.175 8 21 8q.825 0 1.413.587Q23 9.175 23 10q0 .825-.587 1.412Q21.825 12 21 12h-.262q-.113 0-.238-.05l-3.55 3.55q.05.125.05.238V16q0 .825-.587 1.413Q15.825 18 15 18q-.825 0-1.412-.587Q13 16.825 13 16v-.262q0-.113.05-.238l-2.55-2.55q-.125.05-.238.05H10q-.05 0-.5-.05L4.95 17.5q.05.125.05.238V18q0 .825-.588 1.413Q3.825 20 3 20ZM4 9.975l-.625-1.35L2.025 8l1.35-.625L4 6.025l.625 1.35L5.975 8l-1.35.625ZM15 9l-.95-2.05L12 6l2.05-.95L15 3l.95 2.05L18 6l-2.05.95Z" />
+    </group>
 </vector>
diff --git a/app/src/main/res/drawable/ic_key.xml b/app/src/main/res/drawable/ic_key.xml
index cd4ca88ae..ecc9ee735 100644
--- a/app/src/main/res/drawable/ic_key.xml
+++ b/app/src/main/res/drawable/ic_key.xml
@@ -1,9 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="@color/black"
-        android:pathData="M12.65,10C11.83,7.67 9.61,6 7,6c-3.31,0 -6,2.69 -6,6s2.69,6 6,6c2.61,0 4.83,-1.67 5.65,-4H17v4h4v-4h2v-4H12.65zM7,14c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2z"/>
+    <group
+        android:scaleX="0.025"
+        android:scaleY="0.025"
+        android:translateY="24">
+        <path android:fillColor="@color/black" android:pathData="M280-400q-33 0-56.5-23.5T200-480q0-33 23.5-56.5T280-560q33 0 56.5 23.5T360-480q0 33-23.5 56.5T280-400Zm0 160q-100 0-170-70T40-480q0-100 70-170t170-70q67 0 121.5 33t86.5 87h352l120 120-180 180-80-60-80 60-85-60h-47q-32 54-86.5 87T280-240Zm0-80q56 0 98.5-34t56.5-86h125l58 41 82-61 71 55 75-75-40-40H435q-14-52-56.5-86T280-640q-66 0-113 47t-47 113q0 66 47 113t113 47Z" />
+    </group>
 </vector>
diff --git a/app/src/main/res/drawable/ic_label.xml b/app/src/main/res/drawable/ic_label.xml
index 16a2732fd..d8a7d6aa7 100644
--- a/app/src/main/res/drawable/ic_label.xml
+++ b/app/src/main/res/drawable/ic_label.xml
@@ -4,8 +4,10 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <!-- Filled label/tag icon (Material Symbols) -->
-    <path
-        android:fillColor="@color/white"
-        android:pathData="M17.63,5.84C17.27,5.33 16.67,5 16,5L5,5.01C3.9,5.01 3,5.9 3,7v10c0,1.1 0.9,1.99 2,1.99L16,19c0.67,0 1.27,-0.33 1.63,-0.84L22,12l-4.37,-6.16z" />
+    <group
+        android:scaleX="0.025"
+        android:scaleY="0.025"
+        android:translateY="24">
+        <path android:fillColor="@color/white" android:pathData="M840-480 666-234q-11 16-28.5 25t-37.5 9H200q-33 0-56.5-23.5T120-280v-400q0-33 23.5-56.5T200-760h400q20 0 37.5 9t28.5 25l174 246Zm-98 0L600-680H200v400h400l142-200Zm-542 0v200-400 200Z" />
+    </group>
 </vector>
diff --git a/app/src/main/res/drawable/ic_language.png b/app/src/main/res/drawable/ic_language.png
deleted file mode 100644
index 101033481..000000000
Binary files a/app/src/main/res/drawable/ic_language.png and /dev/null differ
diff --git a/app/src/main/res/drawable/ic_language.xml b/app/src/main/res/drawable/ic_language.xml
new file mode 100644
index 000000000..17cf1cc22
--- /dev/null
+++ b/app/src/main/res/drawable/ic_language.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <group
+        android:scaleX="0.025"
+        android:scaleY="0.025"
+        android:translateY="24">
+        <path android:fillColor="@color/black" android:pathData="M480-80q-82 0-155-31.5t-127.5-86Q143-252 111.5-325T80-480q0-83 31.5-155.5t86-127Q252-817 325-848.5T480-880q83 0 155.5 31.5t127 86q54.5 54.5 86 127T880-480q0 82-31.5 155t-86 127.5q-54.5 54.5-127 86T480-80Zm0-82q26-36 45-75t31-83H404q12 44 31 83t45 75Zm-104-16q-18-33-31.5-68.5T322-320H204q29 50 72.5 87t99.5 55Zm208 0q56-18 99.5-55t72.5-87H638q-9 38-22.5 73.5T584-178ZM170-400h136q-3-20-4.5-39.5T300-480q0-21 1.5-40.5T306-560H170q-5 20-7.5 39.5T160-480q0 21 2.5 40.5T170-400Zm216 0h188q3-20 4.5-39.5T580-480q0-21-1.5-40.5T574-560H386q-3 20-4.5 39.5T380-480q0 21 1.5 40.5T386-400Zm268 0h136q5-20 7.5-39.5T800-480q0-21-2.5-40.5T790-560H654q3 20 4.5 39.5T660-480q0 21-1.5 40.5T654-400Zm-16-240h118q-29-50-72.5-87T584-782q18 33 31.5 68.5T638-640Zm-234 0h152q-12-44-31-83t-45-75q-26 36-45 75t-31 83Zm-200 0h118q9-38 22.5-73.5T376-782q-56 18-99.5 55T204-640Z" />
+    </group>
+</vector>
diff --git a/app/src/main/res/drawable/ic_light_mode.xml b/app/src/main/res/drawable/ic_light_mode.xml
index fe1fe681e..c7d57d4e9 100644
--- a/app/src/main/res/drawable/ic_light_mode.xml
+++ b/app/src/main/res/drawable/ic_light_mode.xml
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
-    <path android:fillColor="@color/black" android:pathData="M12 6a1 1 0 0 0 1-1V3a1 1 0 0 0-2 0v2a1 1 0 0 0 1 1z" />
-    <path android:fillColor="@color/black" android:pathData="M21 11h-2a1 1 0 0 0 0 2h2a1 1 0 0 0 0-2z" />
-    <path android:fillColor="@color/black" android:pathData="M6 12a1 1 0 0 0-1-1H3a1 1 0 0 0 0 2h2a1 1 0 0 0 1-1z" />
-    <path android:fillColor="@color/black" android:pathData="M6.22 5a1 1 0 0 0-1.39 1.47l1.44 1.39a1 1 0 0 0 .73.28 1 1 0 0 0 .72-.31 1 1 0 0 0 0-1.41z" />
-    <path android:fillColor="@color/black" android:pathData="M17 8.14a1 1 0 0 0 .69-.28l1.44-1.39A1 1 0 0 0 17.78 5l-1.44 1.42a1 1 0 0 0 0 1.41 1 1 0 0 0 .66.31z" />
-    <path android:fillColor="@color/black" android:pathData="M12 18a1 1 0 0 0-1 1v2a1 1 0 0 0 2 0v-2a1 1 0 0 0-1-1z" />
-    <path android:fillColor="@color/black" android:pathData="M17.73 16.14a1 1 0 0 0-1.39 1.44L17.78 19a1 1 0 0 0 .69.28 1 1 0 0 0 .72-.3 1 1 0 0 0 0-1.42z" />
-    <path android:fillColor="@color/black" android:pathData="M6.27 16.14l-1.44 1.39a1 1 0 0 0 0 1.42 1 1 0 0 0 .72.3 1 1 0 0 0 .67-.25l1.44-1.39a1 1 0 0 0-1.39-1.44z" />
-    <path android:fillColor="@color/black" android:pathData="M12 8a4 4 0 1 0 4 4 4 4 0 0 0-4-4z" />
-</vector>
\ No newline at end of file
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <group
+        android:scaleX="0.025"
+        android:scaleY="0.025"
+        android:translateY="24">
+        <path android:fillColor="@color/black" android:pathData="M480-360q50 0 85-35t35-85q0-50-35-85t-85-35q-50 0-85 35t-35 85q0 50 35 85t85 35Zm0 80q-83 0-141.5-58.5T280-480q0-83 58.5-141.5T480-680q83 0 141.5 58.5T680-480q0 83-58.5 141.5T480-280ZM200-440H40v-80h160v80Zm720 0H760v-80h160v80ZM440-760v-160h80v160h-80Zm0 720v-160h80v160h-80ZM256-650l-101-97 57-59 96 100-52 56Zm492 496-97-101 53-55 101 97-57 59Zm-98-550 97-101 59 57-100 96-56-52ZM154-212l101-97 55 53-97 101-59-57Zm326-268Z" />
+    </group>
+</vector>
diff --git a/app/src/main/res/drawable/ic_lightning.png b/app/src/main/res/drawable/ic_lightning.png
deleted file mode 100644
index 29fa06e97..000000000
Binary files a/app/src/main/res/drawable/ic_lightning.png and /dev/null differ
diff --git a/app/src/main/res/drawable/ic_lightning_black.xml b/app/src/main/res/drawable/ic_lightning_black.xml
index 580235f28..33b99c80a 100644
--- a/app/src/main/res/drawable/ic_lightning_black.xml
+++ b/app/src/main/res/drawable/ic_lightning_black.xml
@@ -1,9 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="@color/black"
-        android:pathData="M13,2L3,14h8l-1,8l10,-12h-8l1,-8z"/>
+    <group
+        android:scaleX="0.025"
+        android:scaleY="0.025"
+        android:translateY="24">
+        <path android:fillColor="@color/black" android:pathData="m422-232 207-248H469l29-227-185 267h139l-30 208ZM320-80l40-280H160l360-520h80l-40 320h240L400-80h-80Zm151-390Z" />
+    </group>
 </vector>
diff --git a/app/src/main/res/drawable/ic_lightning_bolt.xml b/app/src/main/res/drawable/ic_lightning_bolt.xml
index 3ca50098e..33b99c80a 100644
--- a/app/src/main/res/drawable/ic_lightning_bolt.xml
+++ b/app/src/main/res/drawable/ic_lightning_bolt.xml
@@ -1,10 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="@color/black"
-        android:pathData="M13,2L3,14h8l-1,8l10,-12h-8l1,-8z"/>
+    <group
+        android:scaleX="0.025"
+        android:scaleY="0.025"
+        android:translateY="24">
+        <path android:fillColor="@color/black" android:pathData="m422-232 207-248H469l29-227-185 267h139l-30 208ZM320-80l40-280H160l360-520h80l-40 320h240L400-80h-80Zm151-390Z" />
+    </group>
 </vector>
-
diff --git a/app/src/main/res/drawable/ic_lightning_small.xml b/app/src/main/res/drawable/ic_lightning_small.xml
index 1bc3d05eb..8a290ce63 100644
--- a/app/src/main/res/drawable/ic_lightning_small.xml
+++ b/app/src/main/res/drawable/ic_lightning_small.xml
@@ -1,10 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="20dp"
     android:height="20dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="@color/color_bitcoin_orange"
-        android:pathData="M13,2L3,14h8l-1,8l10,-12h-8l1,-8z"/>
+    <group
+        android:scaleX="0.025"
+        android:scaleY="0.025"
+        android:translateY="24">
+        <path android:fillColor="@color/color_bitcoin_orange" android:pathData="m422-232 207-248H469l29-227-185 267h139l-30 208ZM320-80l40-280H160l360-520h80l-40 320h240L400-80h-80Zm151-390Z" />
+    </group>
 </vector>
-
diff --git a/app/src/main/res/drawable/ic_link.xml b/app/src/main/res/drawable/ic_link.xml
index 158588732..85e8b885a 100644
--- a/app/src/main/res/drawable/ic_link.xml
+++ b/app/src/main/res/drawable/ic_link.xml
@@ -4,18 +4,10 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:strokeWidth="2"
-        android:strokeColor="@color/black"
-        android:strokeLineCap="round"
-        android:strokeLineJoin="round"
-        android:fillColor="#00000000"
-        android:pathData="M10,13a5,5 0,0 0,7.54 0.54l3,-3a5,5 0,0 0,-7.07 -7.07l-1.72,1.71" />
-    <path
-        android:strokeWidth="2"
-        android:strokeColor="@color/black"
-        android:strokeLineCap="round"
-        android:strokeLineJoin="round"
-        android:fillColor="#00000000"
-        android:pathData="M14,11a5,5 0,0 0,-7.54 -0.54l-3,3a5,5 0,0 0,7.07 7.07l1.71,-1.71" />
+    <group
+        android:scaleX="0.025"
+        android:scaleY="0.025"
+        android:translateY="24">
+        <path android:fillColor="@color/black" android:pathData="M440-280H280q-83 0-141.5-58.5T80-480q0-83 58.5-141.5T280-680h160v80H280q-50 0-85 35t-35 85q0 50 35 85t85 35h160v80ZM320-440v-80h320v80H320Zm200 160v-80h160q50 0 85-35t35-85q0-50-35-85t-85-35H520v-80h160q83 0 141.5 58.5T880-480q0 83-58.5 141.5T680-280H520Z" />
+    </group>
 </vector>
diff --git a/app/src/main/res/drawable/ic_lock.xml b/app/src/main/res/drawable/ic_lock.xml
index 6f349104e..3d14cad94 100644
--- a/app/src/main/res/drawable/ic_lock.xml
+++ b/app/src/main/res/drawable/ic_lock.xml
@@ -4,7 +4,10 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="@android:color/black"
-        android:pathData="M18,8h-1V6c0,-2.76 -2.24,-5 -5,-5S7,3.24 7,6v2H6c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2V10c0,-1.1 -0.9,-2 -2,-2zM12,17c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2zM15.1,8H8.9V6c0,-1.71 1.39,-3.1 3.1,-3.1 1.71,0 3.1,1.39 3.1,3.1v2z"/>
+    <group
+        android:scaleX="0.025"
+        android:scaleY="0.025"
+        android:translateY="24">
+        <path android:fillColor="@android:color/black" android:pathData="M240-80q-33 0-56.5-23.5T160-160v-400q0-33 23.5-56.5T240-640h40v-80q0-83 58.5-141.5T480-920q83 0 141.5 58.5T680-720v80h40q33 0 56.5 23.5T800-560v400q0 33-23.5 56.5T720-80H240Zm0-80h480v-400H240v400Zm240-120q33 0 56.5-23.5T560-360q0-33-23.5-56.5T480-440q-33 0-56.5 23.5T400-360q0 33 23.5 56.5T480-280ZM360-640h240v-80q0-50-35-85t-85-35q-50 0-85 35t-35 85v80ZM240-160v-400 400Z" />
+    </group>
 </vector>
diff --git a/app/src/main/res/drawable/ic_minus.xml b/app/src/main/res/drawable/ic_minus.xml
index eac4a582e..b5f822580 100644
--- a/app/src/main/res/drawable/ic_minus.xml
+++ b/app/src/main/res/drawable/ic_minus.xml
@@ -1,4 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
-    <path android:fillColor="@color/black" android:pathData="M19 13H5a1 1 0 0 1 0-2h14a1 1 0 0 1 0 2z" />
-</vector>
\ No newline at end of file
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <group
+        android:scaleX="0.025"
+        android:scaleY="0.025"
+        android:translateY="24">
+        <path android:fillColor="@color/black" android:pathData="M200-440v-80h560v80H200Z" />
+    </group>
+</vector>
diff --git a/app/src/main/res/drawable/ic_more_vert.xml b/app/src/main/res/drawable/ic_more_vert.xml
index 3d92458da..21f1fddcf 100644
--- a/app/src/main/res/drawable/ic_more_vert.xml
+++ b/app/src/main/res/drawable/ic_more_vert.xml
@@ -1,6 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
-    <path android:fillColor="@color/black" android:pathData="M 10.0,12.0 A 2.0,2.0 0 1,1 14.0,12.0 A 2.0,2.0 0 1,1 10.0,12.0" />
-    <path android:fillColor="@color/black" android:pathData="M 10.0,5.0 A 2.0,2.0 0 1,1 14.0,5.0 A 2.0,2.0 0 1,1 10.0,5.0" />
-    <path android:fillColor="@color/black" android:pathData="M 10.0,19.0 A 2.0,2.0 0 1,1 14.0,19.0 A 2.0,2.0 0 1,1 10.0,19.0" />
-</vector>
\ No newline at end of file
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <group
+        android:scaleX="0.025"
+        android:scaleY="0.025"
+        android:translateY="24">
+        <path android:fillColor="@color/black" android:pathData="M480-160q-33 0-56.5-23.5T400-240q0-33 23.5-56.5T480-320q33 0 56.5 23.5T560-240q0 33-23.5 56.5T480-160Zm0-240q-33 0-56.5-23.5T400-480q0-33 23.5-56.5T480-560q33 0 56.5 23.5T560-480q0 33-23.5 56.5T480-400Zm0-240q-33 0-56.5-23.5T400-720q0-33 23.5-56.5T480-800q33 0 56.5 23.5T560-720q0 33-23.5 56.5T480-640Z" />
+    </group>
+</vector>
diff --git a/app/src/main/res/drawable/ic_open_external.xml b/app/src/main/res/drawable/ic_open_external.xml
index b25c5d1c3..52ff06e8e 100644
--- a/app/src/main/res/drawable/ic_open_external.xml
+++ b/app/src/main/res/drawable/ic_open_external.xml
@@ -4,7 +4,10 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="@color/black"
-        android:pathData="M19,19H5V5H12V3H5C3.89,3 3,3.9 3,5V19C3,20.1 3.89,21 5,21H19C20.1,21 21,20.1 21,19V12H19V19ZM14,3V5H17.59L7.76,14.83L9.17,16.24L19,6.41V10H21V3H14Z"/>
+    <group
+        android:scaleX="0.025"
+        android:scaleY="0.025"
+        android:translateY="24">
+        <path android:fillColor="@color/black" android:pathData="M200-120q-33 0-56.5-23.5T120-200v-560q0-33 23.5-56.5T200-840h280v80H200v560h560v-280h80v280q0 33-23.5 56.5T760-120H200Zm188-212-56-56 372-372H560v-80h280v280h-80v-144L388-332Z" />
+    </group>
 </vector>
diff --git a/app/src/main/res/drawable/ic_open_with.xml b/app/src/main/res/drawable/ic_open_with.xml
index c76359081..d5786d46c 100644
--- a/app/src/main/res/drawable/ic_open_with.xml
+++ b/app/src/main/res/drawable/ic_open_with.xml
@@ -1,4 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
-    <path android:fillColor="@color/black" android:pathData="M18 15a3 3 0 0 0-2.1.86L8 12.34V12v-.33l7.9-3.53A3 3 0 1 0 15 6v.34L7.1 9.86a3 3 0 1 0 0 4.28l7.9 3.53V18a3 3 0 1 0 3-3z" />
-</vector>
\ No newline at end of file
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <group
+        android:scaleX="0.025"
+        android:scaleY="0.025"
+        android:translateY="24">
+        <path android:fillColor="@color/black" android:pathData="M720-80q-50 0-85-35t-35-85q0-7 1-14.5t3-13.5L322-392q-17 15-38 23.5t-44 8.5q-50 0-85-35t-35-85q0-50 35-85t85-35q23 0 44 8.5t38 23.5l282-164q-2-6-3-13.5t-1-14.5q0-50 35-85t85-35q50 0 85 35t35 85q0 50-35 85t-85 35q-23 0-44-8.5T638-672L356-508q2 6 3 13.5t1 14.5q0 7-1 14.5t-3 13.5l282 164q17-15 38-23.5t44-8.5q50 0 85 35t35 85q0 50-35 85t-85 35Zm0-640q17 0 28.5-11.5T760-760q0-17-11.5-28.5T720-800q-17 0-28.5 11.5T680-760q0 17 11.5 28.5T720-720ZM240-440q17 0 28.5-11.5T280-480q0-17-11.5-28.5T240-520q-17 0-28.5 11.5T200-480q0 17 11.5 28.5T240-440Zm480 280q17 0 28.5-11.5T760-200q0-17-11.5-28.5T720-240q-17 0-28.5 11.5T680-200q0 17 11.5 28.5T720-160Zm0-600ZM240-480Zm480 280Z" />
+    </group>
+</vector>
diff --git a/app/src/main/res/drawable/ic_pending.xml b/app/src/main/res/drawable/ic_pending.xml
index 3a3fe5dcf..100939d92 100644
--- a/app/src/main/res/drawable/ic_pending.xml
+++ b/app/src/main/res/drawable/ic_pending.xml
@@ -1,14 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <!-- Clock/pending icon -->
-    <path
-        android:fillColor="@color/black"
-        android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8z"/>
-    <path
-        android:fillColor="@color/black"
-        android:pathData="M12.5,7H11v6l5.25,3.15 0.75,-1.23 -4.5,-2.67z"/>
+    <group
+        android:scaleX="0.025"
+        android:scaleY="0.025"
+        android:translateY="24">
+        <path android:fillColor="@color/black" android:pathData="M280-420q25 0 42.5-17.5T340-480q0-25-17.5-42.5T280-540q-25 0-42.5 17.5T220-480q0 25 17.5 42.5T280-420Zm200 0q25 0 42.5-17.5T540-480q0-25-17.5-42.5T480-540q-25 0-42.5 17.5T420-480q0 25 17.5 42.5T480-420Zm200 0q25 0 42.5-17.5T740-480q0-25-17.5-42.5T680-540q-25 0-42.5 17.5T620-480q0 25 17.5 42.5T680-420ZM480-80q-83 0-156-31.5T197-197q-54-54-85.5-127T80-480q0-83 31.5-156T197-763q54-54 127-85.5T480-880q83 0 156 31.5T763-763q54 54 85.5 127T880-480q0 83-31.5 156T763-197q-54 54-127 85.5T480-80Zm0-80q134 0 227-93t93-227q0-134-93-227t-227-93q-134 0-227 93t-93 227q0 134 93 227t227 93Zm0-320Z" />
+    </group>
 </vector>
-
diff --git a/app/src/main/res/drawable/ic_plus.xml b/app/src/main/res/drawable/ic_plus.xml
index e294a137d..07edfa433 100644
--- a/app/src/main/res/drawable/ic_plus.xml
+++ b/app/src/main/res/drawable/ic_plus.xml
@@ -4,7 +4,10 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="@color/black"
-        android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>
+    <group
+        android:scaleX="0.025"
+        android:scaleY="0.025"
+        android:translateY="24">
+        <path android:fillColor="@color/black" android:pathData="M440-440H200v-80h240v-240h80v240h240v80H520v240h-80v-240Z" />
+    </group>
 </vector>
diff --git a/app/src/main/res/drawable/ic_plus_small.xml b/app/src/main/res/drawable/ic_plus_small.xml
index b7f82f3da..2f73d327b 100644
--- a/app/src/main/res/drawable/ic_plus_small.xml
+++ b/app/src/main/res/drawable/ic_plus_small.xml
@@ -4,10 +4,10 @@
     android:height="14dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:pathData="M12,4.5v15m7.5,-7.5h-15"
-        android:strokeColor="@color/color_text_secondary"
-        android:strokeWidth="2"
-        android:strokeLineCap="round"
-        android:fillColor="@android:color/transparent" />
+    <group
+        android:scaleX="0.025"
+        android:scaleY="0.025"
+        android:translateY="24">
+        <path android:fillColor="@color/color_text_secondary" android:pathData="M440-440H200v-80h240v-240h80v240h240v80H520v240h-80v-240Z" />
+    </group>
 </vector>
diff --git a/app/src/main/res/drawable/ic_print.xml b/app/src/main/res/drawable/ic_print.xml
index 60387f436..1c785996e 100644
--- a/app/src/main/res/drawable/ic_print.xml
+++ b/app/src/main/res/drawable/ic_print.xml
@@ -1,9 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="@color/black"
-        android:pathData="M19,8H5c-1.66,0 -3,1.34 -3,3v6h4v4h12v-4h4v-6c0,-1.66 -1.34,-3 -3,-3zM16,19H8v-5h8v5zM19,12c-0.55,0 -1,-0.45 -1,-1s0.45,-1 1,-1 1,0.45 1,1 -0.45,1 -1,1zM18,3H6v4h12V3z"/>
+    <group
+        android:scaleX="0.025"
+        android:scaleY="0.025"
+        android:translateY="24">
+        <path android:fillColor="@color/black" android:pathData="M640-640v-120H320v120h-80v-200h480v200h-80Zm-480 80h640-640Zm560 100q17 0 28.5-11.5T760-500q0-17-11.5-28.5T720-540q-17 0-28.5 11.5T680-500q0 17 11.5 28.5T720-460Zm-80 260v-160H320v160h320Zm80 80H240v-160H80v-240q0-51 35-85.5t85-34.5h560q51 0 85.5 34.5T880-520v240H720v160Zm80-240v-160q0-17-11.5-28.5T760-560H200q-17 0-28.5 11.5T160-520v160h80v-80h480v80h80Z" />
+    </group>
 </vector>
diff --git a/app/src/main/res/drawable/ic_qr_code.xml b/app/src/main/res/drawable/ic_qr_code.xml
index 20a624994..8cdfc0129 100644
--- a/app/src/main/res/drawable/ic_qr_code.xml
+++ b/app/src/main/res/drawable/ic_qr_code.xml
@@ -1,39 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-  <path
-      android:fillColor="@color/black"
-      android:pathData="M3,11h8V3H3V11z M5,5h4v4H5V5z"/>
-  <path
-      android:fillColor="@color/black"
-      android:pathData="M3,21h8v-8H3V21z M5,15h4v4H5V15z"/>
-  <path
-      android:fillColor="@color/black"
-      android:pathData="M13,3v8h8V3H13z M19,9h-4V5h4V9z"/>
-  <path
-      android:fillColor="@color/black"
-      android:pathData="M13,13h2v2h-2z"/>
-  <path
-      android:fillColor="@color/black"
-      android:pathData="M17,13h2v2h-2z"/>
-  <path
-      android:fillColor="@color/black"
-      android:pathData="M19,15h2v2h-2z"/>
-  <path
-      android:fillColor="@color/black"
-      android:pathData="M13,17h2v2h-2z"/>
-  <path
-      android:fillColor="@color/black"
-      android:pathData="M15,19h2v2h-2z"/>
-  <path
-      android:fillColor="@color/black"
-      android:pathData="M17,17h2v2h-2z"/>
-  <path
-      android:fillColor="@color/black"
-      android:pathData="M13,19h2v2h-2z"/>
-  <path
-      android:fillColor="@color/black"
-      android:pathData="M15,15h2v2h-2z"/>
-</vector>
\ No newline at end of file
+    <group
+        android:scaleX="0.025"
+        android:scaleY="0.025"
+        android:translateY="24">
+        <path android:fillColor="@color/black" android:pathData="M120-520v-320h320v320H120Zm80-80h160v-160H200v160Zm-80 480v-320h320v320H120Zm80-80h160v-160H200v160Zm320-320v-320h320v320H520Zm80-80h160v-160H600v160Zm160 480v-80h80v80h-80ZM520-360v-80h80v80h-80Zm80 80v-80h80v80h-80Zm-80 80v-80h80v80h-80Zm80 80v-80h80v80h-80Zm80-80v-80h80v80h-80Zm0-160v-80h80v80h-80Zm80 80v-80h80v80h-80Z" />
+    </group>
+</vector>
diff --git a/app/src/main/res/drawable/ic_qr_scan.xml b/app/src/main/res/drawable/ic_qr_scan.xml
index d13bd7fee..449a0effc 100644
--- a/app/src/main/res/drawable/ic_qr_scan.xml
+++ b/app/src/main/res/drawable/ic_qr_scan.xml
@@ -4,7 +4,10 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="@color/black"
-        android:pathData="M3,5v4h2V5h4V3H5C3.9,3 3,3.9 3,5zM5,15H3v4c0,1.1 0.9,2 2,2h4v-2H5V15zM19,19h-4v2h4c1.1,0 2,-0.9 2,-2v-4h-2V19zM19,3h-4v2h4v4h2V5C21,3.9 20.1,3 19,3zM12,15c-1.66,0 -3,-1.34 -3,-3s1.34,-3 3,-3 3,1.34 3,3 -1.34,3 -3,3zM12,7c-2.76,0 -5,2.24 -5,5s2.24,5 5,5 5,-2.24 5,-5 -2.24,-5 -5,-5z"/>
+    <group
+        android:scaleX="0.025"
+        android:scaleY="0.025"
+        android:translateY="24">
+        <path android:fillColor="@color/black" android:pathData="M80-680v-200h200v80H160v120H80Zm0 600v-200h80v120h120v80H80Zm600 0v-80h120v-120h80v200H680Zm120-600v-120H680v-80h200v200h-80ZM700-260h60v60h-60v-60Zm0-120h60v60h-60v-60Zm-60 60h60v60h-60v-60Zm-60 60h60v60h-60v-60Zm-60-60h60v60h-60v-60Zm120-120h60v60h-60v-60Zm-60 60h60v60h-60v-60Zm-60-60h60v60h-60v-60Zm240-320v240H520v-240h240ZM440-440v240H200v-240h240Zm0-320v240H200v-240h240Zm-60 500v-120H260v120h120Zm0-320v-120H260v120h120Zm320 0v-120H580v120h120Z" />
+    </group>
 </vector>
diff --git a/app/src/main/res/drawable/ic_quick_charge.xml b/app/src/main/res/drawable/ic_quick_charge.xml
index 427352148..eecd2c934 100644
--- a/app/src/main/res/drawable/ic_quick_charge.xml
+++ b/app/src/main/res/drawable/ic_quick_charge.xml
@@ -1,10 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M6,3C4.9,3 4,3.9 4,5C4,6.1 4.9,7 6,7C7.1,7 8,6.1 8,5C8,3.9 7.1,3 6,3zM12,3C10.9,3 10,3.9 10,5C10,6.1 10.9,7 12,7C13.1,7 14,6.1 14,5C14,3.9 13.1,3 12,3zM18,3C16.9,3 16,3.9 16,5C16,6.1 16.9,7 18,7C19.1,7 20,6.1 20,5C20,3.9 19.1,3 18,3zM6,11C4.9,11 4,11.9 4,13C4,14.1 4.9,15 6,15C7.1,15 8,14.1 8,13C8,11.9 7.1,11 6,11zM12,11C10.9,11 10,11.9 10,13C10,14.1 10.9,15 12,15C13.1,15 14,14.1 14,13C14,11.9 13.1,11 12,11zM18,11C16.9,11 16,11.9 16,13C16,14.1 16.9,15 18,15C19.1,15 20,14.1 20,13C20,11.9 19.1,11 18,11zM6,19C4.9,19 4,19.9 4,21C4,22.1 4.9,23 6,23C7.1,23 8,22.1 8,21C8,19.9 7.1,19 6,19zM12,19C10.9,19 10,19.9 10,21C10,22.1 10.9,23 12,23C13.1,23 14,22.1 14,21C14,19.9 13.1,19 12,19zM18,19C16.9,19 16,19.9 16,21C16,22.1 16.9,23 18,23C19.1,23 20,22.1 20,21C20,19.9 19.1,19 18,19z" />
+    <group
+        android:scaleX="0.025"
+        android:scaleY="0.025"
+        android:translateY="24">
+        <path android:fillColor="@android:color/white" android:pathData="M480-40q-33 0-56.5-23.5T400-120q0-33 23.5-56.5T480-200q33 0 56.5 23.5T560-120q0 33-23.5 56.5T480-40ZM240-760q-33 0-56.5-23.5T160-840q0-33 23.5-56.5T240-920q33 0 56.5 23.5T320-840q0 33-23.5 56.5T240-760Zm0 240q-33 0-56.5-23.5T160-600q0-33 23.5-56.5T240-680q33 0 56.5 23.5T320-600q0 33-23.5 56.5T240-520Zm0 240q-33 0-56.5-23.5T160-360q0-33 23.5-56.5T240-440q33 0 56.5 23.5T320-360q0 33-23.5 56.5T240-280Zm480-480q-33 0-56.5-23.5T640-840q0-33 23.5-56.5T720-920q33 0 56.5 23.5T800-840q0 33-23.5 56.5T720-760ZM480-280q-33 0-56.5-23.5T400-360q0-33 23.5-56.5T480-440q33 0 56.5 23.5T560-360q0 33-23.5 56.5T480-280Zm240 0q-33 0-56.5-23.5T640-360q0-33 23.5-56.5T720-440q33 0 56.5 23.5T800-360q0 33-23.5 56.5T720-280Zm0-240q-33 0-56.5-23.5T640-600q0-33 23.5-56.5T720-680q33 0 56.5 23.5T800-600q0 33-23.5 56.5T720-520Zm-240 0q-33 0-56.5-23.5T400-600q0-33 23.5-56.5T480-680q33 0 56.5 23.5T560-600q0 33-23.5 56.5T480-520Zm0-240q-33 0-56.5-23.5T400-840q0-33 23.5-56.5T480-920q33 0 56.5 23.5T560-840q0 33-23.5 56.5T480-760Z" />
+    </group>
 </vector>
diff --git a/app/src/main/res/drawable/ic_receipt.xml b/app/src/main/res/drawable/ic_receipt.xml
index 67abd8e17..c6c79992b 100644
--- a/app/src/main/res/drawable/ic_receipt.xml
+++ b/app/src/main/res/drawable/ic_receipt.xml
@@ -4,7 +4,10 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="@color/white"
-        android:pathData="M19.5,3.5L18,2L16.5,3.5L15,2L13.5,3.5L12,2L10.5,3.5L9,2L7.5,3.5L6,2L4.5,3.5L3,2V22L4.5,20.5L6,22L7.5,20.5L9,22L10.5,20.5L12,22L13.5,20.5L15,22L16.5,20.5L18,22L19.5,20.5L21,22V2L19.5,3.5ZM19,19.09H5V4.91H19V19.09ZM6,15H18V17H6V15ZM6,11H18V13H6V11ZM6,7H18V9H6V7Z" />
+    <group
+        android:scaleX="0.025"
+        android:scaleY="0.025"
+        android:translateY="24">
+        <path android:fillColor="@color/white" android:pathData="M240-80q-50 0-85-35t-35-85v-120h120v-560l60 60 60-60 60 60 60-60 60 60 60-60 60 60 60-60 60 60 60-60v680q0 50-35 85t-85 35H240Zm480-80q17 0 28.5-11.5T760-200v-560H320v440h360v120q0 17 11.5 28.5T720-160ZM360-600v-80h240v80H360Zm0 120v-80h240v80H360Zm320-120q-17 0-28.5-11.5T640-640q0-17 11.5-28.5T680-680q17 0 28.5 11.5T720-640q0 17-11.5 28.5T680-600Zm0 120q-17 0-28.5-11.5T640-520q0-17 11.5-28.5T680-560q17 0 28.5 11.5T720-520q0 17-11.5 28.5T680-480ZM240-160h360v-80H200v40q0 17 11.5 28.5T240-160Zm-40 0v-80 80Z" />
+    </group>
 </vector>
diff --git a/app/src/main/res/drawable/ic_refresh.xml b/app/src/main/res/drawable/ic_refresh.xml
index 82aa8bc9f..bbfadd782 100644
--- a/app/src/main/res/drawable/ic_refresh.xml
+++ b/app/src/main/res/drawable/ic_refresh.xml
@@ -4,7 +4,10 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="@color/black"
-        android:pathData="M17.65,6.35C16.2,4.9 14.21,4 12,4c-4.42,0 -7.99,3.58 -7.99,8s3.57,8 7.99,8c3.73,0 6.84,-2.55 7.73,-6h-2.08c-0.82,2.33 -3.04,4 -5.65,4 -3.31,0 -6,-2.69 -6,-6s2.69,-6 6,-6c1.66,0 3.14,0.69 4.22,1.78L13,11h7V4l-2.35,2.35z"/>
+    <group
+        android:scaleX="0.025"
+        android:scaleY="0.025"
+        android:translateY="24">
+        <path android:fillColor="@color/black" android:pathData="M480-160q-134 0-227-93t-93-227q0-134 93-227t227-93q69 0 132 28.5T720-690v-110h80v280H520v-80h168q-32-56-87.5-88T480-720q-100 0-170 70t-70 170q0 100 70 170t170 70q77 0 139-44t87-116h84q-28 106-114 173t-196 67Z" />
+    </group>
 </vector>
diff --git a/app/src/main/res/drawable/ic_restore.xml b/app/src/main/res/drawable/ic_restore.xml
index b1a8c7128..9b97e9616 100644
--- a/app/src/main/res/drawable/ic_restore.xml
+++ b/app/src/main/res/drawable/ic_restore.xml
@@ -1,9 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="@color/black"
-        android:pathData="M13,3c-4.97,0 -9,4.03 -9,9H1l3.89,3.89 0.07,0.14L9,12H6c0,-3.87 3.13,-7 7,-7s7,3.13 7,7 -3.13,7 -7,7c-1.93,0 -3.68,-0.79 -4.94,-2.06l-1.42,1.42C8.27,19.99 10.51,21 13,21c4.97,0 9,-4.03 9,-9s-4.03,-9 -9,-9zM12,8v5l4.28,2.54 0.72,-1.21 -3.5,-2.08V8H12z"/>
+    <group
+        android:scaleX="0.025"
+        android:scaleY="0.025"
+        android:translateY="24">
+        <path android:fillColor="@color/black" android:pathData="M480-400q-33 0-56.5-23.5T400-480q0-33 23.5-56.5T480-560q33 0 56.5 23.5T560-480q0 33-23.5 56.5T480-400Zm0 280q-139 0-241-91.5T122-440h82q14 104 92.5 172T480-200q117 0 198.5-81.5T760-480q0-117-81.5-198.5T480-760q-69 0-129 32t-101 88h110v80H120v-240h80v94q51-64 124.5-99T480-840q75 0 140.5 28.5t114 77q48.5 48.5 77 114T840-480q0 75-28.5 140.5t-77 114q-48.5 48.5-114 77T480-120Z" />
+    </group>
 </vector>
diff --git a/app/src/main/res/drawable/ic_search.xml b/app/src/main/res/drawable/ic_search.xml
index 21e5731f4..d428c68f6 100644
--- a/app/src/main/res/drawable/ic_search.xml
+++ b/app/src/main/res/drawable/ic_search.xml
@@ -1,4 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
-    <path android:fillColor="@android:color/white" android:pathData="M20.71 19.29l-3.4-3.39A7.92 7.92 0 0 0 19 11a8 8 0 1 0-8 8 7.92 7.92 0 0 0 4.9-1.69l3.39 3.4a1 1 0 0 0 1.42 0 1 1 0 0 0 0-1.42zM5 11a6 6 0 1 1 6 6 6 6 0 0 1-6-6z" />
-</vector>
\ No newline at end of file
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <group
+        android:scaleX="0.025"
+        android:scaleY="0.025"
+        android:translateY="24">
+        <path android:fillColor="@android:color/white" android:pathData="M784-120 532-372q-30 24-69 38t-83 14q-109 0-184.5-75.5T120-580q0-109 75.5-184.5T380-840q109 0 184.5 75.5T640-580q0 44-14 83t-38 69l252 252-56 56ZM380-400q75 0 127.5-52.5T560-580q0-75-52.5-127.5T380-760q-75 0-127.5 52.5T200-580q0 75 52.5 127.5T380-400Z" />
+    </group>
+</vector>
diff --git a/app/src/main/res/drawable/ic_settings.xml b/app/src/main/res/drawable/ic_settings.xml
index 1b1f03288..a99c807c3 100644
--- a/app/src/main/res/drawable/ic_settings.xml
+++ b/app/src/main/res/drawable/ic_settings.xml
@@ -1,5 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
-    <path android:fillColor="@color/black" android:pathData="M21.89 10.32L21.1 7.8a2.26 2.26 0 0 0-2.88-1.51l-.34.11a1.74 1.74 0 0 1-1.59-.26l-.11-.08a1.76 1.76 0 0 1-.69-1.43v-.28a2.37 2.37 0 0 0-.68-1.68 2.26 2.26 0 0 0-1.6-.67h-2.55a2.32 2.32 0 0 0-2.29 2.33v.24a1.94 1.94 0 0 1-.73 1.51l-.13.1a1.93 1.93 0 0 1-1.78.29 2.14 2.14 0 0 0-1.68.12 2.18 2.18 0 0 0-1.12 1.33l-.82 2.6a2.34 2.34 0 0 0 1.48 2.94h.16a1.83 1.83 0 0 1 1.12 1.22l.06.16a2.06 2.06 0 0 1-.23 1.86 2.37 2.37 0 0 0 .49 3.3l2.07 1.57a2.25 2.25 0 0 0 1.35.43A2 2 0 0 0 9 22a2.25 2.25 0 0 0 1.47-1l.23-.33a1.8 1.8 0 0 1 1.43-.77 1.75 1.75 0 0 1 1.5.78l.12.17a2.24 2.24 0 0 0 3.22.53L19 19.86a2.38 2.38 0 0 0 .5-3.23l-.26-.38A2 2 0 0 1 19 14.6a1.89 1.89 0 0 1 1.21-1.28l.2-.07a2.36 2.36 0 0 0 1.48-2.93zM12 15.5a3.5 3.5 0 1 1 3.5-3.5 3.5 3.5 0 0 1-3.5 3.5z" />
-    <path android:fillColor="@color/black" android:pathData="M 10.5,12.0 A 1.5,1.5 0 1,1 13.5,12.0 A 1.5,1.5 0 1,1 10.5,12.0" />
-</vector>
\ No newline at end of file
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <group
+        android:scaleX="0.025"
+        android:scaleY="0.025"
+        android:translateY="24">
+        <path android:fillColor="@color/black" android:pathData="m370-80-16-128q-13-5-24.5-12T307-235l-119 50L78-375l103-78q-1-7-1-13.5v-27q0-6.5 1-13.5L78-585l110-190 119 50q11-8 23-15t24-12l16-128h220l16 128q13 5 24.5 12t22.5 15l119-50 110 190-103 78q1 7 1 13.5v27q0 6.5-2 13.5l103 78-110 190-118-50q-11 8-23 15t-24 12L590-80H370Zm70-80h79l14-106q31-8 57.5-23.5T639-327l99 41 39-68-86-65q5-14 7-29.5t2-31.5q0-16-2-31.5t-7-29.5l86-65-39-68-99 42q-22-23-48.5-38.5T533-694l-13-106h-79l-14 106q-31 8-57.5 23.5T321-633l-99-41-39 68 86 64q-5 15-7 30t-2 32q0 16 2 31t7 30l-86 65 39 68 99-42q22 23 48.5 38.5T427-266l13 106Zm42-180q58 0 99-41t41-99q0-58-41-99t-99-41q-59 0-99.5 41T342-480q0 58 40.5 99t99.5 41Zm-2-140Z" />
+    </group>
+</vector>
diff --git a/app/src/main/res/drawable/ic_share.xml b/app/src/main/res/drawable/ic_share.xml
index bd49dbf31..f271abe9e 100644
--- a/app/src/main/res/drawable/ic_share.xml
+++ b/app/src/main/res/drawable/ic_share.xml
@@ -1,4 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
-    <path android:fillColor="@android:color/white" android:pathData="M18 15a3 3 0 0 0-2.1.86L8 12.34V12v-.33l7.9-3.53A3 3 0 1 0 15 6v.34L7.1 9.86a3 3 0 1 0 0 4.28l7.9 3.53V18a3 3 0 1 0 3-3z" />
-</vector>
\ No newline at end of file
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <group
+        android:scaleX="0.025"
+        android:scaleY="0.025"
+        android:translateY="24">
+        <path android:fillColor="@android:color/white" android:pathData="M720-80q-50 0-85-35t-35-85q0-7 1-14.5t3-13.5L322-392q-17 15-38 23.5t-44 8.5q-50 0-85-35t-35-85q0-50 35-85t85-35q23 0 44 8.5t38 23.5l282-164q-2-6-3-13.5t-1-14.5q0-50 35-85t85-35q50 0 85 35t35 85q0 50-35 85t-85 35q-23 0-44-8.5T638-672L356-508q2 6 3 13.5t1 14.5q0 7-1 14.5t-3 13.5l282 164q17-15 38-23.5t44-8.5q50 0 85 35t35 85q0 50-35 85t-85 35Zm0-640q17 0 28.5-11.5T760-760q0-17-11.5-28.5T720-800q-17 0-28.5 11.5T680-760q0 17 11.5 28.5T720-720ZM240-440q17 0 28.5-11.5T280-480q0-17-11.5-28.5T240-520q-17 0-28.5 11.5T200-480q0 17 11.5 28.5T240-440Zm480 280q17 0 28.5-11.5T760-200q0-17-11.5-28.5T720-240q-17 0-28.5 11.5T680-200q0 17 11.5 28.5T720-160Zm0-600ZM240-480Zm480 280Z" />
+    </group>
+</vector>
diff --git a/app/src/main/res/drawable/ic_shield.xml b/app/src/main/res/drawable/ic_shield.xml
index 5f251b3b5..e66d90437 100644
--- a/app/src/main/res/drawable/ic_shield.xml
+++ b/app/src/main/res/drawable/ic_shield.xml
@@ -1,9 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="@color/black"
-        android:pathData="M12,1L3,5v6c0,5.55 3.84,10.74 9,12 5.16,-1.26 9,-6.45 9,-12V5l-9,-4zm0,10.99h7c-0.53,4.12 -3.28,7.79 -7,8.94V12H5V6.3l7,-3.11v8.8z"/>
+    <group
+        android:scaleX="0.025"
+        android:scaleY="0.025"
+        android:translateY="24">
+        <path android:fillColor="@color/black" android:pathData="M480-80q-139-35-229.5-159.5T160-516v-244l320-120 320 120v244q0 152-90.5 276.5T480-80Zm0-84q104-33 172-132t68-220v-189l-240-90-240 90v189q0 121 68 220t172 132Zm0-316Z" />
+    </group>
 </vector>
diff --git a/app/src/main/res/drawable/ic_shopping_bag.xml b/app/src/main/res/drawable/ic_shopping_bag.xml
index 04150f747..22ab5130d 100644
--- a/app/src/main/res/drawable/ic_shopping_bag.xml
+++ b/app/src/main/res/drawable/ic_shopping_bag.xml
@@ -4,7 +4,10 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="@color/black"
-        android:pathData="M18,6h-2c0,-2.21 -1.79,-4 -4,-4S8,3.79 8,6H6C4.9,6 4,6.9 4,8v12c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2V8C20,6.9 19.1,6 18,6zM12,4c1.1,0 2,0.9 2,2h-4C10,4.9 10.9,4 12,4zM18,20H6V8h2v2c0,0.55 0.45,1 1,1s1,-0.45 1,-1V8h4v2c0,0.55 0.45,1 1,1s1,-0.45 1,-1V8h2V20z"/>
+    <group
+        android:scaleX="0.025"
+        android:scaleY="0.025"
+        android:translateY="24">
+        <path android:fillColor="@color/black" android:pathData="M240-80q-33 0-56.5-23.5T160-160v-480q0-33 23.5-56.5T240-720h80q0-66 47-113t113-47q66 0 113 47t47 113h80q33 0 56.5 23.5T800-640v480q0 33-23.5 56.5T720-80H240Zm0-80h480v-480h-80v80q0 17-11.5 28.5T600-520q-17 0-28.5-11.5T560-560v-80H400v80q0 17-11.5 28.5T360-520q-17 0-28.5-11.5T320-560v-80h-80v480Zm160-560h160q0-33-23.5-56.5T480-800q-33 0-56.5 23.5T400-720ZM240-160v-480 480Z" />
+    </group>
 </vector>
diff --git a/app/src/main/res/drawable/ic_switch_currency.xml b/app/src/main/res/drawable/ic_switch_currency.xml
index e3b252733..d07bfa5ea 100644
--- a/app/src/main/res/drawable/ic_switch_currency.xml
+++ b/app/src/main/res/drawable/ic_switch_currency.xml
@@ -1,5 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="24" android:viewportHeight="24">
-    <path android:fillColor="@color/black" android:pathData="M4 9h13l-1.6 1.2a1 1 0 0 0-.2 1.4 1 1 0 0 0 .8.4 1 1 0 0 0 .6-.2l4-3a1 1 0 0 0 0-1.59l-3.86-3a1 1 0 0 0-1.23 1.58L17.08 7H4a1 1 0 0 0 0 2z" />
-    <path android:fillColor="@color/black" android:pathData="M20 16H7l1.6-1.2a1 1 0 0 0-1.2-1.6l-4 3a1 1 0 0 0 0 1.59l3.86 3a1 1 0 0 0 .61.21 1 1 0 0 0 .79-.39 1 1 0 0 0-.17-1.4L6.92 18H20a1 1 0 0 0 0-2z" />
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <group
+        android:scaleX="0.025"
+        android:scaleY="0.025"
+        android:translateY="24">
+        <path android:fillColor="@color/black" android:pathData="M280-160 80-360l200-200 56 57-103 103h287v80H233l103 103-56 57Zm400-240-56-57 103-103H440v-80h287L624-743l56-57 200 200-200 200Z" />
+    </group>
 </vector>
diff --git a/app/src/main/res/drawable/ic_tip.xml b/app/src/main/res/drawable/ic_tip.xml
index 187b00d46..192dc50d8 100644
--- a/app/src/main/res/drawable/ic_tip.xml
+++ b/app/src/main/res/drawable/ic_tip.xml
@@ -4,11 +4,10 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <!-- Coin/money icon representing tips -->
-    <path
-        android:fillColor="@color/black"
-        android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8z" />
-    <path
-        android:fillColor="@color/black"
-        android:pathData="M12,6c-0.55,0 -1,0.45 -1,1v0.26c-1.2,0.3 -2,1.39 -2,2.74 0,1.51 1.23,2.74 2.73,2.96L12,13v2c-0.73,0 -1.38,-0.38 -1.75,-0.95 -0.3,-0.46 -0.91,-0.59 -1.37,-0.29 -0.46,0.3 -0.59,0.91 -0.29,1.37 0.67,1.02 1.82,1.69 3.08,1.85v0.02c0,0.55 0.45,1 1,1s1,-0.45 1,-1v-0.26c1.2,-0.3 2,-1.39 2,-2.74 0,-1.51 -1.23,-2.74 -2.73,-2.96L13,11V9c0.73,0 1.38,0.38 1.75,0.95 0.3,0.46 0.91,0.59 1.37,0.29 0.46,-0.3 0.59,-0.91 0.29,-1.37 -0.67,-1.02 -1.82,-1.69 -3.08,-1.85V7c0,-0.55 -0.45,-1 -1,-1zM11,9.18L11,11c-0.44,-0.07 -1,-0.51 -1,-1 0,-0.38 0.25,-0.7 0.58,-0.82zM13,14.82L13,13c0.44,0.07 1,0.51 1,1 0,0.38 -0.25,0.7 -0.58,0.82z" />
+    <group
+        android:scaleX="0.025"
+        android:scaleY="0.025"
+        android:translateY="24">
+        <path android:fillColor="@color/black" android:pathData="M444-200h70v-50q50-9 86-39t36-89q0-42-24-77t-96-61q-60-20-83-35t-23-41q0-26 18.5-41t53.5-15q32 0 50 15.5t26 38.5l64-26q-11-35-40.5-61T516-710v-50h-70v50q-50 11-78 44t-28 74q0 47 27.5 76t86.5 50q63 23 87.5 41t24.5 47q0 33-23.5 48.5T486-314q-33 0-58.5-20.5T390-396l-66 26q14 48 43.5 77.5T444-252v52Zm36 120q-83 0-156-31.5T197-197q-54-54-85.5-127T80-480q0-83 31.5-156T197-763q54-54 127-85.5T480-880q83 0 156 31.5T763-763q54 54 85.5 127T880-480q0 83-31.5 156T763-197q-54 54-127 85.5T480-80Zm0-80q134 0 227-93t93-227q0-134-93-227t-227-93q-134 0-227 93t-93 227q0 134 93 227t227 93Zm0-320Z" />
+    </group>
 </vector>
diff --git a/app/src/main/res/drawable/ic_trash.xml b/app/src/main/res/drawable/ic_trash.xml
index cf27390ee..c5b9d499d 100644
--- a/app/src/main/res/drawable/ic_trash.xml
+++ b/app/src/main/res/drawable/ic_trash.xml
@@ -4,17 +4,10 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="@color/black"
-        android:pathData="M3,6h18M19,6v14a2,2 0,0 1,-2 2H7a2,2 0,0 1,-2 -2V6M8,6V4a2,2 0,0 1,2 -2h4a2,2 0,0 1,2 2v2"
-        android:strokeWidth="2"
-        android:strokeColor="@color/black"
-        android:strokeLineCap="round"
-        android:strokeLineJoin="round"
-        android:fillType="nonZero" />
-    <path
-        android:strokeWidth="2"
-        android:strokeColor="@color/black"
-        android:strokeLineCap="round"
-        android:pathData="M10,11v6M14,11v6" />
+    <group
+        android:scaleX="0.025"
+        android:scaleY="0.025"
+        android:translateY="24">
+        <path android:fillColor="@color/black" android:pathData="M280-120q-33 0-56.5-23.5T200-200v-520h-40v-80h200v-40h240v40h200v80h-40v520q0 33-23.5 56.5T680-120H280Zm400-600H280v520h400v-520ZM360-280h80v-360h-80v360Zm160 0h80v-360h-80v360ZM280-720v520-520Z" />
+    </group>
 </vector>
diff --git a/app/src/main/res/drawable/ic_tune.xml b/app/src/main/res/drawable/ic_tune.xml
index 4c30d4bf4..fc571934e 100644
--- a/app/src/main/res/drawable/ic_tune.xml
+++ b/app/src/main/res/drawable/ic_tune.xml
@@ -1,10 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M3,17v2h6v-2H3zM3,5v2h10V5H3zM13,21v-2h8v-2h-8v-2h-2v6h2zM7,9v2H3v2h4v2h2V9H7zM21,13v-2H11v2h10zM15,9h2V7h4V5h-4V3h-2v6z" />
+    <group
+        android:scaleX="0.025"
+        android:scaleY="0.025"
+        android:translateY="24">
+        <path android:fillColor="@android:color/white" android:pathData="M440-120v-240h80v80h320v80H520v80h-80Zm-320-80v-80h240v80H120Zm160-160v-80H120v-80h160v-80h80v240h-80Zm160-80v-80h400v80H440Zm160-160v-240h80v80h160v80H680v80h-80Zm-480-80v-80h400v80H120Z" />
+    </group>
 </vector>
diff --git a/app/src/main/res/drawable/ic_visibility.xml b/app/src/main/res/drawable/ic_visibility.xml
index 77dfa36fc..2feee81e2 100644
--- a/app/src/main/res/drawable/ic_visibility.xml
+++ b/app/src/main/res/drawable/ic_visibility.xml
@@ -4,7 +4,10 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="@color/black"
-        android:pathData="M12,4.5C7,4.5 2.73,7.61 1,12c1.73,4.39 6,7.5 11,7.5s9.27,-3.11 11,-7.5c-1.73,-4.39 -6,-7.5 -11,-7.5zM12,17c-2.76,0 -5,-2.24 -5,-5s2.24,-5 5,-5 5,2.24 5,5 -2.24,5 -5,5zM12,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3 3,-1.34 3,-3 -1.34,-3 -3,-3z"/>
+    <group
+        android:scaleX="0.025"
+        android:scaleY="0.025"
+        android:translateY="24">
+        <path android:fillColor="@color/black" android:pathData="M480-320q75 0 127.5-52.5T660-500q0-75-52.5-127.5T480-680q-75 0-127.5 52.5T300-500q0 75 52.5 127.5T480-320Zm0-72q-45 0-76.5-31.5T372-500q0-45 31.5-76.5T480-608q45 0 76.5 31.5T588-500q0 45-31.5 76.5T480-392Zm0 192q-146 0-266-81.5T40-500q54-137 174-218.5T480-800q146 0 266 81.5T920-500q-54 137-174 218.5T480-200Zm0-300Zm0 220q113 0 207.5-59.5T832-500q-50-101-144.5-160.5T480-720q-113 0-207.5 59.5T128-500q50 101 144.5 160.5T480-280Z" />
+    </group>
 </vector>
diff --git a/app/src/main/res/drawable/ic_visibility_off.xml b/app/src/main/res/drawable/ic_visibility_off.xml
index 656165af8..cef337954 100644
--- a/app/src/main/res/drawable/ic_visibility_off.xml
+++ b/app/src/main/res/drawable/ic_visibility_off.xml
@@ -4,7 +4,10 @@
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="@color/black"
-        android:pathData="M12,7c2.76,0 5,2.24 5,5 0,0.65 -0.13,1.26 -0.36,1.83l2.92,2.92C21.45,15.52 22.63,13.86 23,12 21.27,7.61 17,4.5 12,4.5c-1.4,0 -2.74,0.25 -4,0.7l2.17,2.17C10.74,7.13 11.35,7 12,7zM2.81,2.81L1.39,4.22 3.68,6.51C2.35,7.45 1.26,8.62 1,12c1.73,4.39 6,7.5 11,7.5 1.55,0 3.03,-0.3 4.38,-0.84l2.4,2.4 1.41,-1.41L2.81,2.81zM7.53,9.24l1.55,1.55C9.03,11.14 9,11.32 9,11.5c0,1.66 1.34,3 3,3 0.18,0 0.36,-0.03 0.71,-0.08l1.55,1.55C13.55,16.6 12.8,17 12,17c-2.76,0 -5,-2.24 -5,-5 0,-0.8 0.4,-1.55 0.53,-1.76z"/>
+    <group
+        android:scaleX="0.025"
+        android:scaleY="0.025"
+        android:translateY="24">
+        <path android:fillColor="@color/black" android:pathData="m644-428-58-58q9-47-27-88t-93-32l-58-58q17-8 34.5-12t37.5-4q75 0 127.5 52.5T660-500q0 20-4 37.5T644-428Zm128 126-58-56q38-29 67.5-63.5T832-500q-50-101-143.5-160.5T480-720q-29 0-57 4t-55 12l-62-62q41-17 84-25.5t90-8.5q151 0 269 83.5T920-500q-23 59-60.5 109.5T772-302Zm20 246L624-222q-35 11-70.5 16.5T480-200q-151 0-269-83.5T40-500q21-53 53-98.5t73-81.5L56-792l56-56 736 736-56 56ZM222-624q-29 26-53 57t-41 67q50 101 143.5 160.5T480-280q20 0 39-2.5t39-5.5l-36-38q-11 3-21 4.5t-21 1.5q-75 0-127.5-52.5T300-500q0-11 1.5-21t4.5-21l-84-82Zm319 93Zm-151 75Z" />
+    </group>
 </vector>
diff --git a/app/src/main/res/drawable/ic_warning.xml b/app/src/main/res/drawable/ic_warning.xml
index 8c159c8ef..c73428d54 100644
--- a/app/src/main/res/drawable/ic_warning.xml
+++ b/app/src/main/res/drawable/ic_warning.xml
@@ -1,9 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="@color/black"
-        android:pathData="M1,21h22L12,2 1,21zM13,18h-2v-2h2v2zM13,14h-2v-4h2v4z"/>
+    <group
+        android:scaleX="0.025"
+        android:scaleY="0.025"
+        android:translateY="24">
+        <path android:fillColor="@color/black" android:pathData="m40-120 440-760 440 760H40Zm138-80h604L480-720 178-200Zm302-40q17 0 28.5-11.5T520-280q0-17-11.5-28.5T480-320q-17 0-28.5 11.5T440-280q0 17 11.5 28.5T480-240Zm-40-120h80v-200h-80v200Zm40-100Z" />
+    </group>
 </vector>
diff --git a/app/src/main/res/layout/activity_history.xml b/app/src/main/res/layout/activity_history.xml
index 4e8cee8b5..40126dac1 100644
--- a/app/src/main/res/layout/activity_history.xml
+++ b/app/src/main/res/layout/activity_history.xml
@@ -132,7 +132,7 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/btn_filter_status"
-            style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+            style="@style/Widget.Material3.Button.OutlinedButton"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:minHeight="48dp"
@@ -155,7 +155,7 @@
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/btn_filter_date"
-            style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+            style="@style/Widget.Material3.Button.OutlinedButton"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:minHeight="48dp"
diff --git a/app/src/main/res/layout/activity_item_entry.xml b/app/src/main/res/layout/activity_item_entry.xml
index f4d1f5912..27c0d109b 100644
--- a/app/src/main/res/layout/activity_item_entry.xml
+++ b/app/src/main/res/layout/activity_item_entry.xml
@@ -341,7 +341,7 @@
 
                         <com.google.android.material.button.MaterialButton
                             android:id="@+id/btn_price_fiat"
-                            style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                            style="@style/Widget.Material3.Button.OutlinedButton"
                             android:layout_width="0dp"
                             android:layout_height="match_parent"
                             android:layout_weight="1"
@@ -351,7 +351,7 @@
 
                         <com.google.android.material.button.MaterialButton
                             android:id="@+id/btn_price_bitcoin"
-                            style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                            style="@style/Widget.Material3.Button.OutlinedButton"
                             android:layout_width="0dp"
                             android:layout_height="match_parent"
                             android:layout_weight="1"
diff --git a/app/src/main/res/layout/activity_pin_reset.xml b/app/src/main/res/layout/activity_pin_reset.xml
index 4ff8a7d28..7f91aa8ab 100644
--- a/app/src/main/res/layout/activity_pin_reset.xml
+++ b/app/src/main/res/layout/activity_pin_reset.xml
@@ -117,7 +117,7 @@
             <!-- Paste Button -->
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/paste_button"
-                style="@style/Widget.MaterialComponents.Button.OutlinedButton"
+                style="@style/Widget.Material3.Button.OutlinedButton"
                 android:layout_width="wrap_content"
                 android:layout_height="44dp"
                 android:layout_gravity="center_horizontal"
diff --git a/app/src/main/res/layout/activity_seed_phrase.xml b/app/src/main/res/layout/activity_seed_phrase.xml
index a6a51f152..7b425186c 100644
--- a/app/src/main/res/layout/activity_seed_phrase.xml
+++ b/app/src/main/res/layout/activity_seed_phrase.xml
@@ -82,7 +82,7 @@
             <!-- Show/Hide Button -->
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/toggle_visibility_button"
-                style="@style/Widget.MaterialComponents.Button.TextButton"
+                style="@style/Widget.Material3.Button.TextButton"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_horizontal"
diff --git a/app/src/main/res/layout/item_basket_archive.xml b/app/src/main/res/layout/item_basket_archive.xml
index 31611d8f9..87bb14c42 100644
--- a/app/src/main/res/layout/item_basket_archive.xml
+++ b/app/src/main/res/layout/item_basket_archive.xml
@@ -122,7 +122,7 @@
             app:cornerRadius="@dimen/radius_m"
             app:rippleColor="@color/color_accent_blue"
             app:strokeWidth="0dp"
-            style="@style/Widget.MaterialComponents.Button.UnelevatedButton" />
+            style="@style/Widget.Material3.Button" />
 
     </LinearLayout>
 
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index cb3e1374f..3cfa16fd0 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -189,4 +189,38 @@
     <color name="color_theme_green">@color/numo_green</color>
     <color name="color_theme_white">#FFFFFF</color>
     <color name="color_theme_text_dark">@color/numo_dark</color>
+
+    <!-- ══════════════════════════════════════════════════════════ -->
+    <!-- Material 3 Color Roles (Dark)                             -->
+    <!-- Tonal palette generated from the numo_green (#00C244)     -->
+    <!-- seed using HCT (Material Theme Builder / tonal spot).     -->
+    <!-- ══════════════════════════════════════════════════════════ -->
+    <color name="m3_primary">#42E360</color>
+    <color name="m3_on_primary">#00390E</color>
+    <color name="m3_primary_container">#005318</color>
+    <color name="m3_on_primary_container">#6DFF7E</color>
+    <color name="m3_secondary">#ACD0A8</color>
+    <color name="m3_on_secondary">#19371A</color>
+    <color name="m3_secondary_container">#2F4E2F</color>
+    <color name="m3_on_secondary_container">#C8ECC2</color>
+    <color name="m3_tertiary">#75D5E1</color>
+    <color name="m3_on_tertiary">#00363C</color>
+    <color name="m3_tertiary_container">#004F56</color>
+    <color name="m3_on_tertiary_container">#92F1FE</color>
+    <color name="m3_error">#FFB4AB</color>
+    <color name="m3_on_error">#690005</color>
+    <color name="m3_error_container">#93000A</color>
+    <color name="m3_on_error_container">#FFDAD6</color>
+    <color name="m3_surface_variant">#424940</color>
+    <color name="m3_on_surface_variant">#C2C9BD</color>
+    <color name="m3_outline">#8C9388</color>
+    <color name="m3_outline_variant">#424940</color>
+    <color name="m3_surface_container_lowest">#0C0F0C</color>
+    <color name="m3_surface_container_low">#1A1C19</color>
+    <color name="m3_surface_container">#1E201D</color>
+    <color name="m3_surface_container_high">#282B27</color>
+    <color name="m3_surface_container_highest">#333532</color>
+    <color name="m3_surface_inverse">#E2E3DD</color>
+    <color name="m3_on_surface_inverse">#2F312D</color>
+    <color name="m3_primary_inverse">#006E23</color>
 </resources>
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index 6871621a1..8c5ec750c 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -1,15 +1,36 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <!-- Base Theme (Dark Mode) -->
-    <style name="Theme.Numo" parent="Theme.MaterialComponents.DayNight.NoActionBar">
-        <!-- Primary brand color. -->
-        <item name="colorPrimary">#FFFFFF</item>
-        <item name="colorPrimaryVariant">@color/dark_colorPrimaryDark</item>
-        <item name="colorOnPrimary">#000000</item>
-        <!-- Secondary brand color. -->
-        <item name="colorSecondary">#FFFFFF</item>
-        <item name="colorSecondaryVariant">#FFFFFF</item>
-        <item name="colorOnSecondary">#000000</item>
+    <!-- Base Theme (Dark Mode) — Material 3, brand palette from numo_green seed -->
+    <style name="Theme.Numo" parent="Theme.Material3.DayNight.NoActionBar">
+        <!-- Material 3 color roles (tonal palette from numo_green seed) -->
+        <item name="colorPrimary">@color/m3_primary</item>
+        <item name="colorOnPrimary">@color/m3_on_primary</item>
+        <item name="colorPrimaryContainer">@color/m3_primary_container</item>
+        <item name="colorOnPrimaryContainer">@color/m3_on_primary_container</item>
+        <item name="colorSecondary">@color/m3_secondary</item>
+        <item name="colorOnSecondary">@color/m3_on_secondary</item>
+        <item name="colorSecondaryContainer">@color/m3_secondary_container</item>
+        <item name="colorOnSecondaryContainer">@color/m3_on_secondary_container</item>
+        <item name="colorTertiary">@color/m3_tertiary</item>
+        <item name="colorOnTertiary">@color/m3_on_tertiary</item>
+        <item name="colorTertiaryContainer">@color/m3_tertiary_container</item>
+        <item name="colorOnTertiaryContainer">@color/m3_on_tertiary_container</item>
+        <item name="colorError">@color/m3_error</item>
+        <item name="colorOnError">@color/m3_on_error</item>
+        <item name="colorErrorContainer">@color/m3_error_container</item>
+        <item name="colorOnErrorContainer">@color/m3_on_error_container</item>
+        <item name="colorSurfaceVariant">@color/m3_surface_variant</item>
+        <item name="colorOnSurfaceVariant">@color/m3_on_surface_variant</item>
+        <item name="colorOutline">@color/m3_outline</item>
+        <item name="colorOutlineVariant">@color/m3_outline_variant</item>
+        <item name="colorSurfaceContainerLowest">@color/m3_surface_container_lowest</item>
+        <item name="colorSurfaceContainerLow">@color/m3_surface_container_low</item>
+        <item name="colorSurfaceContainer">@color/m3_surface_container</item>
+        <item name="colorSurfaceContainerHigh">@color/m3_surface_container_high</item>
+        <item name="colorSurfaceContainerHighest">@color/m3_surface_container_highest</item>
+        <item name="colorSurfaceInverse">@color/m3_surface_inverse</item>
+        <item name="colorOnSurfaceInverse">@color/m3_on_surface_inverse</item>
+        <item name="colorPrimaryInverse">@color/m3_primary_inverse</item>
         <!-- Status bar color - matches window background for seamless edge-to-edge -->
         <item name="android:statusBarColor">@color/dark_windowBackground</item>
         <item name="android:windowLightStatusBar">false</item>
@@ -23,9 +44,10 @@
         <!-- Background colors -->
         <item name="android:windowBackground">@color/dark_windowBackground</item>
         <item name="android:colorBackground">@color/dark_windowBackground</item>
-        <!-- Surface colors -->
+        <!-- Surface colors (kept on the app's neutral surfaces, not tinted) -->
         <item name="colorSurface">@color/dark_surfaceColor</item>
         <item name="colorOnSurface">@color/dark_textColorPrimary</item>
+        <item name="colorOnBackground">@color/dark_textColorPrimary</item>
         <!-- Custom attributes -->
         <item name="keypadButtonColor">@color/dark_keypadButtonColor</item>
         <item name="keypadButtonTextColor">@color/dark_keypadButtonTextColor</item>
@@ -35,20 +57,20 @@
         <item name="toolbarStyle">@style/Widget.App.Toolbar.Dark</item>
         <!-- Icon tint -->
         <item name="colorControlNormal">@color/dark_iconTint</item>
-        <!-- Switch colors -->
-        <item name="colorControlActivated">#FFFFFF</item>
+        <!-- Switch colors (M3 primary role) -->
+        <item name="colorControlActivated">@color/m3_primary</item>
         <!-- Popup menu styling -->
         <item name="popupMenuStyle">@style/Widget.Numo.PopupMenu</item>
         <item name="android:popupMenuStyle">@style/Widget.Numo.PopupMenu</item>
     </style>
 
     <!-- Popup Menu Style -->
-    <style name="Widget.Numo.PopupMenu" parent="Widget.MaterialComponents.PopupMenu">
+    <style name="Widget.Numo.PopupMenu" parent="Widget.Material3.PopupMenu">
         <item name="android:popupBackground">@drawable/bg_popup_menu</item>
         <item name="android:popupElevation">0dp</item>
     </style>
 
-    <style name="Widget.App.Toolbar.Dark" parent="Widget.MaterialComponents.Toolbar.Primary">
+    <style name="Widget.App.Toolbar.Dark" parent="Widget.Material3.Toolbar">
         <item name="android:background">@color/dark_colorPrimary</item>
         <item name="titleTextColor">@color/dark_textColorPrimary</item>
         <item name="subtitleTextColor">@color/dark_textColorSecondary</item>
@@ -66,7 +88,7 @@
     </style>
     
     <!-- Bottom Sheet Theme (Dark Mode - only override nav bar) -->
-    <style name="Theme.Numo.BottomSheet" parent="Theme.MaterialComponents.DayNight.BottomSheetDialog">
+    <style name="Theme.Numo.BottomSheet" parent="Theme.Material3.DayNight.BottomSheetDialog">
         <item name="android:navigationBarColor">@android:color/transparent</item>
         <item name="android:windowLightNavigationBar">false</item>
         <item name="enableEdgeToEdge">true</item>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 0f4e041f5..edfbfc4de 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -226,4 +226,38 @@
     <color name="color_theme_green">@color/numo_green</color>
     <color name="color_theme_white">@color/white</color>
     <color name="color_theme_text_dark">@color/numo_dark</color>
+
+    <!-- ══════════════════════════════════════════════════════════ -->
+    <!-- Material 3 Color Roles (Light)                            -->
+    <!-- Tonal palette generated from the numo_green (#00C244)     -->
+    <!-- seed using HCT (Material Theme Builder / tonal spot).     -->
+    <!-- ══════════════════════════════════════════════════════════ -->
+    <color name="m3_primary">#006E23</color>
+    <color name="m3_on_primary">#FFFFFF</color>
+    <color name="m3_primary_container">#6DFF7E</color>
+    <color name="m3_on_primary_container">#002105</color>
+    <color name="m3_secondary">#466645</color>
+    <color name="m3_on_secondary">#FFFFFF</color>
+    <color name="m3_secondary_container">#C8ECC2</color>
+    <color name="m3_on_secondary_container">#032107</color>
+    <color name="m3_tertiary">#006972</color>
+    <color name="m3_on_tertiary">#FFFFFF</color>
+    <color name="m3_tertiary_container">#92F1FE</color>
+    <color name="m3_on_tertiary_container">#001F23</color>
+    <color name="m3_error">#BA1A1A</color>
+    <color name="m3_on_error">#FFFFFF</color>
+    <color name="m3_error_container">#FFDAD6</color>
+    <color name="m3_on_error_container">#410002</color>
+    <color name="m3_surface_variant">#DEE5D9</color>
+    <color name="m3_on_surface_variant">#424940</color>
+    <color name="m3_outline">#72796F</color>
+    <color name="m3_outline_variant">#C2C9BD</color>
+    <color name="m3_surface_container_lowest">#FFFFFF</color>
+    <color name="m3_surface_container_low">#F3F4EE</color>
+    <color name="m3_surface_container">#EDEEE8</color>
+    <color name="m3_surface_container_high">#E8E9E3</color>
+    <color name="m3_surface_container_highest">#E2E3DD</color>
+    <color name="m3_surface_inverse">#2F312D</color>
+    <color name="m3_on_surface_inverse">#F0F1EB</color>
+    <color name="m3_primary_inverse">#42E360</color>
 </resources>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index df4b30a6c..f09df375e 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -31,6 +31,13 @@
     <dimen name="radius_input">12dp</dimen>
     <dimen name="radius_m">12dp</dimen>
     <dimen name="radius_l">@dimen/radius_card</dimen>
+    <!-- Extended radii (previously hardcoded in bg_* drawables) -->
+    <dimen name="radius_micro">2dp</dimen>
+    <dimen name="radius_xs">4dp</dimen>
+    <dimen name="radius_badge">6dp</dimen>
+    <dimen name="radius_s">10dp</dimen>
+    <dimen name="radius_button_compact">14dp</dimen>
+    <dimen name="radius_xl">24dp</dimen>
 
     <!-- Icon Sizes -->
     <dimen name="icon_size_xs">28dp</dimen>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 6c693a06e..8041c26fa 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <!-- Base Text Style -->
-    <style name="Text" parent="TextAppearance.MaterialComponents.Body1">
+    <style name="Text" parent="TextAppearance.Material3.BodyLarge">
         <item name="fontFamily">sans-serif-medium</item>
         <item name="android:textColor">@color/color_text_primary</item>
     </style>
@@ -215,14 +215,14 @@
     <style name="Widget.App" parent=""/>
 
     <!-- Zero out hidden insets so all MaterialButton variants respect their declared height -->
-    <style name="Widget.Numo.Button" parent="Widget.MaterialComponents.Button">
+    <style name="Widget.Numo.Button" parent="Widget.Material3.Button">
         <item name="android:insetTop">0dp</item>
         <item name="android:insetBottom">0dp</item>
     </style>
 
-    <style name="Widget.Button" parent="Widget.MaterialComponents.Button"/>
+    <style name="Widget.Button" parent="Widget.Material3.Button"/>
 
-    <style name="Widget.Button.Primary" parent="Widget.MaterialComponents.Button"/>
+    <style name="Widget.Button.Primary" parent="Widget.Material3.Button"/>
 
     <!-- Component Styles -->
     <style name="Widget.Button.Primary.Green">
@@ -238,9 +238,9 @@
         <item name="android:stateListAnimator">@null</item>
     </style>
 
-    <style name="Widget.Button.Secondary" parent="Widget.MaterialComponents.Button.OutlinedButton"/>
+    <style name="Widget.Button.Secondary" parent="Widget.Material3.Button.OutlinedButton"/>
 
-    <style name="Widget.Button.Secondary.Outlined" parent="Widget.MaterialComponents.Button.OutlinedButton">
+    <style name="Widget.Button.Secondary.Outlined" parent="Widget.Material3.Button.OutlinedButton">
         <item name="android:insetTop">0dp</item>
         <item name="android:insetBottom">0dp</item>
         <item name="android:textColor">@color/color_text_secondary</item>
@@ -260,7 +260,7 @@
     </style>
 
     <!-- Tertiary: borderless text button with consistent sizing -->
-    <style name="Widget.Numo.Button.Tertiary" parent="Widget.MaterialComponents.Button.TextButton">
+    <style name="Widget.Numo.Button.Tertiary" parent="Widget.Material3.Button.TextButton">
         <item name="android:insetTop">0dp</item>
         <item name="android:insetBottom">0dp</item>
         <item name="android:textAllCaps">false</item>
@@ -358,7 +358,7 @@
     </style>
 
     <!-- TextInputLayout: Outlined input (standard across all screens) -->
-    <style name="Widget.Numo.TextInputLayout.OutlinedBox" parent="Widget.MaterialComponents.TextInputLayout.OutlinedBox">
+    <style name="Widget.Numo.TextInputLayout.OutlinedBox" parent="Widget.Material3.TextInputLayout.OutlinedBox">
         <item name="boxCornerRadiusTopStart">@dimen/radius_input</item>
         <item name="boxCornerRadiusTopEnd">@dimen/radius_input</item>
         <item name="boxCornerRadiusBottomStart">@dimen/radius_input</item>
@@ -372,7 +372,7 @@
     </style>
 
     <!-- TextInputLayout prefix/suffix text appearance -->
-    <style name="Text.InputAffix" parent="TextAppearance.MaterialComponents.Subtitle1">
+    <style name="Text.InputAffix" parent="TextAppearance.Material3.TitleMedium">
         <item name="android:textSize">18sp</item>
         <item name="android:textColor">@color/color_text_primary</item>
         <item name="android:fontFamily">sans-serif-medium</item>
@@ -385,13 +385,13 @@
     </style>
 
     <!-- Snackbar -->
-    <style name="Widget.Numo.Snackbar" parent="Widget.MaterialComponents.Snackbar">
+    <style name="Widget.Numo.Snackbar" parent="Widget.Material3.Snackbar">
         <item name="backgroundTint">@color/color_bg_white</item>
         <item name="android:elevation">8dp</item>
         <item name="shapeAppearance">@style/ShapeAppearance.Numo.Snackbar</item>
     </style>
 
-    <style name="Widget.Numo.Snackbar.Text" parent="Widget.MaterialComponents.Snackbar.TextView">
+    <style name="Widget.Numo.Snackbar.Text" parent="Widget.Material3.Snackbar.TextView">
         <item name="android:textColor">@color/color_text_primary</item>
         <item name="android:textSize">14sp</item>
         <item name="android:fontFamily">sans-serif-medium</item>
@@ -408,7 +408,7 @@
     <!-- ══════════════════════════════════════════════════════════ -->
 
     <!-- Dialog: Primary action (dark fill) -->
-    <style name="Widget.Numo.Button.Dialog.Confirm" parent="Widget.MaterialComponents.Button">
+    <style name="Widget.Numo.Button.Dialog.Confirm" parent="Widget.Material3.Button">
         <item name="android:insetTop">0dp</item>
         <item name="android:insetBottom">0dp</item>
         <item name="android:textColor">@color/color_bg_white</item>
@@ -424,7 +424,7 @@
     </style>
 
     <!-- Dialog: Cancel action (outlined) -->
-    <style name="Widget.Numo.Button.Dialog.Cancel" parent="Widget.MaterialComponents.Button.UnelevatedButton">
+    <style name="Widget.Numo.Button.Dialog.Cancel" parent="Widget.Material3.Button.OutlinedButton">
         <item name="android:insetTop">0dp</item>
         <item name="android:insetBottom">0dp</item>
         <item name="android:textColor">@color/color_text_primary</item>
@@ -440,7 +440,7 @@
     </style>
 
     <!-- Dialog: Destructive action (red fill) -->
-    <style name="Widget.Numo.Button.Dialog.Destructive" parent="Widget.MaterialComponents.Button">
+    <style name="Widget.Numo.Button.Dialog.Destructive" parent="Widget.Material3.Button">
         <item name="android:insetTop">0dp</item>
         <item name="android:insetBottom">0dp</item>
         <item name="android:textColor">@color/color_bg_white</item>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 2ffd4ece3..7b7ef5f56 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -1,15 +1,36 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <!-- Base Theme (Light Mode) -->
-    <style name="Theme.Numo" parent="Theme.MaterialComponents.DayNight.NoActionBar">
-        <!-- Primary brand color. -->
-        <item name="colorPrimary">@color/color_primary_green_light</item>
-        <item name="colorPrimaryVariant">@color/color_primary_green</item>
-        <item name="colorOnPrimary">@color/color_bg_white</item>
-        <!-- Secondary brand color. -->
-        <item name="colorSecondary">@color/color_primary_green_light</item>
-        <item name="colorSecondaryVariant">@color/color_primary_green</item>
-        <item name="colorOnSecondary">@color/color_bg_white</item>
+    <!-- Base Theme (Light Mode) — Material 3, brand palette from numo_green seed -->
+    <style name="Theme.Numo" parent="Theme.Material3.DayNight.NoActionBar">
+        <!-- Material 3 color roles (tonal palette from numo_green seed) -->
+        <item name="colorPrimary">@color/m3_primary</item>
+        <item name="colorOnPrimary">@color/m3_on_primary</item>
+        <item name="colorPrimaryContainer">@color/m3_primary_container</item>
+        <item name="colorOnPrimaryContainer">@color/m3_on_primary_container</item>
+        <item name="colorSecondary">@color/m3_secondary</item>
+        <item name="colorOnSecondary">@color/m3_on_secondary</item>
+        <item name="colorSecondaryContainer">@color/m3_secondary_container</item>
+        <item name="colorOnSecondaryContainer">@color/m3_on_secondary_container</item>
+        <item name="colorTertiary">@color/m3_tertiary</item>
+        <item name="colorOnTertiary">@color/m3_on_tertiary</item>
+        <item name="colorTertiaryContainer">@color/m3_tertiary_container</item>
+        <item name="colorOnTertiaryContainer">@color/m3_on_tertiary_container</item>
+        <item name="colorError">@color/m3_error</item>
+        <item name="colorOnError">@color/m3_on_error</item>
+        <item name="colorErrorContainer">@color/m3_error_container</item>
+        <item name="colorOnErrorContainer">@color/m3_on_error_container</item>
+        <item name="colorSurfaceVariant">@color/m3_surface_variant</item>
+        <item name="colorOnSurfaceVariant">@color/m3_on_surface_variant</item>
+        <item name="colorOutline">@color/m3_outline</item>
+        <item name="colorOutlineVariant">@color/m3_outline_variant</item>
+        <item name="colorSurfaceContainerLowest">@color/m3_surface_container_lowest</item>
+        <item name="colorSurfaceContainerLow">@color/m3_surface_container_low</item>
+        <item name="colorSurfaceContainer">@color/m3_surface_container</item>
+        <item name="colorSurfaceContainerHigh">@color/m3_surface_container_high</item>
+        <item name="colorSurfaceContainerHighest">@color/m3_surface_container_highest</item>
+        <item name="colorSurfaceInverse">@color/m3_surface_inverse</item>
+        <item name="colorOnSurfaceInverse">@color/m3_on_surface_inverse</item>
+        <item name="colorPrimaryInverse">@color/m3_primary_inverse</item>
         <!-- Status bar color - matches window background for seamless edge-to-edge -->
         <item name="android:statusBarColor">@color/color_bg_white</item>
         <item name="android:windowLightStatusBar">true</item>
@@ -23,15 +44,16 @@
         <!-- Background colors -->
         <item name="android:windowBackground">@color/color_bg_white</item>
         <item name="android:colorBackground">@color/color_bg_white</item>
-        <!-- Surface colors -->
+        <!-- Surface colors (kept on the app's neutral surfaces, not tinted) -->
         <item name="colorSurface">@color/color_bg_white</item>
         <item name="colorOnSurface">@color/color_text_primary</item>
+        <item name="colorOnBackground">@color/color_text_primary</item>
         <!-- Normalize MaterialButton height across all variants -->
         <item name="materialButtonStyle">@style/Widget.Numo.Button</item>
         <!-- Icon tint -->
         <item name="colorControlNormal">@color/color_text_secondary</item>
-        <!-- Switch/toggle active color -->
-        <item name="colorControlActivated">@color/color_success_green</item>
+        <!-- Switch/toggle active color (M3 primary role) -->
+        <item name="colorControlActivated">@color/m3_primary</item>
         <!-- Popup menu styling -->
         <item name="popupMenuStyle">@style/Widget.Numo.PopupMenu</item>
         <item name="android:popupMenuStyle">@style/Widget.Numo.PopupMenu</item>
@@ -41,11 +63,11 @@
     </style>
 
     <!-- Popup Menu Style -->
-    <style name="Widget.Numo.PopupMenu" parent="Widget.MaterialComponents.PopupMenu">
+    <style name="Widget.Numo.PopupMenu" parent="Widget.Material3.PopupMenu">
         <item name="android:popupBackground">@drawable/bg_popup_menu</item>
         <item name="android:popupElevation">0dp</item>
     </style>
-    
+
     <!-- Splash Screen Theme for Android 12+ -->
     <style name="Theme.Numo.Splash" parent="Theme.Numo">
         <!-- Splash screen background: Navy -->
@@ -63,7 +85,7 @@
     </style>
 
     <!-- Legacy Toolbar Style -->
-    <style name="Widget.App.Toolbar.Light" parent="Widget.MaterialComponents.Toolbar.Primary">
+    <style name="Widget.App.Toolbar.Light" parent="Widget.Material3.Toolbar">
         <item name="android:background">@color/color_bg_white</item>
         <item name="titleTextColor">@color/color_text_primary</item>
         <item name="subtitleTextColor">@color/color_text_secondary</item>
@@ -80,7 +102,7 @@
     </style>
 
     <!-- Google-style Centered Dialog Theme -->
-    <style name="Theme.Numo.Dialog" parent="Theme.MaterialComponents.Light.Dialog">
+    <style name="Theme.Numo.Dialog" parent="Theme.Material3.Light.Dialog">
         <item name="android:windowBackground">@android:color/transparent</item>
         <item name="android:backgroundDimEnabled">true</item>
         <item name="android:backgroundDimAmount">0.5</item>
@@ -97,7 +119,7 @@
     </style>
     
     <!-- Bottom Sheet Fragment Theme (DayNight-aware) -->
-    <style name="Theme.Numo.BottomSheet" parent="Theme.MaterialComponents.DayNight.BottomSheetDialog">
+    <style name="Theme.Numo.BottomSheet" parent="Theme.Material3.DayNight.BottomSheetDialog">
         <item name="android:windowBackground">@android:color/transparent</item>
         <item name="android:backgroundDimEnabled">true</item>
         <item name="android:backgroundDimAmount">0.5</item>
@@ -112,7 +134,7 @@
     </style>
 
     <!-- Bottom Sheet Widget Style -->
-    <style name="Widget.Numo.BottomSheet" parent="Widget.MaterialComponents.BottomSheet.Modal">
+    <style name="Widget.Numo.BottomSheet" parent="Widget.Material3.BottomSheet.Modal">
         <item name="backgroundTint">@color/color_bg_white</item>
         <item name="shapeAppearance">@style/ShapeAppearance.Numo.BottomSheet</item>
         <item name="behavior_peekHeight">auto</item>
@@ -120,11 +142,11 @@
         <item name="android:elevation">16dp</item>
     </style>
     
-    <!-- Bottom Sheet Shape -->
-    <style name="ShapeAppearance.Numo.BottomSheet" parent="ShapeAppearance.MaterialComponents.LargeComponent">
+    <!-- Bottom Sheet Shape (Material 3 large component: 28dp top corners) -->
+    <style name="ShapeAppearance.Numo.BottomSheet" parent="ShapeAppearance.Material3.LargeComponent">
         <item name="cornerFamily">rounded</item>
-        <item name="cornerSizeTopLeft">20dp</item>
-        <item name="cornerSizeTopRight">20dp</item>
+        <item name="cornerSizeTopLeft">28dp</item>
+        <item name="cornerSizeTopRight">28dp</item>
         <item name="cornerSizeBottomLeft">0dp</item>
         <item name="cornerSizeBottomRight">0dp</item>
     </style>