diff --git a/wear/src/main/java/io/homeassistant/companion/android/home/views/SelectShortcutsTileView.kt b/wear/src/main/java/io/homeassistant/companion/android/home/views/SelectShortcutsTileView.kt
index d14e1763317..08339b44c16 100644
--- a/wear/src/main/java/io/homeassistant/companion/android/home/views/SelectShortcutsTileView.kt
+++ b/wear/src/main/java/io/homeassistant/companion/android/home/views/SelectShortcutsTileView.kt
@@ -9,15 +9,15 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.wear.compose.foundation.lazy.itemsIndexed
 import androidx.wear.compose.material3.Button
-import androidx.wear.compose.material3.CheckboxButton
+import androidx.wear.compose.material3.SwitchButton
 import androidx.wear.compose.material3.Text
 import androidx.wear.tooling.preview.devices.WearDevices
 import com.mikepenz.iconics.compose.Image
 import com.mikepenz.iconics.typeface.library.community.material.CommunityMaterial
 import io.homeassistant.companion.android.common.R as commonR
 import io.homeassistant.companion.android.theme.WearAppTheme
-import io.homeassistant.companion.android.theme.getCheckboxButtonColors
 import io.homeassistant.companion.android.theme.getFilledTonalButtonColors
+import io.homeassistant.companion.android.theme.getSwitchButtonColors
 import io.homeassistant.companion.android.theme.wearColorScheme
 import io.homeassistant.companion.android.views.ListHeader
 import io.homeassistant.companion.android.views.ThemeLazyColumn
@@ -35,7 +35,7 @@ fun SelectShortcutsTileView(
                 ListHeader(id = commonR.string.shortcut_tiles)
             }
             item {
-                CheckboxButton(
+                SwitchButton(
                     modifier = Modifier.fillMaxWidth(),
                     checked = isShowShortcutTextEnabled,
                     onCheckedChange = { onShowShortcutTextEnabled(it) },
@@ -51,7 +51,7 @@ fun SelectShortcutsTileView(
                             colorFilter = ColorFilter.tint(wearColorScheme.onSurface)
                         )
                     },
-                    colors = getCheckboxButtonColors()
+                    colors = getSwitchButtonColors()
                 )
             }
             item {
diff --git a/wear/src/main/java/io/homeassistant/companion/android/theme/Color.kt b/wear/src/main/java/io/homeassistant/companion/android/theme/Color.kt
index f7b2494aa31..0fb132fddde 100644
--- a/wear/src/main/java/io/homeassistant/companion/android/theme/Color.kt
+++ b/wear/src/main/java/io/homeassistant/companion/android/theme/Color.kt
@@ -3,7 +3,6 @@ package io.homeassistant.companion.android.theme
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.graphics.Color
 import androidx.wear.compose.material3.ButtonDefaults
-import androidx.wear.compose.material3.CheckboxButtonDefaults
 import androidx.wear.compose.material3.ColorScheme
 import androidx.wear.compose.material3.SliderDefaults
 import androidx.wear.compose.material3.SwitchButtonDefaults
@@ -50,14 +49,6 @@ internal val wearColorScheme: ColorScheme = ColorScheme(
     outlineVariant = md_theme_dark_outlineVariant
 )
 
-@Composable
-fun getCheckboxButtonColors() = CheckboxButtonDefaults.checkboxButtonColors(
-    checkedBoxColor = wearColorScheme.onTertiary,
-    checkedCheckmarkColor = wearColorScheme.tertiary,
-    checkedContainerColor = wearColorScheme.surfaceContainerHigh,
-    uncheckedContentColor = wearColorScheme.surfaceContainerLow
-)
-
 @Composable
 fun getSwitchButtonColors() = SwitchButtonDefaults.switchButtonColors(
     checkedThumbColor = wearColorScheme.tertiary,