diff --git a/core/ui/src/main/kotlin/dev/meloda/fast/ui/model/vk/ConvoOption.kt b/core/ui/src/main/kotlin/dev/meloda/fast/ui/model/vk/ConvoOption.kt
index fcedd14c..89169e26 100644
--- a/core/ui/src/main/kotlin/dev/meloda/fast/ui/model/vk/ConvoOption.kt
+++ b/core/ui/src/main/kotlin/dev/meloda/fast/ui/model/vk/ConvoOption.kt
@@ -11,31 +11,31 @@ sealed class ConvoOption(
 
     data object MarkAsRead : ConvoOption(
         title = UiText.Resource(R.string.action_mark_as_read),
-        icon = UiImage.Resource(R.drawable.round_done_all_24)
+        icon = UiImage.Resource(R.drawable.ic_done_all_round_24)
     )
 
     data object Pin : ConvoOption(
         title = UiText.Resource(R.string.action_pin),
-        icon = UiImage.Resource(R.drawable.pin_outline_24)
+        icon = UiImage.Resource(R.drawable.ic_keep_round_24)
     )
 
     data object Unpin : ConvoOption(
         title = UiText.Resource(R.string.action_unpin),
-        icon = UiImage.Resource(R.drawable.pin_off_outline_24)
+        icon = UiImage.Resource(R.drawable.ic_keep_off_round_24)
     )
 
     data object Delete : ConvoOption(
         title = UiText.Resource(R.string.action_delete),
-        icon = UiImage.Resource(R.drawable.round_delete_outline_24)
+        icon = UiImage.Resource(R.drawable.ic_delete_round_24)
     )
 
     data object Archive : ConvoOption(
         title = UiText.Resource(R.string.convo_context_action_archive),
-        icon = UiImage.Resource(R.drawable.outline_archive_24)
+        icon = UiImage.Resource(R.drawable.ic_archive_round_24)
     )
 
     data object Unarchive : ConvoOption(
         title = UiText.Resource(R.string.convo_context_action_unarchive),
-        icon = UiImage.Resource(R.drawable.outline_unarchive_24)
+        icon = UiImage.Resource(R.drawable.ic_unarchive_round_24)
     )
 }
diff --git a/core/ui/src/main/res/drawable/ic_archive_fill_round_24.xml b/core/ui/src/main/res/drawable/ic_archive_fill_round_24.xml
new file mode 100644
index 00000000..4a2c6d18
--- /dev/null
+++ b/core/ui/src/main/res/drawable/ic_archive_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="M200,840Q167,840 143.5,816.5Q120,793 120,760L120,261Q120,247 124.5,234Q129,221 138,210L188,149Q199,135 215.5,127.5Q232,120 250,120L710,120Q728,120 744.5,127.5Q761,135 772,149L822,210Q831,221 835.5,234Q840,247 840,261L840,760Q840,793 816.5,816.5Q793,840 760,840L200,840ZM216,240L744,240L710,200Q710,200 710,200Q710,200 710,200L250,200Q250,200 250,200Q250,200 250,200L216,240ZM480,400Q463,400 451.5,411.5Q440,423 440,440L440,568L404,532Q393,521 376,521Q359,521 348,532Q337,543 337,560Q337,577 348,588L452,692Q464,704 480,704Q496,704 508,692L612,588Q623,577 623,560Q623,543 612,532Q601,521 584,521Q567,521 556,532L520,568L520,440Q520,423 508.5,411.5Q497,400 480,400Z"/>
+</vector>
diff --git a/core/ui/src/main/res/drawable/ic_archive_round_24.xml b/core/ui/src/main/res/drawable/ic_archive_round_24.xml
new file mode 100644
index 00000000..192c1f60
--- /dev/null
+++ b/core/ui/src/main/res/drawable/ic_archive_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,400Q463,400 451.5,411.5Q440,423 440,440L440,568L404,532Q393,521 376,521Q359,521 348,532Q337,543 337,560Q337,577 348,588L452,692Q464,704 480,704Q496,704 508,692L612,588Q623,577 623,560Q623,543 612,532Q601,521 584,521Q567,521 556,532L520,568L520,440Q520,423 508.5,411.5Q497,400 480,400ZM200,320L200,760Q200,760 200,760Q200,760 200,760L760,760Q760,760 760,760Q760,760 760,760L760,320L200,320ZM200,840Q167,840 143.5,816.5Q120,793 120,760L120,261Q120,247 124.5,234Q129,221 138,210L188,149Q199,135 215.5,127.5Q232,120 250,120L710,120Q728,120 744.5,127.5Q761,135 772,149L822,210Q831,221 835.5,234Q840,247 840,261L840,760Q840,793 816.5,816.5Q793,840 760,840L200,840ZM216,240L744,240L710,200Q710,200 710,200Q710,200 710,200L250,200Q250,200 250,200Q250,200 250,200L216,240ZM480,540L480,540L480,540Q480,540 480,540Q480,540 480,540L480,540Q480,540 480,540Q480,540 480,540Z"/>
+</vector>
diff --git a/core/ui/src/main/res/drawable/ic_delete_fill_round_24.xml b/core/ui/src/main/res/drawable/ic_delete_fill_round_24.xml
new file mode 100644
index 00000000..4b537a42
--- /dev/null
+++ b/core/ui/src/main/res/drawable/ic_delete_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="M280,840Q247,840 223.5,816.5Q200,793 200,760L200,240L200,240Q183,240 171.5,228.5Q160,217 160,200Q160,183 171.5,171.5Q183,160 200,160L360,160L360,160Q360,143 371.5,131.5Q383,120 400,120L560,120Q577,120 588.5,131.5Q600,143 600,160L600,160L760,160Q777,160 788.5,171.5Q800,183 800,200Q800,217 788.5,228.5Q777,240 760,240L760,240L760,760Q760,793 736.5,816.5Q713,840 680,840L280,840ZM400,680Q417,680 428.5,668.5Q440,657 440,640L440,360Q440,343 428.5,331.5Q417,320 400,320Q383,320 371.5,331.5Q360,343 360,360L360,640Q360,657 371.5,668.5Q383,680 400,680ZM560,680Q577,680 588.5,668.5Q600,657 600,640L600,360Q600,343 588.5,331.5Q577,320 560,320Q543,320 531.5,331.5Q520,343 520,360L520,640Q520,657 531.5,668.5Q543,680 560,680Z"/>
+</vector>
diff --git a/core/ui/src/main/res/drawable/ic_delete_round_24.xml b/core/ui/src/main/res/drawable/ic_delete_round_24.xml
new file mode 100644
index 00000000..13ec2291
--- /dev/null
+++ b/core/ui/src/main/res/drawable/ic_delete_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="M280,840Q247,840 223.5,816.5Q200,793 200,760L200,240L200,240Q183,240 171.5,228.5Q160,217 160,200Q160,183 171.5,171.5Q183,160 200,160L360,160L360,160Q360,143 371.5,131.5Q383,120 400,120L560,120Q577,120 588.5,131.5Q600,143 600,160L600,160L760,160Q777,160 788.5,171.5Q800,183 800,200Q800,217 788.5,228.5Q777,240 760,240L760,240L760,760Q760,793 736.5,816.5Q713,840 680,840L280,840ZM680,240L280,240L280,760Q280,760 280,760Q280,760 280,760L680,760Q680,760 680,760Q680,760 680,760L680,240ZM400,680Q417,680 428.5,668.5Q440,657 440,640L440,360Q440,343 428.5,331.5Q417,320 400,320Q383,320 371.5,331.5Q360,343 360,360L360,640Q360,657 371.5,668.5Q383,680 400,680ZM560,680Q577,680 588.5,668.5Q600,657 600,640L600,360Q600,343 588.5,331.5Q577,320 560,320Q543,320 531.5,331.5Q520,343 520,360L520,640Q520,657 531.5,668.5Q543,680 560,680ZM280,240L280,240L280,760Q280,760 280,760Q280,760 280,760L280,760Q280,760 280,760Q280,760 280,760L280,240Z"/>
+</vector>
diff --git a/core/ui/src/main/res/drawable/ic_done_all_round_24.xml b/core/ui/src/main/res/drawable/ic_done_all_round_24.xml
new file mode 100644
index 00000000..451fca14
--- /dev/null
+++ b/core/ui/src/main/res/drawable/ic_done_all_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="M70,522Q58,510 58.5,494Q59,478 71,466Q83,455 99,454.5Q115,454 127,466L269,608L269,608Q276,615 283,622Q290,629 297,636Q309,648 308.5,664Q308,680 296,692L296,692Q284,703 268,703.5Q252,704 240,692L70,522ZM494,607L834,267Q846,255 862,255.5Q878,256 890,268Q901,280 901.5,296Q902,312 890,324L522,692Q510,704 494,704Q478,704 466,692L296,522Q285,511 285,494.5Q285,478 296,466Q308,454 324.5,454Q341,454 353,466L494,607ZM663,325L522,466Q511,477 494.5,477Q478,477 466,466Q454,454 454,437.5Q454,421 466,409L607,268Q618,257 634.5,257Q651,257 663,268Q675,280 675,296.5Q675,313 663,325Z"/>
+</vector>
diff --git a/core/ui/src/main/res/drawable/ic_keep_fill_round_24.xml b/core/ui/src/main/res/drawable/ic_keep_fill_round_24.xml
new file mode 100644
index 00000000..2b2c7b5b
--- /dev/null
+++ b/core/ui/src/main/res/drawable/ic_keep_fill_round_24.xml
@@ -0,0 +1,10 @@
+<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="M640,200L640,480L708,548Q714,554 717,561.5Q720,569 720,577L720,600Q720,617 708.5,628.5Q697,640 680,640L520,640L520,874Q520,891 508.5,902.5Q497,914 480,914Q463,914 451.5,902.5Q440,891 440,874L440,640L280,640Q263,640 251.5,628.5Q240,617 240,600L240,577Q240,569 243,561.5Q246,554 252,548L320,480L320,200L320,200Q303,200 291.5,188.5Q280,177 280,160Q280,143 291.5,131.5Q303,120 320,120L640,120Q657,120 668.5,131.5Q680,143 680,160Q680,177 668.5,188.5Q657,200 640,200Z"/>
+</vector>
+
diff --git a/core/ui/src/main/res/drawable/ic_keep_off_fill_round_24.xml b/core/ui/src/main/res/drawable/ic_keep_off_fill_round_24.xml
new file mode 100644
index 00000000..f27b8fe9
--- /dev/null
+++ b/core/ui/src/main/res/drawable/ic_keep_off_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="M572,459L290,177Q285,172 282.5,166Q280,160 280,154Q280,141 289,130.5Q298,120 313,120L640,120Q657,120 668.5,131.5Q680,143 680,160Q680,176 665.5,182.5Q651,189 640,200L640,200L640,430Q640,457 615.5,467.5Q591,478 572,459ZM440,880L440,640L296,640Q271,640 256,622.5Q241,605 241,583Q241,572 245.5,561Q250,550 260,540L320,480L320,434L84,196Q73,185 72.5,168.5Q72,152 84,140Q95,129 112,129Q129,129 140,140L819,819Q831,831 830.5,847.5Q830,864 818,876Q806,887 790,887.5Q774,888 762,876L526,640L520,640L520,880Q520,897 508.5,908.5Q497,920 480,920Q463,920 451.5,908.5Q440,897 440,880Z"/>
+</vector>
diff --git a/core/ui/src/main/res/drawable/ic_keep_off_round_24.xml b/core/ui/src/main/res/drawable/ic_keep_off_round_24.xml
new file mode 100644
index 00000000..9eb541de
--- /dev/null
+++ b/core/ui/src/main/res/drawable/ic_keep_off_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="M560,200L400,200L400,287L290,177Q285,172 282.5,166Q280,160 280,154Q280,141 289,130.5Q298,120 313,120L640,120Q657,120 668.5,131.5Q680,143 680,160Q680,176 665.5,182.5Q651,189 640,200L640,200L640,440Q640,457 628.5,468.5Q617,480 600,480Q583,480 571.5,468.5Q560,457 560,440L560,200ZM440,880L440,640L296,640Q271,640 256,622.5Q241,605 241,583Q241,572 245.5,561Q250,550 260,540L320,480L320,434L84,196Q73,185 72.5,168.5Q72,152 84,140Q95,129 112,129Q129,129 140,140L819,819Q831,831 830.5,847.5Q830,864 818,876Q806,887 790,887.5Q774,888 762,876L526,640L520,640L520,880Q520,897 508.5,908.5Q497,920 480,920Q463,920 451.5,908.5Q440,897 440,880ZM354,560L446,560L402,516L400,514L354,560ZM480,367L480,367L480,367L480,367ZM402,516L402,516L402,516L402,516Z"/>
+</vector>
diff --git a/core/ui/src/main/res/drawable/ic_keep_round_24.xml b/core/ui/src/main/res/drawable/ic_keep_round_24.xml
new file mode 100644
index 00000000..e5cd7e53
--- /dev/null
+++ b/core/ui/src/main/res/drawable/ic_keep_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="M640,200L640,480L708,548Q714,554 717,561.5Q720,569 720,577L720,600Q720,617 708.5,628.5Q697,640 680,640L520,640L520,874Q520,891 508.5,902.5Q497,914 480,914Q463,914 451.5,902.5Q440,891 440,874L440,640L280,640Q263,640 251.5,628.5Q240,617 240,600L240,577Q240,569 243,561.5Q246,554 252,548L320,480L320,200L320,200Q303,200 291.5,188.5Q280,177 280,160Q280,143 291.5,131.5Q303,120 320,120L640,120Q657,120 668.5,131.5Q680,143 680,160Q680,177 668.5,188.5Q657,200 640,200ZM354,560L606,560L560,514L560,200L400,200L400,514L354,560ZM480,560L480,560L480,560L480,560L480,560L480,560Z"/>
+</vector>
diff --git a/core/ui/src/main/res/drawable/ic_round_push_pin_24.xml b/core/ui/src/main/res/drawable/ic_round_push_pin_24.xml
deleted file mode 100644
index 0f69fced..00000000
--- a/core/ui/src/main/res/drawable/ic_round_push_pin_24.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<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="#ffffff"
-        android:fillType="evenOdd"
-        android:pathData="M19,12.87c0,-0.47 -0.34,-0.85 -0.8,-0.98C16.93,11.54 16,10.38 16,9V4l1,0c0.55,0 1,-0.45 1,-1c0,-0.55 -0.45,-1 -1,-1H7C6.45,2 6,2.45 6,3c0,0.55 0.45,1 1,1l1,0v5c0,1.38 -0.93,2.54 -2.2,2.89C5.34,12.02 5,12.4 5,12.87V13c0,0.55 0.45,1 1,1h4.98L11,21c0,0.55 0.45,1 1,1c0.55,0 1,-0.45 1,-1l-0.02,-7H18c0.55,0 1,-0.45 1,-1V12.87z" />
-</vector>
diff --git a/core/ui/src/main/res/drawable/ic_unarchive_fill_round_24.xml b/core/ui/src/main/res/drawable/ic_unarchive_fill_round_24.xml
new file mode 100644
index 00000000..3a8f0a58
--- /dev/null
+++ b/core/ui/src/main/res/drawable/ic_unarchive_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,707Q497,707 508.5,695.5Q520,684 520,667L520,539L556,575Q567,586 584,586Q601,586 612,575Q623,564 623,547Q623,530 612,519L508,416Q496,404 480,404Q464,404 452,416L348,519Q337,530 337,547Q337,564 348,575Q359,586 376,586Q393,586 404,575L440,539L440,667Q440,684 451.5,695.5Q463,707 480,707ZM200,840Q167,840 143.5,816.5Q120,793 120,760L120,261Q120,247 124.5,234Q129,221 138,210L188,149Q199,135 215.5,127.5Q232,120 250,120L710,120Q728,120 744.5,127.5Q761,135 772,149L822,210Q831,221 835.5,234Q840,247 840,261L840,760Q840,793 816.5,816.5Q793,840 760,840L200,840ZM216,240L744,240L710,200Q710,200 710,200Q710,200 710,200L250,200Q250,200 250,200Q250,200 250,200L216,240Z" />
+</vector>
diff --git a/core/ui/src/main/res/drawable/ic_unarchive_round_24.xml b/core/ui/src/main/res/drawable/ic_unarchive_round_24.xml
new file mode 100644
index 00000000..67d7987a
--- /dev/null
+++ b/core/ui/src/main/res/drawable/ic_unarchive_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,707Q497,707 508.5,695.5Q520,684 520,667L520,539L556,575Q567,586 584,586Q601,586 612,575Q623,564 623,547Q623,530 612,519L508,416Q496,404 480,404Q464,404 452,416L348,519Q337,530 337,547Q337,564 348,575Q359,586 376,586Q393,586 404,575L440,539L440,667Q440,684 451.5,695.5Q463,707 480,707ZM200,320L200,760Q200,760 200,760Q200,760 200,760L760,760Q760,760 760,760Q760,760 760,760L760,320L200,320ZM200,840Q167,840 143.5,816.5Q120,793 120,760L120,261Q120,247 124.5,234Q129,221 138,210L188,149Q199,135 215.5,127.5Q232,120 250,120L710,120Q728,120 744.5,127.5Q761,135 772,149L822,210Q831,221 835.5,234Q840,247 840,261L840,760Q840,793 816.5,816.5Q793,840 760,840L200,840ZM216,240L744,240L710,200Q710,200 710,200Q710,200 710,200L250,200Q250,200 250,200Q250,200 250,200L216,240ZM480,540L480,540L480,540Q480,540 480,540Q480,540 480,540L480,540Q480,540 480,540Q480,540 480,540Z"/>
+</vector>
diff --git a/core/ui/src/main/res/drawable/outline_archive_24.xml b/core/ui/src/main/res/drawable/outline_archive_24.xml
deleted file mode 100644
index 6fec2e7d..00000000
--- a/core/ui/src/main/res/drawable/outline_archive_24.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<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="#ffffff"
-        android:pathData="M20.54,5.23l-1.39,-1.68C18.88,3.21 18.47,3 18,3L6,3c-0.47,0 -0.88,0.21 -1.16,0.55L3.46,5.23C3.17,5.57 3,6.02 3,6.5L3,19c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2L21,6.5c0,-0.48 -0.17,-0.93 -0.46,-1.27zM6.24,5h11.52l0.81,0.97L5.44,5.97l0.8,-0.97zM5,19L5,8h14v11L5,19zM13.45,10h-2.9v3L8,13l4,4 4,-4h-2.55z" />
-
-</vector>
diff --git a/core/ui/src/main/res/drawable/outline_unarchive_24.xml b/core/ui/src/main/res/drawable/outline_unarchive_24.xml
deleted file mode 100644
index a0d2b11c..00000000
--- a/core/ui/src/main/res/drawable/outline_unarchive_24.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<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="#ffffff"
-        android:pathData="M20.54,5.23l-1.39,-1.68C18.88,3.21 18.47,3 18,3L6,3c-0.47,0 -0.88,0.21 -1.16,0.55L3.46,5.23C3.17,5.57 3,6.02 3,6.5L3,19c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2L21,6.5c0,-0.48 -0.17,-0.93 -0.46,-1.27zM6.24,5h11.52l0.83,1L5.42,6l0.82,-1zM5,19L5,8h14v11L5,19zM8,14h2.55v3h2.9v-3L16,14l-4,-4z" />
-
-</vector>
diff --git a/core/ui/src/main/res/drawable/pin_off_outline_24.xml b/core/ui/src/main/res/drawable/pin_off_outline_24.xml
deleted file mode 100644
index d5e30001..00000000
--- a/core/ui/src/main/res/drawable/pin_off_outline_24.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?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="#ffffff"
-        android:pathData="M8,6.2V4H7V2H17V4H16V12L18,14V16H17.8L14,12.2V4H10V8.2L8,6.2M20,20.7L18.7,22L12.8,16.1V22H11.2V16H6V14L8,12V11.3L2,5.3L3.3,4L20,20.7M8.8,14H10.6L9.7,13.1L8.8,14Z" />
-</vector>
diff --git a/core/ui/src/main/res/drawable/pin_outline_24.xml b/core/ui/src/main/res/drawable/pin_outline_24.xml
deleted file mode 100644
index 9ba2578c..00000000
--- a/core/ui/src/main/res/drawable/pin_outline_24.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?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="#ffffff"
-        android:pathData="M16,12V4H17V2H7V4H8V12L6,14V16H11.2V22H12.8V16H18V14L16,12M8.8,14L10,12.8V4H14V12.8L15.2,14H8.8Z" />
-</vector>
diff --git a/core/ui/src/main/res/drawable/round_delete_outline_24.xml b/core/ui/src/main/res/drawable/round_delete_outline_24.xml
deleted file mode 100644
index 606642f7..00000000
--- a/core/ui/src/main/res/drawable/round_delete_outline_24.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<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="#ffffff"
-        android:pathData="M6,19c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2L18,9c0,-1.1 -0.9,-2 -2,-2L8,7c-1.1,0 -2,0.9 -2,2v10zM9,9h6c0.55,0 1,0.45 1,1v8c0,0.55 -0.45,1 -1,1L9,19c-0.55,0 -1,-0.45 -1,-1v-8c0,-0.55 0.45,-1 1,-1zM15.5,4l-0.71,-0.71c-0.18,-0.18 -0.44,-0.29 -0.7,-0.29L9.91,3c-0.26,0 -0.52,0.11 -0.7,0.29L8.5,4L6,4c-0.55,0 -1,0.45 -1,1s0.45,1 1,1h12c0.55,0 1,-0.45 1,-1s-0.45,-1 -1,-1h-2.5z" />
-</vector>
diff --git a/core/ui/src/main/res/drawable/round_done_all_24.xml b/core/ui/src/main/res/drawable/round_done_all_24.xml
deleted file mode 100644
index 9ae31682..00000000
--- a/core/ui/src/main/res/drawable/round_done_all_24.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<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="#ffffff"
-        android:pathData="M17.3,6.3c-0.39,-0.39 -1.02,-0.39 -1.41,0l-5.64,5.64 1.41,1.41L17.3,7.7c0.38,-0.38 0.38,-1.02 0,-1.4zM21.54,6.29l-9.88,9.88 -3.48,-3.47c-0.39,-0.39 -1.02,-0.39 -1.41,0 -0.39,0.39 -0.39,1.02 0,1.41l4.18,4.18c0.39,0.39 1.02,0.39 1.41,0L22.95,7.71c0.39,-0.39 0.39,-1.02 0,-1.41h-0.01c-0.38,-0.4 -1.01,-0.4 -1.4,-0.01zM1.12,14.12L5.3,18.3c0.39,0.39 1.02,0.39 1.41,0l0.7,-0.7 -4.88,-4.9c-0.39,-0.39 -1.02,-0.39 -1.41,0 -0.39,0.39 -0.39,1.03 0,1.42z" />
-</vector>
diff --git a/feature/convos/src/main/kotlin/dev/meloda/fast/convos/presentation/ConvosScreen.kt b/feature/convos/src/main/kotlin/dev/meloda/fast/convos/presentation/ConvosScreen.kt
index 647f0d34..2cdea729 100644
--- a/feature/convos/src/main/kotlin/dev/meloda/fast/convos/presentation/ConvosScreen.kt
+++ b/feature/convos/src/main/kotlin/dev/meloda/fast/convos/presentation/ConvosScreen.kt
@@ -204,7 +204,7 @@ fun ConvosScreen(
                         if (!screenState.isArchive) {
                             IconButton(onClick = onArchiveActionClicked) {
                                 Icon(
-                                    painter = painterResource(R.drawable.outline_archive_24),
+                                    painter = painterResource(R.drawable.ic_archive_round_24),
                                     contentDescription = null
                                 )
                             }
diff --git a/feature/messageshistory/src/main/kotlin/dev/meloda/fast/messageshistory/model/MessageOption.kt b/feature/messageshistory/src/main/kotlin/dev/meloda/fast/messageshistory/model/MessageOption.kt
index b8374345..a341d281 100644
--- a/feature/messageshistory/src/main/kotlin/dev/meloda/fast/messageshistory/model/MessageOption.kt
+++ b/feature/messageshistory/src/main/kotlin/dev/meloda/fast/messageshistory/model/MessageOption.kt
@@ -34,12 +34,12 @@ sealed class MessageOption(
 
     data object Pin : MessageOption(
         titleResId = R.string.message_context_action_pin,
-        iconResId = R.drawable.pin_outline_24
+        iconResId = R.drawable.ic_keep_round_24
     )
 
     data object Unpin : MessageOption(
         titleResId = R.string.message_context_action_unpin,
-        iconResId = R.drawable.pin_off_outline_24
+        iconResId = R.drawable.ic_keep_off_round_24
     )
 
     data object Read : MessageOption(
@@ -79,6 +79,6 @@ sealed class MessageOption(
 
     data object Delete : MessageOption(
         titleResId = R.string.message_context_action_delete,
-        iconResId = R.drawable.round_delete_outline_24
+        iconResId = R.drawable.ic_delete_round_24
     )
 }
diff --git a/feature/messageshistory/src/main/kotlin/dev/meloda/fast/messageshistory/presentation/DateStatus.kt b/feature/messageshistory/src/main/kotlin/dev/meloda/fast/messageshistory/presentation/DateStatus.kt
index 3a88a680..16e31ea8 100644
--- a/feature/messageshistory/src/main/kotlin/dev/meloda/fast/messageshistory/presentation/DateStatus.kt
+++ b/feature/messageshistory/src/main/kotlin/dev/meloda/fast/messageshistory/presentation/DateStatus.kt
@@ -54,7 +54,7 @@ fun BoxScope.DateStatus(
         if (isPinned) {
             Spacer(modifier = Modifier.width(4.dp))
             Icon(
-                painter = painterResource(R.drawable.ic_round_push_pin_24),
+                painter = painterResource(R.drawable.ic_keep_fill_round_24),
                 contentDescription = null,
                 modifier = Modifier
                     .size(14.dp)
@@ -85,7 +85,7 @@ fun BoxScope.DateStatus(
                     when (sendingStatus) {
                         SendingStatus.SENDING -> R.drawable.round_access_time_24
                         SendingStatus.SENT -> {
-                            if (isRead) R.drawable.round_done_all_24
+                            if (isRead) R.drawable.ic_done_all_round_24
                             else R.drawable.ic_round_done_24
                         }
 
diff --git a/feature/messageshistory/src/main/kotlin/dev/meloda/fast/messageshistory/presentation/InputBar.kt b/feature/messageshistory/src/main/kotlin/dev/meloda/fast/messageshistory/presentation/InputBar.kt
index 2d467760..5fdf622d 100644
--- a/feature/messageshistory/src/main/kotlin/dev/meloda/fast/messageshistory/presentation/InputBar.kt
+++ b/feature/messageshistory/src/main/kotlin/dev/meloda/fast/messageshistory/presentation/InputBar.kt
@@ -324,7 +324,7 @@ fun InputBar(
                             Icon(
                                 painter = painterResource(
                                     id = when (actionMode) {
-                                        ActionMode.DELETE -> R.drawable.round_delete_outline_24
+                                        ActionMode.DELETE -> R.drawable.ic_delete_round_24
                                         ActionMode.EDIT -> R.drawable.ic_round_done_24
                                         ActionMode.RECORD_AUDIO -> R.drawable.ic_round_mic_none_24
                                         ActionMode.RECORD_VIDEO -> R.drawable.rounded_photo_camera_24
diff --git a/feature/messageshistory/src/main/kotlin/dev/meloda/fast/messageshistory/presentation/MessagesHistoryTopBar.kt b/feature/messageshistory/src/main/kotlin/dev/meloda/fast/messageshistory/presentation/MessagesHistoryTopBar.kt
index 887717e3..d27f4952 100644
--- a/feature/messageshistory/src/main/kotlin/dev/meloda/fast/messageshistory/presentation/MessagesHistoryTopBar.kt
+++ b/feature/messageshistory/src/main/kotlin/dev/meloda/fast/messageshistory/presentation/MessagesHistoryTopBar.kt
@@ -212,7 +212,7 @@ fun MessagesHistoryTopBar(
                 }
                 IconButton(onClick = onDeleteSelectedButtonClicked) {
                     Icon(
-                        painter = painterResource(R.drawable.round_delete_outline_24),
+                        painter = painterResource(R.drawable.ic_delete_round_24),
                         contentDescription = null
                     )
                 }
diff --git a/feature/messageshistory/src/main/kotlin/dev/meloda/fast/messageshistory/presentation/PinnedMessageContainer.kt b/feature/messageshistory/src/main/kotlin/dev/meloda/fast/messageshistory/presentation/PinnedMessageContainer.kt
index 9206e840..6279b1b9 100644
--- a/feature/messageshistory/src/main/kotlin/dev/meloda/fast/messageshistory/presentation/PinnedMessageContainer.kt
+++ b/feature/messageshistory/src/main/kotlin/dev/meloda/fast/messageshistory/presentation/PinnedMessageContainer.kt
@@ -52,7 +52,7 @@ fun PinnedMessageContainer(
         horizontalArrangement = Arrangement.spacedBy(12.dp)
     ) {
         Icon(
-            painter = painterResource(R.drawable.ic_round_push_pin_24),
+            painter = painterResource(R.drawable.ic_keep_fill_round_24),
             contentDescription = null,
             modifier = Modifier
                 .rotate(45f)