diff --git a/orbotservice/src/main/res/drawable/button.xml b/orbotservice/src/main/res/drawable/button.xml
deleted file mode 100644
index 9f44d248..00000000
--- a/orbotservice/src/main/res/drawable/button.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-  <item android:state_pressed="true" >
-    <shape>
-      <solid
-          android:color="@color/panel_background" />
-      <stroke
-          android:width="1dp"
-          android:color="#ffffff" />
-      <corners
-          android:radius="6dp" />
-      <padding
-          android:left="10dp"
-          android:top="10dp"
-          android:right="10dp"
-          android:bottom="10dp" />
-    </shape>
-  </item>
-  <item>
-    <shape>
-      <gradient
-          android:startColor="@color/panel_background_dark"
-          android:endColor="@color/panel_background_main"
-          android:angle="270" />
-      <stroke
-          android:width="2dp"
-          android:color="#aaaaaa" />
-      <corners
-          android:radius="6dp" />
-      <padding
-          android:left="10dp"
-          android:top="10dp"
-          android:right="10dp"
-          android:bottom="10dp" />
-    </shape>
-  </item>
-</selector>
\ No newline at end of file
diff --git a/orbotservice/src/main/res/drawable/button_off.xml b/orbotservice/src/main/res/drawable/button_off.xml
deleted file mode 100644
index 1304d1b6..00000000
--- a/orbotservice/src/main/res/drawable/button_off.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-  <item android:state_pressed="true" >
-    <shape>
-      <solid
-          android:color="@color/panel_background" />
-      <stroke
-          android:width="1dp"
-          android:color="#ffffff" />
-      <corners
-          android:radius="6dp" />
-      <padding
-          android:left="10dp"
-          android:top="10dp"
-          android:right="10dp"
-          android:bottom="10dp" />
-    </shape>
-  </item>
-  <item>
-    <shape>
-      <gradient
-          android:startColor="@color/panel_background_dark"
-          android:endColor="@color/panel_background_main"
-          android:angle="270" />
-      <stroke
-          android:width="2dp"
-          android:color="#555555" />
-      <corners
-          android:radius="6dp" />
-      <padding
-          android:left="10dp"
-          android:top="10dp"
-          android:right="10dp"
-          android:bottom="10dp" />
-    </shape>
-  </item>
-</selector>
\ No newline at end of file
diff --git a/orbotservice/src/main/res/drawable/button_on.xml b/orbotservice/src/main/res/drawable/button_on.xml
deleted file mode 100644
index 27dc0922..00000000
--- a/orbotservice/src/main/res/drawable/button_on.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-  <item android:state_pressed="true" >
-    <shape>
-      <solid
-          android:color="@color/bright_green" />
-      <stroke
-          android:width="1dp"
-          android:color="#ffffff" />
-      <corners
-          android:radius="6dp" />
-      <padding
-          android:left="10dp"
-          android:top="10dp"
-          android:right="10dp"
-          android:bottom="10dp" />
-    </shape>
-  </item>
-  <item>
-  <shape>
-      <solid
-          android:color="@color/dark_green" />
-      <stroke
-          android:width="1dp"
-          android:color="#ffffff" />
-      <corners
-          android:radius="6dp" />
-      <padding
-          android:left="10dp"
-          android:top="10dp"
-          android:right="10dp"
-          android:bottom="10dp" />
-    </shape>
-  </item>
-</selector>
\ No newline at end of file
diff --git a/orbotservice/src/main/res/drawable/classyfabric.png b/orbotservice/src/main/res/drawable/classyfabric.png
deleted file mode 100644
index ca3d2679..00000000
Binary files a/orbotservice/src/main/res/drawable/classyfabric.png and /dev/null differ
diff --git a/orbotservice/src/main/res/drawable/error.png b/orbotservice/src/main/res/drawable/error.png
deleted file mode 100644
index 42dc6d66..00000000
Binary files a/orbotservice/src/main/res/drawable/error.png and /dev/null differ
diff --git a/orbotservice/src/main/res/drawable/ic_chatsecure.png b/orbotservice/src/main/res/drawable/ic_chatsecure.png
deleted file mode 100644
index aaddd883..00000000
Binary files a/orbotservice/src/main/res/drawable/ic_chatsecure.png and /dev/null differ
diff --git a/orbotservice/src/main/res/drawable/ic_duckduckgo.png b/orbotservice/src/main/res/drawable/ic_duckduckgo.png
deleted file mode 100644
index 696dcd6e..00000000
Binary files a/orbotservice/src/main/res/drawable/ic_duckduckgo.png and /dev/null differ
diff --git a/orbotservice/src/main/res/drawable/ic_launcher.png b/orbotservice/src/main/res/drawable/ic_launcher.png
deleted file mode 100644
index ea473739..00000000
Binary files a/orbotservice/src/main/res/drawable/ic_launcher.png and /dev/null differ
diff --git a/orbotservice/src/main/res/drawable/ic_menu_about.png b/orbotservice/src/main/res/drawable/ic_menu_about.png
deleted file mode 100644
index 866d4e0b..00000000
Binary files a/orbotservice/src/main/res/drawable/ic_menu_about.png and /dev/null differ
diff --git a/orbotservice/src/main/res/drawable/ic_menu_exit.png b/orbotservice/src/main/res/drawable/ic_menu_exit.png
deleted file mode 100644
index d301ea64..00000000
Binary files a/orbotservice/src/main/res/drawable/ic_menu_exit.png and /dev/null differ
diff --git a/orbotservice/src/main/res/drawable/ic_menu_goto.png b/orbotservice/src/main/res/drawable/ic_menu_goto.png
deleted file mode 100644
index 40183ebc..00000000
Binary files a/orbotservice/src/main/res/drawable/ic_menu_goto.png and /dev/null differ
diff --git a/orbotservice/src/main/res/drawable/ic_play.png b/orbotservice/src/main/res/drawable/ic_play.png
deleted file mode 100644
index a9197949..00000000
Binary files a/orbotservice/src/main/res/drawable/ic_play.png and /dev/null differ
diff --git a/orbotservice/src/main/res/drawable/ic_stat_tor_off.png b/orbotservice/src/main/res/drawable/ic_stat_tor_off.png
deleted file mode 100644
index 6df646eb..00000000
Binary files a/orbotservice/src/main/res/drawable/ic_stat_tor_off.png and /dev/null differ
diff --git a/orbotservice/src/main/res/drawable/ic_stat_tor_xfer.png b/orbotservice/src/main/res/drawable/ic_stat_tor_xfer.png
deleted file mode 100644
index 73ab2330..00000000
Binary files a/orbotservice/src/main/res/drawable/ic_stat_tor_xfer.png and /dev/null differ
diff --git a/orbotservice/src/main/res/drawable/ic_twitter.png b/orbotservice/src/main/res/drawable/ic_twitter.png
deleted file mode 100644
index 1e61c0a2..00000000
Binary files a/orbotservice/src/main/res/drawable/ic_twitter.png and /dev/null differ
diff --git a/orbotservice/src/main/res/drawable/icon_martus.png b/orbotservice/src/main/res/drawable/icon_martus.png
deleted file mode 100644
index e72db19c..00000000
Binary files a/orbotservice/src/main/res/drawable/icon_martus.png and /dev/null differ
diff --git a/orbotservice/src/main/res/drawable/icon_orfox.png b/orbotservice/src/main/res/drawable/icon_orfox.png
deleted file mode 100644
index 57ed1f0f..00000000
Binary files a/orbotservice/src/main/res/drawable/icon_orfox.png and /dev/null differ
diff --git a/orbotservice/src/main/res/drawable/icon_story_maker.png b/orbotservice/src/main/res/drawable/icon_story_maker.png
deleted file mode 100644
index 9c54ca56..00000000
Binary files a/orbotservice/src/main/res/drawable/icon_story_maker.png and /dev/null differ
diff --git a/orbotservice/src/main/res/drawable/inverse.png b/orbotservice/src/main/res/drawable/inverse.png
deleted file mode 100644
index 65eff2c7..00000000
Binary files a/orbotservice/src/main/res/drawable/inverse.png and /dev/null differ
diff --git a/orbotservice/src/main/res/drawable/n8fr8.jpg b/orbotservice/src/main/res/drawable/n8fr8.jpg
deleted file mode 100644
index 4939d5c7..00000000
Binary files a/orbotservice/src/main/res/drawable/n8fr8.jpg and /dev/null differ
diff --git a/orbotservice/src/main/res/drawable/oldtoroff.png b/orbotservice/src/main/res/drawable/oldtoroff.png
deleted file mode 100644
index 4b23e0b3..00000000
Binary files a/orbotservice/src/main/res/drawable/oldtoroff.png and /dev/null differ
diff --git a/orbotservice/src/main/res/drawable/oldtoron.png b/orbotservice/src/main/res/drawable/oldtoron.png
deleted file mode 100644
index a99bec1c..00000000
Binary files a/orbotservice/src/main/res/drawable/oldtoron.png and /dev/null differ
diff --git a/orbotservice/src/main/res/drawable/oldtorstarting.png b/orbotservice/src/main/res/drawable/oldtorstarting.png
deleted file mode 100644
index a56844a9..00000000
Binary files a/orbotservice/src/main/res/drawable/oldtorstarting.png and /dev/null differ
diff --git a/orbotservice/src/main/res/drawable/onion32.png b/orbotservice/src/main/res/drawable/onion32.png
deleted file mode 100644
index 78467601..00000000
Binary files a/orbotservice/src/main/res/drawable/onion32.png and /dev/null differ
diff --git a/orbotservice/src/main/res/drawable/tilebg.xml b/orbotservice/src/main/res/drawable/tilebg.xml
deleted file mode 100644
index 6f0d2a3d..00000000
--- a/orbotservice/src/main/res/drawable/tilebg.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
-    android:src="@drawable/classyfabric"
-    android:tileMode="repeat" />
\ No newline at end of file
diff --git a/orbotservice/src/main/res/drawable/toggle.xml b/orbotservice/src/main/res/drawable/toggle.xml
deleted file mode 100644
index 0f9a36e5..00000000
--- a/orbotservice/src/main/res/drawable/toggle.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:state_checked="false"
-        android:drawable="@drawable/button_off" />
-    <item
-        android:state_checked="true"
-        android:drawable="@drawable/button_on" />
-</selector>
\ No newline at end of file
diff --git a/orbotservice/src/main/res/drawable/tor.png b/orbotservice/src/main/res/drawable/tor.png
deleted file mode 100644
index 0d63dd97..00000000
Binary files a/orbotservice/src/main/res/drawable/tor.png and /dev/null differ
diff --git a/orbotservice/src/main/res/drawable/tor25.png b/orbotservice/src/main/res/drawable/tor25.png
deleted file mode 100644
index 20b7666c..00000000
Binary files a/orbotservice/src/main/res/drawable/tor25.png and /dev/null differ
diff --git a/orbotservice/src/main/res/drawable/toroff.png b/orbotservice/src/main/res/drawable/toroff.png
deleted file mode 100644
index a72790bb..00000000
Binary files a/orbotservice/src/main/res/drawable/toroff.png and /dev/null differ
diff --git a/orbotservice/src/main/res/drawable/toron.png b/orbotservice/src/main/res/drawable/toron.png
deleted file mode 100644
index e3592b1d..00000000
Binary files a/orbotservice/src/main/res/drawable/toron.png and /dev/null differ
diff --git a/orbotservice/src/main/res/drawable/torstarting.png b/orbotservice/src/main/res/drawable/torstarting.png
deleted file mode 100644
index 6e84a6f1..00000000
Binary files a/orbotservice/src/main/res/drawable/torstarting.png and /dev/null differ
diff --git a/orbotservice/src/main/res/values/styles.xml b/orbotservice/src/main/res/values/styles.xml
new file mode 100644
index 00000000..b3fe8af4
--- /dev/null
+++ b/orbotservice/src/main/res/values/styles.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="NotificationText" parent="android:TextAppearance.StatusBar.EventContent" />
+    <style name="NotificationTitle" parent="android:TextAppearance.StatusBar.EventContent.Title" />
+</resources>