diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/utils/PaletteUtils.java b/android/uhabits-android/src/main/java/org/isoron/uhabits/utils/PaletteUtils.java
deleted file mode 100644
index a3b262ef4..000000000
--- a/android/uhabits-android/src/main/java/org/isoron/uhabits/utils/PaletteUtils.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package org.isoron.uhabits.utils;
-
-import android.content.*;
-import android.graphics.*;
-import android.util.*;
-
-import org.isoron.androidbase.utils.*;
-
-public class PaletteUtils
-{
-    public static int colorToPaletteIndex(Context context, int color)
-     {
-        StyledResources res = new StyledResources(context);
-        int[] palette = res.getPalette();
-
-        for (int k = 0; k < palette.length; k++)
-            if (palette[k] == color) return k;
-
-        return -1;
-    }
-
-    public static int getAndroidTestColor(int index)
-    {
-        int palette[] = {
-            Color.parseColor("#D32F2F"), //  0 red
-            Color.parseColor("#E64A19"), //  1 deep orange
-            Color.parseColor("#F57C00"), //  2 orange
-            Color.parseColor("#FF8F00"), //  3 amber
-            Color.parseColor("#F9A825"), //  4 yellow
-            Color.parseColor("#AFB42B"), //  5 lime
-            Color.parseColor("#7CB342"), //  6 light green
-            Color.parseColor("#388E3C"), //  7 green
-            Color.parseColor("#00897B"), //  8 teal
-            Color.parseColor("#00ACC1"), //  9 cyan
-            Color.parseColor("#039BE5"), // 10 light blue
-            Color.parseColor("#1976D2"), // 11 blue
-            Color.parseColor("#303F9F"), // 12 indigo
-            Color.parseColor("#5E35B1"), // 13 deep purple
-            Color.parseColor("#8E24AA"), // 14 purple
-            Color.parseColor("#D81B60"), // 15 pink
-            Color.parseColor("#5D4037"), // 16 brown
-            Color.parseColor("#303030"), // 17 dark grey
-            Color.parseColor("#757575"), // 18 grey
-            Color.parseColor("#aaaaaa")  // 19 light grey
-        };
-
-        return palette[index];
-    }
-
-    public static int getColor(Context context, int paletteColor)
-    {
-        if (context == null)
-            throw new IllegalArgumentException("Context is null");
-
-        StyledResources res = new StyledResources(context);
-        int palette[] = res.getPalette();
-        if (paletteColor < 0 || paletteColor >= palette.length)
-        {
-            Log.w("ColorHelper",
-                String.format("Invalid color: %d. Returning default.",
-                    paletteColor));
-            paletteColor = 0;
-        }
-
-        return palette[paletteColor];
-    }
-}
diff --git a/android/uhabits-android/src/main/java/org/isoron/uhabits/utils/PaletteUtils.kt b/android/uhabits-android/src/main/java/org/isoron/uhabits/utils/PaletteUtils.kt
new file mode 100644
index 000000000..6e205a5a6
--- /dev/null
+++ b/android/uhabits-android/src/main/java/org/isoron/uhabits/utils/PaletteUtils.kt
@@ -0,0 +1,54 @@
+package org.isoron.uhabits.utils
+
+import android.content.Context
+import android.graphics.Color
+import android.util.Log
+import org.isoron.androidbase.utils.StyledResources
+
+object PaletteUtils {
+
+    @JvmStatic
+    fun colorToPaletteIndex(context: Context, color: Int): Int {
+        val palette = StyledResources(context).palette
+        return palette.indexOf(color)
+    }
+
+    @JvmStatic
+    fun getAndroidTestColor(index: Int): Int {
+        val palette = intArrayOf(
+            Color.parseColor("#D32F2F"), //  0 red
+            Color.parseColor("#E64A19"), //  1 deep orange
+            Color.parseColor("#F57C00"), //  2 orange
+            Color.parseColor("#FF8F00"), //  3 amber
+            Color.parseColor("#F9A825"), //  4 yellow
+            Color.parseColor("#AFB42B"), //  5 lime
+            Color.parseColor("#7CB342"), //  6 light green
+            Color.parseColor("#388E3C"), //  7 green
+            Color.parseColor("#00897B"), //  8 teal
+            Color.parseColor("#00ACC1"), //  9 cyan
+            Color.parseColor("#039BE5"), // 10 light blue
+            Color.parseColor("#1976D2"), // 11 blue
+            Color.parseColor("#303F9F"), // 12 indigo
+            Color.parseColor("#5E35B1"), // 13 deep purple
+            Color.parseColor("#8E24AA"), // 14 purple
+            Color.parseColor("#D81B60"), // 15 pink
+            Color.parseColor("#5D4037"), // 16 brown
+            Color.parseColor("#303030"), // 17 dark grey
+            Color.parseColor("#757575"), // 18 grey
+            Color.parseColor("#aaaaaa")  // 19 light grey
+        )
+
+        return palette[index]
+    }
+
+    @JvmStatic
+    fun getColor(context: Context, paletteColor: Int): Int {
+        val palette = StyledResources(context).palette
+        return if (paletteColor in palette.indices) {
+            palette[paletteColor]
+        } else {
+            Log.w("ColorHelper", "Invalid color: $paletteColor. Returning default.")
+            palette[0]
+        }
+    }
+}