diff --git a/data/themes/src/main/java/de/mm20/launcher2/themes/Theme.kt b/data/themes/src/main/java/de/mm20/launcher2/themes/Theme.kt
index d5377907..4c8ad761 100644
--- a/data/themes/src/main/java/de/mm20/launcher2/themes/Theme.kt
+++ b/data/themes/src/main/java/de/mm20/launcher2/themes/Theme.kt
@@ -59,14 +59,14 @@ data class ColorRef(
     val tone: Int,
 ) : Color {
     override fun toString(): String {
-        return "\$${color.toString()}.$tone"
+        return "\$$color.$tone"
     }
 }
 
 @JvmInline
 value class StaticColor(val color: Int) : Color {
     override fun toString(): String {
-        return "#${color.toString(16).padStart(6, '0')}"
+        return "#${color.toUInt().toString(16).padStart(8, '0')}"
     }
 }