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 b6f1e3bc..02b44f11 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
@@ -208,12 +208,13 @@ fun ChannelSideDrawer(
                                     onDestinationChanged(ChatRouterDestination.Home)
                                 }
                                 .size(48.dp)
-                                .background(MaterialTheme.colorScheme.secondaryContainer),
+                                .background(MaterialTheme.colorScheme.primaryContainer),
                             contentAlignment = Alignment.Center
                         ) {
                             Icon(
-                                painter = painterResource(R.drawable.ic_message_text_24dp),
-                                contentDescription = stringResource(R.string.discover_alt)
+                                painter = painterResource(R.drawable.ic_direct_messages),
+                                contentDescription = stringResource(R.string.discover_alt),
+                                tint = MaterialTheme.colorScheme.onPrimaryContainer
                             )
                         }
                     }
@@ -298,7 +299,7 @@ fun ChannelSideDrawer(
                                 )
                             }
                             .size(48.dp)
-                            .background(MaterialTheme.colorScheme.onPrimary),
+                            .background(MaterialTheme.colorScheme.secondaryContainer),
                         contentAlignment = Alignment.Center
                     ) {
                         Icon(
@@ -317,7 +318,7 @@ fun ChannelSideDrawer(
                                 onShowAddServerSheet()
                             }
                             .size(48.dp)
-                            .background(MaterialTheme.colorScheme.onPrimary),
+                            .background(MaterialTheme.colorScheme.secondaryContainer),
                         contentAlignment = Alignment.Center
                     ) {
                         Icon(
@@ -563,13 +564,14 @@ fun ChannelSideDrawer(
                 onClick = {
                     onDestinationChanged(ChatRouterDestination.Friends)
                 },
-                containerColor = MaterialTheme.colorScheme.primary,
-                contentColor = MaterialTheme.colorScheme.onPrimary,
+                containerColor = MaterialTheme.colorScheme.primaryContainer,
+                contentColor = MaterialTheme.colorScheme.onPrimaryContainer,
                 shape = CircleShape
             ) {
                 Icon(
-                    painter = painterResource(R.drawable.icn_message_24dp),
-                    contentDescription = stringResource(R.string.message_friends)
+                    painter = painterResource(R.drawable.ic_new_message),
+                    contentDescription = stringResource(R.string.message_friends),
+                    tint = MaterialTheme.colorScheme.onPrimaryContainer
                 )
             }
         }
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 4ff99153..ef660e5e 100644
--- a/app/src/main/java/chat/revolt/screens/chat/ChatRouterScreen.kt
+++ b/app/src/main/java/chat/revolt/screens/chat/ChatRouterScreen.kt
@@ -17,12 +17,9 @@ import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.only
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.systemBars
 import androidx.compose.foundation.layout.windowInsetsPadding
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Face
-import androidx.compose.material.icons.filled.Home
-import androidx.compose.material.icons.filled.Person
 import androidx.compose.material3.AlertDialog
 import androidx.compose.material3.BottomAppBar
 import androidx.compose.material3.DrawerValue
@@ -56,6 +53,7 @@ import androidx.compose.ui.platform.LocalView
 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
 import androidx.core.app.NotificationManagerCompat
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.Lifecycle
@@ -851,8 +849,9 @@ fun ChannelNavigator(
                         NavigationBarItem(
                             icon = {
                                 Icon(
-                                    imageVector = Icons.Default.Home,
+                                    painter = painterResource(R.drawable.ic_bottom_navbar_home),
                                     contentDescription = "Home",
+                                    modifier = Modifier.size(32.dp)
                                 )
                             },
                             label = {
@@ -873,8 +872,9 @@ fun ChannelNavigator(
                         NavigationBarItem(
                             icon = {
                                 Icon(
-                                    imageVector = Icons.Default.Person,
+                                    painter = painterResource(R.drawable.ic_bottom_navbar_friends),
                                     contentDescription = "Friends",
+                                    modifier = Modifier.size(32.dp)
                                 )
                             },
                             label = {
@@ -889,8 +889,9 @@ fun ChannelNavigator(
                         NavigationBarItem(
                             icon = {
                                 Icon(
-                                    imageVector = Icons.Default.Face,
+                                    painter = painterResource(R.drawable.ic_bottom_navbar_you),
                                     contentDescription = "You",
+                                    modifier = Modifier.size(32.dp)
                                 )
                             },
                             label = {
diff --git a/app/src/main/res/drawable/ic_bottom_navbar_friends.xml b/app/src/main/res/drawable/ic_bottom_navbar_friends.xml
new file mode 100644
index 00000000..c0be1b7d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_bottom_navbar_friends.xml
@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="41dp"
+    android:height="40dp"
+    android:viewportWidth="41"
+    android:viewportHeight="40">
+  <group>
+    <clip-path
+        android:pathData="M8.5,8h24v24h-24z"/>
+    <path
+        android:pathData="M23.921,26.341C23.995,26.454 24.037,26.585 24.042,26.72C24.048,26.855 24.016,26.989 23.952,27.108C23.888,27.226 23.792,27.326 23.677,27.395C23.56,27.464 23.428,27.5 23.293,27.5H9.461C9.326,27.5 9.193,27.464 9.077,27.395C8.961,27.326 8.866,27.226 8.801,27.108C8.737,26.989 8.706,26.855 8.712,26.72C8.717,26.585 8.759,26.454 8.833,26.341C9.888,24.716 11.441,23.476 13.26,22.805C12.254,22.136 11.491,21.161 11.083,20.025C10.675,18.888 10.643,17.651 10.993,16.495C11.342,15.339 12.054,14.326 13.024,13.606C13.994,12.887 15.169,12.498 16.377,12.498C17.584,12.498 18.76,12.887 19.729,13.606C20.699,14.326 21.411,15.339 21.761,16.495C22.111,17.651 22.079,18.888 21.671,20.025C21.262,21.161 20.499,22.136 19.494,22.805C21.312,23.476 22.865,24.716 23.921,26.341ZM32.162,26.327C31.106,24.708 29.557,23.474 27.744,22.805C28.931,22.006 29.768,20.785 30.086,19.389C30.404,17.994 30.178,16.531 29.455,15.296C28.731,14.062 27.565,13.149 26.192,12.745C24.82,12.34 23.345,12.474 22.067,13.118C22.019,13.143 21.976,13.179 21.942,13.223C21.909,13.266 21.885,13.316 21.873,13.37C21.861,13.424 21.861,13.479 21.874,13.533C21.885,13.587 21.909,13.637 21.943,13.681C22.893,14.866 23.438,16.323 23.499,17.841C23.56,19.358 23.134,20.855 22.283,22.112C22.228,22.195 22.208,22.295 22.226,22.392C22.245,22.49 22.302,22.575 22.383,22.631C23.493,23.406 24.443,24.387 25.182,25.521C25.48,25.977 25.601,26.526 25.524,27.065C25.515,27.119 25.518,27.174 25.533,27.226C25.548,27.278 25.573,27.327 25.609,27.368C25.644,27.41 25.688,27.443 25.737,27.466C25.786,27.489 25.84,27.5 25.894,27.5H31.547C31.713,27.5 31.873,27.446 32.004,27.345C32.135,27.245 32.229,27.104 32.272,26.944C32.298,26.84 32.302,26.73 32.283,26.624C32.264,26.517 32.223,26.416 32.162,26.327Z"
+        android:fillColor="#8C8A8E"/>
+  </group>
+</vector>
diff --git a/app/src/main/res/drawable/ic_bottom_navbar_home.xml b/app/src/main/res/drawable/ic_bottom_navbar_home.xml
new file mode 100644
index 00000000..a2bf4b8e
--- /dev/null
+++ b/app/src/main/res/drawable/ic_bottom_navbar_home.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="41dp"
+    android:height="40dp"
+    android:viewportWidth="41"
+    android:viewportHeight="40">
+  <path
+      android:pathData="M31,27.5H29.5V20.75L29.719,20.97C29.86,21.11 30.052,21.189 30.251,21.189C30.45,21.189 30.641,21.11 30.782,20.969C30.922,20.828 31.001,20.637 31.001,20.437C31.001,20.238 30.922,20.047 30.781,19.906L21.56,10.689C21.279,10.408 20.898,10.25 20.5,10.25C20.102,10.25 19.721,10.408 19.44,10.689L10.219,19.906C10.079,20.047 10,20.238 10,20.437C10,20.636 10.079,20.827 10.22,20.967C10.361,21.108 10.551,21.187 10.75,21.187C10.949,21.187 11.14,21.108 11.281,20.967L11.5,20.75V27.5H10C9.801,27.5 9.61,27.579 9.47,27.72C9.329,27.861 9.25,28.051 9.25,28.25C9.25,28.449 9.329,28.64 9.47,28.781C9.61,28.921 9.801,29 10,29H31C31.199,29 31.39,28.921 31.53,28.781C31.671,28.64 31.75,28.449 31.75,28.25C31.75,28.051 31.671,27.861 31.53,27.72C31.39,27.579 31.199,27.5 31,27.5ZM22.75,27.5H18.25V23C18.25,22.901 18.289,22.805 18.36,22.735C18.43,22.665 18.525,22.625 18.625,22.625H22.375C22.475,22.625 22.57,22.665 22.64,22.735C22.711,22.805 22.75,22.901 22.75,23V27.5Z"
+      android:fillColor="#FFFFFD"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_bottom_navbar_you.xml b/app/src/main/res/drawable/ic_bottom_navbar_you.xml
new file mode 100644
index 00000000..0fde3ffb
--- /dev/null
+++ b/app/src/main/res/drawable/ic_bottom_navbar_you.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="41dp"
+    android:height="40dp"
+    android:viewportWidth="41"
+    android:viewportHeight="40">
+  <path
+      android:pathData="M20.5,10.25C18.572,10.25 16.687,10.822 15.083,11.893C13.48,12.965 12.23,14.487 11.492,16.269C10.754,18.05 10.561,20.011 10.937,21.902C11.314,23.793 12.242,25.531 13.606,26.894C14.969,28.258 16.707,29.187 18.598,29.563C20.489,29.939 22.45,29.746 24.231,29.008C26.013,28.27 27.535,27.02 28.607,25.417C29.678,23.813 30.25,21.928 30.25,20C30.247,17.415 29.219,14.937 27.391,13.109C25.563,11.281 23.085,10.253 20.5,10.25ZM17.125,17C17.347,17 17.565,17.066 17.75,17.19C17.935,17.313 18.079,17.489 18.164,17.694C18.25,17.9 18.272,18.126 18.228,18.344C18.185,18.563 18.078,18.763 17.92,18.92C17.763,19.078 17.563,19.185 17.344,19.228C17.126,19.272 16.9,19.25 16.694,19.164C16.489,19.079 16.313,18.935 16.19,18.75C16.066,18.565 16,18.347 16,18.125C16,17.827 16.118,17.541 16.33,17.33C16.541,17.118 16.827,17 17.125,17ZM24.899,22.625C23.934,24.293 22.331,25.25 20.5,25.25C18.669,25.25 17.066,24.294 16.101,22.625C16.047,22.54 16.011,22.444 15.994,22.344C15.978,22.245 15.982,22.142 16.006,22.044C16.03,21.946 16.073,21.854 16.134,21.773C16.195,21.692 16.271,21.624 16.359,21.573C16.446,21.523 16.543,21.49 16.644,21.478C16.744,21.466 16.846,21.474 16.943,21.502C17.04,21.531 17.131,21.578 17.209,21.642C17.287,21.706 17.352,21.785 17.399,21.875C18.099,23.085 19.2,23.75 20.5,23.75C21.8,23.75 22.901,23.084 23.601,21.875C23.648,21.785 23.713,21.706 23.791,21.642C23.869,21.578 23.96,21.531 24.057,21.502C24.154,21.474 24.256,21.466 24.356,21.478C24.457,21.49 24.554,21.523 24.641,21.573C24.729,21.624 24.805,21.692 24.866,21.773C24.927,21.854 24.97,21.946 24.994,22.044C25.018,22.142 25.022,22.245 25.006,22.344C24.99,22.444 24.953,22.54 24.899,22.625ZM23.875,19.25C23.653,19.25 23.435,19.184 23.25,19.06C23.065,18.937 22.921,18.761 22.836,18.556C22.75,18.35 22.728,18.124 22.772,17.906C22.815,17.687 22.922,17.487 23.08,17.33C23.237,17.172 23.437,17.065 23.656,17.022C23.874,16.978 24.1,17 24.306,17.086C24.511,17.171 24.687,17.315 24.81,17.5C24.934,17.685 25,17.903 25,18.125C25,18.423 24.882,18.709 24.67,18.92C24.459,19.132 24.173,19.25 23.875,19.25Z"
+      android:fillColor="#8C8A8E"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_direct_messages.xml b/app/src/main/res/drawable/ic_direct_messages.xml
new file mode 100644
index 00000000..5efb937d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_direct_messages.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="40dp"
+    android:height="40dp"
+    android:viewportWidth="40"
+    android:viewportHeight="40">
+  <path
+      android:pathData="M29.75,20C29.75,21.683 29.315,23.338 28.486,24.803C27.657,26.268 26.463,27.494 25.02,28.36C23.577,29.227 21.934,29.705 20.251,29.749L12.237,29.713C11.685,29.71 11.08,29.7 10.69,29.31C10.493,29.113 10.355,28.865 10.291,28.594C10.227,28.323 10.24,28.039 10.328,27.775L11.392,24.582C10.696,23.275 10.308,21.826 10.256,20.346C10.204,18.866 10.49,17.393 11.092,16.04C11.694,14.687 12.597,13.489 13.731,12.536C14.865,11.584 16.202,10.903 17.639,10.544C19.076,10.186 20.575,10.159 22.024,10.466C23.473,10.774 24.833,11.407 26,12.319C27.167,13.23 28.112,14.396 28.762,15.726C29.411,17.057 29.749,18.519 29.75,20Z"
+      android:fillColor="#FFFFFD"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_new_message.xml b/app/src/main/res/drawable/ic_new_message.xml
new file mode 100644
index 00000000..24b2a720
--- /dev/null
+++ b/app/src/main/res/drawable/ic_new_message.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M21.75,12C21.75,13.098 21.565,14.184 21.206,15.212H19.788V13.787C19.788,13.181 19.546,12.599 19.118,12.17C18.688,11.741 18.107,11.5 17.5,11.5C16.893,11.5 16.312,11.741 15.882,12.17C15.453,12.599 15.212,13.181 15.212,13.787V15.212H13.788C13.181,15.212 12.599,15.453 12.17,15.882C11.741,16.311 11.5,16.893 11.5,17.5C11.5,18.107 11.741,18.688 12.17,19.117C12.599,19.546 13.181,19.787 13.788,19.787H15.212V21.208C14.263,21.539 13.264,21.723 12.251,21.749L4.237,21.713C3.685,21.71 3.08,21.7 2.69,21.31C2.493,21.113 2.355,20.865 2.291,20.594C2.227,20.323 2.24,20.039 2.328,19.775L3.392,16.582C2.696,15.275 2.308,13.826 2.256,12.346C2.204,10.866 2.49,9.393 3.092,8.04C3.694,6.687 4.597,5.489 5.731,4.536C6.865,3.584 8.202,2.903 9.639,2.544C11.076,2.185 12.575,2.159 14.024,2.466C15.473,2.774 16.833,3.407 18,4.319C19.167,5.23 20.112,6.396 20.762,7.727C21.411,9.057 21.749,10.519 21.75,12ZM18.057,13.231C18.205,13.378 18.288,13.578 18.288,13.787V16.712H20.537H21.212C21.421,16.712 21.622,16.795 21.769,16.943C21.917,17.091 22,17.291 22,17.5C22,17.709 21.917,17.909 21.769,18.057C21.622,18.204 21.421,18.287 21.212,18.287H19.454H18.288V19.454V21.212C18.288,21.421 18.205,21.622 18.057,21.769C17.909,21.917 17.709,22 17.5,22C17.291,22 17.091,21.917 16.943,21.769C16.795,21.622 16.712,21.421 16.712,21.212V20.538V18.287H13.788C13.579,18.287 13.378,18.204 13.231,18.057C13.083,17.909 13,17.709 13,17.5C13,17.291 13.083,17.091 13.231,16.943C13.378,16.795 13.579,16.712 13.788,16.712H16.712V13.787C16.712,13.578 16.795,13.378 16.943,13.231C17.091,13.083 17.291,13 17.5,13C17.709,13 17.909,13.083 18.057,13.231Z"
+      android:fillColor="#06000A"
+      android:fillType="evenOdd"/>
+</vector>