diff --git a/app/src/main/java/chat/revolt/activities/InviteActivity.kt b/app/src/main/java/chat/revolt/activities/InviteActivity.kt
index 0615a3a2..a0ebfb26 100644
--- a/app/src/main/java/chat/revolt/activities/InviteActivity.kt
+++ b/app/src/main/java/chat/revolt/activities/InviteActivity.kt
@@ -16,8 +16,6 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.shape.CircleShape
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Close
 import androidx.compose.material3.AlertDialog
 import androidx.compose.material3.Button
 import androidx.compose.material3.CircularProgressIndicator
@@ -38,6 +36,7 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.toArgb
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.testTag
+import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextAlign
@@ -280,7 +279,7 @@ fun InvalidInviteError(error: RevoltError? = null, onDismissRequest: () -> Unit)
         onDismissRequest = onDismissRequest,
         icon = {
             Icon(
-                imageVector = Icons.Default.Close,
+                painter = painterResource(R.drawable.icn_error_24dp),
                 contentDescription = null, // decorative
                 tint = MaterialTheme.colorScheme.primary
             )
@@ -326,7 +325,7 @@ fun NoInviteSpecifiedError(onDismissRequest: () -> Unit) {
         onDismissRequest = onDismissRequest,
         icon = {
             Icon(
-                imageVector = Icons.Default.Close,
+                painter = painterResource(R.drawable.icn_error_24dp),
                 contentDescription = null, // decorative
                 tint = MaterialTheme.colorScheme.primary
             )
diff --git a/app/src/main/java/chat/revolt/activities/media/ImageViewActivity.kt b/app/src/main/java/chat/revolt/activities/media/ImageViewActivity.kt
index 1657ae4a..2ca46ff0 100644
--- a/app/src/main/java/chat/revolt/activities/media/ImageViewActivity.kt
+++ b/app/src/main/java/chat/revolt/activities/media/ImageViewActivity.kt
@@ -14,8 +14,6 @@ import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.automirrored.filled.ArrowBack
 import androidx.compose.material3.DropdownMenu
 import androidx.compose.material3.DropdownMenuItem
 import androidx.compose.material3.ExperimentalMaterial3Api
@@ -206,7 +204,7 @@ fun ImageViewScreen(resource: AutumnResource, onClose: () -> Unit = {}) {
                             onClose()
                         }) {
                             Icon(
-                                imageVector = Icons.AutoMirrored.Default.ArrowBack,
+                                painter = painterResource(id = R.drawable.icn_arrow_back_24dp),
                                 contentDescription = stringResource(id = R.string.back)
                             )
                         }
@@ -216,7 +214,7 @@ fun ImageViewScreen(resource: AutumnResource, onClose: () -> Unit = {}) {
                             shareSubmenuIsOpen.value = true
                         }) {
                             Icon(
-                                painter = painterResource(id = R.drawable.ic_share_24dp),
+                                painter = painterResource(id = R.drawable.icn_ios_share_24dp),
                                 contentDescription = stringResource(id = R.string.share)
                             )
                         }
@@ -255,7 +253,7 @@ fun ImageViewScreen(resource: AutumnResource, onClose: () -> Unit = {}) {
                             saveToGallery()
                         }) {
                             Icon(
-                                painter = painterResource(id = R.drawable.ic_download_24dp),
+                                painter = painterResource(id = R.drawable.icn_download_24dp),
                                 contentDescription = stringResource(
                                     id = R.string.media_viewer_save
                                 )
diff --git a/app/src/main/java/chat/revolt/c2dm/HandlerService.kt b/app/src/main/java/chat/revolt/c2dm/HandlerService.kt
index 4971eb51..a08561fe 100644
--- a/app/src/main/java/chat/revolt/c2dm/HandlerService.kt
+++ b/app/src/main/java/chat/revolt/c2dm/HandlerService.kt
@@ -134,7 +134,7 @@ class HandlerService : FirebaseMessagingService() {
 
         val action: NotificationCompat.Action =
             NotificationCompat.Action.Builder(
-                R.drawable.ic_reply_24dp,
+                R.drawable.icn_reply_24dp,
                 getString(R.string.message_context_sheet_actions_reply),
                 PendingIntent.getActivity(
                     this,
@@ -147,7 +147,7 @@ class HandlerService : FirebaseMessagingService() {
                 .build()
 
         val builder = NotificationCompat.Builder(this, CHANNEL_ID_GROUP_SOCIAL_FRIENDREQUESTS)
-            .setSmallIcon(R.drawable.ic_message_text_24dp)
+            .setSmallIcon(R.drawable.icn_chat_24dp)
             .setContentTitle(user.displayName ?: user.username)
             .setContentText(message.content)
             .setCategory(NotificationCompat.CATEGORY_MESSAGE)
diff --git a/app/src/main/java/chat/revolt/composables/chat/InlineBadge.kt b/app/src/main/java/chat/revolt/composables/chat/InlineBadge.kt
index 9c92ca36..a5f9bfc5 100644
--- a/app/src/main/java/chat/revolt/composables/chat/InlineBadge.kt
+++ b/app/src/main/java/chat/revolt/composables/chat/InlineBadge.kt
@@ -27,35 +27,35 @@ fun InlineBadge(
 ) {
     when (badge) {
         InlineBadge.Bot -> Icon(
-            painter = painterResource(id = R.drawable.ic_robot_24dp),
+            painter = painterResource(id = R.drawable.icn_smart_toy_24dp),
             contentDescription = stringResource(id = R.string.badge_bot_alt),
             tint = colour,
             modifier = modifier
         )
 
         InlineBadge.Bridge -> Icon(
-            painter = painterResource(id = R.drawable.ic_link_variant_24dp),
+            painter = painterResource(id = R.drawable.icn_link_24dp),
             contentDescription = stringResource(id = R.string.badge_masquerade_alt),
             tint = colour,
             modifier = modifier
         )
 
         InlineBadge.PlatformModeration -> Icon(
-            painter = painterResource(id = R.drawable.ic_alert_decagram_24dp),
+            painter = painterResource(id = R.drawable.icn_brightness_alert_24dp),
             contentDescription = stringResource(id = R.string.badge_bot_alt),
             tint = colour,
             modifier = modifier
         )
 
         InlineBadge.TeamMember -> Icon(
-            painter = painterResource(id = R.drawable.ic_hammer_wrench_24dp),
+            painter = painterResource(id = R.drawable.icn_hardware_24dp),
             contentDescription = stringResource(id = R.string.badge_team_member_alt),
             tint = colour,
             modifier = modifier
         )
 
         InlineBadge.Webhook -> Icon(
-            painter = painterResource(id = R.drawable.ic_cloud_24dp),
+            painter = painterResource(id = R.drawable.icn_cloud_24dp),
             contentDescription = stringResource(id = R.string.badge_webhook_alt),
             tint = colour,
             modifier = modifier.padding(start = 4.dp)
diff --git a/app/src/main/java/chat/revolt/composables/chat/Message.kt b/app/src/main/java/chat/revolt/composables/chat/Message.kt
index 7869f12c..4e68651d 100644
--- a/app/src/main/java/chat/revolt/composables/chat/Message.kt
+++ b/app/src/main/java/chat/revolt/composables/chat/Message.kt
@@ -28,8 +28,6 @@ import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Edit
 import androidx.compose.material3.CircularProgressIndicator
 import androidx.compose.material3.Icon
 import androidx.compose.material3.LocalContentColor
@@ -267,7 +265,7 @@ fun Message(
                         modifier = Modifier.padding(vertical = 8.dp)
                     ) {
                         Icon(
-                            painter = painterResource(R.drawable.ic_close_octagon_24dp),
+                            painter = painterResource(R.drawable.icn_block_24dp),
                             contentDescription = null
                         )
 
@@ -415,7 +413,7 @@ fun Message(
 
                                 if (message.edited != null) {
                                     Icon(
-                                        imageVector = Icons.Default.Edit,
+                                        painter = painterResource(R.drawable.icn_edit_24dp),
                                         contentDescription = stringResource(id = R.string.edited),
                                         tint = MaterialTheme.colorScheme.onBackground.copy(
                                             alpha = 0.5f
@@ -619,7 +617,7 @@ fun Message(
                                         .padding(8.dp)
                                 ) {
                                     Icon(
-                                        painter = painterResource(R.drawable.ic_hamburger_plus_24dp),
+                                        painter = painterResource(R.drawable.icn_add_reaction_24dp),
                                         contentDescription = stringResource(R.string.message_context_sheet_actions_react),
                                         modifier = Modifier.size(16.dp)
                                     )
diff --git a/app/src/main/java/chat/revolt/composables/chat/MessageAttachment.kt b/app/src/main/java/chat/revolt/composables/chat/MessageAttachment.kt
index 6a489bb0..a10fa65c 100644
--- a/app/src/main/java/chat/revolt/composables/chat/MessageAttachment.kt
+++ b/app/src/main/java/chat/revolt/composables/chat/MessageAttachment.kt
@@ -13,8 +13,6 @@ import androidx.compose.foundation.layout.aspectRatio
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.width
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.PlayArrow
 import androidx.compose.material3.Icon
 import androidx.compose.material3.LocalContentColor
 import androidx.compose.material3.MaterialTheme
@@ -58,7 +56,7 @@ fun FileAttachment(attachment: AutumnResource) {
             verticalAlignment = Alignment.CenterVertically
         ) {
             Icon(
-                painter = painterResource(id = R.drawable.ic_file_24dp),
+                painter = painterResource(id = R.drawable.icn_file_present_24dp),
                 contentDescription = null
             )
 
@@ -140,7 +138,7 @@ fun VideoPlayButton() {
     )
 
     Icon(
-        imageVector = Icons.Default.PlayArrow,
+        painter = painterResource(R.drawable.icn_play_arrow_24dp),
         contentDescription = stringResource(id = R.string.media_viewer_play),
         modifier = Modifier
             .width(32.dp)
diff --git a/app/src/main/java/chat/revolt/composables/chat/MessageField.kt b/app/src/main/java/chat/revolt/composables/chat/MessageField.kt
index 2c44a11f..1036ff6f 100644
--- a/app/src/main/java/chat/revolt/composables/chat/MessageField.kt
+++ b/app/src/main/java/chat/revolt/composables/chat/MessageField.kt
@@ -35,9 +35,7 @@ import androidx.compose.foundation.text.input.rememberTextFieldState
 import androidx.compose.foundation.text.input.setTextAndPlaceCursorAtEnd
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.automirrored.filled.Send
 import androidx.compose.material.icons.filled.Add
-import androidx.compose.material.icons.filled.Edit
 import androidx.compose.material3.Icon
 import androidx.compose.material3.LocalContentColor
 import androidx.compose.material3.LocalTextStyle
@@ -584,7 +582,7 @@ fun MessageField(
             )
 
             Icon(
-                painter = painterResource(R.drawable.ic_emoticon_24dp),
+                painter = painterResource(R.drawable.icn_mood_24dp),
                 tint = MaterialTheme.colorScheme.onSurface.copy(alpha = 0.5f),
                 contentDescription = stringResource(id = R.string.pick_emoji_alt),
                 modifier = Modifier
@@ -622,9 +620,9 @@ fun MessageField(
                 ) + fadeOut(animationSpec = RevoltTweenFloat)
             ) {
                 Icon(
-                    when {
-                        editMode -> Icons.Default.Edit
-                        else -> Icons.AutoMirrored.Default.Send
+                    painter = when {
+                        editMode -> painterResource(R.drawable.icn_edit_24dp)
+                        else -> painterResource(R.drawable.icn_send_24dp)
                     },
                     tint = MaterialTheme.colorScheme.primary,
                     contentDescription = stringResource(id = R.string.send_alt),
diff --git a/app/src/main/java/chat/revolt/composables/chat/UserBadgeList.kt b/app/src/main/java/chat/revolt/composables/chat/UserBadgeList.kt
index 0b12f0ef..b191652d 100644
--- a/app/src/main/java/chat/revolt/composables/chat/UserBadgeList.kt
+++ b/app/src/main/java/chat/revolt/composables/chat/UserBadgeList.kt
@@ -92,7 +92,7 @@ fun BadgeListEntry(badge: UserBadges) {
         UserBadges.ActiveSupporter.value -> {
             BadgeListEntryTemplate(
                 label = stringResource(R.string.user_badge_active_supporter),
-                icon = painterResource(R.drawable.ic_human_greeting_variant_24dp)
+                icon = painterResource(R.drawable.icn_emoji_people_24dp)
             )
         }
 
@@ -157,7 +157,7 @@ fun UserBadgeRow(badges: Long) {
                         UserBadges.ResponsibleDisclosure -> painterResource(R.drawable.user_badge_disclosure)
                         UserBadges.Founder -> painterResource(R.drawable.user_badge_founder)
                         UserBadges.PlatformModeration -> painterResource(R.drawable.user_badge_moderation)
-                        UserBadges.ActiveSupporter -> painterResource(R.drawable.ic_human_greeting_variant_24dp)
+                        UserBadges.ActiveSupporter -> painterResource(R.drawable.icn_emoji_people_24dp)
                         UserBadges.Paw -> painterResource(R.drawable.user_badge_paw)
                         UserBadges.EarlyAdopter -> painterResource(R.drawable.user_badge_early_adopter)
                         UserBadges.ReservedRelevantJokeBadge1 -> painterResource(R.drawable.user_badge_reserved_relevant_one)
diff --git a/app/src/main/java/chat/revolt/composables/emoji/EmojiPicker.kt b/app/src/main/java/chat/revolt/composables/emoji/EmojiPicker.kt
index 8dd565d5..81cb153f 100644
--- a/app/src/main/java/chat/revolt/composables/emoji/EmojiPicker.kt
+++ b/app/src/main/java/chat/revolt/composables/emoji/EmojiPicker.kt
@@ -30,9 +30,6 @@ import androidx.compose.foundation.lazy.grid.rememberLazyGridState
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.text.BasicTextField
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.automirrored.filled.KeyboardArrowRight
-import androidx.compose.material.icons.filled.Close
 import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.Icon
 import androidx.compose.material3.LocalContentColor
@@ -231,7 +228,7 @@ fun EmojiPicker(
                     innerTextField()
 
                     Icon(
-                        imageVector = Icons.Default.Close,
+                        painter = painterResource(R.drawable.icn_close_24dp),
                         contentDescription = stringResource(R.string.emoji_picker_clear_search),
                         modifier = Modifier
                             .clip(CircleShape)
@@ -343,7 +340,7 @@ fun EmojiPicker(
                         textAlign = TextAlign.Center
                     )
                     Icon(
-                        imageVector = Icons.AutoMirrored.Default.KeyboardArrowRight,
+                        painter = painterResource(R.drawable.icn_keyboard_arrow_right_24dp),
                         contentDescription = stringResource(
                             R.string.emoji_picker_close_skin_tone_menu
                         ),
@@ -445,39 +442,39 @@ fun EmojiPicker(
                         Icon(
                             painter = when (category) {
                                 UnicodeEmojiSection.Smileys -> painterResource(
-                                    R.drawable.ic_emoticon_24dp
+                                    R.drawable.icn_mood_24dp
                                 )
 
                                 UnicodeEmojiSection.People -> painterResource(
-                                    R.drawable.ic_human_greeting_variant_24dp
+                                    R.drawable.icn_emoji_people_24dp
                                 )
 
                                 UnicodeEmojiSection.Animals -> painterResource(
-                                    R.drawable.ic_snake_24dp
+                                    R.drawable.icn_emoji_nature_24dp
                                 )
 
                                 UnicodeEmojiSection.Food -> painterResource(
-                                    R.drawable.ic_glass_mug_variant_24dp
+                                    R.drawable.icn_sports_bar_24dp
                                 )
 
                                 UnicodeEmojiSection.Travel -> painterResource(
-                                    R.drawable.ic_train_bus_24dp
+                                    R.drawable.icn_bus_railway_24dp
                                 )
 
                                 UnicodeEmojiSection.Activities -> painterResource(
-                                    R.drawable.ic_skate_24dp
+                                    R.drawable.icn_sports_and_outdoors_24dp
                                 )
 
                                 UnicodeEmojiSection.Objects -> painterResource(
-                                    R.drawable.ic_table_chair_24dp
+                                    R.drawable.icn_emoji_objects_24dp
                                 )
 
                                 UnicodeEmojiSection.Symbols -> painterResource(
-                                    R.drawable.ic_symbol_24dp
+                                    R.drawable.icn_emoji_symbols_24dp
                                 )
 
                                 UnicodeEmojiSection.Flags -> painterResource(
-                                    R.drawable.ic_flag_24dp
+                                    R.drawable.icn_flag_24dp
                                 )
                             },
                             contentDescription = null,
diff --git a/app/src/main/java/chat/revolt/composables/generic/InlineMediaPicker.kt b/app/src/main/java/chat/revolt/composables/generic/InlineMediaPicker.kt
index 86bc47dd..4c6cc06a 100644
--- a/app/src/main/java/chat/revolt/composables/generic/InlineMediaPicker.kt
+++ b/app/src/main/java/chat/revolt/composables/generic/InlineMediaPicker.kt
@@ -13,9 +13,6 @@ import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Add
-import androidx.compose.material.icons.filled.Close
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
@@ -26,6 +23,7 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
@@ -70,7 +68,7 @@ fun InlineMediaPicker(
                     enabled = (currentModel != null) && enabled
                 ) {
                     Icon(
-                        imageVector = Icons.Default.Close,
+                        painter = painterResource(R.drawable.icn_close_24dp),
                         contentDescription = stringResource(R.string.inline_media_picker_remove)
                     )
                 }
@@ -96,7 +94,7 @@ fun InlineMediaPicker(
                     modifier = Modifier.width(480.dp)
                 ) {
                     Icon(
-                        imageVector = Icons.Default.Close,
+                        painter = painterResource(R.drawable.icn_close_24dp),
                         contentDescription = null
                     )
 
@@ -183,7 +181,7 @@ fun InlineMediaPickerMediaPicker(
         ) {
             if (circular) {
                 Icon(
-                    imageVector = Icons.Default.Add,
+                    painter = painterResource(R.drawable.icn_add_24dp),
                     contentDescription = stringResource(R.string.inline_media_picker_no_media_placeholder)
                 )
             } else {
diff --git a/app/src/main/java/chat/revolt/composables/generic/NonIdealState.kt b/app/src/main/java/chat/revolt/composables/generic/NonIdealState.kt
index 7e51bc23..2145a38c 100644
--- a/app/src/main/java/chat/revolt/composables/generic/NonIdealState.kt
+++ b/app/src/main/java/chat/revolt/composables/generic/NonIdealState.kt
@@ -9,7 +9,6 @@ import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Close
 import androidx.compose.material.icons.filled.Star
 import androidx.compose.material.icons.filled.Warning
 import androidx.compose.material3.Button
@@ -22,10 +21,12 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
+import chat.revolt.R
 
 private val NoneLambda = @Composable { throw UnsupportedOperationException() }
 
@@ -107,7 +108,7 @@ fun NonIdealStatePreviewNoActions() {
     NonIdealState(
         icon = {
             Icon(
-                imageVector = Icons.Default.Close,
+                painter = painterResource(R.drawable.icn_error_24dp),
                 contentDescription = null,
                 modifier = Modifier.size(it)
             )
diff --git a/app/src/main/java/chat/revolt/composables/media/AudioPlayer.kt b/app/src/main/java/chat/revolt/composables/media/AudioPlayer.kt
index 76047b2f..3dd8d09d 100644
--- a/app/src/main/java/chat/revolt/composables/media/AudioPlayer.kt
+++ b/app/src/main/java/chat/revolt/composables/media/AudioPlayer.kt
@@ -12,9 +12,6 @@ import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.width
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.MoreVert
-import androidx.compose.material.icons.filled.PlayArrow
 import androidx.compose.material3.CircularProgressIndicator
 import androidx.compose.material3.DropdownMenu
 import androidx.compose.material3.DropdownMenuItem
@@ -235,12 +232,12 @@ fun AudioPlayer(url: String, filename: String, contentType: String) {
                 } else {
                     if (isPlaying.value) {
                         Icon(
-                            painter = painterResource(R.drawable.ic_pause_24dp),
+                            painter = painterResource(R.drawable.icn_pause_24dp),
                             contentDescription = stringResource(R.string.media_viewer_pause)
                         )
                     } else {
                         Icon(
-                            imageVector = Icons.Filled.PlayArrow,
+                            painter = painterResource(R.drawable.icn_play_arrow_24dp),
                             contentDescription = stringResource(R.string.media_viewer_play)
                         )
                     }
@@ -268,7 +265,7 @@ fun AudioPlayer(url: String, filename: String, contentType: String) {
                 showMenu.value = !showMenu.value
             }) {
                 Icon(
-                    imageVector = Icons.Filled.MoreVert,
+                    painter = painterResource(R.drawable.icn_more_vert_24dp),
                     contentDescription = stringResource(R.string.media_viewer_more)
                 )
                 DropdownMenu(
diff --git a/app/src/main/java/chat/revolt/composables/media/MediaPickerGateway.kt b/app/src/main/java/chat/revolt/composables/media/MediaPickerGateway.kt
index 57c729c4..a8e90b94 100644
--- a/app/src/main/java/chat/revolt/composables/media/MediaPickerGateway.kt
+++ b/app/src/main/java/chat/revolt/composables/media/MediaPickerGateway.kt
@@ -66,7 +66,7 @@ fun MediaPickerGateway(
                         .padding(8.dp)
                 ) {
                     Icon(
-                        painterResource(R.drawable.ic_image_multiple_24dp),
+                        painterResource(R.drawable.icn_photo_library_24dp),
                         contentDescription = null,
                     )
                     Text(
@@ -102,7 +102,7 @@ fun MediaPickerGateway(
                         .padding(8.dp)
                 ) {
                     Icon(
-                        painterResource(R.drawable.ic_paperclip_24dp),
+                        painterResource(R.drawable.icn_attach_file_24dp),
                         contentDescription = null,
                     )
                     Text(
@@ -126,7 +126,7 @@ fun MediaPickerGateway(
                         .padding(8.dp)
                 ) {
                     Icon(
-                        painterResource(R.drawable.ic_camera_24dp),
+                        painterResource(R.drawable.icn_camera_24dp),
                         contentDescription = null,
                     )
                     Text(
diff --git a/app/src/main/java/chat/revolt/composables/screens/chat/AttachmentManager.kt b/app/src/main/java/chat/revolt/composables/screens/chat/AttachmentManager.kt
index 3e02d219..04c8c9ad 100644
--- a/app/src/main/java/chat/revolt/composables/screens/chat/AttachmentManager.kt
+++ b/app/src/main/java/chat/revolt/composables/screens/chat/AttachmentManager.kt
@@ -137,7 +137,7 @@ fun FilePreviewSheet(
                     onRemove()
                 }, modifier = Modifier.weight(1f)) {
                     Icon(
-                        painterResource(R.drawable.ic_paperclip_minus_24dp),
+                        painterResource(R.drawable.icn_attach_file_off_24dp),
                         contentDescription = null
                     )
                     Spacer(modifier = Modifier.width(8.dp))
diff --git a/app/src/main/java/chat/revolt/composables/screens/chat/ChannelHeader.kt b/app/src/main/java/chat/revolt/composables/screens/chat/ChannelHeader.kt
index 0f33cd7a..a841cd63 100644
--- a/app/src/main/java/chat/revolt/composables/screens/chat/ChannelHeader.kt
+++ b/app/src/main/java/chat/revolt/composables/screens/chat/ChannelHeader.kt
@@ -9,7 +9,6 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.automirrored.filled.KeyboardArrowRight
 import androidx.compose.material.icons.filled.Menu
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
@@ -18,6 +17,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.alpha
+import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextOverflow
@@ -48,7 +48,7 @@ fun ChannelHeader(
                 onToggleDrawer()
             }) {
                 Icon(
-                    imageVector = Icons.Default.Menu,
+                    painter = painterResource(R.drawable.icn_menu_24dp),
                     contentDescription = stringResource(R.string.menu)
                 )
             }
@@ -92,7 +92,7 @@ fun ChannelHeader(
             Spacer(modifier = Modifier.width(4.dp))
 
             Icon(
-                imageVector = Icons.AutoMirrored.Default.KeyboardArrowRight,
+                painter = painterResource(R.drawable.icn_keyboard_arrow_right_24dp),
                 contentDescription = stringResource(R.string.menu),
                 modifier = Modifier
                     .size(18.dp)
diff --git a/app/src/main/java/chat/revolt/composables/screens/chat/ChannelIcon.kt b/app/src/main/java/chat/revolt/composables/screens/chat/ChannelIcon.kt
index c244f7cb..9713296a 100644
--- a/app/src/main/java/chat/revolt/composables/screens/chat/ChannelIcon.kt
+++ b/app/src/main/java/chat/revolt/composables/screens/chat/ChannelIcon.kt
@@ -1,8 +1,5 @@
 package chat.revolt.composables.screens.chat
 
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.AccountBox
-import androidx.compose.material.icons.filled.AccountCircle
 import androidx.compose.material3.Icon
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
@@ -19,35 +16,39 @@ fun ChannelIcon(channelType: ChannelType, modifier: Modifier = Modifier) {
     when (channelType) {
         ChannelType.TextChannel -> {
             Icon(
-                painter = painterResource(R.drawable.ic_pound_24dp),
+                painter = painterResource(R.drawable.icn_tag_24dp),
                 contentDescription = stringResource(R.string.channel_text),
                 modifier = modifier
             )
         }
+
         ChannelType.VoiceChannel -> {
             Icon(
-                painter = painterResource(R.drawable.ic_volume_up_24dp),
+                painter = painterResource(R.drawable.icn_volume_up_24dp),
                 contentDescription = stringResource(R.string.channel_voice),
                 modifier = modifier
             )
         }
+
         ChannelType.SavedMessages -> {
             Icon(
-                painter = painterResource(R.drawable.ic_note_24dp),
+                painter = painterResource(R.drawable.icn_note_stack_24dp),
                 contentDescription = stringResource(R.string.channel_notes),
                 modifier = modifier
             )
         }
+
         ChannelType.DirectMessage -> {
             Icon(
-                imageVector = Icons.Default.AccountCircle,
+                painter = painterResource(R.drawable.icn_account_circle_24dp),
                 contentDescription = stringResource(R.string.channel_dm),
                 modifier = modifier
             )
         }
+
         ChannelType.Group -> {
             Icon(
-                imageVector = Icons.Default.AccountBox,
+                painter = painterResource(R.drawable.icn_account_box_24dp),
                 contentDescription = stringResource(R.string.channel_group),
                 modifier = modifier
             )
diff --git a/app/src/main/java/chat/revolt/composables/screens/chat/ReplyManager.kt b/app/src/main/java/chat/revolt/composables/screens/chat/ReplyManager.kt
index 43271c29..5250e1e2 100644
--- a/app/src/main/java/chat/revolt/composables/screens/chat/ReplyManager.kt
+++ b/app/src/main/java/chat/revolt/composables/screens/chat/ReplyManager.kt
@@ -21,6 +21,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
+import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextOverflow
@@ -59,7 +60,7 @@ fun ManageableReply(reply: SendMessageReply, onToggleMention: () -> Unit, onRemo
         verticalAlignment = Alignment.CenterVertically
     ) {
         Icon(
-            imageVector = Icons.Default.Close,
+            painter = painterResource(R.drawable.icn_close_24dp),
             contentDescription = stringResource(id = R.string.remove_reply_alt),
             modifier = Modifier
                 .clip(MaterialTheme.shapes.small)
diff --git a/app/src/main/java/chat/revolt/composables/screens/chat/atoms/RegularMessage.kt b/app/src/main/java/chat/revolt/composables/screens/chat/atoms/RegularMessage.kt
index 325321a9..3ba2a7e4 100644
--- a/app/src/main/java/chat/revolt/composables/screens/chat/atoms/RegularMessage.kt
+++ b/app/src/main/java/chat/revolt/composables/screens/chat/atoms/RegularMessage.kt
@@ -242,7 +242,7 @@ fun RegularMessage(
                     )
                 ) {
                     Icon(
-                        painter = painterResource(R.drawable.ic_reply_24dp),
+                        painter = painterResource(R.drawable.icn_reply_24dp),
                         contentDescription = null,
                         modifier = Modifier.size(
                             min(
diff --git a/app/src/main/java/chat/revolt/composables/screens/chat/drawer/ChannelSideDrawer.kt b/app/src/main/java/chat/revolt/composables/screens/chat/drawer/ChannelSideDrawer.kt
index 4df73658..5e5cb176 100644
--- a/app/src/main/java/chat/revolt/composables/screens/chat/drawer/ChannelSideDrawer.kt
+++ b/app/src/main/java/chat/revolt/composables/screens/chat/drawer/ChannelSideDrawer.kt
@@ -37,10 +37,6 @@ import androidx.compose.foundation.lazy.LazyListState
 import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.shape.CornerSize
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Add
-import androidx.compose.material.icons.filled.MoreVert
-import androidx.compose.material.icons.filled.Settings
 import androidx.compose.material3.DrawerState
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.HorizontalDivider
@@ -410,7 +406,7 @@ fun ChannelSideDrawer(
                     contentAlignment = Alignment.Center
                 ) {
                     Icon(
-                        imageVector = Icons.Default.Add,
+                        painter = painterResource(R.drawable.icn_add_24dp),
                         contentDescription = stringResource(R.string.server_plus_alt)
                     )
                 }
@@ -428,7 +424,7 @@ fun ChannelSideDrawer(
                     contentAlignment = Alignment.Center
                 ) {
                     Icon(
-                        painter = painterResource(R.drawable.ic_compass_24dp),
+                        painter = painterResource(R.drawable.icn_explore_24dp),
                         contentDescription = stringResource(R.string.discover_alt)
                     )
                 }
@@ -450,7 +446,7 @@ fun ChannelSideDrawer(
                         contentAlignment = Alignment.Center
                     ) {
                         Icon(
-                            imageVector = Icons.Default.Settings,
+                            painter = painterResource(R.drawable.icn_settings_24dp),
                             contentDescription = stringResource(R.string.settings)
                         )
                     }
@@ -564,7 +560,7 @@ fun ChannelSideDrawer(
                                 server?.id?.let { srvId -> onShowServerContextSheet(srvId) }
                             }) {
                                 Icon(
-                                    imageVector = Icons.Default.MoreVert,
+                                    painter = painterResource(R.drawable.icn_more_vert_24dp),
                                     contentDescription = stringResource(R.string.menu),
                                     tint = LocalContentColor.current
                                 )
@@ -628,7 +624,7 @@ fun ColumnScope.DirectMessagesChannelListRenderer(
                     name = stringResource(R.string.overview_screen_title),
                     channelType = ChannelType.TextChannel
                 ),
-                iconType = ChannelItemIconType.Painter(painterResource(R.drawable.ic_creation_24dp)),
+                iconType = ChannelItemIconType.Painter(painterResource(R.drawable.icn_star_shine_24dp)),
                 isCurrent = currentDestination is ChatRouterDestination.Overview,
                 onDestinationChanged = {
                     onDestinationChanged(ChatRouterDestination.Overview)
@@ -649,7 +645,7 @@ fun ColumnScope.DirectMessagesChannelListRenderer(
                     name = stringResource(R.string.friends),
                     channelType = ChannelType.TextChannel
                 ),
-                iconType = ChannelItemIconType.Painter(painterResource(R.drawable.ic_human_greeting_variant_24dp)),
+                iconType = ChannelItemIconType.Painter(painterResource(R.drawable.icn_group_24dp)),
                 isCurrent = currentDestination is ChatRouterDestination.Friends,
                 onDestinationChanged = {
                     onDestinationChanged(ChatRouterDestination.Friends)
diff --git a/app/src/main/java/chat/revolt/composables/screens/settings/UserButtons.kt b/app/src/main/java/chat/revolt/composables/screens/settings/UserButtons.kt
index ebeb13e0..35a8cc51 100644
--- a/app/src/main/java/chat/revolt/composables/screens/settings/UserButtons.kt
+++ b/app/src/main/java/chat/revolt/composables/screens/settings/UserButtons.kt
@@ -7,8 +7,6 @@ import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.padding
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.MoreVert
 import androidx.compose.material3.Button
 import androidx.compose.material3.ButtonDefaults
 import androidx.compose.material3.DropdownMenu
@@ -71,7 +69,7 @@ fun UserButtons(
                     } catch (e: Exception) {
                         // Button did nothing, but not an error
                         if (e.message == "NoEffect") return@launch
-                        
+
                         // Log all other errors
                         logcat(LogPriority.ERROR) { e.asLog() }
                     }
@@ -120,7 +118,7 @@ fun UserButtons(
                             .weight(1f)
                     ) {
                         Icon(
-                            painter = painterResource(R.drawable.ic_robot_24dp),
+                            painter = painterResource(R.drawable.icn_smart_toy_24dp),
                             contentDescription = null
                         )
                         Text(
@@ -336,7 +334,7 @@ fun UserButtons(
                     }
                 ) {
                     Icon(
-                        imageVector = Icons.Default.MoreVert,
+                        painter = painterResource(R.drawable.icn_more_vert_24dp),
                         contentDescription = stringResource(R.string.menu)
                     )
                 }
diff --git a/app/src/main/java/chat/revolt/composables/settings/sessions/SessionItem.kt b/app/src/main/java/chat/revolt/composables/settings/sessions/SessionItem.kt
index 3403c7cc..660f9c15 100644
--- a/app/src/main/java/chat/revolt/composables/settings/sessions/SessionItem.kt
+++ b/app/src/main/java/chat/revolt/composables/settings/sessions/SessionItem.kt
@@ -1,8 +1,8 @@
 package chat.revolt.composables.settings.sessions
 
 import android.text.format.DateUtils
-import androidx.compose.material3.IconButton
 import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
 import androidx.compose.material3.ListItem
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
@@ -54,7 +54,7 @@ fun SessionItem(
                     onLogout(session)
                 }) {
                     Icon(
-                        painter = painterResource(R.drawable.ic_logout_24dp),
+                        painter = painterResource(R.drawable.icn_logout_24dp),
                         contentDescription = stringResource(R.string.logout)
                     )
                 }
diff --git a/app/src/main/java/chat/revolt/composables/sheets/SheetSelection.kt b/app/src/main/java/chat/revolt/composables/sheets/SheetSelection.kt
index 066042b4..5efeccf3 100644
--- a/app/src/main/java/chat/revolt/composables/sheets/SheetSelection.kt
+++ b/app/src/main/java/chat/revolt/composables/sheets/SheetSelection.kt
@@ -5,8 +5,6 @@ import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.padding
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.automirrored.filled.KeyboardArrowRight
 import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.ProvideTextStyle
@@ -15,7 +13,9 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.unit.dp
+import chat.revolt.R
 
 /**
  * Sheet selection. Used when a modal sheet prompts a choice out of x options.
@@ -55,7 +55,7 @@ fun SheetSelection(
             }
         }
         Icon(
-            imageVector = Icons.AutoMirrored.Default.KeyboardArrowRight,
+            painter = painterResource(R.drawable.icn_keyboard_arrow_right_24dp),
             contentDescription = null,
             tint = arrowTint
         )
diff --git a/app/src/main/java/chat/revolt/screens/about/AboutScreen.kt b/app/src/main/java/chat/revolt/screens/about/AboutScreen.kt
index fe55987e..c21c60d9 100644
--- a/app/src/main/java/chat/revolt/screens/about/AboutScreen.kt
+++ b/app/src/main/java/chat/revolt/screens/about/AboutScreen.kt
@@ -170,7 +170,7 @@ fun AboutScreen(navController: NavController, viewModel: AboutViewModel = viewMo
                         navController.popBackStack()
                     }) {
                         Icon(
-                            imageVector = Icons.AutoMirrored.Default.ArrowBack,
+                            painter = painterResource(R.drawable.icn_arrow_back_24dp),
                             contentDescription = stringResource(id = R.string.back)
                         )
                     }
diff --git a/app/src/main/java/chat/revolt/screens/about/AttributionScreen.kt b/app/src/main/java/chat/revolt/screens/about/AttributionScreen.kt
index c89f0c1d..cc9a002d 100644
--- a/app/src/main/java/chat/revolt/screens/about/AttributionScreen.kt
+++ b/app/src/main/java/chat/revolt/screens/about/AttributionScreen.kt
@@ -35,6 +35,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.text.style.TextOverflow
@@ -171,7 +172,7 @@ fun AttributionScreen(navController: NavController) {
                         navController.popBackStack()
                     }) {
                         Icon(
-                            imageVector = Icons.AutoMirrored.Default.ArrowBack,
+                            painter = painterResource(R.drawable.icn_arrow_back_24dp),
                             contentDescription = stringResource(id = R.string.back)
                         )
                     }
diff --git a/app/src/main/java/chat/revolt/screens/chat/ChatRouterScreen.kt b/app/src/main/java/chat/revolt/screens/chat/ChatRouterScreen.kt
index ff53b22e..0489ba8d 100644
--- a/app/src/main/java/chat/revolt/screens/chat/ChatRouterScreen.kt
+++ b/app/src/main/java/chat/revolt/screens/chat/ChatRouterScreen.kt
@@ -636,7 +636,7 @@ fun ChatRouterScreen(
             },
             icon = {
                 Icon(
-                    painter = painterResource(R.drawable.ic_lock_alert_24dp),
+                    painter = painterResource(R.drawable.icn_lock_24dp),
                     contentDescription = null, // decorative
                     tint = MaterialTheme.colorScheme.primary
                 )
diff --git a/app/src/main/java/chat/revolt/screens/chat/dialogs/safety/ReportMessageDialog.kt b/app/src/main/java/chat/revolt/screens/chat/dialogs/safety/ReportMessageDialog.kt
index 58390f6a..114deea9 100644
--- a/app/src/main/java/chat/revolt/screens/chat/dialogs/safety/ReportMessageDialog.kt
+++ b/app/src/main/java/chat/revolt/screens/chat/dialogs/safety/ReportMessageDialog.kt
@@ -11,9 +11,6 @@ import androidx.compose.foundation.layout.heightIn
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Check
-import androidx.compose.material.icons.filled.Close
 import androidx.compose.material3.AlertDialog
 import androidx.compose.material3.CircularProgressIndicator
 import androidx.compose.material3.DropdownMenuItem
@@ -34,6 +31,7 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.platform.testTag
+import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextAlign
@@ -272,7 +270,7 @@ fun ReportMessageDialog(onDismiss: () -> Unit, messageId: String) {
                 },
                 icon = {
                     Icon(
-                        imageVector = Icons.Default.Check,
+                        painter = painterResource(R.drawable.icn_check_24dp),
                         contentDescription = null, // decorative
                         tint = MaterialTheme.colorScheme.primary
                     )
@@ -339,7 +337,7 @@ fun ReportMessageDialog(onDismiss: () -> Unit, messageId: String) {
                 },
                 icon = {
                     Icon(
-                        imageVector = Icons.Default.Close,
+                        painter = painterResource(R.drawable.icn_error_24dp),
                         contentDescription = null, // decorative
                         tint = MaterialTheme.colorScheme.primary
                     )
diff --git a/app/src/main/java/chat/revolt/screens/chat/dialogs/safety/ReportServerDialog.kt b/app/src/main/java/chat/revolt/screens/chat/dialogs/safety/ReportServerDialog.kt
index f9f982a0..d7bf403c 100644
--- a/app/src/main/java/chat/revolt/screens/chat/dialogs/safety/ReportServerDialog.kt
+++ b/app/src/main/java/chat/revolt/screens/chat/dialogs/safety/ReportServerDialog.kt
@@ -26,6 +26,7 @@ import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.testTag
+import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextAlign
@@ -236,7 +237,7 @@ fun ReportServerDialog(onDismiss: () -> Unit, serverId: String) {
                 },
                 icon = {
                     Icon(
-                        imageVector = Icons.Default.Check,
+                        painter = painterResource(R.drawable.icn_check_24dp),
                         contentDescription = null, // decorative
                         tint = MaterialTheme.colorScheme.primary
                     )
@@ -281,7 +282,7 @@ fun ReportServerDialog(onDismiss: () -> Unit, serverId: String) {
                 },
                 icon = {
                     Icon(
-                        imageVector = Icons.Default.Close,
+                        painter = painterResource(R.drawable.icn_close_24dp),
                         contentDescription = null, // decorative
                         tint = MaterialTheme.colorScheme.primary
                     )
diff --git a/app/src/main/java/chat/revolt/screens/chat/dialogs/safety/ReportUserDialog.kt b/app/src/main/java/chat/revolt/screens/chat/dialogs/safety/ReportUserDialog.kt
index 9fddd36c..cf8c7a43 100644
--- a/app/src/main/java/chat/revolt/screens/chat/dialogs/safety/ReportUserDialog.kt
+++ b/app/src/main/java/chat/revolt/screens/chat/dialogs/safety/ReportUserDialog.kt
@@ -5,9 +5,6 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Check
-import androidx.compose.material.icons.filled.Close
 import androidx.compose.material3.AlertDialog
 import androidx.compose.material3.CircularProgressIndicator
 import androidx.compose.material3.DropdownMenuItem
@@ -27,6 +24,7 @@ import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.testTag
+import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextAlign
@@ -234,7 +232,7 @@ fun ReportUserDialog(onDismiss: () -> Unit, userId: String) {
                 },
                 icon = {
                     Icon(
-                        imageVector = Icons.Default.Check,
+                        painter = painterResource(R.drawable.icn_check_24dp),
                         contentDescription = null, // decorative
                         tint = MaterialTheme.colorScheme.primary
                     )
@@ -301,7 +299,7 @@ fun ReportUserDialog(onDismiss: () -> Unit, userId: String) {
                 },
                 icon = {
                     Icon(
-                        imageVector = Icons.Default.Close,
+                        painter = painterResource(R.drawable.icn_error_24dp),
                         contentDescription = null, // decorative
                         tint = MaterialTheme.colorScheme.primary
                     )
diff --git a/app/src/main/java/chat/revolt/screens/chat/views/FriendsScreen.kt b/app/src/main/java/chat/revolt/screens/chat/views/FriendsScreen.kt
index 21ff0ab9..38e54d16 100644
--- a/app/src/main/java/chat/revolt/screens/chat/views/FriendsScreen.kt
+++ b/app/src/main/java/chat/revolt/screens/chat/views/FriendsScreen.kt
@@ -28,8 +28,6 @@ import androidx.compose.foundation.text.KeyboardOptions
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Add
 import androidx.compose.material.icons.filled.Close
-import androidx.compose.material.icons.filled.Menu
-import androidx.compose.material.icons.filled.MoreVert
 import androidx.compose.material3.Button
 import androidx.compose.material3.DropdownMenu
 import androidx.compose.material3.DropdownMenuItem
@@ -500,7 +498,7 @@ fun FriendsScreen(topNav: NavController, useDrawer: Boolean, onDrawerClicked: ()
                                 onDrawerClicked()
                             }) {
                                 Icon(
-                                    imageVector = Icons.Default.Menu,
+                                    painter = painterResource(R.drawable.icn_menu_24dp),
                                     contentDescription = stringResource(id = R.string.menu)
                                 )
                             }
@@ -511,7 +509,7 @@ fun FriendsScreen(topNav: NavController, useDrawer: Boolean, onDrawerClicked: ()
                             overflowMenuShown = true
                         }) {
                             Icon(
-                                imageVector = Icons.Default.MoreVert,
+                                painter = painterResource(R.drawable.icn_more_vert_24dp),
                                 contentDescription = stringResource(R.string.menu)
                             )
                         }
@@ -720,7 +718,7 @@ fun FriendsScreen(topNav: NavController, useDrawer: Boolean, onDrawerClicked: ()
                     },
                     icon = {
                         Icon(
-                            painterResource(R.drawable.ic_account_multiple_plus_24dp),
+                            painterResource(R.drawable.icn_group_add_24dp),
                             contentDescription = null
                         )
                     },
@@ -734,7 +732,7 @@ fun FriendsScreen(topNav: NavController, useDrawer: Boolean, onDrawerClicked: ()
                     },
                     icon = {
                         Icon(
-                            painterResource(R.drawable.ic_qrcode_scan_24dp),
+                            painterResource(R.drawable.icn_qr_code_scanner_24dp),
                             contentDescription = null
                         )
                     },
@@ -748,7 +746,7 @@ fun FriendsScreen(topNav: NavController, useDrawer: Boolean, onDrawerClicked: ()
                     },
                     icon = {
                         Icon(
-                            painterResource(R.drawable.ic_pound_24dp),
+                            painterResource(R.drawable.icn_tag_24dp),
                             contentDescription = null
                         )
                     },
diff --git a/app/src/main/java/chat/revolt/screens/chat/views/NoCurrentChannelScreen.kt b/app/src/main/java/chat/revolt/screens/chat/views/NoCurrentChannelScreen.kt
index 20e1432f..5354c8a8 100644
--- a/app/src/main/java/chat/revolt/screens/chat/views/NoCurrentChannelScreen.kt
+++ b/app/src/main/java/chat/revolt/screens/chat/views/NoCurrentChannelScreen.kt
@@ -22,6 +22,7 @@ import androidx.compose.material3.TopAppBar
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
@@ -53,7 +54,7 @@ fun NoCurrentChannelScreen(useDrawer: Boolean, onDrawerClicked: () -> Unit) {
                                 onDrawerClicked()
                             }) {
                                 Icon(
-                                    imageVector = Icons.Default.Menu,
+                                    painter = painterResource(R.drawable.icn_menu_24dp),
                                     contentDescription = stringResource(id = R.string.menu)
                                 )
                             }
diff --git a/app/src/main/java/chat/revolt/screens/chat/views/OverviewScreen.kt b/app/src/main/java/chat/revolt/screens/chat/views/OverviewScreen.kt
index 2b0769b8..31622127 100644
--- a/app/src/main/java/chat/revolt/screens/chat/views/OverviewScreen.kt
+++ b/app/src/main/java/chat/revolt/screens/chat/views/OverviewScreen.kt
@@ -22,10 +22,6 @@ import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.statusBars
 import androidx.compose.foundation.lazy.staggeredgrid.LazyVerticalStaggeredGrid
 import androidx.compose.foundation.lazy.staggeredgrid.StaggeredGridCells
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Close
-import androidx.compose.material.icons.filled.Menu
-import androidx.compose.material.icons.filled.Settings
 import androidx.compose.material3.CenterAlignedTopAppBar
 import androidx.compose.material3.CircularProgressIndicator
 import androidx.compose.material3.ExperimentalMaterial3Api
@@ -131,7 +127,7 @@ fun OverviewScreen(
                                 onDrawerClicked()
                             }) {
                                 Icon(
-                                    imageVector = Icons.Default.Menu,
+                                    painter = painterResource(R.drawable.icn_menu_24dp),
                                     contentDescription = stringResource(id = R.string.menu)
                                 )
                             }
@@ -149,7 +145,7 @@ fun OverviewScreen(
             NonIdealState(
                 icon = { size ->
                     Icon(
-                        imageVector = Icons.Default.Close,
+                        painter = painterResource(R.drawable.icn_error_24dp),
                         contentDescription = null,
                         modifier = Modifier.size(size)
                     )
@@ -219,7 +215,7 @@ fun OverviewScreen(
                                     horizontalArrangement = Arrangement.spacedBy(8.dp)
                                 ) {
                                     Icon(
-                                        imageVector = Icons.Default.Settings,
+                                        painter = painterResource(R.drawable.icn_settings_24dp),
                                         contentDescription = null,
                                         modifier = Modifier.size(22.dp)
                                     )
@@ -242,7 +238,7 @@ fun OverviewScreen(
                                     horizontalArrangement = Arrangement.spacedBy(8.dp)
                                 ) {
                                     Icon(
-                                        painter = painterResource(R.drawable.ic_share_24dp),
+                                        painter = painterResource(R.drawable.icn_ios_share_24dp),
                                         contentDescription = null,
                                         modifier = Modifier.size(22.dp)
                                     )
@@ -266,7 +262,7 @@ fun OverviewScreen(
                                     horizontalArrangement = Arrangement.spacedBy(8.dp)
                                 ) {
                                     Icon(
-                                        painter = painterResource(R.drawable.ic_flask_24dp),
+                                        painter = painterResource(R.drawable.icn_wand_shine_24dp),
                                         contentDescription = null,
                                         modifier = Modifier.size(22.dp)
                                     )
@@ -294,7 +290,7 @@ fun OverviewScreen(
                                     horizontalArrangement = Arrangement.spacedBy(8.dp)
                                 ) {
                                     Icon(
-                                        painter = painterResource(R.drawable.ic_creation_24dp),
+                                        painter = painterResource(R.drawable.icn_star_shine_24dp),
                                         contentDescription = null,
                                         modifier = Modifier.size(22.dp)
                                     )
diff --git a/app/src/main/java/chat/revolt/screens/chat/views/channel/ChannelScreen.kt b/app/src/main/java/chat/revolt/screens/chat/views/channel/ChannelScreen.kt
index 93643853..72633ae1 100644
--- a/app/src/main/java/chat/revolt/screens/chat/views/channel/ChannelScreen.kt
+++ b/app/src/main/java/chat/revolt/screens/chat/views/channel/ChannelScreen.kt
@@ -53,10 +53,7 @@ import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.foundation.text.InlineTextContent
 import androidx.compose.foundation.text.appendInlineContent
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.automirrored.filled.ArrowBack
-import androidx.compose.material.icons.automirrored.filled.KeyboardArrowRight
 import androidx.compose.material.icons.filled.Close
-import androidx.compose.material.icons.filled.Edit
 import androidx.compose.material.icons.filled.Menu
 import androidx.compose.material3.AssistChip
 import androidx.compose.material3.Button
@@ -617,7 +614,7 @@ fun ChannelScreen(
                                 }
 
                                 Icon(
-                                    imageVector = Icons.AutoMirrored.Default.KeyboardArrowRight,
+                                    painter = painterResource(R.drawable.icn_keyboard_arrow_right_24dp),
                                     contentDescription = null,
                                     modifier = Modifier
                                         .size(16.dp)
@@ -631,7 +628,7 @@ fun ChannelScreen(
                         if (useDrawer) {
                             IconButton(onClick = onToggleDrawer) {
                                 Icon(
-                                    imageVector = Icons.Default.Menu,
+                                    painter = painterResource(R.drawable.icn_menu_24dp),
                                     contentDescription = stringResource(id = R.string.menu)
                                 )
                             }
@@ -639,7 +636,7 @@ fun ChannelScreen(
                         if (useBackButton) {
                             IconButton(onClick = backButtonAction ?: {}) {
                                 Icon(
-                                    imageVector = Icons.AutoMirrored.Default.ArrowBack,
+                                    painter = painterResource(R.drawable.icn_arrow_back_24dp),
                                     contentDescription = stringResource(id = R.string.back)
                                 )
                             }
@@ -856,7 +853,7 @@ fun ChannelScreen(
                                 containerColor = MaterialTheme.colorScheme.surfaceVariant
                             ) {
                                 Icon(
-                                    painter = painterResource(R.drawable.ic_arrow_down_24dp),
+                                    painter = painterResource(R.drawable.icn_south_24dp),
                                     contentDescription = stringResource(R.string.scroll_to_bottom)
                                 )
                             }
@@ -1011,13 +1008,13 @@ fun ChannelScreen(
                                                 },
                                                 leadingIcon = {
                                                     Icon(
-                                                        imageVector = Icons.Default.Edit,
+                                                        painter = painterResource(R.drawable.icn_edit_24dp),
                                                         contentDescription = null
                                                     )
                                                 },
                                                 trailingIcon = {
                                                     Icon(
-                                                        imageVector = Icons.Default.Close,
+                                                        painter = painterResource(R.drawable.icn_close_24dp),
                                                         contentDescription = stringResource(R.string.message_field_editing_message_cancel_alt),
                                                         tint = MaterialTheme.colorScheme.onSurface,
                                                         modifier = Modifier.alpha(0.8f)
@@ -1084,7 +1081,7 @@ fun ChannelScreen(
                                         DropdownMenuItem(
                                             leadingIcon = {
                                                 Icon(
-                                                    painter = painterResource(R.drawable.ic_paperclip_24dp),
+                                                    painter = painterResource(R.drawable.icn_attach_file_24dp),
                                                     contentDescription = null // Provided by text below
                                                 )
                                             },
@@ -1097,7 +1094,7 @@ fun ChannelScreen(
                                         DropdownMenuItem(
                                             leadingIcon = {
                                                 Icon(
-                                                    painter = painterResource(R.drawable.ic_camera_24dp),
+                                                    painter = painterResource(R.drawable.icn_camera_24dp),
                                                     contentDescription = null // Provided by text below
                                                 )
                                             },
@@ -1110,7 +1107,7 @@ fun ChannelScreen(
                                         DropdownMenuItem(
                                             leadingIcon = {
                                                 Icon(
-                                                    painter = painterResource(R.drawable.ic_image_multiple_24dp),
+                                                    painter = painterResource(R.drawable.icn_photo_library_24dp),
                                                     contentDescription = null // Provided by text below
                                                 )
                                             },
diff --git a/app/src/main/java/chat/revolt/screens/chat/views/channel/ChannelScreenAgeGate.kt b/app/src/main/java/chat/revolt/screens/chat/views/channel/ChannelScreenAgeGate.kt
index 3ffb6a91..23898040 100644
--- a/app/src/main/java/chat/revolt/screens/chat/views/channel/ChannelScreenAgeGate.kt
+++ b/app/src/main/java/chat/revolt/screens/chat/views/channel/ChannelScreenAgeGate.kt
@@ -122,7 +122,7 @@ fun ChannelScreenAgeGate(
         verticalArrangement = Arrangement.spacedBy(16.dp, Alignment.CenterVertically)
     ) {
         Icon(
-            painter = painterResource(R.drawable.ic_comment_alert_24dp),
+            painter = painterResource(R.drawable.icn_eda_24dp),
             contentDescription = null,
             modifier = Modifier.size(48.dp),
         )
diff --git a/app/src/main/java/chat/revolt/screens/create/CreateGroupScreen.kt b/app/src/main/java/chat/revolt/screens/create/CreateGroupScreen.kt
index 79694c67..cdbb61ed 100644
--- a/app/src/main/java/chat/revolt/screens/create/CreateGroupScreen.kt
+++ b/app/src/main/java/chat/revolt/screens/create/CreateGroupScreen.kt
@@ -10,10 +10,6 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.imePadding
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.automirrored.filled.ArrowBack
-import androidx.compose.material.icons.filled.Check
-import androidx.compose.material.icons.filled.Search
 import androidx.compose.material3.Checkbox
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.FloatingActionButton
@@ -32,6 +28,7 @@ import androidx.compose.runtime.mutableStateListOf
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
@@ -124,7 +121,7 @@ fun CreateGroupScreen(
                         navController.popBackStack()
                     }) {
                         Icon(
-                            imageVector = Icons.AutoMirrored.Default.ArrowBack,
+                            painter = painterResource(R.drawable.icn_arrow_back_24dp),
                             contentDescription = stringResource(id = R.string.back)
                         )
                     }
@@ -139,7 +136,7 @@ fun CreateGroupScreen(
             ) {
                 FloatingActionButton(onClick = { viewModel.createGroup(navController::popBackStack) }) {
                     Icon(
-                        imageVector = Icons.Default.Check,
+                        painter = painterResource(R.drawable.icn_check_24dp),
                         contentDescription = stringResource(R.string.create_group_action)
                     )
                 }
@@ -180,7 +177,7 @@ fun CreateGroupScreen(
                 onValueChange = { viewModel.updateFriendSearchQuery(it) },
                 leadingIcon = {
                     Icon(
-                        imageVector = Icons.Default.Search,
+                        painter = painterResource(R.drawable.icn_search_24dp),
                         contentDescription = null
                     )
                 },
diff --git a/app/src/main/java/chat/revolt/screens/labs/LabsHomeScreen.kt b/app/src/main/java/chat/revolt/screens/labs/LabsHomeScreen.kt
index 567a4910..3f878803 100644
--- a/app/src/main/java/chat/revolt/screens/labs/LabsHomeScreen.kt
+++ b/app/src/main/java/chat/revolt/screens/labs/LabsHomeScreen.kt
@@ -11,9 +11,6 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.automirrored.filled.ArrowBack
-import androidx.compose.material.icons.filled.Home
-import androidx.compose.material.icons.filled.Menu
 import androidx.compose.material.icons.filled.PlayArrow
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.HorizontalDivider
@@ -32,11 +29,13 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.saveable.rememberSaveable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.SpanStyle
 import androidx.compose.ui.text.buildAnnotatedString
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import androidx.navigation.NavController
+import chat.revolt.R
 import chat.revolt.ui.theme.FragmentMono
 
 enum class LabsHomeScreenTab {
@@ -62,7 +61,7 @@ fun LabsHomeScreen(navController: NavController, topNav: NavController) {
                         topNav.popBackStack()
                     }) {
                         Icon(
-                            imageVector = Icons.AutoMirrored.Default.ArrowBack,
+                            painter = painterResource(R.drawable.icn_arrow_back_24dp),
                             contentDescription = "Back"
                         )
                     }
@@ -76,7 +75,7 @@ fun LabsHomeScreen(navController: NavController, topNav: NavController) {
                     onClick = { currentTab.value = LabsHomeScreenTab.Home },
                     icon = {
                         Icon(
-                            imageVector = Icons.Default.Home,
+                            painter = painterResource(R.drawable.icn_home_24dp),
                             contentDescription = null,
                         )
                     },
@@ -89,7 +88,7 @@ fun LabsHomeScreen(navController: NavController, topNav: NavController) {
                     onClick = { currentTab.value = LabsHomeScreenTab.Mockups },
                     icon = {
                         Icon(
-                            imageVector = Icons.Default.Menu,
+                            painter = painterResource(R.drawable.icn_menu_24dp),
                             contentDescription = null,
                         )
                     },
@@ -102,7 +101,7 @@ fun LabsHomeScreen(navController: NavController, topNav: NavController) {
                     onClick = { currentTab.value = LabsHomeScreenTab.Sandboxes },
                     icon = {
                         Icon(
-                            imageVector = Icons.Default.PlayArrow,
+                            painter = painterResource(R.drawable.icn_play_arrow_24dp),
                             contentDescription = null,
                         )
                     },
@@ -147,15 +146,6 @@ fun LabsHomeScreen(navController: NavController, topNav: NavController) {
                     Column(
                         modifier = Modifier.verticalScroll(rememberScrollState())
                     ) {
-                        ListItem(
-                            headlineContent = {
-                                Text("Call Screen")
-                            },
-                            modifier = Modifier.clickable {
-                                navController.navigate("mockups/call")
-                            }
-                        )
-                        HorizontalDivider()
                         ListItem(
                             headlineContent = {
                                 Text("New Login Experience")
diff --git a/app/src/main/java/chat/revolt/screens/labs/LabsRootScreen.kt b/app/src/main/java/chat/revolt/screens/labs/LabsRootScreen.kt
index bcaf0b6f..a4f81a9e 100644
--- a/app/src/main/java/chat/revolt/screens/labs/LabsRootScreen.kt
+++ b/app/src/main/java/chat/revolt/screens/labs/LabsRootScreen.kt
@@ -12,7 +12,6 @@ import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
 import androidx.navigation.compose.rememberNavController
 import chat.revolt.api.settings.FeatureFlags
-import chat.revolt.screens.labs.ui.mockups.CallScreenMockup
 import chat.revolt.screens.labs.ui.mockups.NewLoginExperienceMockup
 import chat.revolt.screens.labs.ui.sandbox.CoreLibSandbox
 import chat.revolt.screens.labs.ui.sandbox.GradientEditorSandbox
@@ -64,9 +63,6 @@ fun LabsRootScreen(topNav: NavController) {
                     LabsHomeScreen(labsNav, topNav)
                 }
 
-                composable("mockups/call") {
-                    CallScreenMockup()
-                }
                 composable("mockups/newlogin") {
                     NewLoginExperienceMockup(labsNav)
                 }
diff --git a/app/src/main/java/chat/revolt/screens/labs/ui/mockups/CallScreenMockup.kt b/app/src/main/java/chat/revolt/screens/labs/ui/mockups/CallScreenMockup.kt
deleted file mode 100644
index ae95c189..00000000
--- a/app/src/main/java/chat/revolt/screens/labs/ui/mockups/CallScreenMockup.kt
+++ /dev/null
@@ -1,261 +0,0 @@
-package chat.revolt.screens.labs.ui.mockups
-
-import androidx.compose.animation.animateColorAsState
-import androidx.compose.animation.core.spring
-import androidx.compose.foundation.background
-import androidx.compose.foundation.interaction.MutableInteractionSource
-import androidx.compose.foundation.interaction.collectIsPressedAsState
-import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.BoxWithConstraints
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.heightIn
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.safeDrawingPadding
-import androidx.compose.foundation.layout.size
-import androidx.compose.foundation.layout.width
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.automirrored.filled.KeyboardArrowRight
-import androidx.compose.material.icons.filled.KeyboardArrowDown
-import androidx.compose.material3.Button
-import androidx.compose.material3.ButtonDefaults
-import androidx.compose.material3.Checkbox
-import androidx.compose.material3.Icon
-import androidx.compose.material3.IconButton
-import androidx.compose.material3.MaterialTheme
-import androidx.compose.material3.Text
-import androidx.compose.material3.TextButton
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.mutableStateOf
-import androidx.compose.runtime.remember
-import androidx.compose.runtime.setValue
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.alpha
-import androidx.compose.ui.draw.clip
-import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.text.style.TextOverflow
-import androidx.compose.ui.unit.dp
-import androidx.compose.ui.window.Dialog
-import chat.revolt.R
-import chat.revolt.api.schemas.ChannelType
-import chat.revolt.composables.screens.chat.ChannelIcon
-import chat.revolt.screens.labs.LabsFeature
-
-@LabsFeature
-@Composable
-fun CallScreenMockup() {
-    var showOptions by remember { mutableStateOf(false) }
-    var pushToTalk by remember { mutableStateOf(false) }
-
-    val interactionSource = remember { MutableInteractionSource() }
-    val pushToTalkIsHeld by interactionSource.collectIsPressedAsState()
-
-    val pttBackground by animateColorAsState(
-        targetValue = if (pushToTalkIsHeld) {
-            MaterialTheme.colorScheme.primaryContainer
-        } else {
-            MaterialTheme.colorScheme.secondaryContainer
-        },
-        animationSpec = spring(),
-        label = "pttBackground"
-    )
-    val pttText by animateColorAsState(
-        targetValue = if (pushToTalkIsHeld) {
-            MaterialTheme.colorScheme.onPrimaryContainer
-        } else {
-            MaterialTheme.colorScheme.onSecondaryContainer
-        },
-        animationSpec = spring(),
-        label = "pttText"
-    )
-
-    if (showOptions) {
-        Dialog(
-            onDismissRequest = { showOptions = false }
-        ) {
-            BoxWithConstraints {
-                Column(
-                    modifier = Modifier
-                        .clip(MaterialTheme.shapes.large)
-                        .background(MaterialTheme.colorScheme.surface)
-                        .padding(24.dp)
-                        .width(maxWidth * 0.85f)
-                        .heightIn(max = maxHeight * 0.85f)
-                ) {
-                    Row {
-                        Checkbox(
-                            checked = pushToTalk,
-                            onCheckedChange = { pushToTalk = it },
-                            modifier = Modifier
-                                .padding(16.dp)
-                        )
-                        Text(
-                            text = "Push to talk",
-                            modifier = Modifier
-                                .padding(16.dp)
-                        )
-                    }
-                }
-            }
-        }
-    }
-
-    Column(
-        modifier = Modifier
-            .fillMaxSize()
-            .safeDrawingPadding()
-    ) {
-        Row(
-            verticalAlignment = Alignment.CenterVertically
-        ) {
-            Row(
-                modifier = Modifier
-                    .weight(1f)
-                    .padding(vertical = 4.dp, horizontal = 4.dp),
-                verticalAlignment = Alignment.CenterVertically
-            ) {
-                Spacer(
-                    modifier = Modifier
-                        .height(48.dp)
-                        .width(12.dp)
-                )
-
-                ChannelIcon(
-                    channelType = ChannelType.VoiceChannel,
-                    modifier = Modifier.alpha(0.6f)
-                )
-
-                Spacer(modifier = Modifier.width(8.dp))
-
-                Row(
-                    modifier = Modifier.weight(1f),
-                    verticalAlignment = Alignment.CenterVertically
-                ) {
-                    Text(
-                        text = "Voice Channel",
-                        fontWeight = FontWeight.Medium,
-                        maxLines = 1,
-                        overflow = TextOverflow.Ellipsis
-                    )
-
-                    Spacer(modifier = Modifier.width(4.dp))
-
-                    Icon(
-                        imageVector = Icons.AutoMirrored.Default.KeyboardArrowRight,
-                        contentDescription = stringResource(R.string.menu),
-                        modifier = Modifier
-                            .size(18.dp)
-                            .alpha(0.4f)
-                    )
-                }
-            }
-            IconButton(onClick = {
-                showOptions = true
-            }) {
-                Icon(
-                    imageVector = Icons.Default.KeyboardArrowDown,
-                    contentDescription = null
-                )
-            }
-            Spacer(modifier = Modifier.width(4.dp))
-        }
-        Column(
-            modifier = Modifier
-                .weight(1f)
-        ) {
-        }
-        if (pushToTalk) {
-            Row(
-                modifier = Modifier
-                    .padding(16.dp),
-                horizontalArrangement = Arrangement.spacedBy(16.dp)
-            ) {
-                TextButton(
-                    onClick = {},
-                ) {
-                    Icon(
-                        painter = painterResource(R.drawable.ic_headphones_24dp),
-                        contentDescription = null
-                    )
-                    Spacer(modifier = Modifier.width(8.dp))
-                    Text(
-                        text = "Galaxy Buds Live",
-                    )
-                }
-            }
-            Row(
-                modifier = Modifier
-                    .padding(horizontal = 16.dp),
-                horizontalArrangement = Arrangement.spacedBy(16.dp)
-            ) {
-                Button(
-                    onClick = {},
-                    colors = ButtonDefaults.buttonColors(
-                        containerColor = pttBackground,
-                        contentColor = pttText
-                    ),
-                    interactionSource = interactionSource,
-                    modifier = Modifier
-                        .weight(1f)
-                ) {
-                    Icon(
-                        painter = painterResource(R.drawable.ic_gesture_tap_button_24dp),
-                        contentDescription = null
-                    )
-                    Spacer(modifier = Modifier.width(8.dp))
-                    Text(
-                        text = "Hold to talk",
-                    )
-                }
-            }
-        }
-        Row(
-            modifier = Modifier
-                .padding(16.dp),
-            horizontalArrangement = Arrangement.spacedBy(16.dp)
-        ) {
-            if (!pushToTalk) {
-                Button(
-                    onClick = {}
-                ) {
-                    Icon(
-                        painter = painterResource(R.drawable.ic_microphone_off_24dp),
-                        contentDescription = null
-                    )
-                }
-            }
-
-            Button(
-                onClick = {},
-                colors = ButtonDefaults.buttonColors(
-                    containerColor = MaterialTheme.colorScheme.errorContainer,
-                    contentColor = MaterialTheme.colorScheme.onErrorContainer
-                ),
-                modifier = Modifier
-                    .weight(1f)
-            ) {
-                Text(
-                    text = "Leave call",
-                )
-            }
-
-            if (!pushToTalk) {
-                Button(
-                    onClick = {}
-                ) {
-                    Icon(
-                        painter = painterResource(R.drawable.ic_headphones_24dp),
-                        contentDescription = null
-                    )
-                }
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/chat/revolt/screens/login/LoginScreen.kt b/app/src/main/java/chat/revolt/screens/login/LoginScreen.kt
index 868fdde7..9b5931f5 100644
--- a/app/src/main/java/chat/revolt/screens/login/LoginScreen.kt
+++ b/app/src/main/java/chat/revolt/screens/login/LoginScreen.kt
@@ -252,14 +252,14 @@ fun LoginScreen(navController: NavController, viewModel: LoginViewModel = hiltVi
                             when {
                                 showPassword.value -> {
                                     Icon(
-                                        painter = painterResource(R.drawable.ic_eye_off_24dp),
+                                        painter = painterResource(R.drawable.icn_visibility_off_24dp),
                                         contentDescription = stringResource(R.string.hide_password)
                                     )
                                 }
 
                                 else -> {
                                     Icon(
-                                        painter = painterResource(R.drawable.ic_eye_24dp),
+                                        painter = painterResource(R.drawable.icn_visibility_24dp),
                                         contentDescription = stringResource(R.string.show_password)
                                     )
                                 }
diff --git a/app/src/main/java/chat/revolt/screens/main/ConversationsScreen.kt b/app/src/main/java/chat/revolt/screens/main/ConversationsScreen.kt
index bebe1e88..22cb903e 100644
--- a/app/src/main/java/chat/revolt/screens/main/ConversationsScreen.kt
+++ b/app/src/main/java/chat/revolt/screens/main/ConversationsScreen.kt
@@ -103,7 +103,7 @@ fun ConversationsScreen(navController: NavController) {
                                 }
                                 Badge {
                                     Icon(
-                                        painter = painterResource(R.drawable.ic_pin_24dp),
+                                        painter = painterResource(R.drawable.icn_keep_24dp),
                                         contentDescription = null,
                                         modifier = Modifier.size(12.dp)
                                     )
@@ -118,11 +118,12 @@ fun ConversationsScreen(navController: NavController) {
                 }
             }
             items(1000) {
-                Text("Conversation $it", modifier = Modifier
-                    .clickable {
-                        navController.navigate("main/conversation/${it}")
-                    }
-                    .fillMaxWidth())
+                Text(
+                    "Conversation $it", modifier = Modifier
+                        .clickable {
+                            navController.navigate("main/conversation/${it}")
+                        }
+                        .fillMaxWidth())
             }
         }
     }
diff --git a/app/src/main/java/chat/revolt/screens/main/MainScreen.kt b/app/src/main/java/chat/revolt/screens/main/MainScreen.kt
index eb98221b..afb3b3d1 100644
--- a/app/src/main/java/chat/revolt/screens/main/MainScreen.kt
+++ b/app/src/main/java/chat/revolt/screens/main/MainScreen.kt
@@ -38,11 +38,7 @@ fun MainScreen(navController: NavController) {
                     icon = {
                         Icon(
                             painter = painterResource(
-                                if (currentTab == MainScreenTab.Communities) {
-                                    R.drawable.ic_account_group_24dp
-                                } else {
-                                    R.drawable.ic_account_group_outline_24dp
-                                }
+                                R.drawable.icn_tag_24dp
                             ),
                             contentDescription = null,
                         )
@@ -58,9 +54,9 @@ fun MainScreen(navController: NavController) {
                         Icon(
                             painter = painterResource(
                                 if (currentTab == MainScreenTab.Conversations) {
-                                    R.drawable.ic_forum_24dp
+                                    R.drawable.icn_forum_24dp__fill
                                 } else {
-                                    R.drawable.ic_forum_outline_24dp
+                                    R.drawable.icn_forum_24dp
                                 }
                             ),
                             contentDescription = null,
@@ -77,9 +73,9 @@ fun MainScreen(navController: NavController) {
                         Icon(
                             painter = painterResource(
                                 if (currentTab == MainScreenTab.Overview) {
-                                    R.drawable.ic_creation_24dp
+                                    R.drawable.icn_star_shine_24dp__fill
                                 } else {
-                                    R.drawable.ic_creation_outline_24dp
+                                    R.drawable.icn_star_shine_24dp
                                 }
                             ),
                             contentDescription = null,
diff --git a/app/src/main/java/chat/revolt/screens/services/DiscoverScreen.kt b/app/src/main/java/chat/revolt/screens/services/DiscoverScreen.kt
index 5aa88c56..119406d0 100644
--- a/app/src/main/java/chat/revolt/screens/services/DiscoverScreen.kt
+++ b/app/src/main/java/chat/revolt/screens/services/DiscoverScreen.kt
@@ -13,6 +13,7 @@ import androidx.compose.material3.Text
 import androidx.compose.material3.TopAppBar
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.navigation.NavController
@@ -37,7 +38,7 @@ fun DiscoverScreen(navController: NavController) {
                         navController.popBackStack()
                     }) {
                         Icon(
-                            imageVector = Icons.AutoMirrored.Default.ArrowBack,
+                            painter = painterResource(R.drawable.icn_arrow_back_24dp),
                             contentDescription = stringResource(id = R.string.back)
                         )
                     }
diff --git a/app/src/main/java/chat/revolt/screens/settings/AppearanceSettingsScreen.kt b/app/src/main/java/chat/revolt/screens/settings/AppearanceSettingsScreen.kt
index 98c46e82..cd7fe0a4 100644
--- a/app/src/main/java/chat/revolt/screens/settings/AppearanceSettingsScreen.kt
+++ b/app/src/main/java/chat/revolt/screens/settings/AppearanceSettingsScreen.kt
@@ -23,9 +23,6 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.automirrored.filled.ArrowBack
-import androidx.compose.material.icons.automirrored.filled.KeyboardArrowRight
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
@@ -292,7 +289,7 @@ fun AppearanceSettingsScreen(
                         navController.popBackStack()
                     }) {
                         Icon(
-                            imageVector = Icons.AutoMirrored.Default.ArrowBack,
+                            painter = painterResource(R.drawable.icn_arrow_back_24dp),
                             contentDescription = stringResource(id = R.string.back)
                         )
                     }
@@ -425,7 +422,7 @@ fun AppearanceSettingsScreen(
                     verticalAlignment = Alignment.CenterVertically
                 ) {
                     Icon(
-                        imageVector = Icons.AutoMirrored.Default.KeyboardArrowRight,
+                        painter = painterResource(R.drawable.icn_keyboard_arrow_right_24dp),
                         contentDescription = null,
                         modifier = Modifier
                             .padding(start = 20.dp, end = 4.dp)
@@ -457,7 +454,7 @@ fun AppearanceSettingsScreen(
                                 modifier = Modifier.weight(1f)
                             ) {
                                 Icon(
-                                    painter = painterResource(R.drawable.ic_folder_24dp),
+                                    painter = painterResource(R.drawable.icn_file_open_24dp),
                                     contentDescription = null
                                 )
 
@@ -475,7 +472,7 @@ fun AppearanceSettingsScreen(
                                 modifier = Modifier.weight(1f)
                             ) {
                                 Icon(
-                                    painter = painterResource(R.drawable.ic_content_save_24dp),
+                                    painter = painterResource(R.drawable.icn_file_export_24dp),
                                     contentDescription = null
                                 )
 
diff --git a/app/src/main/java/chat/revolt/screens/settings/ChangelogsScreen.kt b/app/src/main/java/chat/revolt/screens/settings/ChangelogsScreen.kt
index b3400497..6dd235ec 100644
--- a/app/src/main/java/chat/revolt/screens/settings/ChangelogsScreen.kt
+++ b/app/src/main/java/chat/revolt/screens/settings/ChangelogsScreen.kt
@@ -12,8 +12,6 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.automirrored.filled.ArrowBack
 import androidx.compose.material3.CircularProgressIndicator
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.HorizontalDivider
@@ -34,6 +32,7 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.alpha
 import androidx.compose.ui.input.nestedscroll.nestedScroll
+import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
@@ -128,7 +127,7 @@ fun ChangelogsSettingsScreen(
                         navController.popBackStack()
                     }) {
                         Icon(
-                            imageVector = Icons.AutoMirrored.Default.ArrowBack,
+                            painter = painterResource(R.drawable.icn_arrow_back_24dp),
                             contentDescription = stringResource(id = R.string.back)
                         )
                     }
diff --git a/app/src/main/java/chat/revolt/screens/settings/ChatSettingsScreen.kt b/app/src/main/java/chat/revolt/screens/settings/ChatSettingsScreen.kt
index 83b0ff8c..96ab36aa 100644
--- a/app/src/main/java/chat/revolt/screens/settings/ChatSettingsScreen.kt
+++ b/app/src/main/java/chat/revolt/screens/settings/ChatSettingsScreen.kt
@@ -29,6 +29,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.input.nestedscroll.nestedScroll
+import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
@@ -87,7 +88,7 @@ fun ChatSettingsScreen(
                         navController.popBackStack()
                     }) {
                         Icon(
-                            imageVector = Icons.AutoMirrored.Default.ArrowBack,
+                            painter = painterResource(R.drawable.icn_arrow_back_24dp),
                             contentDescription = stringResource(id = R.string.back)
                         )
                     }
diff --git a/app/src/main/java/chat/revolt/screens/settings/DebugSettingsScreen.kt b/app/src/main/java/chat/revolt/screens/settings/DebugSettingsScreen.kt
index 525fc048..44e33dea 100644
--- a/app/src/main/java/chat/revolt/screens/settings/DebugSettingsScreen.kt
+++ b/app/src/main/java/chat/revolt/screens/settings/DebugSettingsScreen.kt
@@ -40,6 +40,7 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
@@ -202,7 +203,7 @@ fun DebugSettingsScreen(
                         navController.popBackStack()
                     }) {
                         Icon(
-                            imageVector = Icons.AutoMirrored.Default.ArrowBack,
+                            painter = painterResource(R.drawable.icn_arrow_back_24dp),
                             contentDescription = stringResource(id = R.string.back)
                         )
                     }
diff --git a/app/src/main/java/chat/revolt/screens/settings/LanguagePickerSettingsScreen.kt b/app/src/main/java/chat/revolt/screens/settings/LanguagePickerSettingsScreen.kt
index 75d89dc6..1b801a9c 100644
--- a/app/src/main/java/chat/revolt/screens/settings/LanguagePickerSettingsScreen.kt
+++ b/app/src/main/java/chat/revolt/screens/settings/LanguagePickerSettingsScreen.kt
@@ -24,6 +24,7 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.core.os.LocaleListCompat
@@ -81,7 +82,7 @@ fun LanguagePickerSettingsScreen(
                             navController.popBackStack()
                         }) {
                             Icon(
-                                imageVector = Icons.AutoMirrored.Default.ArrowBack,
+                                painter = painterResource(R.drawable.icn_arrow_back_24dp),
                                 contentDescription = stringResource(id = R.string.back)
                             )
                         }
diff --git a/app/src/main/java/chat/revolt/screens/settings/ProfileSettngsScreen.kt b/app/src/main/java/chat/revolt/screens/settings/ProfileSettngsScreen.kt
index a9cd9142..d5cf2815 100644
--- a/app/src/main/java/chat/revolt/screens/settings/ProfileSettngsScreen.kt
+++ b/app/src/main/java/chat/revolt/screens/settings/ProfileSettngsScreen.kt
@@ -19,7 +19,6 @@ import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.automirrored.filled.ArrowBack
 import androidx.compose.material.icons.filled.Check
 import androidx.compose.material3.CircularProgressIndicator
 import androidx.compose.material3.ExperimentalMaterial3Api
@@ -41,6 +40,7 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.input.nestedscroll.nestedScroll
+import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
@@ -259,7 +259,7 @@ fun ProfileSettingsScreen(
                         navController.popBackStack()
                     }) {
                         Icon(
-                            imageVector = Icons.AutoMirrored.Default.ArrowBack,
+                            painter = painterResource(R.drawable.icn_arrow_back_24dp),
                             contentDescription = stringResource(id = R.string.back)
                         )
                     }
@@ -425,7 +425,7 @@ fun ProfileSettingsScreen(
                             modifier = Modifier.fillMaxWidth()
                         ) {
                             Icon(
-                                imageVector = Icons.Default.Check,
+                                painter = painterResource(R.drawable.icn_check_24dp),
                                 contentDescription = null
                             )
 
diff --git a/app/src/main/java/chat/revolt/screens/settings/SessionSettngsScreen.kt b/app/src/main/java/chat/revolt/screens/settings/SessionSettngsScreen.kt
index 495968e6..483a16a5 100644
--- a/app/src/main/java/chat/revolt/screens/settings/SessionSettngsScreen.kt
+++ b/app/src/main/java/chat/revolt/screens/settings/SessionSettngsScreen.kt
@@ -39,6 +39,7 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.input.nestedscroll.nestedScroll
+import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextOverflow
@@ -154,7 +155,7 @@ fun SessionSettingsScreen(
                         navController.popBackStack()
                     }) {
                         Icon(
-                            imageVector = Icons.AutoMirrored.Default.ArrowBack,
+                            painter = painterResource(R.drawable.icn_arrow_back_24dp),
                             contentDescription = stringResource(id = R.string.back)
                         )
                     }
diff --git a/app/src/main/java/chat/revolt/screens/settings/SettingsScreen.kt b/app/src/main/java/chat/revolt/screens/settings/SettingsScreen.kt
index 69599ae9..01af3010 100644
--- a/app/src/main/java/chat/revolt/screens/settings/SettingsScreen.kt
+++ b/app/src/main/java/chat/revolt/screens/settings/SettingsScreen.kt
@@ -10,11 +10,6 @@ import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.ArrowBack
-import androidx.compose.material.icons.automirrored.filled.ArrowForward
-import androidx.compose.material.icons.filled.Close
-import androidx.compose.material.icons.filled.DateRange
-import androidx.compose.material.icons.filled.Info
-import androidx.compose.material.icons.filled.Settings
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
@@ -90,7 +85,7 @@ fun SettingsScreen(
                         navController.popBackStack()
                     }) {
                         Icon(
-                            imageVector = Icons.AutoMirrored.Default.ArrowBack,
+                            painter = painterResource(R.drawable.icn_arrow_back_24dp),
                             contentDescription = stringResource(id = R.string.back)
                         )
                     }
@@ -120,10 +115,12 @@ fun SettingsScreen(
                             )
                         },
                         leadingContent = {
-                            Icon(
-                                painter = painterResource(R.drawable.ic_card_account_details_24dp),
-                                contentDescription = null,
-                            )
+                            SettingsIcon {
+                                Icon(
+                                    painter = painterResource(R.drawable.icn_id_card_24dp),
+                                    contentDescription = null,
+                                )
+                            }
                         },
                         modifier = Modifier
                             .testTag("settings_view_profile")
@@ -139,10 +136,12 @@ fun SettingsScreen(
                             )
                         },
                         leadingContent = {
-                            Icon(
-                                painter = painterResource(R.drawable.ic_tablet_cellphone_24dp),
-                                contentDescription = null,
-                            )
+                            SettingsIcon {
+                                Icon(
+                                    painter = painterResource(R.drawable.icn_devices_24dp),
+                                    contentDescription = null,
+                                )
+                            }
                         },
                         modifier = Modifier
                             .testTag("settings_view_sessions")
@@ -162,10 +161,12 @@ fun SettingsScreen(
                             )
                         },
                         leadingContent = {
-                            Icon(
-                                painter = painterResource(R.drawable.ic_palette_24dp),
-                                contentDescription = null,
-                            )
+                            SettingsIcon {
+                                Icon(
+                                    painter = painterResource(R.drawable.icn_palette_24dp),
+                                    contentDescription = null,
+                                )
+                            }
                         },
                         modifier = Modifier
                             .testTag("settings_view_appearance")
@@ -181,10 +182,12 @@ fun SettingsScreen(
                             )
                         },
                         leadingContent = {
-                            Icon(
-                                painter = painterResource(R.drawable.ic_earth_24dp),
-                                contentDescription = null,
-                            )
+                            SettingsIcon {
+                                Icon(
+                                    painter = painterResource(R.drawable.icn_language_24dp),
+                                    contentDescription = null,
+                                )
+                            }
                         },
                         modifier = Modifier
                             .testTag("settings_view_language")
@@ -200,10 +203,12 @@ fun SettingsScreen(
                             )
                         },
                         leadingContent = {
-                            Icon(
-                                painter = painterResource(R.drawable.ic_message_text_24dp),
-                                contentDescription = null,
-                            )
+                            SettingsIcon {
+                                Icon(
+                                    painter = painterResource(R.drawable.icn_chat_24dp),
+                                    contentDescription = null,
+                                )
+                            }
                         },
                         modifier = Modifier
                             .testTag("settings_view_chat")
@@ -223,10 +228,12 @@ fun SettingsScreen(
                             )
                         },
                         leadingContent = {
-                            Icon(
-                                imageVector = Icons.Default.Info,
-                                contentDescription = null,
-                            )
+                            SettingsIcon {
+                                Icon(
+                                    painter = painterResource(R.drawable.icn_info_24dp),
+                                    contentDescription = null,
+                                )
+                            }
                         },
                         modifier = Modifier
                             .testTag("settings_view_about")
@@ -243,10 +250,12 @@ fun SettingsScreen(
                                 )
                             },
                             leadingContent = {
-                                Icon(
-                                    imageVector = Icons.Default.Settings,
-                                    contentDescription = null,
-                                )
+                                SettingsIcon {
+                                    Icon(
+                                        painter = painterResource(R.drawable.icn_sign_language_24dp),
+                                        contentDescription = null,
+                                    )
+                                }
                             },
                             modifier = Modifier
                                 .testTag("settings_view_debug")
@@ -264,10 +273,12 @@ fun SettingsScreen(
                                 )
                             },
                             leadingContent = {
-                                Icon(
-                                    imageVector = Icons.AutoMirrored.Default.ArrowForward,
-                                    contentDescription = null,
-                                )
+                                SettingsIcon {
+                                    Icon(
+                                        painter = painterResource(R.drawable.icn_sign_language_24dp),
+                                        contentDescription = null,
+                                    )
+                                }
                             },
                             modifier = Modifier
                                 .testTag("settings_view_labs")
@@ -285,10 +296,12 @@ fun SettingsScreen(
                                 )
                             },
                             leadingContent = {
-                                Icon(
-                                    painter = painterResource(R.drawable.ic_flask_24dp),
-                                    contentDescription = null,
-                                )
+                                SettingsIcon {
+                                    Icon(
+                                        painter = painterResource(R.drawable.icn_brand_family_24dp),
+                                        contentDescription = null,
+                                    )
+                                }
                             },
                             modifier = Modifier
                                 .testTag("settings_view_experiments")
@@ -314,10 +327,12 @@ fun SettingsScreen(
                             )
                         },
                         leadingContent = {
-                            Icon(
-                                imageVector = Icons.Default.DateRange,
-                                contentDescription = null,
-                            )
+                            SettingsIcon {
+                                Icon(
+                                    painter = painterResource(R.drawable.icn_wand_shine_24dp),
+                                    contentDescription = null,
+                                )
+                            }
                         },
                         modifier = Modifier
                             .testTag("settings_view_changelogs")
@@ -338,10 +353,12 @@ fun SettingsScreen(
                             )
                         },
                         leadingContent = {
-                            Icon(
-                                painter = painterResource(R.drawable.ic_comment_quote_24dp),
-                                contentDescription = null,
-                            )
+                            SettingsIcon {
+                                Icon(
+                                    painter = painterResource(R.drawable.icn_feedback_24dp),
+                                    contentDescription = null,
+                                )
+                            }
                         },
                         modifier = Modifier
                             .testTag("settings_view_feedback")
@@ -365,9 +382,9 @@ fun SettingsScreen(
                             }
                         },
                         leadingContent = {
-                            CompositionLocalProvider(LocalContentColor provides MaterialTheme.colorScheme.error) {
+                            SettingsIcon(danger = true) {
                                 Icon(
-                                    imageVector = Icons.Default.Close,
+                                    painter = painterResource(R.drawable.icn_logout_24dp),
                                     contentDescription = null,
                                 )
                             }
@@ -390,7 +407,7 @@ fun SettingsScreen(
 }
 
 @Composable
-private fun SettingsIcon(danger: Boolean = false, content: @Composable () -> Unit) {
+fun SettingsIcon(danger: Boolean = false, content: @Composable () -> Unit) {
     CompositionLocalProvider(
         LocalContentColor provides
                 if (danger) MaterialTheme.colorScheme.error
diff --git a/app/src/main/java/chat/revolt/screens/settings/channel/ChannelSettingsHome.kt b/app/src/main/java/chat/revolt/screens/settings/channel/ChannelSettingsHome.kt
index 2e167be4..e3729722 100644
--- a/app/src/main/java/chat/revolt/screens/settings/channel/ChannelSettingsHome.kt
+++ b/app/src/main/java/chat/revolt/screens/settings/channel/ChannelSettingsHome.kt
@@ -7,10 +7,6 @@ import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.automirrored.filled.ArrowBack
-import androidx.compose.material.icons.filled.Delete
-import androidx.compose.material.icons.filled.Info
 import androidx.compose.material3.AlertDialog
 import androidx.compose.material3.Button
 import androidx.compose.material3.CircularProgressIndicator
@@ -48,6 +44,7 @@ import chat.revolt.api.routes.channel.leaveDeleteOrCloseChannel
 import chat.revolt.api.schemas.ChannelType
 import chat.revolt.api.settings.FeatureFlags
 import chat.revolt.internals.extensions.rememberChannelPermissions
+import chat.revolt.screens.settings.SettingsIcon
 import kotlinx.coroutines.launch
 
 @OptIn(ExperimentalMaterial3Api::class)
@@ -113,7 +110,7 @@ fun ChannelSettingsHome(navController: NavController, channelId: String) {
                         navController.popBackStack()
                     }) {
                         Icon(
-                            imageVector = Icons.AutoMirrored.Default.ArrowBack,
+                            painter = painterResource(R.drawable.icn_arrow_back_24dp),
                             contentDescription = stringResource(id = R.string.back)
                         )
                     }
@@ -136,10 +133,12 @@ fun ChannelSettingsHome(navController: NavController, channelId: String) {
                                 )
                             },
                             leadingContent = {
-                                Icon(
-                                    imageVector = Icons.Default.Info,
-                                    contentDescription = null,
-                                )
+                                SettingsIcon {
+                                    Icon(
+                                        painter = painterResource(R.drawable.icn_info_24dp),
+                                        contentDescription = null,
+                                    )
+                                }
                             },
                             modifier = Modifier
                                 .testTag("channel_settings_view_overview")
@@ -158,10 +157,12 @@ fun ChannelSettingsHome(navController: NavController, channelId: String) {
                                 )
                             },
                             leadingContent = {
-                                Icon(
-                                    painter = painterResource(id = R.drawable.ic_list_status_24dp),
-                                    contentDescription = null,
-                                )
+                                SettingsIcon {
+                                    Icon(
+                                        painter = painterResource(id = R.drawable.icn_page_info_24dp),
+                                        contentDescription = null,
+                                    )
+                                }
                             },
                             modifier = Modifier
                                 .testTag("channel_settings_view_permissions")
@@ -181,9 +182,9 @@ fun ChannelSettingsHome(navController: NavController, channelId: String) {
                                 }
                             },
                             leadingContent = {
-                                CompositionLocalProvider(LocalContentColor provides MaterialTheme.colorScheme.error) {
+                                SettingsIcon(danger = true) {
                                     Icon(
-                                        imageVector = Icons.Default.Delete,
+                                        painter = painterResource(R.drawable.icn_delete_24dp),
                                         contentDescription = null,
                                     )
                                 }
diff --git a/app/src/main/java/chat/revolt/screens/settings/channel/ChannelSettingsOverview.kt b/app/src/main/java/chat/revolt/screens/settings/channel/ChannelSettingsOverview.kt
index f2687998..ae583738 100644
--- a/app/src/main/java/chat/revolt/screens/settings/channel/ChannelSettingsOverview.kt
+++ b/app/src/main/java/chat/revolt/screens/settings/channel/ChannelSettingsOverview.kt
@@ -44,6 +44,7 @@ import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.input.nestedscroll.nestedScroll
+import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextAlign
@@ -300,7 +301,7 @@ fun ChannelSettingsOverview(
                         navController.popBackStack()
                     }) {
                         Icon(
-                            imageVector = Icons.AutoMirrored.Default.ArrowBack,
+                            painter = painterResource(R.drawable.icn_arrow_back_24dp),
                             contentDescription = stringResource(id = R.string.back)
                         )
                     }
@@ -315,7 +316,7 @@ fun ChannelSettingsOverview(
             ) {
                 FloatingActionButton(onClick = { viewModel.updateChannel() }) {
                     Icon(
-                        imageVector = Icons.Default.Check,
+                        painter = painterResource(R.drawable.icn_check_24dp),
                         contentDescription = stringResource(R.string.channel_settings_overview_save)
                     )
                 }
diff --git a/app/src/main/java/chat/revolt/screens/settings/channel/ChannelSettingsPermissions.kt b/app/src/main/java/chat/revolt/screens/settings/channel/ChannelSettingsPermissions.kt
index 58da4906..695c4d16 100644
--- a/app/src/main/java/chat/revolt/screens/settings/channel/ChannelSettingsPermissions.kt
+++ b/app/src/main/java/chat/revolt/screens/settings/channel/ChannelSettingsPermissions.kt
@@ -21,6 +21,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.input.nestedscroll.nestedScroll
+import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.navigation.NavController
@@ -50,7 +51,7 @@ fun ChannelSettingsPermissions(navController: NavController, channelId: String)
                         navController.popBackStack()
                     }) {
                         Icon(
-                            imageVector = Icons.AutoMirrored.Default.ArrowBack,
+                            painter = painterResource(R.drawable.icn_arrow_back_24dp),
                             contentDescription = stringResource(id = R.string.back)
                         )
                     }
diff --git a/app/src/main/java/chat/revolt/settings/dsl/SettingsPage.kt b/app/src/main/java/chat/revolt/settings/dsl/SettingsPage.kt
index c8ee0e12..7c7b0a73 100644
--- a/app/src/main/java/chat/revolt/settings/dsl/SettingsPage.kt
+++ b/app/src/main/java/chat/revolt/settings/dsl/SettingsPage.kt
@@ -24,6 +24,7 @@ import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.input.nestedscroll.nestedScroll
+import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import androidx.navigation.NavController
@@ -107,7 +108,7 @@ fun SettingsPage(
                             navController.popBackStack()
                         }) {
                             Icon(
-                                imageVector = Icons.AutoMirrored.Default.ArrowBack,
+                                painter = painterResource(R.drawable.icn_arrow_back_24dp),
                                 contentDescription = stringResource(id = R.string.back)
                             )
                         }
diff --git a/app/src/main/java/chat/revolt/sheets/AddServerSheet.kt b/app/src/main/java/chat/revolt/sheets/AddServerSheet.kt
index 3e57496c..f207933c 100644
--- a/app/src/main/java/chat/revolt/sheets/AddServerSheet.kt
+++ b/app/src/main/java/chat/revolt/sheets/AddServerSheet.kt
@@ -25,8 +25,6 @@ import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.text.input.TextFieldLineLimits
 import androidx.compose.foundation.text.input.rememberTextFieldState
 import androidx.compose.foundation.verticalScroll
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.automirrored.filled.ArrowBack
 import androidx.compose.material3.Button
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
@@ -47,6 +45,7 @@ import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.PathEffect
 import androidx.compose.ui.graphics.drawscope.Stroke
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextAlign
@@ -219,7 +218,7 @@ fun AddServerSheet(onDismiss: () -> Unit) {
                                 }
                             ) {
                                 Icon(
-                                    imageVector = Icons.AutoMirrored.Default.ArrowBack,
+                                    painter = painterResource(R.drawable.icn_arrow_back_24dp),
                                     contentDescription = stringResource(id = R.string.back),
                                 )
                             }
@@ -372,7 +371,7 @@ fun AddServerSheet(onDismiss: () -> Unit) {
                                 }
                             ) {
                                 Icon(
-                                    imageVector = Icons.AutoMirrored.Default.ArrowBack,
+                                    painter = painterResource(R.drawable.icn_arrow_back_24dp),
                                     contentDescription = stringResource(id = R.string.back),
                                 )
                             }
diff --git a/app/src/main/java/chat/revolt/sheets/ChannelContextSheet.kt b/app/src/main/java/chat/revolt/sheets/ChannelContextSheet.kt
index bb1d1c43..57ef991d 100644
--- a/app/src/main/java/chat/revolt/sheets/ChannelContextSheet.kt
+++ b/app/src/main/java/chat/revolt/sheets/ChannelContextSheet.kt
@@ -51,7 +51,7 @@ fun ChannelContextSheet(channelId: String, onHideSheet: suspend () -> Unit) {
         },
         leadingContent = {
             Icon(
-                painter = painterResource(id = R.drawable.ic_content_copy_id_24dp),
+                painter = painterResource(id = R.drawable.icn_identifier_copy_24dp),
                 contentDescription = null
             )
         },
@@ -82,7 +82,7 @@ fun ChannelContextSheet(channelId: String, onHideSheet: suspend () -> Unit) {
         },
         leadingContent = {
             Icon(
-                painter = painterResource(id = R.drawable.ic_eye_check_24dp),
+                painter = painterResource(id = R.drawable.icn_mark_chat_read_24dp),
                 contentDescription = null
             )
         },
diff --git a/app/src/main/java/chat/revolt/sheets/ChannelInfoSheet.kt b/app/src/main/java/chat/revolt/sheets/ChannelInfoSheet.kt
index ed00919d..36ffb27b 100644
--- a/app/src/main/java/chat/revolt/sheets/ChannelInfoSheet.kt
+++ b/app/src/main/java/chat/revolt/sheets/ChannelInfoSheet.kt
@@ -6,11 +6,6 @@ import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.automirrored.filled.List
-import androidx.compose.material.icons.filled.Add
-import androidx.compose.material.icons.filled.Notifications
-import androidx.compose.material.icons.filled.Settings
 import androidx.compose.material3.CircularProgressIndicator
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.HorizontalDivider
@@ -26,6 +21,7 @@ import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.window.Dialog
@@ -128,7 +124,7 @@ fun ChannelInfoSheet(channelId: String, onHideSheet: suspend () -> Unit) {
                 },
                 leadingContent = {
                     Icon(
-                        imageVector = Icons.AutoMirrored.Default.List,
+                        painter = painterResource(R.drawable.icn_list_24dp),
                         contentDescription = null
                     )
                 },
@@ -157,7 +153,7 @@ fun ChannelInfoSheet(channelId: String, onHideSheet: suspend () -> Unit) {
                     },
                     leadingContent = {
                         Icon(
-                            imageVector = Icons.Default.Add,
+                            painter = painterResource(R.drawable.icn_add_24dp),
                             contentDescription = null
                         )
                     },
@@ -176,7 +172,7 @@ fun ChannelInfoSheet(channelId: String, onHideSheet: suspend () -> Unit) {
                     },
                     leadingContent = {
                         Icon(
-                            imageVector = Icons.Default.Add,
+                            painter = painterResource(R.drawable.icn_add_24dp),
                             contentDescription = null
                         )
                     },
@@ -196,7 +192,7 @@ fun ChannelInfoSheet(channelId: String, onHideSheet: suspend () -> Unit) {
         },
         leadingContent = {
             Icon(
-                imageVector = Icons.Default.Notifications,
+                painter = painterResource(R.drawable.icn_notification_settings_24dp),
                 contentDescription = null
             )
         },
@@ -215,7 +211,7 @@ fun ChannelInfoSheet(channelId: String, onHideSheet: suspend () -> Unit) {
             },
             leadingContent = {
                 Icon(
-                    imageVector = Icons.Default.Settings,
+                    painter = painterResource(R.drawable.icn_settings_24dp),
                     contentDescription = null
                 )
             },
diff --git a/app/src/main/java/chat/revolt/sheets/EmoteInfoSheet.kt b/app/src/main/java/chat/revolt/sheets/EmoteInfoSheet.kt
index 1574ee9a..80c36386 100644
--- a/app/src/main/java/chat/revolt/sheets/EmoteInfoSheet.kt
+++ b/app/src/main/java/chat/revolt/sheets/EmoteInfoSheet.kt
@@ -107,7 +107,7 @@ fun EmoteInfoSheet(id: String, onDismiss: () -> Unit) {
         },
         leadingContent = {
             Icon(
-                painter = painterResource(id = R.drawable.ic_content_copy_24dp),
+                painter = painterResource(R.drawable.icn_content_copy_24dp),
                 contentDescription = null
             )
         },
diff --git a/app/src/main/java/chat/revolt/sheets/LinkInfoSheet.kt b/app/src/main/java/chat/revolt/sheets/LinkInfoSheet.kt
index b59481d2..45c5dde5 100644
--- a/app/src/main/java/chat/revolt/sheets/LinkInfoSheet.kt
+++ b/app/src/main/java/chat/revolt/sheets/LinkInfoSheet.kt
@@ -10,8 +10,6 @@ import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.automirrored.filled.ExitToApp
 import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
@@ -83,7 +81,7 @@ fun LinkInfoSheet(url: String, onDismiss: () -> Unit) {
         },
         leadingContent = {
             Icon(
-                imageVector = Icons.AutoMirrored.Default.ExitToApp,
+                painter = painterResource(R.drawable.icn_open_in_browser_24dp),
                 contentDescription = null
             )
         },
@@ -114,7 +112,7 @@ fun LinkInfoSheet(url: String, onDismiss: () -> Unit) {
         },
         leadingContent = {
             Icon(
-                painter = painterResource(id = R.drawable.ic_content_copy_24dp),
+                painter = painterResource(R.drawable.icn_content_copy_24dp),
                 contentDescription = null
             )
         },
diff --git a/app/src/main/java/chat/revolt/sheets/MemberContextSheet.kt b/app/src/main/java/chat/revolt/sheets/MemberContextSheet.kt
index c4a2b022..6ccf99c0 100644
--- a/app/src/main/java/chat/revolt/sheets/MemberContextSheet.kt
+++ b/app/src/main/java/chat/revolt/sheets/MemberContextSheet.kt
@@ -60,7 +60,7 @@ fun ColumnScope.GroupDMMemberContextSheet(
             leadingContent = {
                 CompositionLocalProvider(value = LocalContentColor provides MaterialTheme.colorScheme.error) {
                     Icon(
-                        painter = painterResource(R.drawable.ic_account_cancel_24dp),
+                        painter = painterResource(R.drawable.icn_person_off_24dp),
                         contentDescription = null
                     )
                 }
@@ -82,7 +82,7 @@ fun ColumnScope.GroupDMMemberContextSheet(
         },
         leadingContent = {
             Icon(
-                painter = painterResource(R.drawable.ic_content_copy_id_24dp),
+                painter = painterResource(R.drawable.icn_identifier_copy_24dp),
                 contentDescription = null
             )
         },
@@ -132,7 +132,7 @@ fun ColumnScope.ServerMemberContextSheet(
         },
         leadingContent = {
             Icon(
-                painter = painterResource(R.drawable.ic_content_copy_id_24dp),
+                painter = painterResource(R.drawable.icn_identifier_copy_24dp),
                 contentDescription = null
             )
         },
diff --git a/app/src/main/java/chat/revolt/sheets/MessageContextSheet.kt b/app/src/main/java/chat/revolt/sheets/MessageContextSheet.kt
index 832e3b9e..89608dbc 100644
--- a/app/src/main/java/chat/revolt/sheets/MessageContextSheet.kt
+++ b/app/src/main/java/chat/revolt/sheets/MessageContextSheet.kt
@@ -9,9 +9,6 @@ import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Delete
-import androidx.compose.material.icons.filled.Edit
 import androidx.compose.material3.AlertDialog
 import androidx.compose.material3.Button
 import androidx.compose.material3.CircularProgressIndicator
@@ -98,7 +95,7 @@ fun MessageContextSheet(
                 SheetButton(
                     leadingContent = {
                         Icon(
-                            painter = painterResource(id = R.drawable.ic_content_copy_24dp),
+                            painter = painterResource(id = R.drawable.icn_content_copy_24dp),
                             contentDescription = null
                         )
                     },
@@ -144,7 +141,7 @@ fun MessageContextSheet(
                 SheetButton(
                     leadingContent = {
                         Icon(
-                            painter = painterResource(id = R.drawable.ic_link_variant_24dp),
+                            painter = painterResource(id = R.drawable.icn_link_24dp),
                             contentDescription = null
                         )
                     },
@@ -204,7 +201,7 @@ fun MessageContextSheet(
                 SheetButton(
                     leadingContent = {
                         Icon(
-                            painter = painterResource(id = R.drawable.ic_content_copy_id_24dp),
+                            painter = painterResource(id = R.drawable.icn_identifier_copy_24dp),
                             contentDescription = null
                         )
                     },
@@ -344,7 +341,7 @@ fun MessageContextSheet(
         SheetButton(
             leadingContent = {
                 Icon(
-                    painter = painterResource(id = R.drawable.ic_reply_24dp),
+                    painter = painterResource(id = R.drawable.icn_reply_24dp),
                     contentDescription = null
                 )
             },
@@ -364,7 +361,7 @@ fun MessageContextSheet(
         SheetButton(
             leadingContent = {
                 Icon(
-                    painter = painterResource(id = R.drawable.ic_hamburger_plus_24dp),
+                    painter = painterResource(id = R.drawable.icn_add_reaction_24dp),
                     contentDescription = null
                 )
             },
@@ -382,7 +379,7 @@ fun MessageContextSheet(
             SheetButton(
                 leadingContent = {
                     Icon(
-                        imageVector = Icons.Default.Edit,
+                        painter = painterResource(R.drawable.icn_edit_24dp),
                         contentDescription = null
                     )
                 },
@@ -403,7 +400,7 @@ fun MessageContextSheet(
         SheetButton(
             leadingContent = {
                 Icon(
-                    painter = painterResource(id = R.drawable.ic_eye_off_24dp),
+                    painter = painterResource(id = R.drawable.icn_visibility_off_24dp),
                     contentDescription = null
                 )
             },
@@ -429,7 +426,7 @@ fun MessageContextSheet(
             SheetButton(
                 leadingContent = {
                     Icon(
-                        painter = painterResource(id = R.drawable.ic_file_tree_24dp),
+                        painter = painterResource(id = R.drawable.icn_account_tree_24dp),
                         contentDescription = null
                     )
                 },
@@ -448,7 +445,7 @@ fun MessageContextSheet(
         SheetButton(
             leadingContent = {
                 Icon(
-                    painter = painterResource(id = R.drawable.ic_share_24dp),
+                    painter = painterResource(id = R.drawable.icn_ios_share_24dp),
                     contentDescription = null,
                 )
             },
@@ -474,7 +471,7 @@ fun MessageContextSheet(
             SheetButton(
                 leadingContent = {
                     Icon(
-                        imageVector = Icons.Default.Delete,
+                        painter = painterResource(R.drawable.icn_delete_24dp),
                         contentDescription = null
                     )
                 },
@@ -494,7 +491,7 @@ fun MessageContextSheet(
             SheetButton(
                 leadingContent = {
                     Icon(
-                        painter = painterResource(id = R.drawable.ic_flag_24dp),
+                        painter = painterResource(id = R.drawable.icn_report_24dp),
                         contentDescription = null
                     )
                 },
diff --git a/app/src/main/java/chat/revolt/sheets/ServerContextSheet.kt b/app/src/main/java/chat/revolt/sheets/ServerContextSheet.kt
index 55ce84c6..62625b70 100644
--- a/app/src/main/java/chat/revolt/sheets/ServerContextSheet.kt
+++ b/app/src/main/java/chat/revolt/sheets/ServerContextSheet.kt
@@ -208,7 +208,7 @@ fun ServerContextSheet(
         SheetButton(
             leadingContent = {
                 Icon(
-                    painter = painterResource(id = R.drawable.ic_content_copy_id_24dp),
+                    painter = painterResource(id = R.drawable.icn_identifier_copy_24dp),
                     contentDescription = null
                 )
             },
@@ -239,7 +239,7 @@ fun ServerContextSheet(
         SheetButton(
             leadingContent = {
                 Icon(
-                    painter = painterResource(id = R.drawable.ic_eye_check_24dp),
+                    painter = painterResource(id = R.drawable.icn_mark_chat_read_24dp),
                     contentDescription = null
                 )
             },
@@ -262,7 +262,7 @@ fun ServerContextSheet(
             SheetButton(
                 leadingContent = {
                     Icon(
-                        painter = painterResource(id = R.drawable.ic_flag_24dp),
+                        painter = painterResource(id = R.drawable.icn_report_24dp),
                         contentDescription = null
                     )
                 },
@@ -280,7 +280,7 @@ fun ServerContextSheet(
             SheetButton(
                 leadingContent = {
                     Icon(
-                        painter = painterResource(id = R.drawable.ic_arrow_left_bold_box_24dp),
+                        painter = painterResource(id = R.drawable.icn_door_open_24dp),
                         contentDescription = null,
                     )
                 },
diff --git a/app/src/main/java/chat/revolt/sheets/StatusSheet.kt b/app/src/main/java/chat/revolt/sheets/StatusSheet.kt
index 9a8c21ce..fb2fdac0 100644
--- a/app/src/main/java/chat/revolt/sheets/StatusSheet.kt
+++ b/app/src/main/java/chat/revolt/sheets/StatusSheet.kt
@@ -33,6 +33,7 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
@@ -225,7 +226,7 @@ fun StatusSheet(onBeforeNavigation: () -> Unit, onGoSettings: () -> Unit) {
             )
 
             Icon(
-                imageVector = Icons.Default.Edit,
+                painter = painterResource(R.drawable.icn_edit_24dp),
                 contentDescription = null,
                 modifier = Modifier.padding(16.dp)
             )
@@ -235,7 +236,7 @@ fun StatusSheet(onBeforeNavigation: () -> Unit, onGoSettings: () -> Unit) {
     SheetButton(
         leadingContent = {
             Icon(
-                imageVector = Icons.Default.Settings,
+                painter = painterResource(R.drawable.icn_settings_24dp),
                 contentDescription = null
             )
         },
diff --git a/app/src/main/java/chat/revolt/sheets/UserCardSheet.kt b/app/src/main/java/chat/revolt/sheets/UserCardSheet.kt
index c1d5301a..c6386a55 100644
--- a/app/src/main/java/chat/revolt/sheets/UserCardSheet.kt
+++ b/app/src/main/java/chat/revolt/sheets/UserCardSheet.kt
@@ -209,7 +209,7 @@ fun UserCardSheet(user: User?) {
                     modifier = Modifier.weight(1f)
                 ) {
                     Icon(
-                        painter = painterResource(R.drawable.ic_share_24dp),
+                        painter = painterResource(R.drawable.icn_ios_share_24dp),
                         contentDescription = null
                     )
                     Spacer(modifier = Modifier.width(8.dp))
@@ -229,7 +229,7 @@ fun UserCardSheet(user: User?) {
                     modifier = Modifier.weight(1f)
                 ) {
                     Icon(
-                        painter = painterResource(R.drawable.ic_content_copy_24dp),
+                        painter = painterResource(R.drawable.icn_content_copy_24dp),
                         contentDescription = null
                     )
                     Spacer(modifier = Modifier.width(8.dp))
diff --git a/app/src/main/java/chat/revolt/sheets/UserInfoSheet.kt b/app/src/main/java/chat/revolt/sheets/UserInfoSheet.kt
index 267841aa..fee3cf9d 100644
--- a/app/src/main/java/chat/revolt/sheets/UserInfoSheet.kt
+++ b/app/src/main/java/chat/revolt/sheets/UserInfoSheet.kt
@@ -90,7 +90,7 @@ fun UserInfoSheet(
         NonIdealState(
             icon = {
                 Icon(
-                    painter = painterResource(R.drawable.ic_alert_decagram_24dp),
+                    painter = painterResource(R.drawable.icn_error_24dp),
                     contentDescription = null,
                     modifier = Modifier.size(it)
                 )
@@ -164,7 +164,7 @@ fun UserInfoSheet(
                             onClick = { showUserCard = true },
                         ) {
                             Icon(
-                                painter = painterResource(R.drawable.ic_badge_account_horizontal_24dp),
+                                painter = painterResource(R.drawable.icn_badge_24dp),
                                 contentDescription = null
                             )
                         }
@@ -360,7 +360,7 @@ fun UserInfoSheet(
                                 )
                             } ?: run {
                                 Icon(
-                                    painter = painterResource(id = R.drawable.ic_alert_decagram_24dp),
+                                    painter = painterResource(id = R.drawable.icn_error_24dp),
                                     contentDescription = null
                                 )
                                 Spacer(modifier = Modifier.width(8.dp))
@@ -380,7 +380,7 @@ fun UserInfoSheet(
                         NonIdealState(
                             icon = {
                                 Icon(
-                                    painter = painterResource(R.drawable.ic_alert_decagram_24dp),
+                                    painter = painterResource(R.drawable.icn_error_24dp),
                                     contentDescription = null,
                                     modifier = Modifier.size(24.dp)
                                 )
diff --git a/app/src/main/res/drawable/icn_account_box_24dp.xml b/app/src/main/res/drawable/icn_account_box_24dp.xml
new file mode 100644
index 00000000..af9e42c6
--- /dev/null
+++ b/app/src/main/res/drawable/icn_account_box_24dp.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"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M200,714Q254,661 325.5,630.5Q397,600 480,600Q563,600 634.5,630.5Q706,661 760,714L760,200Q760,200 760,200Q760,200 760,200L200,200Q200,200 200,200Q200,200 200,200L200,714ZM480,520Q538,520 579,479Q620,438 620,380Q620,322 579,281Q538,240 480,240Q422,240 381,281Q340,322 340,380Q340,438 381,479Q422,520 480,520ZM200,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,840ZM269,760L691,760Q691,760 691,760Q691,760 691,760Q647,721 591.5,700.5Q536,680 480,680Q424,680 367.5,700.5Q311,721 269,760Q269,760 269,760Q269,760 269,760ZM480,440Q455,440 437.5,422.5Q420,405 420,380Q420,355 437.5,337.5Q455,320 480,320Q505,320 522.5,337.5Q540,355 540,380Q540,405 522.5,422.5Q505,440 480,440ZM480,457L480,457Q480,457 480,457Q480,457 480,457L480,457Q480,457 480,457Q480,457 480,457L480,457Q480,457 480,457Q480,457 480,457Q480,457 480,457Q480,457 480,457Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/icn_account_circle_24dp.xml b/app/src/main/res/drawable/icn_account_circle_24dp.xml
new file mode 100644
index 00000000..5e4f932b
--- /dev/null
+++ b/app/src/main/res/drawable/icn_account_circle_24dp.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"
+    android:tint="?attr/colorControlNormal">
+    <path
+        android:fillColor="@android:color/white"
+        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/app/src/main/res/drawable/icn_account_tree_24dp.xml b/app/src/main/res/drawable/icn_account_tree_24dp.xml
new file mode 100644
index 00000000..e89e4764
--- /dev/null
+++ b/app/src/main/res/drawable/icn_account_tree_24dp.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"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M600,840L600,720L440,720L440,320L360,320L360,440L80,440L80,120L360,120L360,240L600,240L600,120L880,120L880,440L600,440L600,320L520,320L520,640L600,640L600,520L880,520L880,840L600,840ZM160,200L160,200L160,360L160,360L160,200ZM680,600L680,600L680,760L680,760L680,600ZM680,200L680,200L680,360L680,360L680,200ZM680,360L800,360L800,200L680,200L680,360ZM680,760L800,760L800,600L680,600L680,760ZM160,360L280,360L280,200L160,200L160,360Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/icn_add_24dp.xml b/app/src/main/res/drawable/icn_add_24dp.xml
new file mode 100644
index 00000000..d6fd3d37
--- /dev/null
+++ b/app/src/main/res/drawable/icn_add_24dp.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"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M440,520L200,520L200,440L440,440L440,200L520,200L520,440L760,440L760,520L520,520L520,760L440,760L440,520Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/icn_add_reaction_24dp.xml b/app/src/main/res/drawable/icn_add_reaction_24dp.xml
new file mode 100644
index 00000000..8297412b
--- /dev/null
+++ b/app/src/main/res/drawable/icn_add_reaction_24dp.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"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480L480,480L480,480L480,480L480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480ZM480,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,80Q523,80 563,88.5Q603,97 640,113L640,203Q605,183 564.5,171.5Q524,160 480,160Q347,160 253.5,253.5Q160,347 160,480Q160,613 253.5,706.5Q347,800 480,800Q613,800 706.5,706.5Q800,613 800,480Q800,448 793.5,418Q787,388 776,360L862,360Q871,389 875.5,418.5Q880,448 880,480Q880,563 848.5,636Q817,709 763,763Q709,817 636,848.5Q563,880 480,880ZM800,280L800,200L720,200L720,120L800,120L800,40L880,40L880,120L960,120L960,200L880,200L880,280L800,280ZM620,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,700Q548,700 603.5,661.5Q659,623 684,560L276,560Q301,623 356.5,661.5Q412,700 480,700Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/icn_arrow_back_24dp.xml b/app/src/main/res/drawable/icn_arrow_back_24dp.xml
new file mode 100644
index 00000000..0e2e8635
--- /dev/null
+++ b/app/src/main/res/drawable/icn_arrow_back_24dp.xml
@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    android:tint="?attr/colorControlNormal"
+    android:autoMirrored="true">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M313,520L537,744L480,800L160,480L480,160L537,216L313,440L800,440L800,520L313,520Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/icn_arrow_forward_24dp.xml b/app/src/main/res/drawable/icn_arrow_forward_24dp.xml
new file mode 100644
index 00000000..81139b11
--- /dev/null
+++ b/app/src/main/res/drawable/icn_arrow_forward_24dp.xml
@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    android:tint="?attr/colorControlNormal"
+    android:autoMirrored="true">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M647,520L160,520L160,440L647,440L423,216L480,160L800,480L480,800L423,744L647,520Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/icn_attach_file_24dp.xml b/app/src/main/res/drawable/icn_attach_file_24dp.xml
new file mode 100644
index 00000000..6d9ac738
--- /dev/null
+++ b/app/src/main/res/drawable/icn_attach_file_24dp.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"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      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,240L440,240L440,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,240L720,240L720,630Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/icn_attach_file_off_24dp.xml b/app/src/main/res/drawable/icn_attach_file_off_24dp.xml
new file mode 100644
index 00000000..a4c1f00a
--- /dev/null
+++ b/app/src/main/res/drawable/icn_attach_file_off_24dp.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"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M470,880Q366,880 293,807Q220,734 220,630L220,332L56,168L112,112L848,848L792,904L669,781Q634,826 582.5,853Q531,880 470,880ZM300,412L300,630Q299,701 349,750.5Q399,800 470,800Q515,800 551.5,779Q588,758 611,723L561,673Q546,695 522.5,707.5Q499,720 470,720Q424,720 392,688Q360,656 360,610L360,472L300,412ZM440,552L440,610Q440,623 448.5,631.5Q457,640 470,640Q482,640 490.5,632Q499,624 500,612L500,612L440,552ZM640,526L640,240L720,240L720,606L640,526ZM500,386L500,260Q499,218 470.5,189Q442,160 400,160Q374,160 353,172Q332,184 318,204L261,147Q286,116 322,98Q358,80 400,80Q475,80 527.5,132.5Q580,185 580,260L580,466L500,386ZM440,240L440,326L360,246L360,240L440,240Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/icn_badge_24dp.xml b/app/src/main/res/drawable/icn_badge_24dp.xml
new file mode 100644
index 00000000..2deaec7d
--- /dev/null
+++ b/app/src/main/res/drawable/icn_badge_24dp.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"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M160,880Q127,880 103.5,856.5Q80,833 80,800L80,360Q80,327 103.5,303.5Q127,280 160,280L360,280L360,160Q360,127 383.5,103.5Q407,80 440,80L520,80Q553,80 576.5,103.5Q600,127 600,160L600,280L800,280Q833,280 856.5,303.5Q880,327 880,360L880,800Q880,833 856.5,856.5Q833,880 800,880L160,880ZM160,800L800,800Q800,800 800,800Q800,800 800,800L800,360Q800,360 800,360Q800,360 800,360L600,360L600,360Q600,393 576.5,416.5Q553,440 520,440L440,440Q407,440 383.5,416.5Q360,393 360,360L360,360L160,360Q160,360 160,360Q160,360 160,360L160,800Q160,800 160,800Q160,800 160,800ZM240,720L480,720L480,702Q480,685 470.5,670.5Q461,656 444,648Q424,639 403.5,634.5Q383,630 360,630Q337,630 316.5,634.5Q296,639 276,648Q259,656 249.5,670.5Q240,685 240,702L240,720ZM560,660L720,660L720,600L560,600L560,660ZM360,600Q385,600 402.5,582.5Q420,565 420,540Q420,515 402.5,497.5Q385,480 360,480Q335,480 317.5,497.5Q300,515 300,540Q300,565 317.5,582.5Q335,600 360,600ZM560,540L720,540L720,480L560,480L560,540ZM440,360L520,360L520,160L440,160L440,360ZM480,580Q480,580 480,580Q480,580 480,580L480,580Q480,580 480,580Q480,580 480,580L480,580L480,580Q480,580 480,580Q480,580 480,580L480,580Q480,580 480,580Q480,580 480,580L480,580L480,580Q480,580 480,580Q480,580 480,580L480,580Q480,580 480,580Q480,580 480,580Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/icn_block_24dp.xml b/app/src/main/res/drawable/icn_block_24dp.xml
new file mode 100644
index 00000000..540750b3
--- /dev/null
+++ b/app/src/main/res/drawable/icn_block_24dp.xml
@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    android:tint="?attr/colorControlNormal"
+    android:autoMirrored="true">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M480,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,800Q534,800 584,782.5Q634,765 676,732L228,284Q195,326 177.5,376Q160,426 160,480Q160,614 253,707Q346,800 480,800ZM732,676Q765,634 782.5,584Q800,534 800,480Q800,346 707,253Q614,160 480,160Q426,160 376,177.5Q326,195 284,228L732,676Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/icn_brand_family_24dp.xml b/app/src/main/res/drawable/icn_brand_family_24dp.xml
new file mode 100644
index 00000000..51364ae9
--- /dev/null
+++ b/app/src/main/res/drawable/icn_brand_family_24dp.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"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M186,880Q132,880 106,858Q80,836 80,792Q80,734 129,718Q178,702 245,702L266,702L266,646Q266,612 265,590.5Q264,569 259,555Q254,541 247.5,535.5Q241,530 230,530Q221,530 213.5,533Q206,536 201,541Q197,546 196,551.5Q195,557 197,563Q203,574 211,584.5Q219,595 219,609Q219,634 201.5,651.5Q184,669 159,669Q134,669 116.5,651.5Q99,634 99,609Q99,582 111,565Q123,548 143.5,538Q164,528 191,524Q218,520 249,520Q334,520 367,550.5Q400,581 400,658L400,805Q400,824 404.5,833Q409,842 420,842Q432,842 439.5,824Q447,806 449,768L460,768Q457,830 436.5,855Q416,880 368,880Q325,880 300.5,866.5Q276,853 269,826Q259,855 239.5,867.5Q220,880 186,880ZM559,880Q539,880 526.5,863.5Q514,847 522,828L624,559Q631,542 646,531Q661,520 680,520Q699,520 714,531Q729,542 736,559L838,828Q846,847 833.5,863.5Q821,880 801,880Q789,880 779,873Q769,866 764,854L744,796L616,796L596,854Q592,865 582,872.5Q572,880 559,880ZM235,851Q248,851 257,830.5Q266,810 266,781L266,714Q240,714 228,729.5Q216,745 216,780L216,791Q216,827 220,839Q224,851 235,851ZM642,726L719,726L680,612L642,726ZM605,441Q557,441 528.5,407.5Q500,374 500,317Q500,213 566,146.5Q632,80 735,80Q777,80 803,89.5Q829,99 829,114Q829,120 827,126Q825,132 820,137Q815,144 807.5,147Q800,150 792,148Q778,144 760,141Q742,138 727,138Q656,138 613,186Q570,234 570,313Q570,335 578,359Q586,383 614,383Q625,383 635.5,378Q646,373 654,364Q671,346 685.5,304Q700,262 712,202Q714,189 722.5,183.5Q731,178 746,178Q764,178 773.5,187.5Q783,197 779,211Q767,254 761.5,286Q756,318 756,344Q756,364 761.5,373Q767,382 778,382Q789,382 799.5,374Q810,366 829,344Q831,341 844,337Q852,337 856,343Q860,349 860,360Q860,388 828,414Q796,440 761,440Q735,440 716.5,426Q698,412 691,386Q676,412 654,426.5Q632,441 605,441ZM120,440L120,220Q120,162 161,121Q202,80 260,80Q318,80 359,121Q400,162 400,220L400,440L320,440L320,360L200,360L200,440L120,440ZM200,280L320,280L320,220Q320,195 302.5,177.5Q285,160 260,160Q235,160 217.5,177.5Q200,195 200,220L200,280Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/icn_brightness_alert_24dp.xml b/app/src/main/res/drawable/icn_brightness_alert_24dp.xml
new file mode 100644
index 00000000..0b0b1b57
--- /dev/null
+++ b/app/src/main/res/drawable/icn_brightness_alert_24dp.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"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      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,680ZM440,520L520,520L520,280L440,280L440,520ZM480,932L346,800L160,800L160,614L28,480L160,346L160,160L346,160L480,28L614,160L800,160L800,346L932,480L800,614L800,800L614,800L480,932ZM480,820L580,720L720,720L720,580L820,480L720,380L720,240L580,240L480,140L380,240L240,240L240,380L140,480L240,580L240,720L380,720L480,820ZM480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/icn_bus_railway_24dp.xml b/app/src/main/res/drawable/icn_bus_railway_24dp.xml
new file mode 100644
index 00000000..f8694174
--- /dev/null
+++ b/app/src/main/res/drawable/icn_bus_railway_24dp.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"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M340,520Q315,520 297.5,537.5Q280,555 280,580Q280,605 297.5,622.5Q315,640 340,640Q365,640 382.5,622.5Q400,605 400,580Q400,555 382.5,537.5Q365,520 340,520ZM700,400Q780,400 830,444.5Q880,489 880,560L880,720Q880,753 856.5,776.5Q833,800 800,800L880,880L520,880L600,800Q567,800 543.5,776.5Q520,753 520,720L520,560Q520,489 570,444.5Q620,400 700,400ZM700,660Q688,660 679,669Q670,678 670,690Q670,702 679,711Q688,720 700,720Q712,720 721,711Q730,702 730,690Q730,678 721,669Q712,660 700,660ZM588,520Q584,529 582,539Q580,549 580,560L580,600L820,600L820,560Q820,549 818,539Q816,529 812,520L588,520ZM480,80Q652,80 726,117Q800,154 800,240L800,336Q782,330 762,326.5Q742,323 720,321L720,280L240,280L240,400L500,400Q484,417 472.5,437Q461,457 453,480L240,480L240,600Q240,633 263.5,656.5Q287,680 320,680L440,680L440,760L320,760L320,800Q320,817 308.5,828.5Q297,840 280,840L240,840Q223,840 211.5,828.5Q200,817 200,800L200,718Q182,698 171,673.5Q160,649 160,620L160,240Q160,157 237,118.5Q314,80 480,80ZM482,200Q592,200 641.5,200Q691,200 706,200L258,200Q276,200 325.5,200Q375,200 482,200ZM258,200L706,200Q691,183 641.5,171.5Q592,160 482,160Q375,160 325.5,172.5Q276,185 258,200ZM453,480L453,480Q453,480 453,480Q453,480 453,480L453,480L453,480Q453,480 453,480Q453,480 453,480Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/icn_camera_24dp.xml b/app/src/main/res/drawable/icn_camera_24dp.xml
new file mode 100644
index 00000000..95a7ab12
--- /dev/null
+++ b/app/src/main/res/drawable/icn_camera_24dp.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"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M456,360L776,360Q749,291 693.5,241.5Q638,192 566,172L456,360ZM364,440L524,164Q513,162 502,161Q491,160 480,160Q414,160 357,185Q300,210 256,252L364,440ZM170,560L388,560L228,284Q196,325 178,374.5Q160,424 160,480Q160,501 162.5,520.5Q165,540 170,560ZM394,788L502,600L184,600Q211,669 266.5,718.5Q322,768 394,788ZM480,800Q546,800 603,775Q660,750 704,708L596,520L436,796Q447,798 457.5,799Q468,800 480,800ZM732,676Q764,635 782,585.5Q800,536 800,480Q800,459 797.5,439.5Q795,420 790,400L572,400L732,676ZM480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,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,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,880Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/icn_chat_24dp.xml b/app/src/main/res/drawable/icn_chat_24dp.xml
new file mode 100644
index 00000000..6ce2d158
--- /dev/null
+++ b/app/src/main/res/drawable/icn_chat_24dp.xml
@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    android:tint="?attr/colorControlNormal"
+    android:autoMirrored="true">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M240,560L560,560L560,480L240,480L240,560ZM240,440L720,440L720,360L240,360L240,440ZM240,320L720,320L720,240L240,240L240,320ZM80,880L80,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,720L80,880ZM206,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,640Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/icn_check_24dp.xml b/app/src/main/res/drawable/icn_check_24dp.xml
new file mode 100644
index 00000000..280f0bd8
--- /dev/null
+++ b/app/src/main/res/drawable/icn_check_24dp.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"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M382,720L154,492L211,435L382,606L749,239L806,296L382,720Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/icn_close_24dp.xml b/app/src/main/res/drawable/icn_close_24dp.xml
new file mode 100644
index 00000000..7a0ff35d
--- /dev/null
+++ b/app/src/main/res/drawable/icn_close_24dp.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"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M256,760L200,704L424,480L200,256L256,200L480,424L704,200L760,256L536,480L760,704L704,760L480,536L256,760Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/icn_cloud_24dp.xml b/app/src/main/res/drawable/icn_cloud_24dp.xml
new file mode 100644
index 00000000..b6651328
--- /dev/null
+++ b/app/src/main/res/drawable/icn_cloud_24dp.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"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M260,800Q169,800 104.5,737Q40,674 40,583Q40,505 87,444Q134,383 210,366Q235,274 310,217Q385,160 480,160Q597,160 678.5,241.5Q760,323 760,440L760,440L760,440Q829,448 874.5,499.5Q920,551 920,620Q920,695 867.5,747.5Q815,800 740,800L260,800ZM260,720L740,720Q782,720 811,691Q840,662 840,620Q840,578 811,549Q782,520 740,520L680,520L680,440Q680,357 621.5,298.5Q563,240 480,240Q397,240 338.5,298.5Q280,357 280,440L280,440L260,440Q202,440 161,481Q120,522 120,580Q120,638 161,679Q202,720 260,720ZM480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480L480,480L480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480L480,480L480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/icn_content_copy_24dp.xml b/app/src/main/res/drawable/icn_content_copy_24dp.xml
new file mode 100644
index 00000000..a423fecf
--- /dev/null
+++ b/app/src/main/res/drawable/icn_content_copy_24dp.xml
@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    android:tint="?attr/colorControlNormal"
+    android:autoMirrored="true">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M360,720Q327,720 303.5,696.5Q280,673 280,640L280,160Q280,127 303.5,103.5Q327,80 360,80L720,80Q753,80 776.5,103.5Q800,127 800,160L800,640Q800,673 776.5,696.5Q753,720 720,720L360,720ZM360,640L720,640Q720,640 720,640Q720,640 720,640L720,160Q720,160 720,160Q720,160 720,160L360,160Q360,160 360,160Q360,160 360,160L360,640Q360,640 360,640Q360,640 360,640ZM200,880Q167,880 143.5,856.5Q120,833 120,800L120,240L200,240L200,800Q200,800 200,800Q200,800 200,800L640,800L640,880L200,880ZM360,640Q360,640 360,640Q360,640 360,640L360,160Q360,160 360,160Q360,160 360,160L360,160Q360,160 360,160Q360,160 360,160L360,640Q360,640 360,640Q360,640 360,640Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/icn_delete_24dp.xml b/app/src/main/res/drawable/icn_delete_24dp.xml
new file mode 100644
index 00000000..d724c2e0
--- /dev/null
+++ b/app/src/main/res/drawable/icn_delete_24dp.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"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M280,840Q247,840 223.5,816.5Q200,793 200,760L200,240L160,240L160,160L360,160L360,120L600,120L600,160L800,160L800,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,240ZM360,680L440,680L440,320L360,320L360,680ZM520,680L600,680L600,320L520,320L520,680ZM280,240L280,240L280,760Q280,760 280,760Q280,760 280,760L280,760Q280,760 280,760Q280,760 280,760L280,240Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/icn_devices_24dp.xml b/app/src/main/res/drawable/icn_devices_24dp.xml
new file mode 100644
index 00000000..7d69f1aa
--- /dev/null
+++ b/app/src/main/res/drawable/icn_devices_24dp.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"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M480,420L480,420Q480,420 480,420Q480,420 480,420L480,420Q480,420 480,420Q480,420 480,420L480,420Q480,420 480,420Q480,420 480,420ZM80,800L80,720L480,720L480,800L80,800ZM200,680Q167,680 143.5,656.5Q120,633 120,600L120,240Q120,207 143.5,183.5Q167,160 200,160L760,160Q793,160 816.5,183.5Q840,207 840,240L200,240Q200,240 200,240Q200,240 200,240L200,600Q200,600 200,600Q200,600 200,600L480,600L480,680L200,680ZM800,720L800,400Q800,400 800,400Q800,400 800,400L640,400Q640,400 640,400Q640,400 640,400L640,720Q640,720 640,720Q640,720 640,720L800,720Q800,720 800,720Q800,720 800,720ZM620,800Q595,800 577.5,782.5Q560,765 560,740L560,380Q560,355 577.5,337.5Q595,320 620,320L820,320Q845,320 862.5,337.5Q880,355 880,380L880,740Q880,765 862.5,782.5Q845,800 820,800L620,800ZM720,500Q733,500 741.5,491Q750,482 750,470Q750,457 741.5,448.5Q733,440 720,440Q708,440 699,448.5Q690,457 690,470Q690,482 699,491Q708,500 720,500ZM720,560Q720,560 720,560Q720,560 720,560L720,560Q720,560 720,560Q720,560 720,560L720,560Q720,560 720,560Q720,560 720,560L720,560Q720,560 720,560Q720,560 720,560Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/icn_download_24dp.xml b/app/src/main/res/drawable/icn_download_24dp.xml
new file mode 100644
index 00000000..dba46014
--- /dev/null
+++ b/app/src/main/res/drawable/icn_download_24dp.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"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M480,640L280,440L336,382L440,486L440,160L520,160L520,486L624,382L680,440L480,640ZM240,800Q207,800 183.5,776.5Q160,753 160,720L160,600L240,600L240,720Q240,720 240,720Q240,720 240,720L720,720Q720,720 720,720Q720,720 720,720L720,600L800,600L800,720Q800,753 776.5,776.5Q753,800 720,800L240,800Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/icn_eda_24dp.xml b/app/src/main/res/drawable/icn_eda_24dp.xml
new file mode 100644
index 00000000..feb34f1f
--- /dev/null
+++ b/app/src/main/res/drawable/icn_eda_24dp.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"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M280,480L280,120Q280,103 291.5,91.5Q303,80 320,80Q337,80 348.5,91.5Q360,103 360,120L360,480L280,480ZM440,480L440,80Q440,63 451.5,51.5Q463,40 480,40Q497,40 508.5,51.5Q520,63 520,80L520,480L440,480ZM600,643L600,160Q600,143 611.5,131.5Q623,120 640,120Q657,120 668.5,131.5Q680,143 680,160L680,596L600,643ZM280,840L547,840Q555,840 562,836.5Q569,833 575,828L757,646L757,646Q757,646 757,646Q757,646 757,646L470,813L340,640L200,640L200,760Q200,793 223.5,816.5Q247,840 280,840ZM280,920Q214,920 167,873Q120,826 120,760L120,560L380,560L490,707L680,596L770,544Q791,532 814.5,533.5Q838,535 858,549L921,596L632,885Q615,902 593,911Q571,920 547,920L280,920ZM200,560L120,560L120,200Q120,183 131.5,171.5Q143,160 160,160Q177,160 188.5,171.5Q200,183 200,200L200,560ZM200,480L600,480L600,480L490,480L380,480L200,480ZM280,840Q247,840 223.5,840Q200,840 200,840L200,840L340,840L470,840L575,840L575,840L575,840L575,840Q569,840 562,840Q555,840 547,840L280,840Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/icn_edit_24dp.xml b/app/src/main/res/drawable/icn_edit_24dp.xml
new file mode 100644
index 00000000..b2531085
--- /dev/null
+++ b/app/src/main/res/drawable/icn_edit_24dp.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"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M200,760L257,760L648,369L591,312L200,703L200,760ZM120,840L120,670L648,143Q660,132 674.5,126Q689,120 705,120Q721,120 736,126Q751,132 762,144L817,200Q829,211 834.5,226Q840,241 840,256Q840,272 834.5,286.5Q829,301 817,313L290,840L120,840ZM760,256L760,256L704,200L704,200L760,256ZM619,341L591,312L591,312L648,369L648,369L619,341Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/icn_emoji_nature_24dp.xml b/app/src/main/res/drawable/icn_emoji_nature_24dp.xml
new file mode 100644
index 00000000..958ed649
--- /dev/null
+++ b/app/src/main/res/drawable/icn_emoji_nature_24dp.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"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M720,360L688,388Q674,401 655,401Q636,401 622,390Q608,379 603,362Q598,345 604,326L620,276L586,256Q570,247 563.5,230Q557,213 562,196Q567,179 582,169.5Q597,160 616,160L656,160L668,122Q674,103 688.5,91.5Q703,80 720,80Q737,80 751.5,91.5Q766,103 772,122L784,160L824,160Q843,160 857.5,169.5Q872,179 878,196Q885,214 878,231Q871,248 856,256L820,276L836,326Q842,345 837,362.5Q832,380 818,390Q803,401 784.5,401Q766,401 752,388L720,360ZM720,280Q737,280 748.5,268.5Q760,257 760,240Q760,223 748.5,211.5Q737,200 720,200Q703,200 691.5,211.5Q680,223 680,240Q680,257 691.5,268.5Q703,280 720,280ZM552,716Q575,776 537,828Q499,880 430,880Q397,880 367.5,863Q338,846 324,818Q241,830 186.5,775.5Q132,721 142,636Q112,619 96,589.5Q80,560 80,522Q80,461 135.5,423.5Q191,386 244,408L306,434Q326,403 359,383.5Q392,364 430,362L430,280L490,280L490,370Q527,381 551,404.5Q575,428 592,470L680,470L680,530L598,530Q596,568 577.5,601Q559,634 528,654L552,716ZM304,740Q304,713 308.5,687.5Q313,662 322,638Q299,649 272.5,653.5Q246,658 220,656Q220,695 242.5,717.5Q265,740 304,740ZM230,576Q262,576 286.5,568Q311,560 350,536L230,486Q201,474 180.5,486.5Q160,499 160,526Q160,552 177,564Q194,576 230,576ZM430,800Q455,800 470.5,782.5Q486,765 478,746L424,610Q405,642 394.5,674Q384,706 384,732Q384,765 395.5,782.5Q407,800 430,800ZM496,578Q506,568 512,551.5Q518,535 518,517Q518,485 497,463Q476,441 445,441Q427,441 411,447Q395,453 384,464L462,500L496,578ZM322,638Q322,638 322,638Q322,638 322,638Q322,638 322,638Q322,638 322,638Q322,638 322,638Q322,638 322,638Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/icn_emoji_objects_24dp.xml b/app/src/main/res/drawable/icn_emoji_objects_24dp.xml
new file mode 100644
index 00000000..13e69fbf
--- /dev/null
+++ b/app/src/main/res/drawable/icn_emoji_objects_24dp.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"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M480,880Q454,880 433,867.5Q412,855 400,834L400,834Q367,834 343.5,810.5Q320,787 320,754L320,612Q261,573 225.5,509Q190,445 190,370Q190,249 274.5,164.5Q359,80 480,80Q601,80 685.5,164.5Q770,249 770,370Q770,447 734.5,510Q699,573 640,612L640,754Q640,787 616.5,810.5Q593,834 560,834L560,834Q548,855 527,867.5Q506,880 480,880ZM400,754L560,754L560,718L400,718L400,754ZM400,678L560,678L560,640L400,640L400,678ZM392,560L450,560L450,452L362,364L404,322L480,398L556,322L598,364L510,452L510,560L568,560Q622,534 656,483.5Q690,433 690,370Q690,282 629,221Q568,160 480,160Q392,160 331,221Q270,282 270,370Q270,433 304,483.5Q338,534 392,560ZM480,398L480,398L480,398L480,398L480,398L480,398L480,398L480,398L480,398ZM480,360Q480,360 480,360Q480,360 480,360Q480,360 480,360Q480,360 480,360Q480,360 480,360Q480,360 480,360Q480,360 480,360Q480,360 480,360L480,360L480,360L480,360L480,360L480,360L480,360L480,360L480,360L480,360Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/icn_emoji_people_24dp.xml b/app/src/main/res/drawable/icn_emoji_people_24dp.xml
new file mode 100644
index 00000000..95c476d5
--- /dev/null
+++ b/app/src/main/res/drawable/icn_emoji_people_24dp.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"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M360,880L360,351Q269,327 214.5,250.5Q160,174 160,80L240,80Q240,163 293.5,221.5Q347,280 430,280L530,280Q560,280 586,291Q612,302 633,323L814,504L758,560L600,402L600,880L520,880L520,640L440,640L440,880L360,880ZM480,240Q447,240 423.5,216.5Q400,193 400,160Q400,127 423.5,103.5Q447,80 480,80Q513,80 536.5,103.5Q560,127 560,160Q560,193 536.5,216.5Q513,240 480,240Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/icn_emoji_symbols_24dp.xml b/app/src/main/res/drawable/icn_emoji_symbols_24dp.xml
new file mode 100644
index 00000000..a8637d9d
--- /dev/null
+++ b/app/src/main/res/drawable/icn_emoji_symbols_24dp.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"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M120,160L120,80L440,80L440,160L120,160ZM240,440L240,280L120,280L120,200L440,200L440,280L320,280L320,440L240,440ZM548,864L492,808L804,496L860,552L548,864ZM580,640Q554,640 537,623Q520,606 520,580Q520,554 537,537Q554,520 580,520Q606,520 623,537Q640,554 640,580Q640,606 623,623Q606,640 580,640ZM780,840Q754,840 737,823Q720,806 720,780Q720,754 737,737Q754,720 780,720Q806,720 823,737Q840,754 840,780Q840,806 823,823Q806,840 780,840ZM620,440Q579,440 549.5,410.5Q520,381 520,340Q520,299 549.5,268.5Q579,238 620,238Q632,238 641.5,239.5Q651,241 660,244L660,120Q660,103 671.5,91.5Q683,80 700,80L840,80L840,160L720,160L720,340Q720,381 690.5,410.5Q661,440 620,440ZM220,880Q179,880 149.5,849.5Q120,819 120,778Q120,760 127.5,741.5Q135,723 150,708L192,666L178,652Q163,637 155.5,619.5Q148,602 148,582Q148,541 177.5,511.5Q207,482 248,482Q289,482 318.5,511.5Q348,541 348,582Q348,602 341.5,619.5Q335,637 320,652L306,666L334,694L390,638L446,696L390,752L446,808L390,864L334,808L292,850Q277,865 258.5,872.5Q240,880 220,880ZM248,610L262,596Q265,593 266.5,590Q268,587 268,582Q268,573 262,567.5Q256,562 248,562Q240,562 234,567.5Q228,573 228,582Q228,585 229.5,589Q231,593 234,596L248,610ZM218,800Q221,800 226,798.5Q231,797 234,794L278,752L250,724L206,766Q203,769 201.5,773Q200,777 200,782Q200,790 205,795Q210,800 218,800Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/icn_error_24dp.xml b/app/src/main/res/drawable/icn_error_24dp.xml
new file mode 100644
index 00000000..8355c11c
--- /dev/null
+++ b/app/src/main/res/drawable/icn_error_24dp.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"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      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,680ZM440,520L520,520L520,280L440,280L440,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,800Q614,800 707,707Q800,614 800,480Q800,346 707,253Q614,160 480,160Q346,160 253,253Q160,346 160,480Q160,614 253,707Q346,800 480,800ZM480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/icn_explore_24dp.xml b/app/src/main/res/drawable/icn_explore_24dp.xml
new file mode 100644
index 00000000..9cd59b9e
--- /dev/null
+++ b/app/src/main/res/drawable/icn_explore_24dp.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"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M300,660L580,580L660,300L380,380L300,660ZM480,540Q455,540 437.5,522.5Q420,505 420,480Q420,455 437.5,437.5Q455,420 480,420Q505,420 522.5,437.5Q540,455 540,480Q540,505 522.5,522.5Q505,540 480,540ZM480,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,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,800ZM480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/icn_feedback_24dp.xml b/app/src/main/res/drawable/icn_feedback_24dp.xml
new file mode 100644
index 00000000..1765191e
--- /dev/null
+++ b/app/src/main/res/drawable/icn_feedback_24dp.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"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M480,600Q497,600 508.5,588.5Q520,577 520,560Q520,543 508.5,531.5Q497,520 480,520Q463,520 451.5,531.5Q440,543 440,560Q440,577 451.5,588.5Q463,600 480,600ZM440,440L520,440L520,200L440,200L440,440ZM80,880L80,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,720L80,880ZM206,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,640Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/icn_file_export_24dp.xml b/app/src/main/res/drawable/icn_file_export_24dp.xml
new file mode 100644
index 00000000..783669eb
--- /dev/null
+++ b/app/src/main/res/drawable/icn_file_export_24dp.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"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M480,480L480,480Q480,480 480,480Q480,480 480,480L480,480L480,480L480,480Q480,480 480,480Q480,480 480,480L480,480L480,480ZM202,895L146,838L264,720L174,720L174,640L400,640L400,866L320,866L320,777L202,895ZM480,880L480,800L720,800Q720,800 720,800Q720,800 720,800L720,360L520,360L520,160L240,160Q240,160 240,160Q240,160 240,160L240,560L160,560L160,160Q160,127 183.5,103.5Q207,80 240,80L560,80L800,320L800,800Q800,833 776.5,856.5Q753,880 720,880L480,880Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/icn_file_open_24dp.xml b/app/src/main/res/drawable/icn_file_open_24dp.xml
new file mode 100644
index 00000000..c94ebed3
--- /dev/null
+++ b/app/src/main/res/drawable/icn_file_open_24dp.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"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M240,880Q207,880 183.5,856.5Q160,833 160,800L160,160Q160,127 183.5,103.5Q207,80 240,80L560,80L800,320L800,560L720,560L720,360L520,360L520,160L240,160Q240,160 240,160Q240,160 240,160L240,800Q240,800 240,800Q240,800 240,800L600,800L600,880L240,880ZM878,895L760,777L760,866L680,866L680,640L906,640L906,720L816,720L934,838L878,895ZM240,800L240,560L240,560L240,360L240,160L240,160Q240,160 240,160Q240,160 240,160L240,800Q240,800 240,800Q240,800 240,800Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/icn_file_present_24dp.xml b/app/src/main/res/drawable/icn_file_present_24dp.xml
new file mode 100644
index 00000000..9513c4b2
--- /dev/null
+++ b/app/src/main/res/drawable/icn_file_present_24dp.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"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M240,880Q207,880 183.5,856.5Q160,833 160,800L160,160Q160,127 183.5,103.5Q207,80 240,80L600,80L800,280L800,800Q800,833 776.5,856.5Q753,880 720,880L240,880ZM240,800L720,800Q720,800 720,800Q720,800 720,800L720,320L560,320L560,160L240,160Q240,160 240,160Q240,160 240,160L240,800Q240,800 240,800Q240,800 240,800ZM480,760Q547,760 593.5,713Q640,666 640,600L640,440L560,440L560,600Q560,633 537,656.5Q514,680 480,680Q447,680 423.5,656.5Q400,633 400,600L400,380Q400,371 406,365.5Q412,360 420,360Q429,360 434.5,365.5Q440,371 440,380L440,600L520,600L520,380Q520,338 491,309Q462,280 420,280Q378,280 349,309Q320,338 320,380L320,600Q320,666 367,713Q414,760 480,760ZM240,160L240,160L240,320L240,320L240,160L240,320L240,320L240,800Q240,800 240,800Q240,800 240,800L240,800Q240,800 240,800Q240,800 240,800L240,160Q240,160 240,160Q240,160 240,160Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/icn_flag_24dp.xml b/app/src/main/res/drawable/icn_flag_24dp.xml
new file mode 100644
index 00000000..2b2dd31f
--- /dev/null
+++ b/app/src/main/res/drawable/icn_flag_24dp.xml
@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    android:tint="?attr/colorControlNormal"
+    android:autoMirrored="true">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M200,840L200,160L560,160L576,240L800,240L800,640L520,640L504,560L280,560L280,840L200,840ZM500,400L500,400L500,400L500,400L500,400L500,400L500,400L500,400ZM586,560L720,560L720,320L510,320L494,240L280,240L280,480L570,480L586,560Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/icn_forum_24dp.xml b/app/src/main/res/drawable/icn_forum_24dp.xml
new file mode 100644
index 00000000..8531a432
--- /dev/null
+++ b/app/src/main/res/drawable/icn_forum_24dp.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"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M880,880L720,720L320,720Q287,720 263.5,696.5Q240,673 240,640L240,600L680,600Q713,600 736.5,576.5Q760,553 760,520L760,240L800,240Q833,240 856.5,263.5Q880,287 880,320L880,880ZM160,487L207,440L600,440Q600,440 600,440Q600,440 600,440L600,160Q600,160 600,160Q600,160 600,160L160,160Q160,160 160,160Q160,160 160,160L160,487ZM80,680L80,160Q80,127 103.5,103.5Q127,80 160,80L600,80Q633,80 656.5,103.5Q680,127 680,160L680,440Q680,473 656.5,496.5Q633,520 600,520L240,520L80,680ZM160,440L160,160Q160,160 160,160Q160,160 160,160L160,160Q160,160 160,160Q160,160 160,160L160,440Q160,440 160,440Q160,440 160,440L160,440Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/icn_forum_24dp__fill.xml b/app/src/main/res/drawable/icn_forum_24dp__fill.xml
new file mode 100644
index 00000000..1339c1a1
--- /dev/null
+++ b/app/src/main/res/drawable/icn_forum_24dp__fill.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"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M280,720Q263,720 251.5,708.5Q240,697 240,680L240,600L760,600L760,600L760,240L840,240Q857,240 868.5,251.5Q880,263 880,280L880,880L720,720L280,720ZM80,680L80,120Q80,103 91.5,91.5Q103,80 120,80L640,80Q657,80 668.5,91.5Q680,103 680,120L680,480Q680,497 668.5,508.5Q657,520 640,520L240,520L80,680Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/icn_group_24dp.xml b/app/src/main/res/drawable/icn_group_24dp.xml
new file mode 100644
index 00000000..556499a8
--- /dev/null
+++ b/app/src/main/res/drawable/icn_group_24dp.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"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M40,800L40,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,800L40,800ZM760,800L760,680Q760,636 735.5,595.5Q711,555 666,526Q717,532 762,546.5Q807,561 846,582Q882,602 901,626.5Q920,651 920,680L920,800L760,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/app/src/main/res/drawable/icn_hardware_24dp.xml b/app/src/main/res/drawable/icn_hardware_24dp.xml
new file mode 100644
index 00000000..e5aea58d
--- /dev/null
+++ b/app/src/main/res/drawable/icn_hardware_24dp.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"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M400,840Q383,840 371.5,828.5Q360,817 360,800L360,320L160,320Q160,237 218.5,178.5Q277,120 360,120L600,120L600,240L720,120L800,120L800,440L720,440L600,320L600,800Q600,817 588.5,828.5Q577,840 560,840L400,840ZM440,760L520,760L520,520L480,520L440,520L440,760ZM440,440L520,440L520,200L360,200Q334,200 311,210.5Q288,221 271,240L440,240L440,440ZM480,480L480,480L480,480L480,480L480,480L480,480L480,480L480,480Q480,480 480,480Q480,480 480,480L480,480L480,480L480,480L480,480L480,480Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/icn_home_24dp.xml b/app/src/main/res/drawable/icn_home_24dp.xml
new file mode 100644
index 00000000..16b05380
--- /dev/null
+++ b/app/src/main/res/drawable/icn_home_24dp.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"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M240,760L360,760L360,520L600,520L600,760L720,760L720,400L480,220L240,400L240,760ZM160,840L160,360L480,120L800,360L800,840L520,840L520,600L440,600L440,840L160,840ZM480,490L480,490L480,490L480,490L480,490L480,490L480,490L480,490L480,490Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/icn_id_card_24dp.xml b/app/src/main/res/drawable/icn_id_card_24dp.xml
new file mode 100644
index 00000000..b70f75ca
--- /dev/null
+++ b/app/src/main/res/drawable/icn_id_card_24dp.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"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M560,520L760,520L760,440L560,440L560,520ZM560,400L760,400L760,320L560,320L560,400ZM200,640L520,640L520,618Q520,573 476,546.5Q432,520 360,520Q288,520 244,546.5Q200,573 200,618L200,640ZM360,480Q393,480 416.5,456.5Q440,433 440,400Q440,367 416.5,343.5Q393,320 360,320Q327,320 303.5,343.5Q280,367 280,400Q280,433 303.5,456.5Q327,480 360,480ZM160,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,800ZM160,720L800,720Q800,720 800,720Q800,720 800,720L800,240Q800,240 800,240Q800,240 800,240L160,240Q160,240 160,240Q160,240 160,240L160,720Q160,720 160,720Q160,720 160,720ZM160,720Q160,720 160,720Q160,720 160,720L160,240Q160,240 160,240Q160,240 160,240L160,240Q160,240 160,240Q160,240 160,240L160,720Q160,720 160,720Q160,720 160,720Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/icn_identifier_copy_24dp.xml b/app/src/main/res/drawable/icn_identifier_copy_24dp.xml
new file mode 100644
index 00000000..203b5f1d
--- /dev/null
+++ b/app/src/main/res/drawable/icn_identifier_copy_24dp.xml
@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="25dp"
+    android:height="24dp"
+    android:viewportWidth="25"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M9,18C8.45,18 7.979,17.804 7.588,17.413C7.196,17.021 7,16.55 7,16L7,4C7,3.45 7.196,2.979 7.588,2.587C7.979,2.196 8.45,2 9,2L18,2C18.55,2 19.021,2.196 19.413,2.587C19.804,2.979 20,3.45 20,4L20,16C20,16.55 19.804,17.021 19.413,17.413C19.021,17.804 18.55,18 18,18L9,18ZM9,16L18,16L18,4L9,4L9,16ZM5,22C4.45,22 3.979,21.804 3.588,21.413C3.196,21.021 3,20.55 3,20L3,6L5,6L5,20L16,20L16,22L5,22ZM9,16L9,4L9,16Z"
+      android:fillType="nonZero"/>
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M12.462,7.518L12.462,8.524L11.959,8.524L11.959,11.542L12.462,11.542L12.462,12.548L10.45,12.548L10.45,11.542L10.953,11.542L10.953,8.524L10.45,8.524L10.45,7.518L12.462,7.518M15.48,7.518C16.038,7.518 16.485,7.971 16.485,8.524L16.485,11.542C16.485,12.1 16.038,12.548 15.48,12.548L13.468,12.548L13.468,7.518M15.48,8.524L14.474,8.524L14.474,11.542L15.48,11.542L15.48,8.524Z"
+      android:fillType="nonZero"/>
+</vector>
diff --git a/app/src/main/res/drawable/icn_ios_share_24dp.xml b/app/src/main/res/drawable/icn_ios_share_24dp.xml
new file mode 100644
index 00000000..3a65b172
--- /dev/null
+++ b/app/src/main/res/drawable/icn_ios_share_24dp.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"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M240,920Q207,920 183.5,896.5Q160,873 160,840L160,400Q160,367 183.5,343.5Q207,320 240,320L360,320L360,400L240,400Q240,400 240,400Q240,400 240,400L240,840Q240,840 240,840Q240,840 240,840L720,840Q720,840 720,840Q720,840 720,840L720,400Q720,400 720,400Q720,400 720,400L600,400L600,320L720,320Q753,320 776.5,343.5Q800,367 800,400L800,840Q800,873 776.5,896.5Q753,920 720,920L240,920ZM440,640L440,193L376,257L320,200L480,40L640,200L584,257L520,193L520,640L440,640Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/icn_keep_24dp.xml b/app/src/main/res/drawable/icn_keep_24dp.xml
new file mode 100644
index 00000000..b7be67f8
--- /dev/null
+++ b/app/src/main/res/drawable/icn_keep_24dp.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"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M640,480L720,560L720,640L520,640L520,880L480,920L440,880L440,640L240,640L240,560L320,480L320,200L280,200L280,120L680,120L680,200L640,200L640,480ZM354,560L606,560L560,514L560,200L400,200L400,514L354,560ZM480,560L480,560L480,560L480,560L480,560L480,560Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/icn_keyboard_arrow_right_24dp.xml b/app/src/main/res/drawable/icn_keyboard_arrow_right_24dp.xml
new file mode 100644
index 00000000..3d036ecb
--- /dev/null
+++ b/app/src/main/res/drawable/icn_keyboard_arrow_right_24dp.xml
@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    android:tint="?attr/colorControlNormal"
+    android:autoMirrored="true">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M504,480L320,296L376,240L616,480L376,720L320,664L504,480Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/icn_language_24dp.xml b/app/src/main/res/drawable/icn_language_24dp.xml
new file mode 100644
index 00000000..2211f7a2
--- /dev/null
+++ b/app/src/main/res/drawable/icn_language_24dp.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"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      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/app/src/main/res/drawable/icn_link_24dp.xml b/app/src/main/res/drawable/icn_link_24dp.xml
new file mode 100644
index 00000000..e8af9e16
--- /dev/null
+++ b/app/src/main/res/drawable/icn_link_24dp.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"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M440,680L280,680Q197,680 138.5,621.5Q80,563 80,480Q80,397 138.5,338.5Q197,280 280,280L440,280L440,360L280,360Q230,360 195,395Q160,430 160,480Q160,530 195,565Q230,600 280,600L440,600L440,680ZM320,520L320,440L640,440L640,520L320,520ZM520,680L520,600L680,600Q730,600 765,565Q800,530 800,480Q800,430 765,395Q730,360 680,360L520,360L520,280L680,280Q763,280 821.5,338.5Q880,397 880,480Q880,563 821.5,621.5Q763,680 680,680L520,680Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/icn_list_24dp.xml b/app/src/main/res/drawable/icn_list_24dp.xml
new file mode 100644
index 00000000..a16c9370
--- /dev/null
+++ b/app/src/main/res/drawable/icn_list_24dp.xml
@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    android:tint="?attr/colorControlNormal"
+    android:autoMirrored="true">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M280,360L280,280L840,280L840,360L280,360ZM280,520L280,440L840,440L840,520L280,520ZM280,680L280,600L840,600L840,680L280,680ZM160,360Q143,360 131.5,348.5Q120,337 120,320Q120,303 131.5,291.5Q143,280 160,280Q177,280 188.5,291.5Q200,303 200,320Q200,337 188.5,348.5Q177,360 160,360ZM160,520Q143,520 131.5,508.5Q120,497 120,480Q120,463 131.5,451.5Q143,440 160,440Q177,440 188.5,451.5Q200,463 200,480Q200,497 188.5,508.5Q177,520 160,520ZM160,680Q143,680 131.5,668.5Q120,657 120,640Q120,623 131.5,611.5Q143,600 160,600Q177,600 188.5,611.5Q200,623 200,640Q200,657 188.5,668.5Q177,680 160,680Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/icn_lock_24dp.xml b/app/src/main/res/drawable/icn_lock_24dp.xml
new file mode 100644
index 00000000..11d93f2f
--- /dev/null
+++ b/app/src/main/res/drawable/icn_lock_24dp.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"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M240,880Q207,880 183.5,856.5Q160,833 160,800L160,400Q160,367 183.5,343.5Q207,320 240,320L280,320L280,240Q280,157 338.5,98.5Q397,40 480,40Q563,40 621.5,98.5Q680,157 680,240L680,320L720,320Q753,320 776.5,343.5Q800,367 800,400L800,800Q800,833 776.5,856.5Q753,880 720,880L240,880ZM240,800L720,800Q720,800 720,800Q720,800 720,800L720,400Q720,400 720,400Q720,400 720,400L240,400Q240,400 240,400Q240,400 240,400L240,800Q240,800 240,800Q240,800 240,800ZM480,680Q513,680 536.5,656.5Q560,633 560,600Q560,567 536.5,543.5Q513,520 480,520Q447,520 423.5,543.5Q400,567 400,600Q400,633 423.5,656.5Q447,680 480,680ZM360,320L600,320L600,240Q600,190 565,155Q530,120 480,120Q430,120 395,155Q360,190 360,240L360,320ZM240,800Q240,800 240,800Q240,800 240,800L240,400Q240,400 240,400Q240,400 240,400L240,400Q240,400 240,400Q240,400 240,400L240,800Q240,800 240,800Q240,800 240,800Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/icn_logout_24dp.xml b/app/src/main/res/drawable/icn_logout_24dp.xml
new file mode 100644
index 00000000..77efdba7
--- /dev/null
+++ b/app/src/main/res/drawable/icn_logout_24dp.xml
@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    android:tint="?attr/colorControlNormal"
+    android:autoMirrored="true">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M200,840Q167,840 143.5,816.5Q120,793 120,760L120,200Q120,167 143.5,143.5Q167,120 200,120L480,120L480,200L200,200Q200,200 200,200Q200,200 200,200L200,760Q200,760 200,760Q200,760 200,760L480,760L480,840L200,840ZM640,680L585,622L687,520L360,520L360,440L687,440L585,338L640,280L840,480L640,680Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/icn_mark_chat_read_24dp.xml b/app/src/main/res/drawable/icn_mark_chat_read_24dp.xml
new file mode 100644
index 00000000..0b11386c
--- /dev/null
+++ b/app/src/main/res/drawable/icn_mark_chat_read_24dp.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"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M694,800L553,658L609,602L694,687L864,517L920,574L694,800ZM80,880L80,160Q80,127 103.5,103.5Q127,80 160,80L800,80Q833,80 856.5,103.5Q880,127 880,160L880,440L800,440L800,160Q800,160 800,160Q800,160 800,160L160,160Q160,160 160,160Q160,160 160,160L160,685L206,640L480,640L480,720L240,720L80,880ZM160,640L160,640L160,640L160,160Q160,160 160,160Q160,160 160,160L160,160Q160,160 160,160Q160,160 160,160L160,160L160,160L160,640Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/icn_menu_24dp.xml b/app/src/main/res/drawable/icn_menu_24dp.xml
new file mode 100644
index 00000000..538d1cf6
--- /dev/null
+++ b/app/src/main/res/drawable/icn_menu_24dp.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"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M120,720L120,640L840,640L840,720L120,720ZM120,520L120,440L840,440L840,520L120,520ZM120,320L120,240L840,240L840,320L120,320Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/icn_mood_24dp.xml b/app/src/main/res/drawable/icn_mood_24dp.xml
new file mode 100644
index 00000000..947ca7fe
--- /dev/null
+++ b/app/src/main/res/drawable/icn_mood_24dp.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"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M620,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,700Q548,700 603.5,661.5Q659,623 684,560L276,560Q301,623 356.5,661.5Q412,700 480,700ZM480,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/app/src/main/res/drawable/icn_more_vert_24dp.xml b/app/src/main/res/drawable/icn_more_vert_24dp.xml
new file mode 100644
index 00000000..e4aa85d5
--- /dev/null
+++ b/app/src/main/res/drawable/icn_more_vert_24dp.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"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      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/app/src/main/res/drawable/icn_note_stack_24dp.xml b/app/src/main/res/drawable/icn_note_stack_24dp.xml
new file mode 100644
index 00000000..fe180949
--- /dev/null
+++ b/app/src/main/res/drawable/icn_note_stack_24dp.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"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M280,800L280,359Q280,326 304,303Q328,280 361,280L800,280Q833,280 856.5,303.5Q880,327 880,360L880,680L680,880L360,880Q327,880 303.5,856.5Q280,833 280,800ZM81,250Q75,217 94,190.5Q113,164 146,158L580,81Q613,75 639.5,94Q666,113 672,146L682,200L600,200L593,160Q593,160 593,160Q593,160 593,160L160,237Q160,237 160,237Q160,237 160,237L200,463L200,742L200,742Q184,733 172.5,718Q161,703 158,684L81,250ZM360,360L360,800Q360,800 360,800Q360,800 360,800L640,800L640,640L800,640L800,360Q800,360 800,360Q800,360 800,360L360,360Q360,360 360,360Q360,360 360,360ZM580,580L580,580Q580,580 580,580Q580,580 580,580L580,580L580,580L580,580Q580,580 580,580Q580,580 580,580L580,580Q580,580 580,580Q580,580 580,580Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/icn_notification_settings_24dp.xml b/app/src/main/res/drawable/icn_notification_settings_24dp.xml
new file mode 100644
index 00000000..806f9692
--- /dev/null
+++ b/app/src/main/res/drawable/icn_notification_settings_24dp.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"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M480,471L480,471Q480,471 480,471Q480,471 480,471Q480,471 480,471Q480,471 480,471Q480,471 480,471Q480,471 480,471L480,471ZM480,880Q447,880 423.5,856.5Q400,833 400,800L560,800Q560,833 536.5,856.5Q513,880 480,880ZM160,760L160,680L240,680L240,400Q240,316 290.5,251Q341,186 422,167Q412,189 406.5,213Q401,237 399,262Q364,283 342,319Q320,355 320,400L320,680L640,680L640,558Q660,561 680,561Q700,561 720,558L720,680L800,680L800,760L160,760ZM640,480L628,420Q616,415 605.5,409.5Q595,404 584,396L526,414L486,346L532,306Q530,293 530,280Q530,267 532,254L486,214L526,146L584,164Q595,156 605.5,150.5Q616,145 628,140L640,80L720,80L732,140Q744,145 754.5,150.5Q765,156 776,164L834,146L874,214L828,254Q830,267 830,280Q830,293 828,306L874,346L834,414L776,396Q765,404 754.5,409.5Q744,415 732,420L720,480L640,480ZM680,360Q713,360 736.5,336.5Q760,313 760,280Q760,247 736.5,223.5Q713,200 680,200Q647,200 623.5,223.5Q600,247 600,280Q600,313 623.5,336.5Q647,360 680,360Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/icn_open_in_browser_24dp.xml b/app/src/main/res/drawable/icn_open_in_browser_24dp.xml
new file mode 100644
index 00000000..40fcc742
--- /dev/null
+++ b/app/src/main/res/drawable/icn_open_in_browser_24dp.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"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      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,840L600,840L600,760L760,760Q760,760 760,760Q760,760 760,760L760,280L200,280L200,760Q200,760 200,760Q200,760 200,760L360,760L360,840L200,840ZM440,840L440,594L376,658L320,600L480,440L640,600L584,658L520,594L520,840L440,840Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/icn_page_info_24dp.xml b/app/src/main/res/drawable/icn_page_info_24dp.xml
new file mode 100644
index 00000000..9dd10189
--- /dev/null
+++ b/app/src/main/res/drawable/icn_page_info_24dp.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"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M710,810Q647,810 603.5,766.5Q560,723 560,660Q560,597 603.5,553.5Q647,510 710,510Q773,510 816.5,553.5Q860,597 860,660Q860,723 816.5,766.5Q773,810 710,810ZM710,730Q739,730 759.5,709.5Q780,689 780,660Q780,631 759.5,610.5Q739,590 710,590Q681,590 660.5,610.5Q640,631 640,660Q640,689 660.5,709.5Q681,730 710,730ZM160,700L160,620L480,620L480,700L160,700ZM250,450Q187,450 143.5,406.5Q100,363 100,300Q100,237 143.5,193.5Q187,150 250,150Q313,150 356.5,193.5Q400,237 400,300Q400,363 356.5,406.5Q313,450 250,450ZM250,370Q279,370 299.5,349.5Q320,329 320,300Q320,271 299.5,250.5Q279,230 250,230Q221,230 200.5,250.5Q180,271 180,300Q180,329 200.5,349.5Q221,370 250,370ZM480,340L480,260L800,260L800,340L480,340ZM710,660Q710,660 710,660Q710,660 710,660Q710,660 710,660Q710,660 710,660Q710,660 710,660Q710,660 710,660Q710,660 710,660Q710,660 710,660ZM250,300Q250,300 250,300Q250,300 250,300Q250,300 250,300Q250,300 250,300Q250,300 250,300Q250,300 250,300Q250,300 250,300Q250,300 250,300Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/icn_palette_24dp.xml b/app/src/main/res/drawable/icn_palette_24dp.xml
new file mode 100644
index 00000000..58c504c2
--- /dev/null
+++ b/app/src/main/res/drawable/icn_palette_24dp.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"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M480,880Q398,880 325,848.5Q252,817 197.5,762.5Q143,708 111.5,635Q80,562 80,480Q80,397 112.5,324Q145,251 200.5,197Q256,143 330,111.5Q404,80 488,80Q568,80 639,107.5Q710,135 763.5,183.5Q817,232 848.5,298.5Q880,365 880,442Q880,557 810,618.5Q740,680 640,680L566,680Q557,680 553.5,685Q550,690 550,696Q550,708 565,730.5Q580,753 580,782Q580,832 552.5,856Q525,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,480L480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480ZM260,520Q286,520 303,503Q320,486 320,460Q320,434 303,417Q286,400 260,400Q234,400 217,417Q200,434 200,460Q200,486 217,503Q234,520 260,520ZM380,360Q406,360 423,343Q440,326 440,300Q440,274 423,257Q406,240 380,240Q354,240 337,257Q320,274 320,300Q320,326 337,343Q354,360 380,360ZM580,360Q606,360 623,343Q640,326 640,300Q640,274 623,257Q606,240 580,240Q554,240 537,257Q520,274 520,300Q520,326 537,343Q554,360 580,360ZM700,520Q726,520 743,503Q760,486 760,460Q760,434 743,417Q726,400 700,400Q674,400 657,417Q640,434 640,460Q640,486 657,503Q674,520 700,520ZM480,800Q489,800 494.5,795Q500,790 500,782Q500,768 485,749Q470,730 470,692Q470,650 499,625Q528,600 570,600L640,600Q706,600 753,561.5Q800,523 800,442Q800,321 707.5,240.5Q615,160 488,160Q352,160 256,253Q160,346 160,480Q160,613 253.5,706.5Q347,800 480,800Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/icn_pause_24dp.xml b/app/src/main/res/drawable/icn_pause_24dp.xml
new file mode 100644
index 00000000..e80541fd
--- /dev/null
+++ b/app/src/main/res/drawable/icn_pause_24dp.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"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M520,760L520,200L760,200L760,760L520,760ZM200,760L200,200L440,200L440,760L200,760ZM600,680L680,680L680,280L600,280L600,680ZM280,680L360,680L360,280L280,280L280,680ZM280,280L280,280L280,680L280,680L280,280ZM600,280L600,280L600,680L600,680L600,280Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/icn_person_off_24dp.xml b/app/src/main/res/drawable/icn_person_off_24dp.xml
new file mode 100644
index 00000000..bbf48374
--- /dev/null
+++ b/app/src/main/res/drawable/icn_person_off_24dp.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"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M791,905L686,800L160,800L160,688Q160,654 177.5,625.5Q195,597 224,582Q269,559 315.5,545Q362,531 410,524Q410,524 410,524Q410,524 410,524L55,169L112,112L848,848L791,905ZM240,720L606,720L486,600Q484,600 483,600Q482,600 480,600Q424,600 369,613.5Q314,627 260,654Q251,659 245.5,668Q240,677 240,688L240,720ZM736,582Q765,596 782,624.5Q799,653 800,686L800,686L666,552Q684,559 701.5,566Q719,573 736,582ZM568,454L509,395Q532,386 546,365.5Q560,345 560,320Q560,287 536.5,263.5Q513,240 480,240Q455,240 434.5,254Q414,268 405,291L346,232Q369,198 404,179Q439,160 480,160Q546,160 593,207Q640,254 640,320Q640,361 621,396Q602,431 568,454ZM606,720L240,720L240,720Q240,720 245.5,720Q251,720 260,720Q287,720 316,720Q345,720 384.5,720Q424,720 477.5,720Q531,720 606,720Q606,720 606,720Q606,720 606,720ZM457,343Q457,343 457,343Q457,343 457,343Q457,343 457,343Q457,343 457,343L457,343Q457,343 457,343Q457,343 457,343Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/icn_photo_library_24dp.xml b/app/src/main/res/drawable/icn_photo_library_24dp.xml
new file mode 100644
index 00000000..492224cb
--- /dev/null
+++ b/app/src/main/res/drawable/icn_photo_library_24dp.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"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M360,560L760,560L622,380L530,500L468,420L360,560ZM320,720Q287,720 263.5,696.5Q240,673 240,640L240,160Q240,127 263.5,103.5Q287,80 320,80L800,80Q833,80 856.5,103.5Q880,127 880,160L880,640Q880,673 856.5,696.5Q833,720 800,720L320,720ZM320,640L800,640Q800,640 800,640Q800,640 800,640L800,160Q800,160 800,160Q800,160 800,160L320,160Q320,160 320,160Q320,160 320,160L320,640Q320,640 320,640Q320,640 320,640ZM160,880Q127,880 103.5,856.5Q80,833 80,800L80,240L160,240L160,800Q160,800 160,800Q160,800 160,800L720,800L720,880L160,880ZM320,160L320,160Q320,160 320,160Q320,160 320,160L320,640Q320,640 320,640Q320,640 320,640L320,640Q320,640 320,640Q320,640 320,640L320,160Q320,160 320,160Q320,160 320,160Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/icn_play_arrow_24dp.xml b/app/src/main/res/drawable/icn_play_arrow_24dp.xml
new file mode 100644
index 00000000..9bc6b5d6
--- /dev/null
+++ b/app/src/main/res/drawable/icn_play_arrow_24dp.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"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M320,760L320,200L760,480L320,760ZM400,480L400,480L400,480ZM400,614L610,480L400,346L400,614Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/icn_qr_code_scanner_24dp.xml b/app/src/main/res/drawable/icn_qr_code_scanner_24dp.xml
new file mode 100644
index 00000000..f7ec937a
--- /dev/null
+++ b/app/src/main/res/drawable/icn_qr_code_scanner_24dp.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"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M80,280L80,80L280,80L280,160L160,160L160,280L80,280ZM80,880L80,680L160,680L160,800L280,800L280,880L80,880ZM680,880L680,800L800,800L800,680L880,680L880,880L680,880ZM800,280L800,160L680,160L680,80L880,80L880,280L800,280ZM700,700L760,700L760,760L700,760L700,700ZM700,580L760,580L760,640L700,640L700,580ZM640,640L700,640L700,700L640,700L640,640ZM580,700L640,700L640,760L580,760L580,700ZM520,640L580,640L580,700L520,700L520,640ZM640,520L700,520L700,580L640,580L640,520ZM580,580L640,580L640,640L580,640L580,580ZM520,520L580,520L580,580L520,580L520,520ZM760,200L760,440L520,440L520,200L760,200ZM440,520L440,760L200,760L200,520L440,520ZM440,200L440,440L200,440L200,200L440,200ZM380,700L380,580L260,580L260,700L380,700ZM380,380L380,260L260,260L260,380L380,380ZM700,380L700,260L580,260L580,380L700,380Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/icn_reply_24dp.xml b/app/src/main/res/drawable/icn_reply_24dp.xml
new file mode 100644
index 00000000..718f8e91
--- /dev/null
+++ b/app/src/main/res/drawable/icn_reply_24dp.xml
@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    android:tint="?attr/colorControlNormal"
+    android:autoMirrored="true">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M760,760L760,600Q760,550 725,515Q690,480 640,480L273,480L417,624L360,680L120,440L360,200L417,256L273,400L640,400Q723,400 781.5,458.5Q840,517 840,600L840,760L760,760Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/icn_report_24dp.xml b/app/src/main/res/drawable/icn_report_24dp.xml
new file mode 100644
index 00000000..e462b1dd
--- /dev/null
+++ b/app/src/main/res/drawable/icn_report_24dp.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"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      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,680ZM440,520L520,520L520,280L440,280L440,520ZM330,840L120,630L120,330L330,120L630,120L840,330L840,630L630,840L330,840ZM364,760L596,760L760,596L760,364L596,200L364,200L200,364L200,596L364,760ZM480,480L480,480L480,480L480,480L480,480L480,480L480,480L480,480Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/icn_search_24dp.xml b/app/src/main/res/drawable/icn_search_24dp.xml
new file mode 100644
index 00000000..390774bb
--- /dev/null
+++ b/app/src/main/res/drawable/icn_search_24dp.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"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M784,840L532,588Q502,612 463,626Q424,640 380,640Q271,640 195.5,564.5Q120,489 120,380Q120,271 195.5,195.5Q271,120 380,120Q489,120 564.5,195.5Q640,271 640,380Q640,424 626,463Q612,502 588,532L840,784L784,840ZM380,560Q455,560 507.5,507.5Q560,455 560,380Q560,305 507.5,252.5Q455,200 380,200Q305,200 252.5,252.5Q200,305 200,380Q200,455 252.5,507.5Q305,560 380,560Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/icn_send_24dp.xml b/app/src/main/res/drawable/icn_send_24dp.xml
new file mode 100644
index 00000000..254f05c6
--- /dev/null
+++ b/app/src/main/res/drawable/icn_send_24dp.xml
@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    android:tint="?attr/colorControlNormal"
+    android:autoMirrored="true">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M120,800L120,160L880,480L120,800ZM200,680L674,480L200,280L200,420L440,480L200,540L200,680ZM200,680L200,480L200,280L200,420L200,420L200,540L200,540L200,680Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/icn_settings_24dp.xml b/app/src/main/res/drawable/icn_settings_24dp.xml
new file mode 100644
index 00000000..4bcd4aae
--- /dev/null
+++ b/app/src/main/res/drawable/icn_settings_24dp.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"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M370,880L354,752Q341,747 329.5,740Q318,733 307,725L188,775L78,585L181,507Q180,500 180,493.5Q180,487 180,480Q180,473 180,466.5Q180,460 181,453L78,375L188,185L307,235Q318,227 330,220Q342,213 354,208L370,80L590,80L606,208Q619,213 630.5,220Q642,227 653,235L772,185L882,375L779,453Q780,460 780,466.5Q780,473 780,480Q780,487 780,493.5Q780,500 778,507L881,585L771,775L653,725Q642,733 630,740Q618,747 606,752L590,880L370,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/app/src/main/res/drawable/icn_sign_language_24dp.xml b/app/src/main/res/drawable/icn_sign_language_24dp.xml
new file mode 100644
index 00000000..8bee9795
--- /dev/null
+++ b/app/src/main/res/drawable/icn_sign_language_24dp.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"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M527,320L303,153Q289,143 287,127Q285,111 295,97Q305,83 321,80.5Q337,78 351,88L575,256L527,320ZM374,256L338,293Q333,298 328.5,303.5Q324,309 320,315L263,273Q249,263 247,247Q245,231 255,217Q265,203 281,201Q297,199 311,209L374,256ZM658,379L658,379L658,379L658,379Q658,379 658,379Q658,379 658,379L658,379Q658,379 658,379Q658,379 658,379L658,379ZM743,331L439,104Q425,94 422.5,78Q420,62 430,48Q440,34 456,32Q472,30 486,40L682,186L691,117Q694,93 710,76Q726,59 749,55L789,49L883,365Q891,392 886,420Q881,448 864,471L779,584Q777,560 768.5,537.5Q760,515 746,495L800,423Q806,415 807,406Q808,397 806,388L758,225L743,331ZM270,427L256,417Q242,407 239.5,391Q237,375 247,361Q257,347 273,345Q289,343 303,353L304,354Q299,372 300.5,390.5Q302,409 308,427L270,427ZM80,680Q63,680 51.5,668.5Q40,657 40,640Q40,623 51.5,611.5Q63,600 80,600L360,600L360,680L80,680ZM120,800Q103,800 91.5,788.5Q80,777 80,760Q80,743 91.5,731.5Q103,720 120,720L360,720L360,800L120,800ZM200,920Q183,920 171.5,908.5Q160,897 160,880Q160,863 171.5,851.5Q183,840 200,840L600,840Q617,840 628.5,828.5Q640,817 640,800L640,600Q640,590 636,582Q632,574 624,568L488,466L540,560L160,560Q143,560 131.5,548.5Q120,537 120,520Q120,503 131.5,491.5Q143,480 160,480L404,480L370,420Q358,399 360.5,375.5Q363,352 380,335L408,307L672,504Q695,521 707.5,546Q720,571 720,600L720,800Q720,850 685,885Q650,920 600,920L200,920ZM481,697L481,697L481,697L481,697Q481,697 481,697Q481,697 481,697L481,697Q481,697 481,697Q481,697 481,697L481,697L481,697Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/icn_smart_toy_24dp.xml b/app/src/main/res/drawable/icn_smart_toy_24dp.xml
new file mode 100644
index 00000000..b0ba9a07
--- /dev/null
+++ b/app/src/main/res/drawable/icn_smart_toy_24dp.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"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M160,600Q110,600 75,565Q40,530 40,480Q40,430 75,395Q110,360 160,360L160,280Q160,247 183.5,223.5Q207,200 240,200L360,200Q360,150 395,115Q430,80 480,80Q530,80 565,115Q600,150 600,200L720,200Q753,200 776.5,223.5Q800,247 800,280L800,360Q850,360 885,395Q920,430 920,480Q920,530 885,565Q850,600 800,600L800,760Q800,793 776.5,816.5Q753,840 720,840L240,840Q207,840 183.5,816.5Q160,793 160,760L160,600ZM360,520Q385,520 402.5,502.5Q420,485 420,460Q420,435 402.5,417.5Q385,400 360,400Q335,400 317.5,417.5Q300,435 300,460Q300,485 317.5,502.5Q335,520 360,520ZM600,520Q625,520 642.5,502.5Q660,485 660,460Q660,435 642.5,417.5Q625,400 600,400Q575,400 557.5,417.5Q540,435 540,460Q540,485 557.5,502.5Q575,520 600,520ZM320,680L640,680L640,600L320,600L320,680ZM240,760L720,760Q720,760 720,760Q720,760 720,760L720,280Q720,280 720,280Q720,280 720,280L240,280Q240,280 240,280Q240,280 240,280L240,760Q240,760 240,760Q240,760 240,760ZM480,520Q480,520 480,520Q480,520 480,520L480,520Q480,520 480,520Q480,520 480,520L480,520Q480,520 480,520Q480,520 480,520L480,520Q480,520 480,520Q480,520 480,520Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/icn_south_24dp.xml b/app/src/main/res/drawable/icn_south_24dp.xml
new file mode 100644
index 00000000..387721ae
--- /dev/null
+++ b/app/src/main/res/drawable/icn_south_24dp.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"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M480,880L200,600L256,544L440,727L440,80L520,80L520,727L704,543L760,600L480,880Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/icn_sports_bar_24dp.xml b/app/src/main/res/drawable/icn_sports_bar_24dp.xml
new file mode 100644
index 00000000..446144f8
--- /dev/null
+++ b/app/src/main/res/drawable/icn_sports_bar_24dp.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"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M320,760L600,760L600,360L520,360Q492,360 474,374Q456,388 431,415Q411,437 384.5,460.5Q358,484 320,495L320,760ZM240,840L240,494Q188,480 154,438Q120,396 120,340Q120,287 150.5,246Q181,205 229,189Q252,141 297.5,111Q343,81 400,81Q435,81 465.5,93Q496,105 521,125Q531,123 540,121.5Q549,120 560,120Q626,120 673,167Q720,214 720,280Q720,302 714.5,322Q709,342 698,360L760,360Q793,360 816.5,383.5Q840,407 840,440L840,680Q840,713 816.5,736.5Q793,760 760,760L680,760L680,840L240,840ZM200,340Q200,373 223.5,396.5Q247,420 280,420Q312,420 334.5,399Q357,378 381,352Q406,325 437.5,302.5Q469,280 520,280L640,280Q640,247 616.5,223.5Q593,200 560,200Q535,200 518,206.5Q501,213 501,213L470,187Q459,178 441.5,169.5Q424,161 400,161Q368,161 341.5,178Q315,195 301,224L287,254L255,265Q230,273 215,293.5Q200,314 200,340ZM680,680L760,680Q760,680 760,680Q760,680 760,680L760,440Q760,440 760,440Q760,440 760,440L680,440L680,680ZM320,760L320,760Q358,760 384.5,760Q411,760 431,760Q456,760 474,760Q492,760 520,760L600,760L600,760L320,760Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/icn_star_shine_24dp.xml b/app/src/main/res/drawable/icn_star_shine_24dp.xml
new file mode 100644
index 00000000..aa19f98e
--- /dev/null
+++ b/app/src/main/res/drawable/icn_star_shine_24dp.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"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M852,748L732,628L788,572L908,692L852,748ZM708,268L652,212L772,92L828,148L708,268ZM252,268L132,148L188,92L308,212L252,268ZM108,748L52,692L172,572L228,628L108,748ZM354,673L480,597L606,674L573,530L684,434L538,421L480,285L422,420L276,433L387,530L354,673ZM233,840L298,559L80,370L368,345L480,80L592,345L880,370L662,559L727,840L480,691L233,840ZM480,479L480,479L480,479L480,479L480,479L480,479L480,479L480,479L480,479L480,479Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/icn_star_shine_24dp__fill.xml b/app/src/main/res/drawable/icn_star_shine_24dp__fill.xml
new file mode 100644
index 00000000..85a0a7ba
--- /dev/null
+++ b/app/src/main/res/drawable/icn_star_shine_24dp__fill.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"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M852,748L732,628L788,572L908,692L852,748ZM708,268L652,212L772,92L828,148L708,268ZM252,268L132,148L188,92L308,212L252,268ZM108,748L52,692L172,572L228,628L108,748ZM233,840L298,559L80,370L368,345L480,80L592,345L880,370L662,559L727,840L480,691L233,840Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/icn_tag_24dp.xml b/app/src/main/res/drawable/icn_tag_24dp.xml
new file mode 100644
index 00000000..ab04cfea
--- /dev/null
+++ b/app/src/main/res/drawable/icn_tag_24dp.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"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M240,800L280,640L120,640L140,560L300,560L340,400L180,400L200,320L360,320L400,160L480,160L440,320L600,320L640,160L720,160L680,320L840,320L820,400L660,400L620,560L780,560L760,640L600,640L560,800L480,800L520,640L360,640L320,800L240,800ZM380,560L540,560L580,400L420,400L380,560Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/icn_visibility_24dp.xml b/app/src/main/res/drawable/icn_visibility_24dp.xml
new file mode 100644
index 00000000..23d640a8
--- /dev/null
+++ b/app/src/main/res/drawable/icn_visibility_24dp.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"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M480,640Q555,640 607.5,587.5Q660,535 660,460Q660,385 607.5,332.5Q555,280 480,280Q405,280 352.5,332.5Q300,385 300,460Q300,535 352.5,587.5Q405,640 480,640ZM480,568Q435,568 403.5,536.5Q372,505 372,460Q372,415 403.5,383.5Q435,352 480,352Q525,352 556.5,383.5Q588,415 588,460Q588,505 556.5,536.5Q525,568 480,568ZM480,760Q334,760 214,678.5Q94,597 40,460Q94,323 214,241.5Q334,160 480,160Q626,160 746,241.5Q866,323 920,460Q866,597 746,678.5Q626,760 480,760ZM480,460Q480,460 480,460Q480,460 480,460Q480,460 480,460Q480,460 480,460Q480,460 480,460Q480,460 480,460Q480,460 480,460Q480,460 480,460ZM480,680Q593,680 687.5,620.5Q782,561 832,460Q782,359 687.5,299.5Q593,240 480,240Q367,240 272.5,299.5Q178,359 128,460Q178,561 272.5,620.5Q367,680 480,680Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/icn_visibility_off_24dp.xml b/app/src/main/res/drawable/icn_visibility_off_24dp.xml
new file mode 100644
index 00000000..6fa698a6
--- /dev/null
+++ b/app/src/main/res/drawable/icn_visibility_off_24dp.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"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M644,532L586,474Q595,427 559,386Q523,345 466,354L408,296Q425,288 442.5,284Q460,280 480,280Q555,280 607.5,332.5Q660,385 660,460Q660,480 656,497.5Q652,515 644,532ZM772,658L714,602Q752,573 781.5,538.5Q811,504 832,460Q782,359 688.5,299.5Q595,240 480,240Q451,240 423,244Q395,248 368,256L306,194Q347,177 390,168.5Q433,160 480,160Q631,160 749,243.5Q867,327 920,460Q897,519 859.5,569.5Q822,620 772,658ZM792,904L624,738Q589,749 553.5,754.5Q518,760 480,760Q329,760 211,676.5Q93,593 40,460Q61,407 93,361.5Q125,316 166,280L56,168L112,112L848,848L792,904ZM222,336Q193,362 169,393Q145,424 128,460Q178,561 271.5,620.5Q365,680 480,680Q500,680 519,677.5Q538,675 558,672L522,634Q511,637 501,638.5Q491,640 480,640Q405,640 352.5,587.5Q300,535 300,460Q300,449 301.5,439Q303,429 306,418L222,336ZM541,429L541,429Q541,429 541,429Q541,429 541,429Q541,429 541,429Q541,429 541,429Q541,429 541,429Q541,429 541,429ZM390,504Q390,504 390,504Q390,504 390,504L390,504Q390,504 390,504Q390,504 390,504Q390,504 390,504Q390,504 390,504Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/icn_volume_up_24dp.xml b/app/src/main/res/drawable/icn_volume_up_24dp.xml
new file mode 100644
index 00000000..bc9c5c82
--- /dev/null
+++ b/app/src/main/res/drawable/icn_volume_up_24dp.xml
@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="960"
+    android:viewportHeight="960"
+    android:tint="?attr/colorControlNormal"
+    android:autoMirrored="true">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M560,829L560,747Q650,721 705,647Q760,573 760,479Q760,385 705,311Q650,237 560,211L560,129Q684,157 762,254.5Q840,352 840,479Q840,606 762,703.5Q684,801 560,829ZM120,600L120,360L280,360L480,160L480,800L280,600L120,600ZM560,640L560,318Q607,340 633.5,384Q660,428 660,480Q660,531 633.5,574.5Q607,618 560,640ZM400,354L314,440L200,440L200,520L314,520L400,606L400,354ZM300,480L300,480L300,480L300,480L300,480L300,480Z"/>
+</vector>
diff --git a/app/src/main/res/drawable/icn_wand_shine_24dp.xml b/app/src/main/res/drawable/icn_wand_shine_24dp.xml
new file mode 100644
index 00000000..c31fd904
--- /dev/null
+++ b/app/src/main/res/drawable/icn_wand_shine_24dp.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"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M331,309L211,189L268,132L388,252L331,309ZM480,214L480,44L560,44L560,214L480,214ZM771,749L651,629L708,572L828,692L771,749ZM708,309L651,252L771,132L828,189L708,309ZM746,480L746,400L916,400L916,480L746,480ZM205,868L92,755Q80,743 80,727Q80,711 92,699L455,335Q490,300 540,300Q590,300 625,335Q660,370 660,420Q660,470 625,505L261,868Q249,880 233,880Q217,880 205,868ZM484,533L484,533Q484,533 469.5,519Q455,505 455,505Q455,505 441,491Q427,477 427,477L427,477L455,505L484,533ZM233,784L484,533L427,477L177,727L233,784Z"/>
+</vector>
diff --git a/app/src/main/res/menu/menu_videoplayer.xml b/app/src/main/res/menu/menu_videoplayer.xml
index 02482fe7..90588d7e 100644
--- a/app/src/main/res/menu/menu_videoplayer.xml
+++ b/app/src/main/res/menu/menu_videoplayer.xml
@@ -4,7 +4,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/mi_share"
-        android:icon="@drawable/ic_share_24dp"
+        android:icon="@drawable/icn_ios_share_24dp"
         android:iconTint="?attr/colorControlNormal"
         android:iconTintMode="multiply"
         android:title="@string/share"
@@ -21,7 +21,7 @@
     </item>
     <item
         android:id="@+id/mi_save"
-        android:icon="@drawable/ic_download_24dp"
+        android:icon="@drawable/icn_download_24dp"
         android:iconTint="?attr/colorControlNormal"
         android:title="@string/media_viewer_save"
         app:showAsAction="ifRoom"