diff --git a/app/src/main/res/drawable/other.xml b/app/src/main/res/drawable/other.xml
index 9d300c54..8ddba525 100644
--- a/app/src/main/res/drawable/other.xml
+++ b/app/src/main/res/drawable/other.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/other_on" android:state_checked="false" />
-    <item android:drawable="@drawable/other_off" android:state_checked="true" />
-    <item android:drawable="@drawable/other_off" />
+    <item android:drawable="@drawable/other_on" android:state_checked="false" android:state_enabled="true" />
+    <item android:drawable="@drawable/other_off" android:state_checked="true" android:state_enabled="true" />
+    <item android:drawable="@drawable/other_on_disabled" android:state_checked="false" android:state_enabled="false" />
+    <item android:drawable="@drawable/other_off_disabled" android:state_checked="true" android:state_enabled="false" />
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/other_off_disabled.xml b/app/src/main/res/drawable/other_off_disabled.xml
new file mode 100644
index 00000000..a70c3be8
--- /dev/null
+++ b/app/src/main/res/drawable/other_off_disabled.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+    android:src="@drawable/ic_signal_cellular_off_white_24dp"
+    android:tint="@android:color/darker_gray" />
\ No newline at end of file
diff --git a/app/src/main/res/drawable/other_on_disabled.xml b/app/src/main/res/drawable/other_on_disabled.xml
new file mode 100644
index 00000000..bdb71682
--- /dev/null
+++ b/app/src/main/res/drawable/other_on_disabled.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+    android:src="@drawable/ic_network_cell_white_24dp"
+    android:tint="@android:color/darker_gray" />
\ No newline at end of file
diff --git a/app/src/main/res/drawable/wifi.xml b/app/src/main/res/drawable/wifi.xml
index a6ef3152..f042007b 100644
--- a/app/src/main/res/drawable/wifi.xml
+++ b/app/src/main/res/drawable/wifi.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/wifi_on" android:state_checked="false" />
-    <item android:drawable="@drawable/wifi_off" android:state_checked="true" />
-    <item android:drawable="@drawable/wifi_off" />
+    <item android:drawable="@drawable/wifi_on" android:state_checked="false" android:state_enabled="true" />
+    <item android:drawable="@drawable/wifi_off" android:state_checked="true" android:state_enabled="true" />
+    <item android:drawable="@drawable/wifi_on_disabled" android:state_checked="false" android:state_enabled="false" />
+    <item android:drawable="@drawable/wifi_off_disabled" android:state_checked="true" android:state_enabled="false" />
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/wifi_off_disabled.xml b/app/src/main/res/drawable/wifi_off_disabled.xml
new file mode 100644
index 00000000..23187fa7
--- /dev/null
+++ b/app/src/main/res/drawable/wifi_off_disabled.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+    android:src="@drawable/ic_signal_wifi_off_white_24dp"
+    android:tint="@android:color/darker_gray" />
\ No newline at end of file
diff --git a/app/src/main/res/drawable/wifi_on_disabled.xml b/app/src/main/res/drawable/wifi_on_disabled.xml
new file mode 100644
index 00000000..9a960977
--- /dev/null
+++ b/app/src/main/res/drawable/wifi_on_disabled.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
+    android:src="@drawable/ic_network_wifi_white_24dp"
+    android:tint="@android:color/darker_gray" />
\ No newline at end of file