diff --git a/mobile/src/main/AndroidManifest.xml b/mobile/src/main/AndroidManifest.xml
index f3a697bd..cabf65bb 100644
--- a/mobile/src/main/AndroidManifest.xml
+++ b/mobile/src/main/AndroidManifest.xml
@@ -16,6 +16,7 @@
         android:name=".App"
         android:allowBackup="false"
         android:label="@string/app_name"
+        android:icon="@mipmap/ic_launcher"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
         <activity
diff --git a/mobile/src/main/ic_launcher-web.png b/mobile/src/main/ic_launcher-web.png
new file mode 100644
index 00000000..8618ff0f
Binary files /dev/null and b/mobile/src/main/ic_launcher-web.png differ
diff --git a/mobile/src/main/res/drawable/ic_action_autorenew.xml b/mobile/src/main/res/drawable/ic_action_autorenew.xml
new file mode 100644
index 00000000..794ca6ad
--- /dev/null
+++ b/mobile/src/main/res/drawable/ic_action_autorenew.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M12,6v3l4,-4 -4,-4v3c-4.42,0 -8,3.58 -8,8 0,1.57 0.46,3.03 1.24,4.26L6.7,14.8c-0.45,-0.83 -0.7,-1.79 -0.7,-2.8 0,-3.31 2.69,-6 6,-6zM18.76,7.74L17.3,9.2c0.44,0.84 0.7,1.79 0.7,2.8 0,3.31 -2.69,6 -6,6v-3l-4,4 4,4v-3c4.42,0 8,-3.58 8,-8 0,-1.57 -0.46,-3.03 -1.24,-4.26z"/>
+</vector>
diff --git a/mobile/src/main/res/drawable/ic_launcher_background.xml b/mobile/src/main/res/drawable/ic_launcher_background.xml
new file mode 100755
index 00000000..8ab430cc
--- /dev/null
+++ b/mobile/src/main/res/drawable/ic_launcher_background.xml
@@ -0,0 +1,5 @@
+<vector android:height="108dp" android:viewportHeight="108.0"
+    android:viewportWidth="108.0" android:width="108dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#388E3C" android:pathData="M0,0h108v108h-108z"/>
+    <path android:fillColor="#66bb6a" android:pathData="M48,50a4,4 0,1 0,4 4A4,4 0,0 0,48 50ZM60,54A12,12 0,1 0,42 64.38l2,-3.48a8,8 0,1 1,8 0l2,3.48A12,12 0,0 0,60 54ZM48,34A20,20 0,0 0,38 71.3l2,-3.46a16,16 0,1 1,16 0l2,3.46A20,20 0,0 0,48 34Z"/>
+</vector>
diff --git a/mobile/src/main/res/drawable/ic_launcher_foreground.xml b/mobile/src/main/res/drawable/ic_launcher_foreground.xml
new file mode 100755
index 00000000..27b0fdc6
--- /dev/null
+++ b/mobile/src/main/res/drawable/ic_launcher_foreground.xml
@@ -0,0 +1,14 @@
+<vector android:height="108dp" android:viewportHeight="108.0"
+    android:viewportWidth="108.0" android:width="108dp"
+    xmlns:aapt="http://schemas.android.com/aapt" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:pathData="M80,50l-40.48,12.48l45.52,45.52l22.96,0l0,-30.06l-28,-27.94z">
+        <aapt:attr name="android:fillColor">
+            <gradient android:endX="11856.24" android:endY="11471.76"
+                android:startX="5700.24" android:startY="5315.76" android:type="linear">
+                <item android:color="#19000000" android:offset="0.0"/>
+                <item android:color="#00000000" android:offset="0.7"/>
+            </gradient>
+        </aapt:attr>
+    </path>
+    <path android:fillColor="#c6ff00" android:pathData="M59.3,50a12,12 0,1 0,0 8H68v8h8V58h4V50ZM48,58a4,4 0,1 1,4 -4A4,4 0,0 1,48 58Z"/>
+</vector>
diff --git a/mobile/src/main/res/drawable/ic_wps.xml b/mobile/src/main/res/drawable/ic_wps.xml
new file mode 100644
index 00000000..c4d0625b
--- /dev/null
+++ b/mobile/src/main/res/drawable/ic_wps.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M12.79,20.79s8.38,-2 6.77,-12l2.08,-0.65a7.85,7.85 0,0 0,-6.7 -5.68S12.21,4 12.79,11l3,-0.74A13.63,13.63 0,0 1,12.79 20.79Z M11.21,3.21s-8.38,2 -6.77,12l-2.08,0.65a7.85,7.85 0,0 0,6.7 5.68S11.79,20 11.21,13l-3,0.74A13.63,13.63 0,0 1,11.21 3.21Z"/>
+</vector>
diff --git a/mobile/src/main/res/layout/fragment_repeater.xml b/mobile/src/main/res/layout/fragment_repeater.xml
index 209f0ee4..d305801d 100644
--- a/mobile/src/main/res/layout/fragment_repeater.xml
+++ b/mobile/src/main/res/layout/fragment_repeater.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools">
     <data>
         <variable
@@ -17,8 +16,6 @@
             android:layout_width="match_parent"
             android:background="?attr/colorPrimary"
             android:elevation="4dp"
-            android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
-            app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
             android:id="@+id/toolbar">
 
             <Switch
diff --git a/mobile/src/main/res/layout/fragment_settings.xml b/mobile/src/main/res/layout/fragment_settings.xml
index 5d2ac8a3..a6b1b81f 100644
--- a/mobile/src/main/res/layout/fragment_settings.xml
+++ b/mobile/src/main/res/layout/fragment_settings.xml
@@ -11,8 +11,6 @@
         android:background="?attr/colorPrimary"
         android:elevation="4dp"
         app:title="@string/app_name"
-        android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
-        app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
         android:id="@+id/toolbar"/>
     <fragment
         class="be.mygod.vpnhotspot.SettingsPreferenceFragment"
diff --git a/mobile/src/main/res/layout/fragment_tethering.xml b/mobile/src/main/res/layout/fragment_tethering.xml
index 9ce4c9d9..56c9d1dc 100644
--- a/mobile/src/main/res/layout/fragment_tethering.xml
+++ b/mobile/src/main/res/layout/fragment_tethering.xml
@@ -13,8 +13,6 @@
             android:background="?attr/colorPrimary"
             android:elevation="4dp"
             app:title="@string/app_name"
-            android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
-            app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
             android:id="@+id/toolbar"/>
         <FrameLayout
             android:layout_width="match_parent"
diff --git a/mobile/src/main/res/menu/repeater.xml b/mobile/src/main/res/menu/repeater.xml
index 30566af3..8d8ff517 100644
--- a/mobile/src/main/res/menu/repeater.xml
+++ b/mobile/src/main/res/menu/repeater.xml
@@ -1,10 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+      xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <item
         android:id="@+id/wps"
-        android:title="@string/repeater_wps"/>
+        android:icon="@drawable/ic_wps"
+        android:title="@string/repeater_wps"
+        app:showAsAction="ifRoom"/>
     <item
         android:id="@+id/resetGroup"
-        android:title="@string/repeater_reset_credentials"/>
+        android:icon="@drawable/ic_action_autorenew"
+        android:title="@string/repeater_reset_credentials"
+        app:showAsAction="ifRoom"/>
 </menu>
\ No newline at end of file
diff --git a/mobile/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/mobile/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
new file mode 100644
index 00000000..bbd3e021
--- /dev/null
+++ b/mobile/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@drawable/ic_launcher_background"/>
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+</adaptive-icon>
\ No newline at end of file
diff --git a/mobile/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/mobile/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
new file mode 100644
index 00000000..bbd3e021
--- /dev/null
+++ b/mobile/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@drawable/ic_launcher_background"/>
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+</adaptive-icon>
\ No newline at end of file
diff --git a/mobile/src/main/res/mipmap-hdpi/ic_launcher.png b/mobile/src/main/res/mipmap-hdpi/ic_launcher.png
new file mode 100644
index 00000000..5852d30b
Binary files /dev/null and b/mobile/src/main/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/mobile/src/main/res/mipmap-hdpi/ic_launcher_round.png b/mobile/src/main/res/mipmap-hdpi/ic_launcher_round.png
new file mode 100644
index 00000000..20234a6d
Binary files /dev/null and b/mobile/src/main/res/mipmap-hdpi/ic_launcher_round.png differ
diff --git a/mobile/src/main/res/mipmap-mdpi/ic_launcher.png b/mobile/src/main/res/mipmap-mdpi/ic_launcher.png
new file mode 100644
index 00000000..cda1d05f
Binary files /dev/null and b/mobile/src/main/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/mobile/src/main/res/mipmap-mdpi/ic_launcher_round.png b/mobile/src/main/res/mipmap-mdpi/ic_launcher_round.png
new file mode 100644
index 00000000..36e3ab40
Binary files /dev/null and b/mobile/src/main/res/mipmap-mdpi/ic_launcher_round.png differ
diff --git a/mobile/src/main/res/mipmap-xhdpi/ic_launcher.png b/mobile/src/main/res/mipmap-xhdpi/ic_launcher.png
new file mode 100644
index 00000000..cae66e1d
Binary files /dev/null and b/mobile/src/main/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/mobile/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/mobile/src/main/res/mipmap-xhdpi/ic_launcher_round.png
new file mode 100644
index 00000000..925c2c07
Binary files /dev/null and b/mobile/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ
diff --git a/mobile/src/main/res/mipmap-xxhdpi/ic_launcher.png b/mobile/src/main/res/mipmap-xxhdpi/ic_launcher.png
new file mode 100644
index 00000000..558edbb7
Binary files /dev/null and b/mobile/src/main/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/mobile/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/mobile/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
new file mode 100644
index 00000000..1d39cef8
Binary files /dev/null and b/mobile/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ
diff --git a/mobile/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/mobile/src/main/res/mipmap-xxxhdpi/ic_launcher.png
new file mode 100644
index 00000000..52301718
Binary files /dev/null and b/mobile/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/mobile/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/mobile/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
new file mode 100644
index 00000000..6eca5967
Binary files /dev/null and b/mobile/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ
diff --git a/mobile/src/main/res/values/colors.xml b/mobile/src/main/res/values/colors.xml
index 3ab3e9cb..aec4d399 100644
--- a/mobile/src/main/res/values/colors.xml
+++ b/mobile/src/main/res/values/colors.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="colorPrimary">#3F51B5</color>
-    <color name="colorPrimaryDark">#303F9F</color>
-    <color name="colorAccent">#FF4081</color>
+    <color name="colorPrimary">#4CAF50</color>
+    <color name="colorPrimaryDark">#388E3C</color>
+    <color name="colorAccent">#C6FF00</color>
 </resources>