diff --git a/appthemehelper/src/main/res/drawable/ate_track.xml b/appthemehelper/src/main/res/drawable/ate_track.xml
index 337ca0319..8761f1faa 100644
--- a/appthemehelper/src/main/res/drawable/ate_track.xml
+++ b/appthemehelper/src/main/res/drawable/ate_track.xml
@@ -13,15 +13,7 @@
   -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_checked="true">
-        <shape android:dither="true" android:shape="rectangle" android:useLevel="false" android:visible="true">
-            <stroke android:width="2dp" android:color="@color/md_deep_purple_A700" />
-            <corners android:radius="25dp" />
-            <size android:width="2dp" />
-            <solid android:color="@android:color/transparent" />
-        </shape>
-    </item>
-    <item android:state_checked="false">
+    <item android:state_checked="false" android:state_enabled="true">
         <shape android:dither="true" android:shape="rectangle" android:useLevel="false" android:visible="true">
             <stroke android:width="2dp" android:color="@color/md_white_1000" />
             <corners android:radius="25dp" />
@@ -29,4 +21,20 @@
             <solid android:color="@android:color/transparent" />
         </shape>
     </item>
+    <item android:state_checked="true" android:state_enabled="true">
+        <shape android:dither="true" android:shape="rectangle" android:useLevel="false" android:visible="true">
+            <stroke android:width="2dp" android:color="@color/md_deep_purple_A700" />
+            <corners android:radius="25dp" />
+            <size android:width="2dp" />
+            <solid android:color="@android:color/transparent" />
+        </shape>
+    </item>
+    <item android:state_enabled="false">
+        <shape android:dither="true" android:shape="rectangle" android:useLevel="false" android:visible="true">
+            <stroke android:width="2dp" android:color="?colorOnSecondary" />
+            <corners android:radius="25dp" />
+            <size android:width="2dp" />
+            <solid android:color="@android:color/transparent" />
+        </shape>
+    </item>
 </selector>
\ No newline at end of file
diff --git a/appthemehelper/src/main/res/drawable/toggle_switch.xml b/appthemehelper/src/main/res/drawable/toggle_switch.xml
index 5a3596270..71669963e 100644
--- a/appthemehelper/src/main/res/drawable/toggle_switch.xml
+++ b/appthemehelper/src/main/res/drawable/toggle_switch.xml
@@ -21,4 +21,12 @@
             <stroke android:width="8dp" android:color="#0000ffff" />
         </shape>
     </item>
+    <item android:state_enabled="false">
+        <shape android:dither="true" android:shape="rectangle" android:useLevel="false" android:visible="true">
+            <solid android:color="?colorOnSecondary" />
+            <corners android:radius="10dp" />
+            <size android:width="20dp" android:height="20dp" />
+            <stroke android:width="8dp" android:color="#0000ffff" />
+        </shape>
+    </item>
 </selector>
\ No newline at end of file