diff --git a/app/src/main/res/color/chip_duration_bg.xml b/app/src/main/res/color/chip_duration_bg.xml
new file mode 100644
index 0000000..bdc80ea
--- /dev/null
+++ b/app/src/main/res/color/chip_duration_bg.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_checked="true" android:color="#81C784" />
+    <item android:color="#E8E8E8" />
+</selector>
diff --git a/app/src/main/res/drawable/chip_duration_bg.xml b/app/src/main/res/drawable/chip_duration_bg.xml
deleted file mode 100644
index ef1cfb0..0000000
--- a/app/src/main/res/drawable/chip_duration_bg.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_checked="true">
-        <shape android:shape="rectangle">
-            <corners android:radius="12dp" />
-            <solid android:color="#81C784" />
-        </shape>
-    </item>
-    <item>
-        <shape android:shape="rectangle">
-            <corners android:radius="12dp" />
-            <solid android:color="#F5F5F5" />
-        </shape>
-    </item>
-</selector>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 3af0a7e..50595d1 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -146,6 +146,8 @@
                                 style="@style/Widget.Material3.Chip.Suggestion.Elevated"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
+                                android:minWidth="56dp"
+                                app:chipBackgroundColor="@color/chip_duration_bg"
                                 android:text="5s" />
 
                             <com.google.android.material.chip.Chip
@@ -153,7 +155,9 @@
                                 style="@style/Widget.Material3.Chip.Suggestion.Elevated"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
+                                android:minWidth="56dp"
                                 android:checked="true"
+                                app:chipBackgroundColor="@color/chip_duration_bg"
                                 android:text="10s" />
 
                             <com.google.android.material.chip.Chip
@@ -161,6 +165,8 @@
                                 style="@style/Widget.Material3.Chip.Suggestion.Elevated"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
+                                android:minWidth="56dp"
+                                app:chipBackgroundColor="@color/chip_duration_bg"
                                 android:text="15s" />
 
                             <com.google.android.material.chip.Chip
@@ -168,6 +174,8 @@
                                 style="@style/Widget.Material3.Chip.Suggestion.Elevated"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
+                                android:minWidth="56dp"
+                                app:chipBackgroundColor="@color/chip_duration_bg"
                                 android:text="30s" />
                         </com.google.android.material.chip.ChipGroup>
                     </HorizontalScrollView>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index b277b59..e152348 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -5,11 +5,6 @@
         <item name="colorSecondary">@color/md_theme_light_secondary</item>
         <item name="android:statusBarColor">@color/color_gradient_start</item>
         <item name="android:windowLightStatusBar">true</item>
-        <item name="chipStyle">@style/ChipDuration</item>
-    </style>
-
-    <style name="ChipDuration" parent="Widget.Material3.Chip.Suggestion.Elevated">
-        <item name="chipBackground">@drawable/chip_duration_bg</item>
     </style>
 
     <color name="md_theme_light_primary">#2E7D32</color>