diff --git a/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/LobstersApp.kt b/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/LobstersApp.kt
index 11e5b401..fa835cf1 100644
--- a/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/LobstersApp.kt
+++ b/android/src/main/kotlin/dev/msfjarvis/claw/android/ui/LobstersApp.kt
@@ -4,8 +4,6 @@ import androidx.compose.animation.ExperimentalAnimationApi
 import androidx.compose.foundation.layout.navigationBarsPadding
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.rememberLazyListState
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.ArrowBack
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
@@ -129,7 +127,7 @@ fun LobstersApp(
             if (navItems.none { it.route == currentDestination }) {
               IconButton(onClick = { navController.popBackStack() }) {
                 Icon(
-                  imageVector = Icons.Filled.ArrowBack,
+                  painter = ClawIcons.ArrowBack,
                   contentDescription = "Go back to previous screen",
                 )
               }
diff --git a/common/src/commonMain/kotlin/dev/msfjarvis/claw/common/comments/CommentEntry.kt b/common/src/commonMain/kotlin/dev/msfjarvis/claw/common/comments/CommentEntry.kt
index a7f2c002..3f8e5922 100644
--- a/common/src/commonMain/kotlin/dev/msfjarvis/claw/common/comments/CommentEntry.kt
+++ b/common/src/commonMain/kotlin/dev/msfjarvis/claw/common/comments/CommentEntry.kt
@@ -13,9 +13,9 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material.Icon
 import androidx.compose.material.LocalContentColor
 import androidx.compose.material.LocalTextStyle
+import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
diff --git a/common/src/commonMain/kotlin/dev/msfjarvis/claw/common/comments/Comments.kt b/common/src/commonMain/kotlin/dev/msfjarvis/claw/common/comments/Comments.kt
index 1d8dc659..7a297196 100644
--- a/common/src/commonMain/kotlin/dev/msfjarvis/claw/common/comments/Comments.kt
+++ b/common/src/commonMain/kotlin/dev/msfjarvis/claw/common/comments/Comments.kt
@@ -6,8 +6,8 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.itemsIndexed
-import androidx.compose.material.Surface
 import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
diff --git a/common/src/commonMain/kotlin/dev/msfjarvis/claw/common/res/ClawIcons.kt b/common/src/commonMain/kotlin/dev/msfjarvis/claw/common/res/ClawIcons.kt
index 0b01f4f6..b7d212d0 100644
--- a/common/src/commonMain/kotlin/dev/msfjarvis/claw/common/res/ClawIcons.kt
+++ b/common/src/commonMain/kotlin/dev/msfjarvis/claw/common/res/ClawIcons.kt
@@ -1,5 +1,6 @@
 package dev.msfjarvis.claw.common.res
 
+import dev.msfjarvis.claw.common.res.clawicons.arrow_back_black_24dp
 import dev.msfjarvis.claw.common.res.clawicons.comment_black_24dp
 import dev.msfjarvis.claw.common.res.clawicons.favorite_black_24dp
 import dev.msfjarvis.claw.common.res.clawicons.favorite_border_black_24dp
@@ -8,6 +9,9 @@ import dev.msfjarvis.claw.common.res.clawicons.public_black_24dp
 import dev.msfjarvis.claw.common.res.clawicons.whatshot_black_24dp
 
 object ClawIcons {
+
+  val ArrowBack = arrow_back_black_24dp()
+
   val Comment = comment_black_24dp()
 
   val Flame = whatshot_black_24dp()
diff --git a/common/src/commonMain/kotlin/dev/msfjarvis/claw/common/ui/NetworkError.kt b/common/src/commonMain/kotlin/dev/msfjarvis/claw/common/ui/NetworkError.kt
index 1a2aa46c..d1370f5e 100644
--- a/common/src/commonMain/kotlin/dev/msfjarvis/claw/common/ui/NetworkError.kt
+++ b/common/src/commonMain/kotlin/dev/msfjarvis/claw/common/ui/NetworkError.kt
@@ -2,8 +2,8 @@ package dev.msfjarvis.claw.common.ui
 
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.material.Text
 import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
diff --git a/common/src/commonMain/svgs/arrow_back_black_24dp.svg b/common/src/commonMain/svgs/arrow_back_black_24dp.svg
new file mode 100644
index 00000000..74597028
--- /dev/null
+++ b/common/src/commonMain/svgs/arrow_back_black_24dp.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" height="24px" viewBox="0 0 24 24" width="24px" fill="#000000"><path d="M0 0h24v24H0z" fill="none"/><path d="M20 11H7.83l5.59-5.59L12 4l-8 8 8 8 1.41-1.41L7.83 13H20v-2z"/></svg>
\ No newline at end of file