diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index eecaac7..314c5f6 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -119,7 +119,6 @@ dependencies {
         include("*.jar", "*.aar")
     })
 
-    implementation(libs.accompanist.drawablepainter)
     implementation(libs.accompanist.permissions)
     implementation(libs.androidx.activity.compose)
     implementation(libs.androidx.appcompat)
diff --git a/app/src/main/kotlin/com/sanmer/geomag/ui/screens/home/HomeScreen.kt b/app/src/main/kotlin/com/sanmer/geomag/ui/screens/home/HomeScreen.kt
index 1665892..c78027f 100644
--- a/app/src/main/kotlin/com/sanmer/geomag/ui/screens/home/HomeScreen.kt
+++ b/app/src/main/kotlin/com/sanmer/geomag/ui/screens/home/HomeScreen.kt
@@ -34,13 +34,13 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.navigation.NavController
 import com.sanmer.geomag.R
 import com.sanmer.geomag.datastore.UserData
+import com.sanmer.geomag.ui.component.Logo
 import com.sanmer.geomag.ui.navigation.navigateToSettings
 import com.sanmer.geomag.ui.screens.home.items.CalculationItem
 import com.sanmer.geomag.ui.screens.home.items.DateTimeItem
 import com.sanmer.geomag.ui.screens.home.items.LocationItem
 import com.sanmer.geomag.ui.screens.home.items.RecordBottomSheet
 import com.sanmer.geomag.ui.screens.home.items.RecordsItem
-import com.sanmer.geomag.ui.utils.rememberDrawablePainter
 import com.sanmer.geomag.utils.expansion.navigateToLauncher
 import com.sanmer.geomag.viewmodel.HomeViewModel
 
@@ -142,10 +142,11 @@ private fun TopBar(
         Box(
             modifier = Modifier.padding(horizontal = 18.dp)
         ) {
-            Image(
-                painter = rememberDrawablePainter(id = R.mipmap.ic_launcher),
-                contentDescription = null,
-                modifier = Modifier.size(32.dp)
+            Logo(
+                iconRes = R.drawable.ic_logo,
+                modifier = Modifier.size(32.dp),
+                contentColor = MaterialTheme.colorScheme.onPrimary,
+                containerColor = MaterialTheme.colorScheme.primary
             )
         }
     },
diff --git a/app/src/main/kotlin/com/sanmer/geomag/ui/screens/settings/about/AboutScreen.kt b/app/src/main/kotlin/com/sanmer/geomag/ui/screens/settings/about/AboutScreen.kt
index 170deb2..fff9d6b 100644
--- a/app/src/main/kotlin/com/sanmer/geomag/ui/screens/settings/about/AboutScreen.kt
+++ b/app/src/main/kotlin/com/sanmer/geomag/ui/screens/settings/about/AboutScreen.kt
@@ -35,9 +35,9 @@ import com.sanmer.geomag.BuildConfig
 import com.sanmer.geomag.R
 import com.sanmer.geomag.app.Const
 import com.sanmer.geomag.ui.component.HtmlText
+import com.sanmer.geomag.ui.component.Logo
 import com.sanmer.geomag.ui.component.NavigateUpTopBar
 import com.sanmer.geomag.ui.utils.navigateBack
-import com.sanmer.geomag.ui.utils.rememberDrawablePainter
 import com.sanmer.geomag.utils.expansion.openUrl
 
 @Composable
@@ -66,10 +66,11 @@ fun AboutScreen(
             horizontalAlignment = Alignment.CenterHorizontally
         ) {
             Spacer(modifier = Modifier.height(20.dp))
-            Image(
-                painter = rememberDrawablePainter(id = R.mipmap.ic_launcher),
-                contentDescription = null,
-                modifier = Modifier.size(65.dp)
+            Logo(
+                iconRes = R.drawable.ic_logo,
+                modifier = Modifier.size(65.dp),
+                contentColor = MaterialTheme.colorScheme.onPrimary,
+                containerColor = MaterialTheme.colorScheme.primary
             )
 
             Spacer(modifier = Modifier.height(20.dp))
diff --git a/app/src/main/kotlin/com/sanmer/geomag/ui/utils/DrawablePainter.kt b/app/src/main/kotlin/com/sanmer/geomag/ui/utils/DrawablePainter.kt
deleted file mode 100644
index 1ef0c9d..0000000
--- a/app/src/main/kotlin/com/sanmer/geomag/ui/utils/DrawablePainter.kt
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.sanmer.geomag.ui.utils
-
-import androidx.annotation.DrawableRes
-import androidx.appcompat.content.res.AppCompatResources
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.graphics.painter.Painter
-import androidx.compose.ui.platform.LocalContext
-import com.google.accompanist.drawablepainter.rememberDrawablePainter
-
-@Composable
-fun rememberDrawablePainter(
-    @DrawableRes id: Int
-): Painter {
-    val drawable = AppCompatResources.getDrawable(LocalContext.current, id)
-    return rememberDrawablePainter(drawable = drawable)
-}
\ No newline at end of file
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 129c647..2622dc2 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -24,7 +24,6 @@ protobufPlugin = "0.9.3"
 squareMoshi = "1.14.0"
 
 [libraries]
-accompanist-drawablepainter = { group = "com.google.accompanist", name = "accompanist-drawablepainter", version.ref = "accompanist" }
 accompanist-permissions = { group = "com.google.accompanist", name = "accompanist-permissions", version.ref = "accompanist" }
 androidx-activity-compose = { group = "androidx.activity", name = "activity-compose", version.ref = "androidxActivity" }
 androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "androidxAppCompat" }