diff --git a/common/build.gradle.kts b/common/build.gradle.kts
index 814cde26..b8a006ef 100644
--- a/common/build.gradle.kts
+++ b/common/build.gradle.kts
@@ -22,7 +22,6 @@ dependencies {
   implementation(projects.core)
   implementation(projects.database)
   implementation(projects.model)
-  implementation(libs.accompanist.flowlayout)
   implementation(libs.androidx.browser)
   implementation(libs.androidx.compose.animation)
   implementation(libs.androidx.compose.foundation)
diff --git a/common/src/main/kotlin/dev/msfjarvis/claw/common/posts/LobstersCard.kt b/common/src/main/kotlin/dev/msfjarvis/claw/common/posts/LobstersCard.kt
index 22c1fae3..1d203bfe 100644
--- a/common/src/main/kotlin/dev/msfjarvis/claw/common/posts/LobstersCard.kt
+++ b/common/src/main/kotlin/dev/msfjarvis/claw/common/posts/LobstersCard.kt
@@ -14,6 +14,8 @@ import androidx.compose.foundation.combinedClickable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.ExperimentalLayoutApi
+import androidx.compose.foundation.layout.FlowRow
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.absoluteOffset
@@ -43,7 +45,6 @@ import androidx.compose.ui.semantics.Role
 import androidx.compose.ui.text.AnnotatedString
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
-import com.google.accompanist.flowlayout.FlowRow
 import dev.msfjarvis.claw.common.res.ClawIcons
 import dev.msfjarvis.claw.common.ui.NetworkImage
 import dev.msfjarvis.claw.database.local.SavedPost
@@ -200,14 +201,15 @@ private fun CommentsButton(
 }
 
 @Composable
+@OptIn(ExperimentalLayoutApi::class)
 internal fun TagRow(
   tags: List<String>,
   modifier: Modifier = Modifier,
 ) {
   FlowRow(
     modifier = modifier,
-    mainAxisSpacing = 8.dp,
-    crossAxisSpacing = 8.dp,
+    verticalAlignment = Alignment.CenterVertically,
+    horizontalArrangement = Arrangement.spacedBy(8.dp),
   ) {
     tags.forEach { tag -> TagText(tag) }
   }
diff --git a/common/src/main/kotlin/dev/msfjarvis/claw/common/ui/decorations/ClawAppBar.kt b/common/src/main/kotlin/dev/msfjarvis/claw/common/ui/decorations/ClawAppBar.kt
index 23887d4c..377945b1 100644
--- a/common/src/main/kotlin/dev/msfjarvis/claw/common/ui/decorations/ClawAppBar.kt
+++ b/common/src/main/kotlin/dev/msfjarvis/claw/common/ui/decorations/ClawAppBar.kt
@@ -35,7 +35,7 @@ fun ClawAppBar(
   TopAppBar(
     title = title,
     modifier = modifier.shadow(8.dp),
-    colors = TopAppBarDefaults.smallTopAppBarColors(containerColor = backgroundColor),
+    colors = TopAppBarDefaults.topAppBarColors(containerColor = backgroundColor),
     navigationIcon = navigationIcon,
     actions = actions,
   )
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index b39d3835..397f3c94 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -19,7 +19,6 @@ whetstone = "0.6.0-SNAPSHOT"
 workmanager = "2.8.0-rc01"
 
 [libraries]
-accompanist-flowlayout = { module = "com.google.accompanist:accompanist-flowlayout", version.ref = "accompanist" }
 accompanist-sysuicontroller = { module = "com.google.accompanist:accompanist-systemuicontroller", version.ref = "accompanist" }
 androidx-activity-compose = "androidx.activity:activity-compose:1.7.0-alpha02"
 androidx-benchmark-macro-junit4 = "androidx.benchmark:benchmark-macro-junit4:1.2.0-alpha08"