diff --git a/core/ui/src/main/res/drawable/ic_account_circle_fill_round_24.xml b/core/ui/src/main/res/drawable/ic_account_circle_fill_round_24.xml
index c7d233fa..9e67f414 100644
--- a/core/ui/src/main/res/drawable/ic_account_circle_fill_round_24.xml
+++ b/core/ui/src/main/res/drawable/ic_account_circle_fill_round_24.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="960"
     android:viewportHeight="960">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="#ffffff"
         android:pathData="M234,684Q285,645 348,622.5Q411,600 480,600Q549,600 612,622.5Q675,645 726,684Q761,643 780.5,591Q800,539 800,480Q800,347 706.5,253.5Q613,160 480,160Q347,160 253.5,253.5Q160,347 160,480Q160,539 179.5,591Q199,643 234,684ZM480,520Q421,520 380.5,479.5Q340,439 340,380Q340,321 380.5,280.5Q421,240 480,240Q539,240 579.5,280.5Q620,321 620,380Q620,439 579.5,479.5Q539,520 480,520ZM480,880Q397,880 324,848.5Q251,817 197,763Q143,709 111.5,636Q80,563 80,480Q80,397 111.5,324Q143,251 197,197Q251,143 324,111.5Q397,80 480,80Q563,80 636,111.5Q709,143 763,197Q817,251 848.5,324Q880,397 880,480Q880,563 848.5,636Q817,709 763,763Q709,817 636,848.5Q563,880 480,880Z"/>
 </vector>
diff --git a/core/ui/src/main/res/drawable/ic_account_circle_round_24.xml b/core/ui/src/main/res/drawable/ic_account_circle_round_24.xml
index 30337277..46a90c1c 100644
--- a/core/ui/src/main/res/drawable/ic_account_circle_round_24.xml
+++ b/core/ui/src/main/res/drawable/ic_account_circle_round_24.xml
@@ -5,6 +5,6 @@
     android:viewportHeight="960"
     android:tint="?attr/colorControlNormal">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="#ffffff"
         android:pathData="M234,684Q285,645 348,622.5Q411,600 480,600Q549,600 612,622.5Q675,645 726,684Q761,643 780.5,591Q800,539 800,480Q800,347 706.5,253.5Q613,160 480,160Q347,160 253.5,253.5Q160,347 160,480Q160,539 179.5,591Q199,643 234,684ZM480,520Q421,520 380.5,479.5Q340,439 340,380Q340,321 380.5,280.5Q421,240 480,240Q539,240 579.5,280.5Q620,321 620,380Q620,439 579.5,479.5Q539,520 480,520ZM480,880Q397,880 324,848.5Q251,817 197,763Q143,709 111.5,636Q80,563 80,480Q80,397 111.5,324Q143,251 197,197Q251,143 324,111.5Q397,80 480,80Q563,80 636,111.5Q709,143 763,197Q817,251 848.5,324Q880,397 880,480Q880,563 848.5,636Q817,709 763,763Q709,817 636,848.5Q563,880 480,880ZM480,800Q533,800 580,784.5Q627,769 666,740Q627,711 580,695.5Q533,680 480,680Q427,680 380,695.5Q333,711 294,740Q333,769 380,784.5Q427,800 480,800ZM480,440Q506,440 523,423Q540,406 540,380Q540,354 523,337Q506,320 480,320Q454,320 437,337Q420,354 420,380Q420,406 437,423Q454,440 480,440ZM480,380Q480,380 480,380Q480,380 480,380Q480,380 480,380Q480,380 480,380Q480,380 480,380Q480,380 480,380Q480,380 480,380Q480,380 480,380ZM480,740Q480,740 480,740Q480,740 480,740Q480,740 480,740Q480,740 480,740Q480,740 480,740Q480,740 480,740Q480,740 480,740Q480,740 480,740Z"/>
 </vector>
diff --git a/core/ui/src/main/res/drawable/ic_arrow_back_round_24.xml b/core/ui/src/main/res/drawable/ic_arrow_back_round_24.xml
index 3dabbd25..a9fb8933 100644
--- a/core/ui/src/main/res/drawable/ic_arrow_back_round_24.xml
+++ b/core/ui/src/main/res/drawable/ic_arrow_back_round_24.xml
@@ -5,6 +5,6 @@
     android:viewportHeight="960"
     android:autoMirrored="true">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="#ffffff"
         android:pathData="M313,520L509,716Q521,728 520.5,744Q520,760 508,772Q496,783 480,783.5Q464,784 452,772L188,508Q182,502 179.5,495Q177,488 177,480Q177,472 179.5,465Q182,458 188,452L452,188Q463,177 479.5,177Q496,177 508,188Q520,200 520,216.5Q520,233 508,245L313,440L760,440Q777,440 788.5,451.5Q800,463 800,480Q800,497 788.5,508.5Q777,520 760,520L313,520Z"/>
 </vector>
diff --git a/core/ui/src/main/res/drawable/ic_arrow_forward_round_24.xml b/core/ui/src/main/res/drawable/ic_arrow_forward_round_24.xml
index 5a03b0f1..15e2bc43 100644
--- a/core/ui/src/main/res/drawable/ic_arrow_forward_round_24.xml
+++ b/core/ui/src/main/res/drawable/ic_arrow_forward_round_24.xml
@@ -5,6 +5,6 @@
     android:viewportHeight="960"
     android:autoMirrored="true">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="#ffffff"
         android:pathData="M647,520L200,520Q183,520 171.5,508.5Q160,497 160,480Q160,463 171.5,451.5Q183,440 200,440L647,440L451,244Q439,232 439.5,216Q440,200 452,188Q464,177 480,176.5Q496,176 508,188L772,452Q778,458 780.5,465Q783,472 783,480Q783,488 780.5,495Q778,502 772,508L508,772Q497,783 480.5,783Q464,783 452,772Q440,760 440,743.5Q440,727 452,715L647,520Z"/>
 </vector>
diff --git a/core/ui/src/main/res/drawable/ic_attach_file_round_24.xml b/core/ui/src/main/res/drawable/ic_attach_file_round_24.xml
index 1e17b6a7..806dadab 100644
--- a/core/ui/src/main/res/drawable/ic_attach_file_round_24.xml
+++ b/core/ui/src/main/res/drawable/ic_attach_file_round_24.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="960"
     android:viewportHeight="960">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="#ffffff"
         android:pathData="M720,630Q720,734 647,807Q574,880 470,880Q366,880 293,807Q220,734 220,630L220,260Q220,185 272.5,132.5Q325,80 400,80Q475,80 527.5,132.5Q580,185 580,260L580,610Q580,656 548,688Q516,720 470,720Q424,720 392,688Q360,656 360,610L360,280Q360,263 371.5,251.5Q383,240 400,240Q417,240 428.5,251.5Q440,263 440,280L440,610Q440,623 448.5,631.5Q457,640 470,640Q483,640 491.5,631.5Q500,623 500,610L500,260Q499,218 470.5,189Q442,160 400,160Q358,160 329,189Q300,218 300,260L300,630Q299,701 349,750.5Q399,800 470,800Q540,800 589,750.5Q638,701 640,630L640,280Q640,263 651.5,251.5Q663,240 680,240Q697,240 708.5,251.5Q720,263 720,280L720,630Z"/>
 </vector>
diff --git a/core/ui/src/main/res/drawable/ic_bookmark_round_24.xml b/core/ui/src/main/res/drawable/ic_bookmark_round_24.xml
index f0790f89..b6576762 100644
--- a/core/ui/src/main/res/drawable/ic_bookmark_round_24.xml
+++ b/core/ui/src/main/res/drawable/ic_bookmark_round_24.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="960"
     android:viewportHeight="960">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="#ffffff"
         android:pathData="M480,720L312,792Q272,809 236,785.5Q200,762 200,719L200,200Q200,167 223.5,143.5Q247,120 280,120L680,120Q713,120 736.5,143.5Q760,167 760,200L760,719Q760,762 724,785.5Q688,809 648,792L480,720ZM480,632L680,718Q680,718 680,718Q680,718 680,718L680,200Q680,200 680,200Q680,200 680,200L280,200Q280,200 280,200Q280,200 280,200L280,718Q280,718 280,718Q280,718 280,718L480,632ZM480,200L280,200Q280,200 280,200Q280,200 280,200L280,200Q280,200 280,200Q280,200 280,200L680,200Q680,200 680,200Q680,200 680,200L680,200Q680,200 680,200Q680,200 680,200L480,200Z"/>
 </vector>
diff --git a/core/ui/src/main/res/drawable/ic_brick_fill_round_24.xml b/core/ui/src/main/res/drawable/ic_brick_fill_round_24.xml
index 02e13696..ba1e2a2f 100644
--- a/core/ui/src/main/res/drawable/ic_brick_fill_round_24.xml
+++ b/core/ui/src/main/res/drawable/ic_brick_fill_round_24.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="960"
     android:viewportHeight="960">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="#ffffff"
         android:pathData="M80,740L80,380Q80,355 97.5,337.5Q115,320 140,320L200,320L200,220Q200,195 217.5,177.5Q235,160 260,160L380,160Q405,160 422.5,177.5Q440,195 440,220L440,320L520,320L520,220Q520,195 537.5,177.5Q555,160 580,160L700,160Q725,160 742.5,177.5Q760,195 760,220L760,320L820,320Q845,320 862.5,337.5Q880,355 880,380L880,740Q880,765 862.5,782.5Q845,800 820,800L140,800Q115,800 97.5,782.5Q80,765 80,740Z"/>
 </vector>
diff --git a/core/ui/src/main/res/drawable/ic_cake_fill_round_24.xml b/core/ui/src/main/res/drawable/ic_cake_fill_round_24.xml
index 0c182136..d92170e3 100644
--- a/core/ui/src/main/res/drawable/ic_cake_fill_round_24.xml
+++ b/core/ui/src/main/res/drawable/ic_cake_fill_round_24.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="960"
     android:viewportHeight="960">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="#ffffff"
         android:pathData="M160,880Q143,880 131.5,868.5Q120,857 120,840L120,680Q120,647 143.5,623.5Q167,600 200,600L760,600Q793,600 816.5,623.5Q840,647 840,680L840,840Q840,857 828.5,868.5Q817,880 800,880L160,880ZM200,520L200,400Q200,367 223.5,343.5Q247,320 280,320L440,320L440,262Q422,250 411,233Q400,216 400,192Q400,177 406,162.5Q412,148 424,136L466,94Q468,92 480,88Q482,88 494,94L536,136Q548,148 554,162.5Q560,177 560,192Q560,216 549,233Q538,250 520,262L520,320L680,320Q713,320 736.5,343.5Q760,367 760,400L760,520L200,520Z"/>
 </vector>
diff --git a/core/ui/src/main/res/drawable/ic_call_round_24.xml b/core/ui/src/main/res/drawable/ic_call_round_24.xml
index 3d58a87e..be803382 100644
--- a/core/ui/src/main/res/drawable/ic_call_round_24.xml
+++ b/core/ui/src/main/res/drawable/ic_call_round_24.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="960"
     android:viewportHeight="960">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="#ffffff"
         android:pathData="M798,840Q673,840 551,785.5Q429,731 329,631Q229,531 174.5,409Q120,287 120,162Q120,144 132,132Q144,120 162,120L324,120Q338,120 349,129.5Q360,139 362,152L388,292Q390,308 387,319Q384,330 376,338L279,436Q299,473 326.5,507.5Q354,542 387,574Q418,605 452,631.5Q486,658 524,680L618,586Q627,577 641.5,572.5Q656,568 670,570L808,598Q822,602 831,612.5Q840,623 840,636L840,798Q840,816 828,828Q816,840 798,840Z"/>
 </vector>
diff --git a/core/ui/src/main/res/drawable/ic_check_round_24.xml b/core/ui/src/main/res/drawable/ic_check_round_24.xml
index f2d348ac..9adc1b49 100644
--- a/core/ui/src/main/res/drawable/ic_check_round_24.xml
+++ b/core/ui/src/main/res/drawable/ic_check_round_24.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="960"
     android:viewportHeight="960">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="#ffffff"
         android:pathData="M382,606L721,267Q733,255 749,255Q765,255 777,267Q789,279 789,295.5Q789,312 777,324L410,692Q398,704 382,704Q366,704 354,692L182,520Q170,508 170.5,491.5Q171,475 183,463Q195,451 211.5,451Q228,451 240,463L382,606Z"/>
 </vector>
diff --git a/core/ui/src/main/res/drawable/ic_close_round_24.xml b/core/ui/src/main/res/drawable/ic_close_round_24.xml
index 3a076f38..44342dea 100644
--- a/core/ui/src/main/res/drawable/ic_close_round_24.xml
+++ b/core/ui/src/main/res/drawable/ic_close_round_24.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="960"
     android:viewportHeight="960">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="#ffffff"
         android:pathData="M480,536L284,732Q273,743 256,743Q239,743 228,732Q217,721 217,704Q217,687 228,676L424,480L228,284Q217,273 217,256Q217,239 228,228Q239,217 256,217Q273,217 284,228L480,424L676,228Q687,217 704,217Q721,217 732,228Q743,239 743,256Q743,273 732,284L536,480L732,676Q743,687 743,704Q743,721 732,732Q721,743 704,743Q687,743 676,732L480,536Z"/>
 </vector>
diff --git a/core/ui/src/main/res/drawable/ic_comment_fill_round_24.xml b/core/ui/src/main/res/drawable/ic_comment_fill_round_24.xml
index 73e12039..51eb6164 100644
--- a/core/ui/src/main/res/drawable/ic_comment_fill_round_24.xml
+++ b/core/ui/src/main/res/drawable/ic_comment_fill_round_24.xml
@@ -5,6 +5,6 @@
     android:viewportHeight="960"
     android:autoMirrored="true">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="#ffffff"
         android:pathData="M280,560L680,560Q697,560 708.5,548.5Q720,537 720,520Q720,503 708.5,491.5Q697,480 680,480L280,480Q263,480 251.5,491.5Q240,503 240,520Q240,537 251.5,548.5Q263,560 280,560ZM280,440L680,440Q697,440 708.5,428.5Q720,417 720,400Q720,383 708.5,371.5Q697,360 680,360L280,360Q263,360 251.5,371.5Q240,383 240,400Q240,417 251.5,428.5Q263,440 280,440ZM280,320L680,320Q697,320 708.5,308.5Q720,297 720,280Q720,263 708.5,251.5Q697,240 680,240L280,240Q263,240 251.5,251.5Q240,263 240,280Q240,297 251.5,308.5Q263,320 280,320ZM160,720Q127,720 103.5,696.5Q80,673 80,640L80,160Q80,127 103.5,103.5Q127,80 160,80L800,80Q833,80 856.5,103.5Q880,127 880,160L880,783Q880,810 855.5,820.5Q831,831 812,812L720,720L160,720Z"/>
 </vector>
diff --git a/core/ui/src/main/res/drawable/ic_draft_fill_round_24.xml b/core/ui/src/main/res/drawable/ic_draft_fill_round_24.xml
index 3fda2d11..c4b77ae1 100644
--- a/core/ui/src/main/res/drawable/ic_draft_fill_round_24.xml
+++ b/core/ui/src/main/res/drawable/ic_draft_fill_round_24.xml
@@ -5,6 +5,6 @@
     android:viewportHeight="960"
     android:autoMirrored="true">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="#ffffff"
         android:pathData="M240,880Q207,880 183.5,856.5Q160,833 160,800L160,160Q160,127 183.5,103.5Q207,80 240,80L527,80Q543,80 557.5,86Q572,92 583,103L777,297Q788,308 794,322.5Q800,337 800,353L800,800Q800,833 776.5,856.5Q753,880 720,880L240,880ZM520,320Q520,337 531.5,348.5Q543,360 560,360L720,360L520,160L520,320Z"/>
 </vector>
diff --git a/core/ui/src/main/res/drawable/ic_filter_list_round_24.xml b/core/ui/src/main/res/drawable/ic_filter_list_round_24.xml
index d75fa8a4..fa1ed152 100644
--- a/core/ui/src/main/res/drawable/ic_filter_list_round_24.xml
+++ b/core/ui/src/main/res/drawable/ic_filter_list_round_24.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="960"
     android:viewportHeight="960">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="#ffffff"
         android:pathData="M440,720Q423,720 411.5,708.5Q400,697 400,680Q400,663 411.5,651.5Q423,640 440,640L520,640Q537,640 548.5,651.5Q560,663 560,680Q560,697 548.5,708.5Q537,720 520,720L440,720ZM280,520Q263,520 251.5,508.5Q240,497 240,480Q240,463 251.5,451.5Q263,440 280,440L680,440Q697,440 708.5,451.5Q720,463 720,480Q720,497 708.5,508.5Q697,520 680,520L280,520ZM160,320Q143,320 131.5,308.5Q120,297 120,280Q120,263 131.5,251.5Q143,240 160,240L800,240Q817,240 828.5,251.5Q840,263 840,280Q840,297 828.5,308.5Q817,320 800,320L160,320Z"/>
 </vector>
diff --git a/core/ui/src/main/res/drawable/ic_fragrance_fill_round_24.xml b/core/ui/src/main/res/drawable/ic_fragrance_fill_round_24.xml
index 47431983..bbaece2e 100644
--- a/core/ui/src/main/res/drawable/ic_fragrance_fill_round_24.xml
+++ b/core/ui/src/main/res/drawable/ic_fragrance_fill_round_24.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="960"
     android:viewportHeight="960">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="#ffffff"
         android:pathData="M560,320Q543,320 531.5,308.5Q520,297 520,280Q520,263 531.5,251.5Q543,240 560,240Q577,240 588.5,251.5Q600,263 600,280Q600,297 588.5,308.5Q577,320 560,320ZM800,320Q783,320 771.5,308.5Q760,297 760,280Q760,263 771.5,251.5Q783,240 800,240Q817,240 828.5,251.5Q840,263 840,280Q840,297 828.5,308.5Q817,320 800,320ZM680,240Q663,240 651.5,228.5Q640,217 640,200Q640,183 651.5,171.5Q663,160 680,160Q697,160 708.5,171.5Q720,183 720,200Q720,217 708.5,228.5Q697,240 680,240ZM800,160Q783,160 771.5,148.5Q760,137 760,120Q760,103 771.5,91.5Q783,80 800,80Q817,80 828.5,91.5Q840,103 840,120Q840,137 828.5,148.5Q817,160 800,160ZM680,400Q663,400 651.5,388.5Q640,377 640,360Q640,343 651.5,331.5Q663,320 680,320Q697,320 708.5,331.5Q720,343 720,360Q720,377 708.5,388.5Q697,400 680,400ZM800,480Q783,480 771.5,468.5Q760,457 760,440Q760,423 771.5,411.5Q783,400 800,400Q817,400 828.5,411.5Q840,423 840,440Q840,457 828.5,468.5Q817,480 800,480ZM200,840Q167,840 143.5,816.5Q120,793 120,760L120,480Q120,447 143.5,423.5Q167,400 200,400L440,400Q473,400 496.5,423.5Q520,447 520,480L520,760Q520,793 496.5,816.5Q473,840 440,840L200,840ZM200,340L200,200Q200,167 223.5,143.5Q247,120 280,120L400,120Q417,120 428.5,131.5Q440,143 440,160L440,340L200,340Z"/>
 </vector>
diff --git a/core/ui/src/main/res/drawable/ic_group_fill_round_24.xml b/core/ui/src/main/res/drawable/ic_group_fill_round_24.xml
index d87663e1..c2ef604c 100644
--- a/core/ui/src/main/res/drawable/ic_group_fill_round_24.xml
+++ b/core/ui/src/main/res/drawable/ic_group_fill_round_24.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="960"
     android:viewportHeight="960">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="#ffffff"
         android:pathData="M40,688Q40,654 57.5,625.5Q75,597 104,582Q166,551 230,535.5Q294,520 360,520Q426,520 490,535.5Q554,551 616,582Q645,597 662.5,625.5Q680,654 680,688L680,720Q680,753 656.5,776.5Q633,800 600,800L120,800Q87,800 63.5,776.5Q40,753 40,720L40,688ZM738,800Q749,782 754.5,761.5Q760,741 760,720L760,680Q760,636 735.5,595.5Q711,555 666,526Q717,532 762,546.5Q807,561 846,582Q882,602 901,626.5Q920,651 920,680L920,720Q920,753 896.5,776.5Q873,800 840,800L738,800ZM360,480Q294,480 247,433Q200,386 200,320Q200,254 247,207Q294,160 360,160Q426,160 473,207Q520,254 520,320Q520,386 473,433Q426,480 360,480ZM760,320Q760,386 713,433Q666,480 600,480Q589,480 572,477.5Q555,475 544,472Q571,440 585.5,401Q600,362 600,320Q600,278 585.5,239Q571,200 544,168Q558,163 572,161.5Q586,160 600,160Q666,160 713,207Q760,254 760,320Z"/>
 </vector>
diff --git a/core/ui/src/main/res/drawable/ic_group_round_24.xml b/core/ui/src/main/res/drawable/ic_group_round_24.xml
index 7db44bb3..b2057698 100644
--- a/core/ui/src/main/res/drawable/ic_group_round_24.xml
+++ b/core/ui/src/main/res/drawable/ic_group_round_24.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="960"
     android:viewportHeight="960">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="#ffffff"
         android:pathData="M40,688Q40,654 57.5,625.5Q75,597 104,582Q166,551 230,535.5Q294,520 360,520Q426,520 490,535.5Q554,551 616,582Q645,597 662.5,625.5Q680,654 680,688L680,720Q680,753 656.5,776.5Q633,800 600,800L120,800Q87,800 63.5,776.5Q40,753 40,720L40,688ZM840,800L738,800Q749,782 754.5,761.5Q760,741 760,720L760,680Q760,636 735.5,595.5Q711,555 666,526Q717,532 762,546.5Q807,561 846,582Q882,602 901,626.5Q920,651 920,680L920,720Q920,753 896.5,776.5Q873,800 840,800ZM360,480Q294,480 247,433Q200,386 200,320Q200,254 247,207Q294,160 360,160Q426,160 473,207Q520,254 520,320Q520,386 473,433Q426,480 360,480ZM760,320Q760,386 713,433Q666,480 600,480Q589,480 572,477.5Q555,475 544,472Q571,440 585.5,401Q600,362 600,320Q600,278 585.5,239Q571,200 544,168Q558,163 572,161.5Q586,160 600,160Q666,160 713,207Q760,254 760,320ZM120,720L600,720L600,688Q600,677 594.5,668Q589,659 580,654Q526,627 471,613.5Q416,600 360,600Q304,600 249,613.5Q194,627 140,654Q131,659 125.5,668Q120,677 120,688L120,720ZM360,400Q393,400 416.5,376.5Q440,353 440,320Q440,287 416.5,263.5Q393,240 360,240Q327,240 303.5,263.5Q280,287 280,320Q280,353 303.5,376.5Q327,400 360,400ZM360,720L360,720L360,720Q360,720 360,720Q360,720 360,720Q360,720 360,720Q360,720 360,720Q360,720 360,720Q360,720 360,720Q360,720 360,720Q360,720 360,720ZM360,320Q360,320 360,320Q360,320 360,320Q360,320 360,320Q360,320 360,320Q360,320 360,320Q360,320 360,320Q360,320 360,320Q360,320 360,320Z"/>
 </vector>
diff --git a/core/ui/src/main/res/drawable/ic_history_toggle_off_round_24.xml b/core/ui/src/main/res/drawable/ic_history_toggle_off_round_24.xml
index 80a8e023..b7e82a4e 100644
--- a/core/ui/src/main/res/drawable/ic_history_toggle_off_round_24.xml
+++ b/core/ui/src/main/res/drawable/ic_history_toggle_off_round_24.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="960"
     android:viewportHeight="960">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="#ffffff"
         android:pathData="M225,266Q208,266 196.5,254Q185,242 185,225Q185,208 196.5,196.5Q208,185 225,185Q242,185 254,196.5Q266,208 266,225Q266,242 254,254Q242,266 225,266ZM387,173Q370,173 358,161Q346,149 346,132Q346,115 358,103.5Q370,92 387,92Q404,92 415.5,103.5Q427,115 427,132Q427,149 415.5,161Q404,173 387,173ZM573,173Q556,173 544.5,161Q533,149 533,132Q533,115 544.5,103.5Q556,92 573,92Q590,92 602,103.5Q614,115 614,132Q614,149 602,161Q590,173 573,173ZM735,266Q718,266 706,254Q694,242 694,225Q694,208 706,196Q718,184 735,184Q752,184 763.5,196Q775,208 775,225Q775,242 763.5,254Q752,266 735,266ZM828,427Q811,427 799,415.5Q787,404 787,387Q787,370 799,358.5Q811,347 828,347Q845,347 856.5,358.5Q868,370 868,387Q868,404 856.5,415.5Q845,427 828,427ZM828,614Q811,614 799,602Q787,590 787,573Q787,556 799,544.5Q811,533 828,533Q845,533 856.5,544.5Q868,556 868,573Q868,590 856.5,602Q845,614 828,614ZM735,775Q718,775 706,763.5Q694,752 694,735Q694,718 706,706Q718,694 735,694Q752,694 763.5,706Q775,718 775,735Q775,752 763.5,763.5Q752,775 735,775ZM573,868Q556,868 544.5,856.5Q533,845 533,828Q533,811 544.5,799Q556,787 573,787Q590,787 602,799Q614,811 614,828Q614,845 602,856.5Q590,868 573,868ZM387,868Q370,868 358,856.5Q346,845 346,828Q346,811 358,799Q370,787 387,787Q404,787 415.5,799Q427,811 427,828Q427,845 415.5,856.5Q404,868 387,868ZM225,774Q208,774 196.5,762.5Q185,751 185,734Q185,717 196.5,705.5Q208,694 225,694Q242,694 253.5,705.5Q265,717 265,734Q265,751 253.5,762.5Q242,774 225,774ZM132,613Q115,613 103.5,601Q92,589 92,572Q92,555 103.5,543.5Q115,532 132,532Q149,532 161,543.5Q173,555 173,572Q173,589 161,601Q149,613 132,613ZM132,427Q115,427 103.5,415.5Q92,404 92,387Q92,370 103.5,358Q115,346 132,346Q149,346 161,358Q173,370 173,387Q173,404 161,415.5Q149,427 132,427ZM520,464L640,584Q651,595 651,612Q651,629 640,640Q629,651 612,651Q595,651 584,640L452,508Q446,502 443,494.5Q440,487 440,479L440,320Q440,303 451.5,291.5Q463,280 480,280Q497,280 508.5,291.5Q520,303 520,320L520,464Z"/>
 </vector>
diff --git a/core/ui/src/main/res/drawable/ic_image_fill_round_24.xml b/core/ui/src/main/res/drawable/ic_image_fill_round_24.xml
index 964d7d12..d0e280a2 100644
--- a/core/ui/src/main/res/drawable/ic_image_fill_round_24.xml
+++ b/core/ui/src/main/res/drawable/ic_image_fill_round_24.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="960"
     android:viewportHeight="960">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="#ffffff"
         android:pathData="M200,840Q167,840 143.5,816.5Q120,793 120,760L120,200Q120,167 143.5,143.5Q167,120 200,120L760,120Q793,120 816.5,143.5Q840,167 840,200L840,760Q840,793 816.5,816.5Q793,840 760,840L200,840ZM280,680L680,680Q692,680 698,669Q704,658 696,648L586,501Q580,493 570,493Q560,493 554,501L450,640L376,541Q370,533 360,533Q350,533 344,541L264,648Q256,658 262,669Q268,680 280,680Z"/>
 </vector>
diff --git a/core/ui/src/main/res/drawable/ic_insert_chart_fill_round_24.xml b/core/ui/src/main/res/drawable/ic_insert_chart_fill_round_24.xml
index 4ce7cbc2..985d9eed 100644
--- a/core/ui/src/main/res/drawable/ic_insert_chart_fill_round_24.xml
+++ b/core/ui/src/main/res/drawable/ic_insert_chart_fill_round_24.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="960"
     android:viewportHeight="960">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="#ffffff"
         android:pathData="M200,840Q167,840 143.5,816.5Q120,793 120,760L120,200Q120,167 143.5,143.5Q167,120 200,120L760,120Q793,120 816.5,143.5Q840,167 840,200L840,760Q840,793 816.5,816.5Q793,840 760,840L200,840ZM320,400Q303,400 291.5,411.5Q280,423 280,440L280,640Q280,657 291.5,668.5Q303,680 320,680Q337,680 348.5,668.5Q360,657 360,640L360,440Q360,423 348.5,411.5Q337,400 320,400ZM480,280Q463,280 451.5,291.5Q440,303 440,320L440,640Q440,657 451.5,668.5Q463,680 480,680Q497,680 508.5,668.5Q520,657 520,640L520,320Q520,303 508.5,291.5Q497,280 480,280ZM640,520Q623,520 611.5,531.5Q600,543 600,560L600,640Q600,657 611.5,668.5Q623,680 640,680Q657,680 668.5,668.5Q680,657 680,640L680,560Q680,543 668.5,531.5Q657,520 640,520Z"/>
 </vector>
diff --git a/core/ui/src/main/res/drawable/ic_keyboard_arrow_up_round_24.xml b/core/ui/src/main/res/drawable/ic_keyboard_arrow_up_round_24.xml
index 1c2f5cc3..349e5953 100644
--- a/core/ui/src/main/res/drawable/ic_keyboard_arrow_up_round_24.xml
+++ b/core/ui/src/main/res/drawable/ic_keyboard_arrow_up_round_24.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="960"
     android:viewportHeight="960">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="#ffffff"
         android:pathData="M480,432L324,588Q313,599 296,599Q279,599 268,588Q257,577 257,560Q257,543 268,532L452,348Q464,336 480,336Q496,336 508,348L692,532Q703,543 703,560Q703,577 692,588Q681,599 664,599Q647,599 636,588L480,432Z"/>
 </vector>
diff --git a/core/ui/src/main/res/drawable/ic_language_round_24.xml b/core/ui/src/main/res/drawable/ic_language_round_24.xml
index 48155ead..3f6c9122 100644
--- a/core/ui/src/main/res/drawable/ic_language_round_24.xml
+++ b/core/ui/src/main/res/drawable/ic_language_round_24.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="960"
     android:viewportHeight="960">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="#ffffff"
         android:pathData="M480,880Q398,880 325,848.5Q252,817 197.5,762.5Q143,708 111.5,635Q80,562 80,480Q80,397 111.5,324.5Q143,252 197.5,197.5Q252,143 325,111.5Q398,80 480,80Q563,80 635.5,111.5Q708,143 762.5,197.5Q817,252 848.5,324.5Q880,397 880,480Q880,562 848.5,635Q817,708 762.5,762.5Q708,817 635.5,848.5Q563,880 480,880ZM480,798Q506,762 525,723Q544,684 556,640L404,640Q416,684 435,723Q454,762 480,798ZM376,782Q358,749 344.5,713.5Q331,678 322,640L204,640Q233,690 276.5,727Q320,764 376,782ZM584,782Q640,764 683.5,727Q727,690 756,640L638,640Q629,678 615.5,713.5Q602,749 584,782ZM170,560L306,560Q303,540 301.5,520.5Q300,501 300,480Q300,459 301.5,439.5Q303,420 306,400L170,400Q165,420 162.5,439.5Q160,459 160,480Q160,501 162.5,520.5Q165,540 170,560ZM386,560L574,560Q577,540 578.5,520.5Q580,501 580,480Q580,459 578.5,439.5Q577,420 574,400L386,400Q383,420 381.5,439.5Q380,459 380,480Q380,501 381.5,520.5Q383,540 386,560ZM654,560L790,560Q795,540 797.5,520.5Q800,501 800,480Q800,459 797.5,439.5Q795,420 790,400L654,400Q657,420 658.5,439.5Q660,459 660,480Q660,501 658.5,520.5Q657,540 654,560ZM638,320L756,320Q727,270 683.5,233Q640,196 584,178Q602,211 615.5,246.5Q629,282 638,320ZM404,320L556,320Q544,276 525,237Q506,198 480,162Q454,198 435,237Q416,276 404,320ZM204,320L322,320Q331,282 344.5,246.5Q358,211 376,178Q320,196 276.5,233Q233,270 204,320Z"/>
 </vector>
diff --git a/core/ui/src/main/res/drawable/ic_mail_fill_round_24.xml b/core/ui/src/main/res/drawable/ic_mail_fill_round_24.xml
index 59c7c93b..7a681f4e 100644
--- a/core/ui/src/main/res/drawable/ic_mail_fill_round_24.xml
+++ b/core/ui/src/main/res/drawable/ic_mail_fill_round_24.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="960"
     android:viewportHeight="960">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="#ffffff"
         android:pathData="M160,800Q127,800 103.5,776.5Q80,753 80,720L80,240Q80,207 103.5,183.5Q127,160 160,160L800,160Q833,160 856.5,183.5Q880,207 880,240L880,720Q880,753 856.5,776.5Q833,800 800,800L160,800ZM480,513Q485,513 490.5,511.5Q496,510 501,507L784,330Q792,325 796,317.5Q800,310 800,301Q800,281 783,271Q766,261 748,272L480,440L212,272Q194,261 177,271.5Q160,282 160,301Q160,311 164,318.5Q168,326 176,330L459,507Q464,510 469.5,511.5Q475,513 480,513Z"/>
 </vector>
diff --git a/core/ui/src/main/res/drawable/ic_mail_round_24.xml b/core/ui/src/main/res/drawable/ic_mail_round_24.xml
index f50491d2..41df5204 100644
--- a/core/ui/src/main/res/drawable/ic_mail_round_24.xml
+++ b/core/ui/src/main/res/drawable/ic_mail_round_24.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="960"
     android:viewportHeight="960">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="#ffffff"
         android:pathData="M160,800Q127,800 103.5,776.5Q80,753 80,720L80,240Q80,207 103.5,183.5Q127,160 160,160L800,160Q833,160 856.5,183.5Q880,207 880,240L880,720Q880,753 856.5,776.5Q833,800 800,800L160,800ZM800,320L501,507Q496,510 490.5,511.5Q485,513 480,513Q475,513 469.5,511.5Q464,510 459,507L160,320L160,720Q160,720 160,720Q160,720 160,720L800,720Q800,720 800,720Q800,720 800,720L800,320ZM480,440L800,240L160,240L480,440ZM160,320L160,330Q160,325 160,317.5Q160,310 160,301Q160,281 160,271Q160,261 160,272L160,240L160,240L160,272Q160,261 160,271.5Q160,282 160,301Q160,311 160,318.5Q160,326 160,330L160,320L160,720Q160,720 160,720Q160,720 160,720L160,720Q160,720 160,720Q160,720 160,720L160,320Z"/>
 </vector>
diff --git a/core/ui/src/main/res/drawable/ic_map_fill_round_24.xml b/core/ui/src/main/res/drawable/ic_map_fill_round_24.xml
index f7846566..e146ea7a 100644
--- a/core/ui/src/main/res/drawable/ic_map_fill_round_24.xml
+++ b/core/ui/src/main/res/drawable/ic_map_fill_round_24.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="960"
     android:viewportHeight="960">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="#ffffff"
         android:pathData="M574,831L360,756L174,828Q164,832 154.5,830.5Q145,829 137,824Q129,819 124.5,810.5Q120,802 120,791L120,230Q120,217 127.5,207Q135,197 148,192L334,129Q340,127 346.5,126Q353,125 360,125Q367,125 373.5,126Q380,127 386,129L600,204L786,132Q796,128 805.5,129.5Q815,131 823,136Q831,141 835.5,149.5Q840,158 840,169L840,730Q840,743 832.5,753Q825,763 812,768L626,831Q620,833 613.5,834Q607,835 600,835Q593,835 586.5,834Q580,833 574,831ZM560,742L560,274L400,218L400,686L560,742Z"/>
 </vector>
diff --git a/core/ui/src/main/res/drawable/ic_mic_fill_round_24.xml b/core/ui/src/main/res/drawable/ic_mic_fill_round_24.xml
index 34524441..28e3f11c 100644
--- a/core/ui/src/main/res/drawable/ic_mic_fill_round_24.xml
+++ b/core/ui/src/main/res/drawable/ic_mic_fill_round_24.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="960"
     android:viewportHeight="960">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="#ffffff"
         android:pathData="M480,560Q430,560 395,525Q360,490 360,440L360,200Q360,150 395,115Q430,80 480,80Q530,80 565,115Q600,150 600,200L600,440Q600,490 565,525Q530,560 480,560ZM440,800L440,717Q348,704 282.5,639Q217,574 203,481Q201,464 212,452Q223,440 240,440Q257,440 268.5,451.5Q280,463 284,480Q298,550 353.5,595Q409,640 480,640Q552,640 607,594.5Q662,549 676,480Q680,463 691.5,451.5Q703,440 720,440Q737,440 748,452Q759,464 757,481Q743,572 678,638Q613,704 520,717L520,800Q520,817 508.5,828.5Q497,840 480,840Q463,840 451.5,828.5Q440,817 440,800Z"/>
 </vector>
diff --git a/core/ui/src/main/res/drawable/ic_mic_round_24.xml b/core/ui/src/main/res/drawable/ic_mic_round_24.xml
index 3d452d30..87f463ee 100644
--- a/core/ui/src/main/res/drawable/ic_mic_round_24.xml
+++ b/core/ui/src/main/res/drawable/ic_mic_round_24.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="960"
     android:viewportHeight="960">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="#ffffff"
         android:pathData="M480,560Q430,560 395,525Q360,490 360,440L360,200Q360,150 395,115Q430,80 480,80Q530,80 565,115Q600,150 600,200L600,440Q600,490 565,525Q530,560 480,560ZM480,320Q480,320 480,320Q480,320 480,320L480,320Q480,320 480,320Q480,320 480,320Q480,320 480,320Q480,320 480,320L480,320Q480,320 480,320Q480,320 480,320ZM440,800L440,717Q348,704 282.5,639Q217,574 203,481Q201,464 212,452Q223,440 240,440Q257,440 268.5,451.5Q280,463 284,480Q298,550 353.5,595Q409,640 480,640Q552,640 607,594.5Q662,549 676,480Q680,463 691.5,451.5Q703,440 720,440Q737,440 748,452Q759,464 757,481Q743,572 678,638Q613,704 520,717L520,800Q520,817 508.5,828.5Q497,840 480,840Q463,840 451.5,828.5Q440,817 440,800ZM480,480Q497,480 508.5,468.5Q520,457 520,440L520,200Q520,183 508.5,171.5Q497,160 480,160Q463,160 451.5,171.5Q440,183 440,200L440,440Q440,457 451.5,468.5Q463,480 480,480Z"/>
 </vector>
diff --git a/core/ui/src/main/res/drawable/ic_more_vert_round_24.xml b/core/ui/src/main/res/drawable/ic_more_vert_round_24.xml
index 1f01db4d..b977d5c9 100644
--- a/core/ui/src/main/res/drawable/ic_more_vert_round_24.xml
+++ b/core/ui/src/main/res/drawable/ic_more_vert_round_24.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="960"
     android:viewportHeight="960">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="#ffffff"
         android:pathData="M480,800Q447,800 423.5,776.5Q400,753 400,720Q400,687 423.5,663.5Q447,640 480,640Q513,640 536.5,663.5Q560,687 560,720Q560,753 536.5,776.5Q513,800 480,800ZM480,560Q447,560 423.5,536.5Q400,513 400,480Q400,447 423.5,423.5Q447,400 480,400Q513,400 536.5,423.5Q560,447 560,480Q560,513 536.5,536.5Q513,560 480,560ZM480,320Q447,320 423.5,296.5Q400,273 400,240Q400,207 423.5,183.5Q447,160 480,160Q513,160 536.5,183.5Q560,207 560,240Q560,273 536.5,296.5Q513,320 480,320Z"/>
 </vector>
diff --git a/core/ui/src/main/res/drawable/ic_music_note_round_24.xml b/core/ui/src/main/res/drawable/ic_music_note_round_24.xml
index c6df97a9..b1d536eb 100644
--- a/core/ui/src/main/res/drawable/ic_music_note_round_24.xml
+++ b/core/ui/src/main/res/drawable/ic_music_note_round_24.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="960"
     android:viewportHeight="960">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="#ffffff"
         android:pathData="M400,840Q334,840 287,793Q240,746 240,680Q240,614 287,567Q334,520 400,520Q423,520 442.5,525.5Q462,531 480,542L480,160Q480,143 491.5,131.5Q503,120 520,120L680,120Q697,120 708.5,131.5Q720,143 720,160L720,240Q720,257 708.5,268.5Q697,280 680,280L560,280L560,680Q560,746 513,793Q466,840 400,840Z"/>
 </vector>
diff --git a/core/ui/src/main/res/drawable/ic_pause_round_24.xml b/core/ui/src/main/res/drawable/ic_pause_round_24.xml
index aaffce37..d94ba8b3 100644
--- a/core/ui/src/main/res/drawable/ic_pause_round_24.xml
+++ b/core/ui/src/main/res/drawable/ic_pause_round_24.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="960"
     android:viewportHeight="960">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="#ffffff"
         android:pathData="M640,760Q607,760 583.5,736.5Q560,713 560,680L560,280Q560,247 583.5,223.5Q607,200 640,200L640,200Q673,200 696.5,223.5Q720,247 720,280L720,680Q720,713 696.5,736.5Q673,760 640,760ZM320,760Q287,760 263.5,736.5Q240,713 240,680L240,280Q240,247 263.5,223.5Q287,200 320,200L320,200Q353,200 376.5,223.5Q400,247 400,280L400,680Q400,713 376.5,736.5Q353,760 320,760Z"/>
 </vector>
diff --git a/core/ui/src/main/res/drawable/ic_perm_phone_msg_fill_round_24.xml b/core/ui/src/main/res/drawable/ic_perm_phone_msg_fill_round_24.xml
index 270a303c..6a11451d 100644
--- a/core/ui/src/main/res/drawable/ic_perm_phone_msg_fill_round_24.xml
+++ b/core/ui/src/main/res/drawable/ic_perm_phone_msg_fill_round_24.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="960"
     android:viewportHeight="960">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="#ffffff"
         android:pathData="M480,472L480,160Q480,143 491.5,131.5Q503,120 520,120L800,120Q817,120 828.5,131.5Q840,143 840,160L840,360Q840,377 828.5,388.5Q817,400 800,400L600,400L514,486Q504,496 492,491Q480,486 480,472ZM798,840Q673,840 551,785.5Q429,731 329,631Q229,531 174.5,409Q120,287 120,162Q120,144 132,132Q144,120 162,120L324,120Q338,120 349,129.5Q360,139 362,152L388,292Q390,308 387,319Q384,330 376,338L279,436Q299,473 326.5,507.5Q354,542 387,574Q418,605 452,631.5Q486,658 524,680L618,586Q627,577 641.5,572.5Q656,568 670,570L808,598Q822,602 831,612.5Q840,623 840,636L840,798Q840,816 828,828Q816,840 798,840Z"/>
 </vector>
diff --git a/core/ui/src/main/res/drawable/ic_photo_camera_round_24.xml b/core/ui/src/main/res/drawable/ic_photo_camera_round_24.xml
index 6f35149b..e8d8e0f2 100644
--- a/core/ui/src/main/res/drawable/ic_photo_camera_round_24.xml
+++ b/core/ui/src/main/res/drawable/ic_photo_camera_round_24.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="960"
     android:viewportHeight="960">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="#ffffff"
         android:pathData="M480,700Q555,700 607.5,647.5Q660,595 660,520Q660,445 607.5,392.5Q555,340 480,340Q405,340 352.5,392.5Q300,445 300,520Q300,595 352.5,647.5Q405,700 480,700ZM480,620Q438,620 409,591Q380,562 380,520Q380,478 409,449Q438,420 480,420Q522,420 551,449Q580,478 580,520Q580,562 551,591Q522,620 480,620ZM160,840Q127,840 103.5,816.5Q80,793 80,760L80,280Q80,247 103.5,223.5Q127,200 160,200L286,200L336,146Q347,134 362.5,127Q378,120 395,120L565,120Q582,120 597.5,127Q613,134 624,146L674,200L800,200Q833,200 856.5,223.5Q880,247 880,280L880,760Q880,793 856.5,816.5Q833,840 800,840L160,840ZM160,760L800,760Q800,760 800,760Q800,760 800,760L800,280Q800,280 800,280Q800,280 800,280L638,280L565,200L395,200L322,280L160,280Q160,280 160,280Q160,280 160,280L160,760Q160,760 160,760Q160,760 160,760ZM480,520Q480,520 480,520Q480,520 480,520L480,520Q480,520 480,520Q480,520 480,520L480,520L480,520L480,520L480,520L480,520Q480,520 480,520Q480,520 480,520L480,520Q480,520 480,520Q480,520 480,520Z"/>
 </vector>
diff --git a/core/ui/src/main/res/drawable/ic_pin_drop_fill_round_24.xml b/core/ui/src/main/res/drawable/ic_pin_drop_fill_round_24.xml
index 5c27a125..f1b85620 100644
--- a/core/ui/src/main/res/drawable/ic_pin_drop_fill_round_24.xml
+++ b/core/ui/src/main/res/drawable/ic_pin_drop_fill_round_24.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="960"
     android:viewportHeight="960">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="#ffffff"
         android:pathData="M480,741Q468,741 456,737Q444,733 434,725Q316,631 258,541.5Q200,452 200,366Q200,241 278,160.5Q356,80 480,80Q604,80 682,160.5Q760,241 760,366Q760,452 702,541.5Q644,631 526,725Q516,733 504,737Q492,741 480,741ZM480,440Q513,440 536.5,416.5Q560,393 560,360Q560,327 536.5,303.5Q513,280 480,280Q447,280 423.5,303.5Q400,327 400,360Q400,393 423.5,416.5Q447,440 480,440ZM240,880Q223,880 211.5,868.5Q200,857 200,840Q200,823 211.5,811.5Q223,800 240,800L720,800Q737,800 748.5,811.5Q760,823 760,840Q760,857 748.5,868.5Q737,880 720,880L240,880Z"/>
 </vector>
diff --git a/core/ui/src/main/res/drawable/ic_play_arrow_fill_round_24.xml b/core/ui/src/main/res/drawable/ic_play_arrow_fill_round_24.xml
index e33014b4..8927416b 100644
--- a/core/ui/src/main/res/drawable/ic_play_arrow_fill_round_24.xml
+++ b/core/ui/src/main/res/drawable/ic_play_arrow_fill_round_24.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="960"
     android:viewportHeight="960">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="#ffffff"
         android:pathData="M320,687L320,273Q320,256 332,244.5Q344,233 360,233Q365,233 370.5,234.5Q376,236 381,239L707,446Q716,452 720.5,461Q725,470 725,480Q725,490 720.5,499Q716,508 707,514L381,721Q376,724 370.5,725.5Q365,727 360,727Q344,727 332,715.5Q320,704 320,687Z"/>
 </vector>
diff --git a/core/ui/src/main/res/drawable/ic_qr_code_round_24.xml b/core/ui/src/main/res/drawable/ic_qr_code_round_24.xml
index 56481fd8..ee922d8c 100644
--- a/core/ui/src/main/res/drawable/ic_qr_code_round_24.xml
+++ b/core/ui/src/main/res/drawable/ic_qr_code_round_24.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="960"
     android:viewportHeight="960">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="#ffffff"
         android:pathData="M120,400L120,160Q120,143 131.5,131.5Q143,120 160,120L400,120Q417,120 428.5,131.5Q440,143 440,160L440,400Q440,417 428.5,428.5Q417,440 400,440L160,440Q143,440 131.5,428.5Q120,417 120,400ZM200,360L360,360L360,200L200,200L200,360ZM120,800L120,560Q120,543 131.5,531.5Q143,520 160,520L400,520Q417,520 428.5,531.5Q440,543 440,560L440,800Q440,817 428.5,828.5Q417,840 400,840L160,840Q143,840 131.5,828.5Q120,817 120,800ZM200,760L360,760L360,600L200,600L200,760ZM520,400L520,160Q520,143 531.5,131.5Q543,120 560,120L800,120Q817,120 828.5,131.5Q840,143 840,160L840,400Q840,417 828.5,428.5Q817,440 800,440L560,440Q543,440 531.5,428.5Q520,417 520,400ZM600,360L760,360L760,200L600,200L600,360ZM760,840L760,760L840,760L840,840L760,840ZM520,600L520,520L600,520L600,600L520,600ZM600,680L600,600L680,600L680,680L600,680ZM520,760L520,680L600,680L600,760L520,760ZM600,840L600,760L680,760L680,840L600,840ZM680,760L680,680L760,680L760,760L680,760ZM680,600L680,520L760,520L760,600L680,600ZM760,680L760,600L840,600L840,680L760,680Z"/>
 </vector>
diff --git a/core/ui/src/main/res/drawable/ic_refresh_round_24.xml b/core/ui/src/main/res/drawable/ic_refresh_round_24.xml
index 70607bdf..d1c7f63d 100644
--- a/core/ui/src/main/res/drawable/ic_refresh_round_24.xml
+++ b/core/ui/src/main/res/drawable/ic_refresh_round_24.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="960"
     android:viewportHeight="960">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="#ffffff"
         android:pathData="M480,800Q346,800 253,707Q160,614 160,480Q160,346 253,253Q346,160 480,160Q549,160 612,188.5Q675,217 720,270L720,200Q720,183 731.5,171.5Q743,160 760,160Q777,160 788.5,171.5Q800,183 800,200L800,400Q800,417 788.5,428.5Q777,440 760,440L560,440Q543,440 531.5,428.5Q520,417 520,400Q520,383 531.5,371.5Q543,360 560,360L688,360Q656,304 600.5,272Q545,240 480,240Q380,240 310,310Q240,380 240,480Q240,580 310,650Q380,720 480,720Q548,720 604.5,685.5Q661,651 692,593Q700,579 714.5,573.5Q729,568 744,573Q760,578 767,594Q774,610 766,624Q725,704 649,752Q573,800 480,800Z"/>
 </vector>
diff --git a/core/ui/src/main/res/drawable/ic_report_fill_round_24.xml b/core/ui/src/main/res/drawable/ic_report_fill_round_24.xml
new file mode 100644
index 00000000..4732acdf
--- /dev/null
+++ b/core/ui/src/main/res/drawable/ic_report_fill_round_24.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M480,680Q497,680 508.5,668.5Q520,657 520,640Q520,623 508.5,611.5Q497,600 480,600Q463,600 451.5,611.5Q440,623 440,640Q440,657 451.5,668.5Q463,680 480,680ZM480,520Q497,520 508.5,508.5Q520,497 520,480L520,320Q520,303 508.5,291.5Q497,280 480,280Q463,280 451.5,291.5Q440,303 440,320L440,480Q440,497 451.5,508.5Q463,520 480,520ZM363,840Q347,840 332.5,834Q318,828 307,817L143,653Q132,642 126,627.5Q120,613 120,597L120,363Q120,347 126,332.5Q132,318 143,307L307,143Q318,132 332.5,126Q347,120 363,120L597,120Q613,120 627.5,126Q642,132 653,143L817,307Q828,318 834,332.5Q840,347 840,363L840,597Q840,613 834,627.5Q828,642 817,653L653,817Q642,828 627.5,834Q613,840 597,840L363,840Z"/>
+</vector>
diff --git a/core/ui/src/main/res/drawable/ic_schedule_round_24.xml b/core/ui/src/main/res/drawable/ic_schedule_round_24.xml
index 21b55220..8b982621 100644
--- a/core/ui/src/main/res/drawable/ic_schedule_round_24.xml
+++ b/core/ui/src/main/res/drawable/ic_schedule_round_24.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="960"
     android:viewportHeight="960">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="#ffffff"
         android:pathData="M520,464L520,320Q520,303 508.5,291.5Q497,280 480,280Q463,280 451.5,291.5Q440,303 440,320L440,479Q440,487 443,494.5Q446,502 452,508L584,640Q595,651 612,651Q629,651 640,640Q651,629 651,612Q651,595 640,584L520,464ZM480,880Q397,880 324,848.5Q251,817 197,763Q143,709 111.5,636Q80,563 80,480Q80,397 111.5,324Q143,251 197,197Q251,143 324,111.5Q397,80 480,80Q563,80 636,111.5Q709,143 763,197Q817,251 848.5,324Q880,397 880,480Q880,563 848.5,636Q817,709 763,763Q709,817 636,848.5Q563,880 480,880ZM480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480ZM480,800Q613,800 706.5,706.5Q800,613 800,480Q800,347 706.5,253.5Q613,160 480,160Q347,160 253.5,253.5Q160,347 160,480Q160,613 253.5,706.5Q347,800 480,800Z"/>
 </vector>
diff --git a/core/ui/src/main/res/drawable/ic_send_round_24.xml b/core/ui/src/main/res/drawable/ic_send_round_24.xml
index c0b81fd4..79c57b50 100644
--- a/core/ui/src/main/res/drawable/ic_send_round_24.xml
+++ b/core/ui/src/main/res/drawable/ic_send_round_24.xml
@@ -5,6 +5,6 @@
     android:viewportHeight="960"
     android:autoMirrored="true">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="#ffffff"
         android:pathData="M176,777Q156,785 138,773.5Q120,762 120,740L120,560L440,480L120,400L120,220Q120,198 138,186.5Q156,175 176,183L792,443Q817,454 817,480Q817,506 792,517L176,777Z"/>
 </vector>
diff --git a/core/ui/src/main/res/drawable/ic_sentiment_satisfied_round_24.xml b/core/ui/src/main/res/drawable/ic_sentiment_satisfied_round_24.xml
index 15d82916..f7ba4efe 100644
--- a/core/ui/src/main/res/drawable/ic_sentiment_satisfied_round_24.xml
+++ b/core/ui/src/main/res/drawable/ic_sentiment_satisfied_round_24.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="960"
     android:viewportHeight="960">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="#ffffff"
         android:pathData="M480,700Q533,700 580.5,677Q628,654 657,610Q668,593 660,576.5Q652,560 634,560Q626,560 619.5,563.5Q613,567 609,574Q586,605 552,622.5Q518,640 480,640Q442,640 408,622.5Q374,605 351,574Q346,567 339.5,563.5Q333,560 325,560Q307,560 299,576Q291,592 302,608Q331,653 378.5,676.5Q426,700 480,700ZM620,440Q645,440 662.5,422.5Q680,405 680,380Q680,355 662.5,337.5Q645,320 620,320Q595,320 577.5,337.5Q560,355 560,380Q560,405 577.5,422.5Q595,440 620,440ZM340,440Q365,440 382.5,422.5Q400,405 400,380Q400,355 382.5,337.5Q365,320 340,320Q315,320 297.5,337.5Q280,355 280,380Q280,405 297.5,422.5Q315,440 340,440ZM480,880Q397,880 324,848.5Q251,817 197,763Q143,709 111.5,636Q80,563 80,480Q80,397 111.5,324Q143,251 197,197Q251,143 324,111.5Q397,80 480,80Q563,80 636,111.5Q709,143 763,197Q817,251 848.5,324Q880,397 880,480Q880,563 848.5,636Q817,709 763,763Q709,817 636,848.5Q563,880 480,880ZM480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480ZM480,800Q614,800 707,707Q800,614 800,480Q800,346 707,253Q614,160 480,160Q346,160 253,253Q160,346 160,480Q160,614 253,707Q346,800 480,800Z"/>
 </vector>
diff --git a/core/ui/src/main/res/drawable/ic_settings_round_24.xml b/core/ui/src/main/res/drawable/ic_settings_round_24.xml
index 6115585b..d61f8df0 100644
--- a/core/ui/src/main/res/drawable/ic_settings_round_24.xml
+++ b/core/ui/src/main/res/drawable/ic_settings_round_24.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="960"
     android:viewportHeight="960">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="#ffffff"
         android:pathData="M433,880Q406,880 386.5,862Q367,844 363,818L354,752Q341,747 329.5,740Q318,733 307,725L245,751Q220,762 195,753Q170,744 156,721L109,639Q95,616 101,590Q107,564 128,547L181,507Q180,500 180,493.5Q180,487 180,480Q180,473 180,466.5Q180,460 181,453L128,413Q107,396 101,370Q95,344 109,321L156,239Q170,216 195,207Q220,198 245,209L307,235Q318,227 330,220Q342,213 354,208L363,142Q367,116 386.5,98Q406,80 433,80L527,80Q554,80 573.5,98Q593,116 597,142L606,208Q619,213 630.5,220Q642,227 653,235L715,209Q740,198 765,207Q790,216 804,239L851,321Q865,344 859,370Q853,396 832,413L779,453Q780,460 780,466.5Q780,473 780,480Q780,487 780,493.5Q780,500 778,507L831,547Q852,564 858,590Q864,616 850,639L802,721Q788,744 763,753Q738,762 713,751L653,725Q642,733 630,740Q618,747 606,752L597,818Q593,844 573.5,862Q554,880 527,880L433,880ZM440,800L519,800L533,694Q564,686 590.5,670.5Q617,655 639,633L738,674L777,606L691,541Q696,527 698,511.5Q700,496 700,480Q700,464 698,448.5Q696,433 691,419L777,354L738,286L639,328Q617,305 590.5,289.5Q564,274 533,266L520,160L441,160L427,266Q396,274 369.5,289.5Q343,305 321,327L222,286L183,354L269,418Q264,433 262,448Q260,463 260,480Q260,496 262,511Q264,526 269,541L183,606L222,674L321,632Q343,655 369.5,670.5Q396,686 427,694L440,800ZM482,620Q540,620 581,579Q622,538 622,480Q622,422 581,381Q540,340 482,340Q423,340 382.5,381Q342,422 342,480Q342,538 382.5,579Q423,620 482,620ZM480,480L480,480Q480,480 480,480Q480,480 480,480L480,480L480,480L480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480L480,480L480,480L480,480Q480,480 480,480Q480,480 480,480L480,480L480,480L480,480Q480,480 480,480Q480,480 480,480L480,480L480,480L480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480L480,480L480,480L480,480Q480,480 480,480Q480,480 480,480L480,480Z"/>
 </vector>
diff --git a/core/ui/src/main/res/drawable/ic_sms_fill_round_24.xml b/core/ui/src/main/res/drawable/ic_sms_fill_round_24.xml
index c17b276e..35062d10 100644
--- a/core/ui/src/main/res/drawable/ic_sms_fill_round_24.xml
+++ b/core/ui/src/main/res/drawable/ic_sms_fill_round_24.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="960"
     android:viewportHeight="960">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="#ffffff"
         android:pathData="M240,720L148,812Q129,831 104.5,820.5Q80,810 80,783L80,160Q80,127 103.5,103.5Q127,80 160,80L800,80Q833,80 856.5,103.5Q880,127 880,160L880,640Q880,673 856.5,696.5Q833,720 800,720L240,720ZM320,440Q337,440 348.5,428.5Q360,417 360,400Q360,383 348.5,371.5Q337,360 320,360Q303,360 291.5,371.5Q280,383 280,400Q280,417 291.5,428.5Q303,440 320,440ZM480,440Q497,440 508.5,428.5Q520,417 520,400Q520,383 508.5,371.5Q497,360 480,360Q463,360 451.5,371.5Q440,383 440,400Q440,417 451.5,428.5Q463,440 480,440ZM640,440Q657,440 668.5,428.5Q680,417 680,400Q680,383 668.5,371.5Q657,360 640,360Q623,360 611.5,371.5Q600,383 600,400Q600,417 611.5,428.5Q623,440 640,440Z"/>
 </vector>
diff --git a/core/ui/src/main/res/drawable/ic_sms_round_24.xml b/core/ui/src/main/res/drawable/ic_sms_round_24.xml
index dff1b308..fc66234e 100644
--- a/core/ui/src/main/res/drawable/ic_sms_round_24.xml
+++ b/core/ui/src/main/res/drawable/ic_sms_round_24.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="960"
     android:viewportHeight="960">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="#ffffff"
         android:pathData="M240,720L148,812Q129,831 104.5,820.5Q80,810 80,783L80,160Q80,127 103.5,103.5Q127,80 160,80L800,80Q833,80 856.5,103.5Q880,127 880,160L880,640Q880,673 856.5,696.5Q833,720 800,720L240,720ZM206,640L800,640Q800,640 800,640Q800,640 800,640L800,160Q800,160 800,160Q800,160 800,160L160,160Q160,160 160,160Q160,160 160,160L160,685L206,640ZM160,640L160,640L160,160Q160,160 160,160Q160,160 160,160L160,160Q160,160 160,160Q160,160 160,160L160,640Q160,640 160,640Q160,640 160,640ZM320,440Q337,440 348.5,428.5Q360,417 360,400Q360,383 348.5,371.5Q337,360 320,360Q303,360 291.5,371.5Q280,383 280,400Q280,417 291.5,428.5Q303,440 320,440ZM480,440Q497,440 508.5,428.5Q520,417 520,400Q520,383 508.5,371.5Q497,360 480,360Q463,360 451.5,371.5Q440,383 440,400Q440,417 451.5,428.5Q463,440 480,440ZM640,440Q657,440 668.5,428.5Q680,417 680,400Q680,383 668.5,371.5Q657,360 640,360Q623,360 611.5,371.5Q600,383 600,400Q600,417 611.5,428.5Q623,440 640,440Z"/>
 </vector>
diff --git a/core/ui/src/main/res/drawable/ic_star_fill_round_24.xml b/core/ui/src/main/res/drawable/ic_star_fill_round_24.xml
new file mode 100644
index 00000000..e8a19002
--- /dev/null
+++ b/core/ui/src/main/res/drawable/ic_star_fill_round_24.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960">
+    <path
+        android:fillColor="#ffffff"
+        android:pathData="M480,691L314,791Q303,798 291,797Q279,796 270,789Q261,782 256,771.5Q251,761 254,748L298,559L151,432Q141,423 138.5,411.5Q136,400 140,389Q144,378 152,371Q160,364 174,362L368,345L443,167Q448,155 458.5,149Q469,143 480,143Q491,143 501.5,149Q512,155 517,167L592,345L786,362Q800,364 808,371Q816,378 820,389Q824,400 821.5,411.5Q819,423 809,432L662,559L706,748Q709,761 704,771.5Q699,782 690,789Q681,796 669,797Q657,798 646,791L480,691Z"/>
+</vector>
diff --git a/core/ui/src/main/res/drawable/ic_sticker_fill_round_24.xml b/core/ui/src/main/res/drawable/ic_sticker_fill_round_24.xml
index 4d40ee6c..72288383 100644
--- a/core/ui/src/main/res/drawable/ic_sticker_fill_round_24.xml
+++ b/core/ui/src/main/res/drawable/ic_sticker_fill_round_24.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="960"
     android:viewportHeight="960">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="#ffffff"
         android:pathData="M460,600Q524,600 573.5,560.5Q623,521 637,460Q639,454 634,449.5Q629,445 623,447L341,526Q333,528 331.5,535.5Q330,543 335,548Q360,572 392,586Q424,600 460,600ZM294,450L400,420Q404,392 386,371Q368,350 340,350Q315,350 297.5,367.5Q280,385 280,410Q280,421 284,431Q288,441 294,450ZM534,380L640,350Q645,322 626.5,301Q608,280 580,280Q555,280 537.5,297.5Q520,315 520,340Q520,351 524,361Q528,371 534,380ZM200,840Q167,840 143.5,816.5Q120,793 120,760L120,200Q120,167 143.5,143.5Q167,120 200,120L760,120Q793,120 816.5,143.5Q840,167 840,200L840,607Q840,623 834,637.5Q828,652 817,663L663,817Q652,828 637.5,834Q623,840 607,840L200,840ZM600,760L760,600L680,600Q647,600 623.5,623.5Q600,647 600,680L600,760Z"/>
 </vector>
diff --git a/core/ui/src/main/res/drawable/ic_video_fill_round_24.xml b/core/ui/src/main/res/drawable/ic_video_fill_round_24.xml
index 1131a66f..a3d5dd52 100644
--- a/core/ui/src/main/res/drawable/ic_video_fill_round_24.xml
+++ b/core/ui/src/main/res/drawable/ic_video_fill_round_24.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="960"
     android:viewportHeight="960">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="#ffffff"
         android:pathData="M160,160L225,290Q232,304 245,312Q258,320 273,320Q303,320 319,294.5Q335,269 321,242L280,160L360,160L425,290Q432,304 445,312Q458,320 473,320Q503,320 519,294.5Q535,269 521,242L480,160L560,160L625,290Q632,304 645,312Q658,320 673,320Q703,320 719,294.5Q735,269 721,242L680,160L800,160Q833,160 856.5,183.5Q880,207 880,240L880,720Q880,753 856.5,776.5Q833,800 800,800L160,800Q127,800 103.5,776.5Q80,753 80,720L80,240Q80,207 103.5,183.5Q127,160 160,160Z"/>
 </vector>
diff --git a/core/ui/src/main/res/drawable/ic_widgets_fill_round_24.xml b/core/ui/src/main/res/drawable/ic_widgets_fill_round_24.xml
index 738e28aa..703e4862 100644
--- a/core/ui/src/main/res/drawable/ic_widgets_fill_round_24.xml
+++ b/core/ui/src/main/res/drawable/ic_widgets_fill_round_24.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="960"
     android:viewportHeight="960">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="#ffffff"
         android:pathData="M638,492L468,322Q462,316 459.5,309Q457,302 457,294Q457,286 459.5,279Q462,272 468,266L638,96Q644,90 651,87.5Q658,85 666,85Q674,85 681,87.5Q688,90 694,96L864,266Q870,272 872.5,279Q875,286 875,294Q875,302 872.5,309Q870,316 864,322L694,492Q688,498 681,500.5Q674,503 666,503Q658,503 651,500.5Q644,498 638,492ZM120,400L120,160Q120,143 131.5,131.5Q143,120 160,120L400,120Q417,120 428.5,131.5Q440,143 440,160L440,400Q440,417 428.5,428.5Q417,440 400,440L160,440Q143,440 131.5,428.5Q120,417 120,400ZM520,800L520,560Q520,543 531.5,531.5Q543,520 560,520L800,520Q817,520 828.5,531.5Q840,543 840,560L840,800Q840,817 828.5,828.5Q817,840 800,840L560,840Q543,840 531.5,828.5Q520,817 520,800ZM120,800L120,560Q120,543 131.5,531.5Q143,520 160,520L400,520Q417,520 428.5,531.5Q440,543 440,560L440,800Q440,817 428.5,828.5Q417,840 400,840L160,840Q143,840 131.5,828.5Q120,817 120,800Z"/>
 </vector>
diff --git a/feature/convos/src/main/kotlin/dev/meloda/fast/convos/presentation/ConvoDialogs.kt b/feature/convos/src/main/kotlin/dev/meloda/fast/convos/presentation/ConvoDialogs.kt
index 44044c23..ecaf7fe1 100644
--- a/feature/convos/src/main/kotlin/dev/meloda/fast/convos/presentation/ConvoDialogs.kt
+++ b/feature/convos/src/main/kotlin/dev/meloda/fast/convos/presentation/ConvoDialogs.kt
@@ -63,22 +63,22 @@ fun HandleDialogs(
         is ConvoDialog.ConvoPin -> {
             MaterialDialog(
                 onDismissRequest = { onDismissed(dialog) },
+                icon = ImageVector.vectorResource(R.drawable.ic_keep_fill_round_24),
                 title = stringResource(id = R.string.confirm_pin_convo),
                 confirmAction = { onConfirmed(dialog, bundleOf()) },
                 confirmText = stringResource(id = R.string.action_pin),
                 cancelText = stringResource(id = R.string.cancel),
-                icon = ImageVector.vectorResource(R.drawable.ic_keep_fill_round_24)
             )
         }
 
         is ConvoDialog.ConvoUnpin -> {
             MaterialDialog(
                 onDismissRequest = { onDismissed(dialog) },
+                icon = ImageVector.vectorResource(R.drawable.ic_keep_off_fill_round_24),
                 title = stringResource(id = R.string.confirm_unpin_convo),
                 confirmAction = { onConfirmed(dialog, bundleOf()) },
                 confirmText = stringResource(id = R.string.action_unpin),
                 cancelText = stringResource(id = R.string.cancel),
-                icon = ImageVector.vectorResource(R.drawable.ic_keep_off_fill_round_24)
             )
         }
     }
diff --git a/feature/messageshistory/src/main/kotlin/dev/meloda/fast/messageshistory/presentation/MessagesHistoryDialogs.kt b/feature/messageshistory/src/main/kotlin/dev/meloda/fast/messageshistory/presentation/MessagesHistoryDialogs.kt
index 5cbd394f..27ffead1 100644
--- a/feature/messageshistory/src/main/kotlin/dev/meloda/fast/messageshistory/presentation/MessagesHistoryDialogs.kt
+++ b/feature/messageshistory/src/main/kotlin/dev/meloda/fast/messageshistory/presentation/MessagesHistoryDialogs.kt
@@ -9,6 +9,7 @@ import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.width
 import androidx.compose.material3.Checkbox
+import androidx.compose.material3.CheckboxDefaults
 import androidx.compose.material3.DropdownMenuItem
 import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
@@ -22,8 +23,10 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.res.vectorResource
 import androidx.compose.ui.unit.dp
 import androidx.core.os.bundleOf
 import dev.meloda.fast.data.UserConfig
@@ -35,6 +38,9 @@ import dev.meloda.fast.ui.R
 import dev.meloda.fast.ui.basic.ContentAlpha
 import dev.meloda.fast.ui.basic.LocalContentAlpha
 import dev.meloda.fast.ui.components.MaterialDialog
+import dev.meloda.fast.ui.util.ImmutableList
+import dev.meloda.fast.ui.util.ImmutableList.Companion.toImmutableList
+import dev.meloda.fast.ui.util.immutableListOf
 import java.util.concurrent.TimeUnit
 
 @Composable
@@ -61,7 +67,7 @@ fun HandleDialogs(
 
         is MessageDialog.MessageDelete -> {
             MessageDeleteDialog(
-                messages = listOf(dialog.message),
+                messages = immutableListOf(dialog.message),
                 onConfirmed = { onConfirmed(dialog, it) },
                 onDismissed = { onDismissed(dialog) }
             )
@@ -69,7 +75,7 @@ fun HandleDialogs(
 
         is MessageDialog.MessagesDelete -> {
             MessageDeleteDialog(
-                messages = dialog.messages,
+                messages = dialog.messages.toImmutableList(),
                 onConfirmed = { onConfirmed(dialog, it) },
                 onDismissed = { onDismissed(dialog) }
             )
@@ -242,10 +248,12 @@ private fun MessageOptionItem(
 
 @Composable
 fun MessageDeleteDialog(
-    messages: List<VkMessage>,
+    messages: ImmutableList<VkMessage>,
     onConfirmed: (Bundle) -> Unit = {},
     onDismissed: () -> Unit = {},
 ) {
+    val errorColor = MaterialTheme.colorScheme.error
+
     var forEveryone by remember {
         mutableStateOf(
             !messages.any { it.peerId == UserConfig.userId }
@@ -263,6 +271,8 @@ fun MessageDeleteDialog(
 
     MaterialDialog(
         onDismissRequest = onDismissed,
+        icon = ImageVector.vectorResource(R.drawable.ic_delete_fill_round_24),
+        iconTint = errorColor,
         title = stringResource(R.string.delete_message_title),
         confirmText = stringResource(R.string.action_delete),
         confirmAction = {
@@ -270,6 +280,7 @@ fun MessageDeleteDialog(
                 bundleOf("everyone" to if (messages.all(VkMessage::isOut)) forEveryone else false)
             )
         },
+        confirmContainerColor = errorColor,
         cancelText = stringResource(R.string.cancel),
     ) {
         Row(
@@ -285,7 +296,8 @@ fun MessageDeleteDialog(
             Checkbox(
                 checked = forEveryone,
                 onCheckedChange = null,
-                enabled = !shouldBeDisabled
+                enabled = !shouldBeDisabled,
+                colors = CheckboxDefaults.colors(checkedColor = errorColor)
             )
 
             Spacer(modifier = Modifier.width(8.dp))
@@ -308,6 +320,10 @@ fun MessagePinStateDialog(
 ) {
     MaterialDialog(
         onDismissRequest = onDismissed,
+        icon = ImageVector.vectorResource(
+            if (pin) R.drawable.ic_keep_fill_round_24
+            else R.drawable.ic_keep_off_fill_round_24
+        ),
         title = stringResource(
             if (pin) R.string.pin_message_title
             else R.string.unpin_message_title
@@ -333,6 +349,10 @@ fun MessageImportanceDialog(
 ) {
     MaterialDialog(
         onDismissRequest = onDismissed,
+        icon = ImageVector.vectorResource(
+            if (important) R.drawable.ic_star_fill_round_24
+            else R.drawable.ic_star_round_24
+        ),
         title = stringResource(
             if (important) R.string.important_message_title
             else R.string.unimportant_message_title
@@ -356,8 +376,12 @@ fun MessageSpamDialog(
     onConfirmed: () -> Unit = {},
     onDismissed: () -> Unit = {},
 ) {
+    val errorColor = MaterialTheme.colorScheme.error
+
     MaterialDialog(
         onDismissRequest = onDismissed,
+        icon = ImageVector.vectorResource(R.drawable.ic_report_fill_round_24),
+        iconTint = errorColor,
         title = stringResource(
             if (spam) R.string.spam_message_title
             else R.string.unspam_message_title
@@ -371,6 +395,7 @@ fun MessageSpamDialog(
             else R.string.action_unmark
         ),
         confirmAction = onConfirmed,
+        confirmContainerColor = errorColor,
         cancelText = stringResource(R.string.cancel)
     )
 }