diff --git a/common/build.gradle.kts b/common/build.gradle.kts
index aadeb618..fd5c7a14 100644
--- a/common/build.gradle.kts
+++ b/common/build.gradle.kts
@@ -49,17 +49,11 @@ kotlin {
       implementation(libs.coil.compose)
     }
   }
-  sourceSets["desktopMain"].apply {
-    resources.srcDir("src/androidMain/res/drawable/")
-    dependencies { implementation(libs.kamel.image) }
-  }
+  sourceSets["desktopMain"].apply { dependencies { implementation(libs.kamel.image) } }
 }
 
 android {
   buildFeatures { androidResources = true }
   namespace = "dev.msfjarvis.claw.common"
-  sourceSets["main"].apply {
-    manifest.srcFile("src/androidMain/AndroidManifest.xml")
-    res.srcDirs("src/commonMain/resources")
-  }
+  sourceSets["main"].apply { manifest.srcFile("src/androidMain/AndroidManifest.xml") }
 }
diff --git a/common/src/commonMain/resources/font/manrope_bold.ttf b/common/src/androidMain/res/font/manrope_bold.ttf
similarity index 100%
rename from common/src/commonMain/resources/font/manrope_bold.ttf
rename to common/src/androidMain/res/font/manrope_bold.ttf
diff --git a/common/src/commonMain/resources/font/manrope_extrabold.ttf b/common/src/androidMain/res/font/manrope_extrabold.ttf
similarity index 100%
rename from common/src/commonMain/resources/font/manrope_extrabold.ttf
rename to common/src/androidMain/res/font/manrope_extrabold.ttf
diff --git a/common/src/commonMain/resources/font/manrope_extralight.ttf b/common/src/androidMain/res/font/manrope_extralight.ttf
similarity index 100%
rename from common/src/commonMain/resources/font/manrope_extralight.ttf
rename to common/src/androidMain/res/font/manrope_extralight.ttf
diff --git a/common/src/commonMain/resources/font/manrope_light.ttf b/common/src/androidMain/res/font/manrope_light.ttf
similarity index 100%
rename from common/src/commonMain/resources/font/manrope_light.ttf
rename to common/src/androidMain/res/font/manrope_light.ttf
diff --git a/common/src/commonMain/resources/font/manrope_medium.ttf b/common/src/androidMain/res/font/manrope_medium.ttf
similarity index 100%
rename from common/src/commonMain/resources/font/manrope_medium.ttf
rename to common/src/androidMain/res/font/manrope_medium.ttf
diff --git a/common/src/commonMain/resources/font/manrope_regular.ttf b/common/src/androidMain/res/font/manrope_regular.ttf
similarity index 100%
rename from common/src/commonMain/resources/font/manrope_regular.ttf
rename to common/src/androidMain/res/font/manrope_regular.ttf
diff --git a/common/src/commonMain/resources/font/manrope_semibold.ttf b/common/src/androidMain/res/font/manrope_semibold.ttf
similarity index 100%
rename from common/src/commonMain/resources/font/manrope_semibold.ttf
rename to common/src/androidMain/res/font/manrope_semibold.ttf
diff --git a/common/src/desktopMain/resources/font/manrope_bold.ttf b/common/src/desktopMain/resources/font/manrope_bold.ttf
new file mode 100644
index 00000000..8bbf0bd1
Binary files /dev/null and b/common/src/desktopMain/resources/font/manrope_bold.ttf differ
diff --git a/common/src/desktopMain/resources/font/manrope_extrabold.ttf b/common/src/desktopMain/resources/font/manrope_extrabold.ttf
new file mode 100644
index 00000000..3f68dffc
Binary files /dev/null and b/common/src/desktopMain/resources/font/manrope_extrabold.ttf differ
diff --git a/common/src/desktopMain/resources/font/manrope_extralight.ttf b/common/src/desktopMain/resources/font/manrope_extralight.ttf
new file mode 100644
index 00000000..9d21d775
Binary files /dev/null and b/common/src/desktopMain/resources/font/manrope_extralight.ttf differ
diff --git a/common/src/desktopMain/resources/font/manrope_light.ttf b/common/src/desktopMain/resources/font/manrope_light.ttf
new file mode 100644
index 00000000..f255257a
Binary files /dev/null and b/common/src/desktopMain/resources/font/manrope_light.ttf differ
diff --git a/common/src/desktopMain/resources/font/manrope_medium.ttf b/common/src/desktopMain/resources/font/manrope_medium.ttf
new file mode 100644
index 00000000..c73d7741
Binary files /dev/null and b/common/src/desktopMain/resources/font/manrope_medium.ttf differ
diff --git a/common/src/desktopMain/resources/font/manrope_regular.ttf b/common/src/desktopMain/resources/font/manrope_regular.ttf
new file mode 100644
index 00000000..c02b01be
Binary files /dev/null and b/common/src/desktopMain/resources/font/manrope_regular.ttf differ
diff --git a/common/src/desktopMain/resources/font/manrope_semibold.ttf b/common/src/desktopMain/resources/font/manrope_semibold.ttf
new file mode 100644
index 00000000..30ee0310
Binary files /dev/null and b/common/src/desktopMain/resources/font/manrope_semibold.ttf differ