diff --git a/app/src/main/res/drawable/radio.xml b/app/src/main/res/drawable/radio.xml
index 730df15f3..03bd3176b 100644
--- a/app/src/main/res/drawable/radio.xml
+++ b/app/src/main/res/drawable/radio.xml
@@ -1,15 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android" >
     <item
-            android:drawable="@drawable/radio_on"
-            android:state_checked="true"
-            android:state_pressed="true" />
+        android:drawable="@drawable/radio_off"
+        android:state_checked="true"
+        android:state_pressed="true" />
     <item
-            android:drawable="@drawable/radio_on"
-            android:state_pressed="true" />
+        android:drawable="@drawable/radio_black"
+        android:state_checked="false"
+        android:state_pressed="true" />
     <item
-            android:drawable="@drawable/radio_on"
-            android:state_checked="true" />
+        android:drawable="@drawable/radio_checked_hover"
+        android:state_checked="true"
+        android:state_hovered="true" />
     <item
-            android:drawable="@drawable/radio_off" />
+        android:drawable="@drawable/radio_unchecked_hover"
+        android:state_checked="false"
+        android:state_hovered="true" />
+    <item
+        android:drawable="@drawable/radio_on"
+        android:state_checked="true" />
+    <item
+        android:drawable="@drawable/radio_off" />
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/radio_black.xml b/app/src/main/res/drawable/radio_black.xml
new file mode 100644
index 000000000..e56592374
--- /dev/null
+++ b/app/src/main/res/drawable/radio_black.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <vector xmlns:android="http://schemas.android.com/apk/res/android"
+                android:width="24dp"
+                android:height="24dp"
+                android:viewportWidth="200"
+                android:viewportHeight="200">
+
+            <path
+                    android:fillColor="@color/fog"
+                    android:pathData="M100,1.79A98.21,98.21,0,1,0,198.21,100,98.33,98.33,0,0,0,100,1.79Zm0,187.49A89.28,89.28,0,1,1,189.28,100,89.28,89.28,0,0,1,100,189.28Z" />
+            <path
+                    android:fillColor="@color/black"
+                    android:pathData="M 100 28.58 C 139.444176833 28.58 171.42 60.5558231671 171.42 100 C 171.42 139.444176833 139.444176833 171.42 100 171.42 C 60.5558231671 171.42 28.58 139.444176833 28.58 100 C 28.58 60.5558231671 60.5558231671 28.58 100 28.58 Z" />
+        </vector>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/radio_checked_hover.xml b/app/src/main/res/drawable/radio_checked_hover.xml
new file mode 100644
index 000000000..e653ccea8
--- /dev/null
+++ b/app/src/main/res/drawable/radio_checked_hover.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <vector xmlns:android="http://schemas.android.com/apk/res/android"
+                android:width="24dp"
+                android:height="24dp"
+                android:viewportWidth="200"
+                android:viewportHeight="200">
+
+            <path
+                    android:fillColor="@color/fog"
+                    android:pathData="M100,1.79A98.21,98.21,0,1,0,198.21,100,98.33,98.33,0,0,0,100,1.79Zm0,187.49A89.28,89.28,0,1,1,189.28,100,89.28,89.28,0,0,1,100,189.28Z" />
+            <path
+                    android:fillColor="@color/rhino"
+                    android:pathData="M 100 28.58 C 139.444176833 28.58 171.42 60.5558231671 171.42 100 C 171.42 139.444176833 139.444176833 171.42 100 171.42 C 60.5558231671 171.42 28.58 139.444176833 28.58 100 C 28.58 60.5558231671 60.5558231671 28.58 100 28.58 Z" />
+        </vector>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/radio_off.xml b/app/src/main/res/drawable/radio_off.xml
index 53555a1e5..231adc70a 100644
--- a/app/src/main/res/drawable/radio_off.xml
+++ b/app/src/main/res/drawable/radio_off.xml
@@ -1,30 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_checked="true">
-        <vector xmlns:android="http://schemas.android.com/apk/res/android"
-                android:width="24dp"
-                android:height="24dp"
-                android:viewportWidth="200"
-                android:viewportHeight="200">
-
-            <path
-                    android:fillColor="@color/fog"
-                    android:pathData="M100,1.79A98.21,98.21,0,1,0,198.21,100,98.33,98.33,0,0,0,100,1.79Zm0,187.49A89.28,89.28,0,1,1,189.28,100,89.28,89.28,0,0,1,100,189.28Z" />
-        </vector>
-    </item>
-    <item android:state_checked="false">
-        <vector xmlns:android="http://schemas.android.com/apk/res/android"
-                android:width="24dp"
-                android:height="24dp"
-                android:viewportWidth="200"
-                android:viewportHeight="200">
-
-            <path
-                    android:fillColor="@color/fog"
-                    android:pathData="M100,1.79A98.21,98.21,0,1,0,198.21,100,98.33,98.33,0,0,0,100,1.79Zm0,187.49A89.28,89.28,0,1,1,189.28,100,89.28,89.28,0,0,1,100,189.28Z" />
-        </vector>
-    </item>
-    <item android:state_hovered="true">
+    <item>
         <vector xmlns:android="http://schemas.android.com/apk/res/android"
                 android:width="24dp"
                 android:height="24dp"
diff --git a/app/src/main/res/drawable/radio_on.xml b/app/src/main/res/drawable/radio_on.xml
index e1b281025..01b147680 100644
--- a/app/src/main/res/drawable/radio_on.xml
+++ b/app/src/main/res/drawable/radio_on.xml
@@ -1,36 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_checked="true">
-        <vector xmlns:android="http://schemas.android.com/apk/res/android"
-                android:width="24dp"
-                android:height="24dp"
-                android:viewportWidth="200"
-                android:viewportHeight="200">
-
-            <path
-                    android:fillColor="@color/fog"
-                    android:pathData="M100,1.79A98.21,98.21,0,1,0,198.21,100,98.33,98.33,0,0,0,100,1.79Zm0,187.49A89.28,89.28,0,1,1,189.28,100,89.28,89.28,0,0,1,100,189.28Z" />
-            <path
-                    android:fillColor="@color/fog"
-                    android:pathData="M 100 28.58 C 139.444176833 28.58 171.42 60.5558231671 171.42 100 C 171.42 139.444176833 139.444176833 171.42 100 171.42 C 60.5558231671 171.42 28.58 139.444176833 28.58 100 C 28.58 60.5558231671 60.5558231671 28.58 100 28.58 Z" />
-        </vector>
-    </item>
-    <item android:state_checked="false">
-        <vector xmlns:android="http://schemas.android.com/apk/res/android"
-                android:width="24dp"
-                android:height="24dp"
-                android:viewportWidth="200"
-                android:viewportHeight="200">
-
-            <path
-                    android:fillColor="@color/fog"
-                    android:pathData="M100,1.79A98.21,98.21,0,1,0,198.21,100,98.33,98.33,0,0,0,100,1.79Zm0,187.49A89.28,89.28,0,1,1,189.28,100,89.28,89.28,0,0,1,100,189.28Z" />
-            <path
-                    android:fillColor="@color/fog"
-                    android:pathData="M 100 28.58 C 139.444176833 28.58 171.42 60.5558231671 171.42 100 C 171.42 139.444176833 139.444176833 171.42 100 171.42 C 60.5558231671 171.42 28.58 139.444176833 28.58 100 C 28.58 60.5558231671 60.5558231671 28.58 100 28.58 Z" />
-        </vector>
-    </item>
-    <item android:state_hovered="true">
+    <item>
         <vector xmlns:android="http://schemas.android.com/apk/res/android"
                 android:width="24dp"
                 android:height="24dp"
diff --git a/app/src/main/res/drawable/radio_unchecked_hover.xml b/app/src/main/res/drawable/radio_unchecked_hover.xml
new file mode 100644
index 000000000..6a9b71f38
--- /dev/null
+++ b/app/src/main/res/drawable/radio_unchecked_hover.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <vector xmlns:android="http://schemas.android.com/apk/res/android"
+                android:width="24dp"
+                android:height="24dp"
+                android:viewportWidth="200"
+                android:viewportHeight="200">
+
+            <path
+                    android:fillColor="@color/fog"
+                    android:pathData="M100,1.79A98.21,98.21,0,1,0,198.21,100,98.33,98.33,0,0,0,100,1.79Zm0,187.49A89.28,89.28,0,1,1,189.28,100,89.28,89.28,0,0,1,100,189.28Z" />
+            <path
+                    android:fillColor="@color/iron"
+                    android:pathData="M 100 28.58 C 139.444176833 28.58 171.42 60.5558231671 171.42 100 C 171.42 139.444176833 139.444176833 171.42 100 171.42 C 60.5558231671 171.42 28.58 139.444176833 28.58 100 C 28.58 60.5558231671 60.5558231671 28.58 100 28.58 Z" />
+        </vector>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/radio_unchecked_pressed.xml b/app/src/main/res/drawable/radio_unchecked_pressed.xml
new file mode 100644
index 000000000..e56592374
--- /dev/null
+++ b/app/src/main/res/drawable/radio_unchecked_pressed.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <vector xmlns:android="http://schemas.android.com/apk/res/android"
+                android:width="24dp"
+                android:height="24dp"
+                android:viewportWidth="200"
+                android:viewportHeight="200">
+
+            <path
+                    android:fillColor="@color/fog"
+                    android:pathData="M100,1.79A98.21,98.21,0,1,0,198.21,100,98.33,98.33,0,0,0,100,1.79Zm0,187.49A89.28,89.28,0,1,1,189.28,100,89.28,89.28,0,0,1,100,189.28Z" />
+            <path
+                    android:fillColor="@color/black"
+                    android:pathData="M 100 28.58 C 139.444176833 28.58 171.42 60.5558231671 171.42 100 C 171.42 139.444176833 139.444176833 171.42 100 171.42 C 60.5558231671 171.42 28.58 139.444176833 28.58 100 C 28.58 60.5558231671 60.5558231671 28.58 100 28.58 Z" />
+        </vector>
+    </item>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/switch_track.xml b/app/src/main/res/drawable/switch_track.xml
index 318d25ae9..6d83a88ba 100644
--- a/app/src/main/res/drawable/switch_track.xml
+++ b/app/src/main/res/drawable/switch_track.xml
@@ -22,7 +22,7 @@
 
         </layer-list>
     </item>
-    <item android:state_checked="true">
+    <item android:state_checked="true" android:state_hovered="false">
         <layer-list>
             <item>
                 <shape
@@ -44,7 +44,29 @@
 
         </layer-list>
     </item>
-    <item android:state_checked="false">
+    <item android:state_checked="true" android:state_hovered="true">
+        <layer-list>
+            <item>
+                <shape
+                    android:dither="true"
+                    android:shape="rectangle"
+                    android:useLevel="false"
+                    android:visible="true">
+                    <gradient
+                        android:angle="270"
+                        android:endColor="@color/forest"
+                        android:startColor="@color/forest"/>
+                    <corners
+                        android:radius="16dp"/>
+                    <size
+                        android:width="20dp"
+                        android:height="20dp" />
+                </shape>
+            </item>
+
+        </layer-list>
+    </item>
+    <item android:state_checked="false" android:state_hovered="false">
         <layer-list>
             <item>
                 <shape
@@ -66,4 +88,26 @@
 
         </layer-list>
     </item>
+    <item android:state_checked="false" android:state_hovered="true">
+        <layer-list>
+            <item>
+                <shape
+                    android:dither="true"
+                    android:shape="rectangle"
+                    android:useLevel="false"
+                    android:visible="true">
+                    <gradient
+                        android:angle="270"
+                        android:endColor="@color/tomato"
+                        android:startColor="@color/tomato"/>
+                    <corners
+                        android:radius="16dp"/>
+                    <size
+                        android:width="20dp"
+                        android:height="20dp" />
+                </shape>
+            </item>
+
+        </layer-list>
+    </item>
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/setting_radio_item.xml b/app/src/main/res/layout/setting_radio_item.xml
index 11048422e..d152f7770 100644
--- a/app/src/main/res/layout/setting_radio_item.xml
+++ b/app/src/main/res/layout/setting_radio_item.xml
@@ -20,7 +20,7 @@
             <RadioButton
                 android:id="@+id/radioItemButton"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
+                android:layout_height="match_parent"
                 style="@style/radioButtonTheme"
                 android:layout_marginLeft="20dp"
                 tools:text="Item"
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 9d5e26eae..0a7f629a3 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -23,7 +23,9 @@
     <color name="fog_blur">#30e2e6eb</color>
     <color name="fog_url_protocol">#c2c6cb</color>
     <color name="grass">#8dc63f</color>
+    <color name="forest">#579334</color>
     <color name="dessert">#ef4136</color>
+    <color name="tomato">#cc332f</color>
     <color name="blackberry">#25003e</color>
     <color name="tangerine">#ff921e</color>
     <color name="iron">#5d5d5d</color>