diff --git a/README.md b/README.md
index 2850846f9..ba31270c4 100644
--- a/README.md
+++ b/README.md
@@ -52,5 +52,13 @@ F-Droid (externally maintained build of the [foss-master branch](https://github.
 ## How to use it
 There aren't presently any official how-to guides, but a youtube search will provide tutorials. For detail on settings in the application, see [https://wigle.net/wiwi_settings](https://wigle.net/wiwi_settings).
 
+## Attributions
+Icon source from SVG:
+ - dashboard: https://www.figma.com/@syalankush
+ - eye, filter, map, sort: https://dazzleui.gumroad.com/l/dazzleiconsfree
+ - no wifi: https://www.figma.com/@d12da0b9_b193_4
+ - share: https://noahjacob.us/?ref=svgrepo.com
+ - user star: https://github.com/Remix-Design/remixicon
+ - wrench: https://github.com/FortAwesome/Font-Awesome
 
 This project is maintained by the WiGLE.net team
\ No newline at end of file
diff --git a/wiglewifiwardriving/src/main/java/net/wigle/wigleandroid/ListFragment.java b/wiglewifiwardriving/src/main/java/net/wigle/wigleandroid/ListFragment.java
index c718996f3..7c5c4b69e 100644
--- a/wiglewifiwardriving/src/main/java/net/wigle/wigleandroid/ListFragment.java
+++ b/wiglewifiwardriving/src/main/java/net/wigle/wigleandroid/ListFragment.java
@@ -464,15 +464,15 @@ public void onDetach() {
     @Override
     public void onCreateOptionsMenu (final Menu menu, @NonNull final MenuInflater inflater) {
         MenuItem item = menu.add(0, MENU_MAP, 0, getString(R.string.tab_map));
-        item.setIcon( android.R.drawable.ic_menu_mapmode );
+        item.setIcon(R.drawable.map );
         item.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
 
         item = menu.add(0, MENU_FILTER, 0, getString(R.string.menu_ssid_filter));
-        item.setIcon(android.R.drawable.ic_menu_manage);
+        item.setIcon(R.drawable.wrench);
         item.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
 
         item = menu.add(0, MENU_SORT, 0, getString(R.string.menu_sort));
-        item.setIcon( android.R.drawable.ic_menu_sort_alphabetically );
+        item.setIcon(R.drawable.sort);
         item.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
 
         final MainActivity main = MainActivity.getMainActivity(this);
diff --git a/wiglewifiwardriving/src/main/java/net/wigle/wigleandroid/MappingFragment.java b/wiglewifiwardriving/src/main/java/net/wigle/wigleandroid/MappingFragment.java
index ef28424e7..575a380ab 100644
--- a/wiglewifiwardriving/src/main/java/net/wigle/wigleandroid/MappingFragment.java
+++ b/wiglewifiwardriving/src/main/java/net/wigle/wigleandroid/MappingFragment.java
@@ -871,11 +871,11 @@ public void onCreateOptionsMenu (@NonNull final Menu menu, @NonNull final MenuIn
             item.setIcon(android.R.drawable.ic_menu_directions);
 
             item = menu.add(0, MENU_MAP_TYPE, 0, getString(R.string.menu_map_type));
-            item.setIcon(android.R.drawable.ic_menu_mapmode);
+            item.setIcon(R.drawable.map);
             MenuItemCompat.setShowAsAction(item, MenuItem.SHOW_AS_ACTION_IF_ROOM);
 
             item = menu.add(0, MENU_FILTER, 0, getString(R.string.settings_map_head));
-            item.setIcon(android.R.drawable.ic_menu_search);
+            item.setIcon(R.drawable.filter);
             MenuItemCompat.setShowAsAction(item, MenuItem.SHOW_AS_ACTION_IF_ROOM);
 
             String name = state.locked ? getString(R.string.menu_turn_off_lockon) : getString(R.string.menu_turn_on_lockon);
diff --git a/wiglewifiwardriving/src/main/java/net/wigle/wigleandroid/RankStatsFragment.java b/wiglewifiwardriving/src/main/java/net/wigle/wigleandroid/RankStatsFragment.java
index e852a6b91..57d436931 100644
--- a/wiglewifiwardriving/src/main/java/net/wigle/wigleandroid/RankStatsFragment.java
+++ b/wiglewifiwardriving/src/main/java/net/wigle/wigleandroid/RankStatsFragment.java
@@ -338,20 +338,20 @@ public void onConfigurationChanged(@NonNull final Configuration newConfig ) {
     @Override
     public void onCreateOptionsMenu (final Menu menu, @NonNull final MenuInflater inflater) {
         MenuItem item = menu.add(0, MENU_USER_STATS, 0, getString(R.string.user_stats_app_name));
-        item.setIcon( android.R.drawable.ic_menu_myplaces );
+        item.setIcon( R.drawable.user_star );
         MenuItemCompat.setShowAsAction(item, MenuItem.SHOW_AS_ACTION_IF_ROOM);
 
         item = menu.add(0, MENU_USER_STATS, 0, getString(R.string.user_stats_app_name));
-        item.setIcon(android.R.drawable.ic_menu_myplaces);
+        item.setIcon(R.drawable.user_star);
 
         item = menu.add(0, MENU_SITE_STATS, 0, getString(R.string.site_stats_app_name));
-        item.setIcon(R.drawable.ic_planet_small_white);
+        item.setIcon(R.drawable.w_logo);
         MenuItemCompat.setShowAsAction(item, MenuItem.SHOW_AS_ACTION_IF_ROOM);
 
         item = menu.add(0, MENU_SITE_STATS, 0, getString(R.string.site_stats_app_name));
-        item.setIcon(R.drawable.ic_planet_small_white);
+        item.setIcon(R.drawable.w_logo);
         item = menu.add(0, MENU_RANK_SWAP, 0, getRankSwapString());
-        item.setIcon(android.R.drawable.ic_menu_sort_alphabetically);
+        item.setIcon(R.drawable.sort);
 
         item = menu.add(0, MENU_USER_CENTRIC_SWAP, 0, getUserCentricSwapString());
         item.setIcon(android.R.drawable.picture_frame);
diff --git a/wiglewifiwardriving/src/main/java/net/wigle/wigleandroid/SiteStatsFragment.java b/wiglewifiwardriving/src/main/java/net/wigle/wigleandroid/SiteStatsFragment.java
index 66c3a7e96..f952da55a 100644
--- a/wiglewifiwardriving/src/main/java/net/wigle/wigleandroid/SiteStatsFragment.java
+++ b/wiglewifiwardriving/src/main/java/net/wigle/wigleandroid/SiteStatsFragment.java
@@ -208,18 +208,18 @@ public void onConfigurationChanged(@NonNull final Configuration newConfig ) {
     @Override
     public void onCreateOptionsMenu (final Menu menu, @NonNull final MenuInflater inflater) {
         MenuItem item = menu.add(0, MENU_USER_STATS, 0, getString(R.string.user_stats_app_name));
-        item.setIcon( android.R.drawable.ic_menu_myplaces );
+        item.setIcon( R.drawable.user_star );
         MenuItemCompat.setShowAsAction(item, MenuItemCompat.SHOW_AS_ACTION_IF_ROOM);
 
         item = menu.add(0, MENU_USER_STATS, 0, getString(R.string.user_stats_app_name));
-        item.setIcon(android.R.drawable.ic_menu_myplaces);
+        item.setIcon(R.drawable.user_star);
 
         item = menu.add(0, MENU_RANK_STATS, 0, getString(R.string.rank_stats_app_name));
-        item.setIcon(android.R.drawable.ic_menu_sort_by_size);
+        item.setIcon(R.drawable.rankings);
         MenuItemCompat.setShowAsAction(item, MenuItemCompat.SHOW_AS_ACTION_IF_ROOM);
 
         item = menu.add(0, MENU_RANK_STATS, 0, getString(R.string.rank_stats_app_name));
-        item.setIcon(android.R.drawable.ic_menu_sort_by_size);
+        item.setIcon(R.drawable.rankings);
 
         super.onCreateOptionsMenu(menu, inflater);
     }
diff --git a/wiglewifiwardriving/src/main/java/net/wigle/wigleandroid/UploadsFragment.java b/wiglewifiwardriving/src/main/java/net/wigle/wigleandroid/UploadsFragment.java
index 043194a0b..de52e91c5 100644
--- a/wiglewifiwardriving/src/main/java/net/wigle/wigleandroid/UploadsFragment.java
+++ b/wiglewifiwardriving/src/main/java/net/wigle/wigleandroid/UploadsFragment.java
@@ -370,18 +370,11 @@ public void onConfigurationChanged(@NonNull final Configuration newConfig ) {
     @Override
     public void onCreateOptionsMenu (final Menu menu, @NonNull final MenuInflater inflater) {
         MenuItem item = menu.add(0, MENU_USER_STATS, 0, getString(R.string.user_stats_app_name));
-        item.setIcon( android.R.drawable.ic_menu_myplaces );
+        item.setIcon(R.drawable.user_star);
         MenuItemCompat.setShowAsAction(item, MenuItemCompat.SHOW_AS_ACTION_IF_ROOM);
 
         item = menu.add(0, MENU_USER_STATS, 0, getString(R.string.user_stats_app_name));
-        item.setIcon(android.R.drawable.ic_menu_myplaces);
-
-        item = menu.add(0, MENU_SITE_STATS, 0, getString(R.string.site_stats_app_name));
-        item.setIcon( R.drawable.ic_planet_small_white );
-        MenuItemCompat.setShowAsAction(item, MenuItemCompat.SHOW_AS_ACTION_IF_ROOM);
-
-        item = menu.add(0, MENU_SITE_STATS, 0, getString(R.string.site_stats_app_name));
-        item.setIcon(R.drawable.ic_planet_small_white);
+        item.setIcon(R.drawable.user_star);
 
         super.onCreateOptionsMenu(menu, inflater);
     }
diff --git a/wiglewifiwardriving/src/main/java/net/wigle/wigleandroid/UserStatsFragment.java b/wiglewifiwardriving/src/main/java/net/wigle/wigleandroid/UserStatsFragment.java
index c797c05de..591a82429 100644
--- a/wiglewifiwardriving/src/main/java/net/wigle/wigleandroid/UserStatsFragment.java
+++ b/wiglewifiwardriving/src/main/java/net/wigle/wigleandroid/UserStatsFragment.java
@@ -296,18 +296,18 @@ public void onConfigurationChanged(@NonNull final Configuration newConfig ) {
     @Override
     public void onCreateOptionsMenu (final Menu menu, @NonNull final MenuInflater inflater) {
         MenuItem item = menu.add(0, MENU_SITE_STATS, 0, getString(R.string.site_stats_app_name));
-        item.setIcon( R.drawable.ic_planet_small_white );
+        item.setIcon( R.drawable.w_logo );
         item.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
 
         item = menu.add(0, MENU_SITE_STATS, 0, getString(R.string.site_stats_app_name));
-        item.setIcon(R.drawable.ic_planet_small_white);
+        item.setIcon(R.drawable.w_logo);
 
         item = menu.add(0, MENU_RANK_STATS, 0, getString(R.string.rank_stats_app_name));
-        item.setIcon(android.R.drawable.ic_menu_sort_by_size);
+        item.setIcon(R.drawable.rankings);
         item.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
 
         item = menu.add(0, MENU_RANK_STATS, 0, getString(R.string.rank_stats_app_name));
-        item.setIcon(android.R.drawable.ic_menu_sort_by_size);
+        item.setIcon(R.drawable.rankings);
 
         super.onCreateOptionsMenu(menu, inflater);
     }
diff --git a/wiglewifiwardriving/src/main/res/drawable/dashboard.xml b/wiglewifiwardriving/src/main/res/drawable/dashboard.xml
new file mode 100644
index 000000000..804d89562
--- /dev/null
+++ b/wiglewifiwardriving/src/main/res/drawable/dashboard.xml
@@ -0,0 +1,5 @@
+<vector android:alpha="0.85" android:height="100dp"
+    android:viewportHeight="25" android:viewportWidth="25"
+    android:width="100dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="?attr/colorControlNormal" android:pathData="M6.25,11C6.25,10.586 5.914,10.25 5.5,10.25C5.086,10.25 4.75,10.586 4.75,11L6.25,11ZM11.5,20.25C11.914,20.25 12.25,19.914 12.25,19.5C12.25,19.086 11.914,18.75 11.5,18.75L11.5,20.25ZM4.75,11C4.75,11.414 5.086,11.75 5.5,11.75C5.914,11.75 6.25,11.414 6.25,11L4.75,11ZM11.5,6.25C11.914,6.25 12.25,5.914 12.25,5.5C12.25,5.086 11.914,4.75 11.5,4.75L11.5,6.25ZM5.5,10.25C5.086,10.25 4.75,10.586 4.75,11C4.75,11.414 5.086,11.75 5.5,11.75L5.5,10.25ZM11.5,11.75C11.914,11.75 12.25,11.414 12.25,11C12.25,10.586 11.914,10.25 11.5,10.25L11.5,11.75ZM10.75,11C10.75,11.414 11.086,11.75 11.5,11.75C11.914,11.75 12.25,11.414 12.25,11L10.75,11ZM12.25,5.5C12.25,5.086 11.914,4.75 11.5,4.75C11.086,4.75 10.75,5.086 10.75,5.5L12.25,5.5ZM12.25,11C12.25,10.586 11.914,10.25 11.5,10.25C11.086,10.25 10.75,10.586 10.75,11L12.25,11ZM10.75,14.5C10.75,14.914 11.086,15.25 11.5,15.25C11.914,15.25 12.25,14.914 12.25,14.5L10.75,14.5ZM11.5,18.75C11.086,18.75 10.75,19.086 10.75,19.5C10.75,19.914 11.086,20.25 11.5,20.25L11.5,18.75ZM20.25,14.5C20.25,14.086 19.914,13.75 19.5,13.75C19.086,13.75 18.75,14.086 18.75,14.5L20.25,14.5ZM10.75,19.5C10.75,19.914 11.086,20.25 11.5,20.25C11.914,20.25 12.25,19.914 12.25,19.5L10.75,19.5ZM12.25,14.5C12.25,14.086 11.914,13.75 11.5,13.75C11.086,13.75 10.75,14.086 10.75,14.5L12.25,14.5ZM11.5,4.75C11.086,4.75 10.75,5.086 10.75,5.5C10.75,5.914 11.086,6.25 11.5,6.25L11.5,4.75ZM18.75,14.5C18.75,14.914 19.086,15.25 19.5,15.25C19.914,15.25 20.25,14.914 20.25,14.5L18.75,14.5ZM19.5,15.25C19.914,15.25 20.25,14.914 20.25,14.5C20.25,14.086 19.914,13.75 19.5,13.75L19.5,15.25ZM11.5,13.75C11.086,13.75 10.75,14.086 10.75,14.5C10.75,14.914 11.086,15.25 11.5,15.25L11.5,13.75ZM4.75,11L4.75,15.5L6.25,15.5L6.25,11L4.75,11ZM4.75,15.5C4.75,18.123 6.877,20.25 9.5,20.25L9.5,18.75C7.705,18.75 6.25,17.295 6.25,15.5L4.75,15.5ZM9.5,20.25L11.5,20.25L11.5,18.75L9.5,18.75L9.5,20.25ZM6.25,11L6.25,9.5L4.75,9.5L4.75,11L6.25,11ZM6.25,9.5C6.25,7.705 7.705,6.25 9.5,6.25L9.5,4.75C6.877,4.75 4.75,6.877 4.75,9.5L6.25,9.5ZM9.5,6.25L11.5,6.25L11.5,4.75L9.5,4.75L9.5,6.25ZM5.5,11.75L11.5,11.75L11.5,10.25L5.5,10.25L5.5,11.75ZM12.25,11L12.25,5.5L10.75,5.5L10.75,11L12.25,11ZM10.75,11L10.75,14.5L12.25,14.5L12.25,11L10.75,11ZM11.5,20.25L15.5,20.25L15.5,18.75L11.5,18.75L11.5,20.25ZM15.5,20.25C18.123,20.25 20.25,18.123 20.25,15.5L18.75,15.5C18.75,17.295 17.295,18.75 15.5,18.75L15.5,20.25ZM20.25,15.5L20.25,14.5L18.75,14.5L18.75,15.5L20.25,15.5ZM12.25,19.5L12.25,14.5L10.75,14.5L10.75,19.5L12.25,19.5ZM11.5,6.25L15.5,6.25L15.5,4.75L11.5,4.75L11.5,6.25ZM15.5,6.25C17.295,6.25 18.75,7.705 18.75,9.5L20.25,9.5C20.25,6.877 18.123,4.75 15.5,4.75L15.5,6.25ZM18.75,9.5L18.75,14.5L20.25,14.5L20.25,9.5L18.75,9.5ZM19.5,13.75L11.5,13.75L11.5,15.25L19.5,15.25L19.5,13.75Z"/>
+</vector>
diff --git a/wiglewifiwardriving/src/main/res/drawable/filter.xml b/wiglewifiwardriving/src/main/res/drawable/filter.xml
new file mode 100644
index 000000000..ae5cd8b1c
--- /dev/null
+++ b/wiglewifiwardriving/src/main/res/drawable/filter.xml
@@ -0,0 +1,8 @@
+<vector android:alpha="0.85" android:height="100dp"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="100dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#00000000"
+        android:pathData="M3,4.6C3,4.04 3,3.76 3.109,3.546C3.205,3.358 3.358,3.205 3.546,3.109C3.76,3 4.04,3 4.6,3H19.4C19.96,3 20.24,3 20.454,3.109C20.642,3.205 20.795,3.358 20.891,3.546C21,3.76 21,4.04 21,4.6V6.337C21,6.582 21,6.704 20.972,6.819C20.948,6.921 20.907,7.019 20.853,7.108C20.791,7.209 20.704,7.296 20.531,7.469L14.469,13.531C14.296,13.704 14.209,13.791 14.147,13.892C14.092,13.981 14.052,14.079 14.028,14.181C14,14.296 14,14.418 14,14.663V17L10,21V14.663C10,14.418 10,14.296 9.972,14.181C9.948,14.079 9.907,13.981 9.853,13.892C9.791,13.791 9.704,13.704 9.531,13.531L3.469,7.469C3.296,7.296 3.209,7.209 3.147,7.108C3.093,7.019 3.052,6.921 3.028,6.819C3,6.704 3,6.582 3,6.337V4.6Z"
+        android:strokeColor="?attr/colorControlNormal" android:strokeLineCap="round"
+        android:strokeLineJoin="round" android:strokeWidth="2"/>
+</vector>
diff --git a/wiglewifiwardriving/src/main/res/drawable/map.xml b/wiglewifiwardriving/src/main/res/drawable/map.xml
new file mode 100644
index 000000000..ef1b58795
--- /dev/null
+++ b/wiglewifiwardriving/src/main/res/drawable/map.xml
@@ -0,0 +1,8 @@
+<vector android:alpha="0.85" android:height="100dp"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="100dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#00000000"
+        android:pathData="M12,6H12.01M9,20L3,17V4L5,5M9,20L15,17M9,20V14M15,17L21,20V7L19,6M15,17V14M15,6.2C15,7.967 13.5,9.4 12,11C10.5,9.4 9,7.967 9,6.2C9,4.433 10.343,3 12,3C13.657,3 15,4.433 15,6.2Z"
+        android:strokeColor="?attr/colorControlNormal" android:strokeLineCap="round"
+        android:strokeLineJoin="round" android:strokeWidth="2"/>
+</vector>
diff --git a/wiglewifiwardriving/src/main/res/drawable/no_scan.xml b/wiglewifiwardriving/src/main/res/drawable/no_scan.xml
new file mode 100644
index 000000000..a67f93e58
--- /dev/null
+++ b/wiglewifiwardriving/src/main/res/drawable/no_scan.xml
@@ -0,0 +1,5 @@
+<vector android:alpha="0.85" android:height="44dp"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="44dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="?attr/colorControlNormal" android:fillType="evenOdd" android:pathData="M3.97,5.03L18.97,20.03L20.03,18.97L5.03,3.97L3.97,5.03ZM2.925,9.675C3.711,8.889 4.574,8.226 5.489,7.686L6.59,8.787C5.868,9.179 5.179,9.656 4.539,10.217L12,17.528L13.683,15.88L14.743,16.94L12,19.628L2.389,10.21L2.925,9.675ZM19.461,10.217L15.825,13.78L16.886,14.84L21.611,10.21L21.075,9.675C17.659,6.258 12.795,5.171 8.458,6.412L9.697,7.651C13.076,6.953 16.712,7.808 19.461,10.217Z"/>
+</vector>
diff --git a/wiglewifiwardriving/src/main/res/drawable/rankings.xml b/wiglewifiwardriving/src/main/res/drawable/rankings.xml
new file mode 100644
index 000000000..2f8ccd4d3
--- /dev/null
+++ b/wiglewifiwardriving/src/main/res/drawable/rankings.xml
@@ -0,0 +1,10 @@
+<vector android:alpha="0.85" android:height="100dp"
+    android:viewportHeight="502.66" android:viewportWidth="502.66"
+    android:width="100dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="?attr/colorControlNormal" android:pathData="M0,289.79h148.67v199.64h-148.67z"/>
+    <path android:fillColor="?attr/colorControlNormal" android:pathData="M354,238.5h148.67v250.93h-148.67z"/>
+    <path android:fillColor="?attr/colorControlNormal" android:pathData="M176.99,164.06h148.71v325.37h-148.71z"/>
+    <path android:fillColor="?attr/colorControlNormal" android:pathData="M429.47,87.24l21.05,42.71l47.15,6.86l-34.08,33.24l8.02,46.96l-42.15,-22.17l-42.15,22.17l8.02,-46.96l-34.08,-33.24l47.11,-6.86L429.47,87.24z"/>
+    <path android:fillColor="?attr/colorControlNormal" android:pathData="M252.14,13.23l21.08,42.73l47.15,6.86l-34.08,33.26l8.05,46.92l-42.17,-22.15l-42.17,22.15l8.02,-46.92l-34.08,-33.26l47.13,-6.86L252.14,13.23z"/>
+    <path android:fillColor="?attr/colorControlNormal" android:pathData="M71.74,137.05l21.05,42.73l47.15,6.88l-34.06,33.22l8.02,46.94l-42.17,-22.15l-42.17,22.17l8.05,-46.94L3.54,186.68l47.13,-6.88L71.74,137.05z"/>
+</vector>
diff --git a/wiglewifiwardriving/src/main/res/drawable/search.xml b/wiglewifiwardriving/src/main/res/drawable/search.xml
new file mode 100644
index 000000000..e1b82c767
--- /dev/null
+++ b/wiglewifiwardriving/src/main/res/drawable/search.xml
@@ -0,0 +1,8 @@
+<vector android:alpha="0.85" android:height="100dp"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="100dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#00000000"
+        android:pathData="M15.795,15.811L21,21M18,10.5C18,14.642 14.642,18 10.5,18C6.358,18 3,14.642 3,10.5C3,6.358 6.358,3 10.5,3C14.642,3 18,6.358 18,10.5Z"
+        android:strokeColor="#000000" android:strokeLineCap="round"
+        android:strokeLineJoin="round" android:strokeWidth="2"/>
+</vector>
diff --git a/wiglewifiwardriving/src/main/res/drawable/share.xml b/wiglewifiwardriving/src/main/res/drawable/share.xml
new file mode 100644
index 000000000..8c96ccfd7
--- /dev/null
+++ b/wiglewifiwardriving/src/main/res/drawable/share.xml
@@ -0,0 +1,5 @@
+<vector android:alpha="0.85" android:height="100dp"
+    android:viewportHeight="22" android:viewportWidth="22"
+    android:width="100dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="?attr/colorControlNormal" android:pathData="m14.864,9.051c1.657,0 3,-1.343 3,-3 0,-1.657 -1.343,-3 -3,-3 -1.657,0 -3,1.343 -3,3 0,0.224 0.024,0.442 0.071,0.651l-3.202,2.001c-0.513,-0.409 -1.162,-0.653 -1.869,-0.653 -1.657,0 -3,1.343 -3,3 0,1.657 1.343,3 3,3 0.707,0 1.356,-0.244 1.869,-0.653l3.202,2.001c-0.046,0.21 -0.071,0.428 -0.071,0.651 0,1.657 1.343,3 3,3 1.657,0 3,-1.343 3,-3 0,-1.657 -1.343,-3 -3,-3 -0.706,0 -1.356,0.244 -1.869,0.653l-3.202,-2.001c0.046,-0.21 0.071,-0.428 0.071,-0.651 0,-0.224 -0.024,-0.442 -0.071,-0.651L12.996,8.398c0.513,0.409 1.162,0.653 1.869,0.653z"/>
+</vector>
diff --git a/wiglewifiwardriving/src/main/res/drawable/sort.xml b/wiglewifiwardriving/src/main/res/drawable/sort.xml
new file mode 100644
index 000000000..43dc84b66
--- /dev/null
+++ b/wiglewifiwardriving/src/main/res/drawable/sort.xml
@@ -0,0 +1,8 @@
+<vector android:alpha="0.85" android:height="80dp"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="80dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="?attr/colorControlNormal"
+        android:pathData="M13,12H21M13,8H21M13,16H21M6,7V17M6,7L3,10M6,7L9,10"
+        android:strokeColor="?attr/colorControlNormal" android:strokeLineCap="round"
+        android:strokeLineJoin="round" android:strokeWidth="2"/>
+</vector>
diff --git a/wiglewifiwardriving/src/main/res/drawable/user_star.xml b/wiglewifiwardriving/src/main/res/drawable/user_star.xml
new file mode 100644
index 000000000..4087c9a38
--- /dev/null
+++ b/wiglewifiwardriving/src/main/res/drawable/user_star.xml
@@ -0,0 +1,5 @@
+<vector android:alpha="0.85" android:height="100dp"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="100dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="?attr/colorControlNormal" android:pathData="M12,14v2a6,6 0,0 0,-6 6L4,22a8,8 0,0 1,8 -8zM12,13c-3.315,0 -6,-2.685 -6,-6s2.685,-6 6,-6 6,2.685 6,6 -2.685,6 -6,6zM12,11c2.21,0 4,-1.79 4,-4s-1.79,-4 -4,-4 -4,1.79 -4,4 1.79,4 4,4zM18,21.5l-2.939,1.545 0.561,-3.272 -2.377,-2.318 3.286,-0.478L18,14l1.47,2.977 3.285,0.478 -2.377,2.318 0.56,3.272L18,21.5z"/>
+</vector>
diff --git a/wiglewifiwardriving/src/main/res/drawable/view.xml b/wiglewifiwardriving/src/main/res/drawable/view.xml
new file mode 100644
index 000000000..7f6cbc4da
--- /dev/null
+++ b/wiglewifiwardriving/src/main/res/drawable/view.xml
@@ -0,0 +1,12 @@
+<vector android:alpha="0.85" android:height="100dp"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="100dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#00000000"
+        android:pathData="M15.001,12C15.001,13.657 13.658,15 12.001,15C10.344,15 9.001,13.657 9.001,12C9.001,10.343 10.344,9 12.001,9C13.658,9 15.001,10.343 15.001,12Z"
+        android:strokeColor="?attr/colorControlNormal" android:strokeLineCap="round"
+        android:strokeLineJoin="round" android:strokeWidth="2"/>
+    <path android:fillColor="#00000000"
+        android:pathData="M12.001,5C7.524,5 3.733,7.943 2.459,12C3.733,16.057 7.524,19 12.001,19C16.479,19 20.269,16.057 21.543,12C20.269,7.943 16.479,5 12.001,5Z"
+        android:strokeColor="?attr/colorControlNormal" android:strokeLineCap="round"
+        android:strokeLineJoin="round" android:strokeWidth="2"/>
+</vector>
diff --git a/wiglewifiwardriving/src/main/res/drawable/w_logo.xml b/wiglewifiwardriving/src/main/res/drawable/w_logo.xml
new file mode 100644
index 000000000..3a9c71d5a
--- /dev/null
+++ b/wiglewifiwardriving/src/main/res/drawable/w_logo.xml
@@ -0,0 +1,12 @@
+<vector android:alpha="0.85" android:height="104.7619dp"
+    android:viewportHeight="200" android:viewportWidth="210"
+    android:width="110dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="?attr/colorControlNormal"
+        android:pathData="m178.28,122.81 l-34.33,40.66q-3.49,4.15 -13.12,4.15 -7.68,0 -13.96,-3.56 -1.12,-0.59 -1.54,-1.04l-26.38,-27.9q-0.98,-1.04 -0.98,-2.52 0,-2.97 4.47,-4.45 3.35,-1.19 6.84,-1.19 6.28,0 8.79,2.97l15.07,17.36 26.24,-32.5q3.35,-4.15 13.26,-4.15 5.44,0 10.33,1.78 6.84,2.23 6.84,6.83 0,1.78 -1.54,3.56zM87.42,166.44q-4.05,1.19 -8.79,1.19 -9.63,0 -13.12,-4.15l-34.33,-40.66q-1.54,-1.78 -1.54,-3.56 0,-4.6 6.84,-6.83 4.88,-1.78 10.33,-1.78 9.63,0 13.12,4.15l34.47,40.66q1.4,1.63 1.4,3.56 0,5.05 -8.37,7.42z" android:strokeColor="#00000000"/>
+    <path android:fillColor="?attr/colorControlNormal"
+        android:pathData="M104.29,31.19A96.74,97.13 0,0 0,15.91 88.81L15.93,88.82A11.41,11.01 0,0 0,14.72 93.72A11.41,11.01 0,0 0,26.13 104.73A11.41,11.01 0,0 0,36.6 98.06L36.65,98.08A74.1,74.1 0,0 1,104.29 54.22A74.1,74.1 0,0 1,171.94 98.08L171.95,98.08A11.41,11.01 0,0 0,182.52 104.98A11.41,11.01 0,0 0,193.93 93.97A11.41,11.01 0,0 0,192.61 88.84L192.67,88.81A96.74,97.13 0,0 0,104.29 31.19z"
+        android:strokeColor="?attr/colorControlNormal" android:strokeWidth="0.264583"/>
+    <path android:fillColor="?attr/colorControlNormal"
+        android:pathData="m104.29,70.48a57.12,57.84 0,0 0,-40.63 17.3,10.05 9.71,0 0,0 -3.78,7.56 10.05,9.71 0,0 0,10.05 9.71,10.05 9.71,0 0,0 6.39,-2.23l0.08,0.07a37.63,37.88 0,0 1,27.89 -12.45,37.63 37.88,0 0,1 27.89,12.45l0.04,-0.04a10.05,9.71 0,0 0,6.48 2.3,10.05 9.71,0 0,0 10.05,-9.71 10.05,9.71 0,0 0,-3.69 -7.51,57.12 57.84,0 0,0 -40.78,-17.45z"
+        android:strokeColor="?attr/colorControlNormal" android:strokeWidth="0.264583"/>
+</vector>
diff --git a/wiglewifiwardriving/src/main/res/drawable/wrench.xml b/wiglewifiwardriving/src/main/res/drawable/wrench.xml
new file mode 100644
index 000000000..d246f42c1
--- /dev/null
+++ b/wiglewifiwardriving/src/main/res/drawable/wrench.xml
@@ -0,0 +1,5 @@
+<vector android:alpha="0.85" android:height="100dp"
+    android:viewportHeight="599.74" android:viewportWidth="599.74"
+    android:width="100dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="?attr/colorControlNormal" android:pathData="m539.4,177.61c-0.37,-4.27 -3.18,-7.94 -7.2,-9.4 -4.03,-1.47 -8.54,-0.47 -11.57,2.56l-62.01,62.01 -68.75,-21.77 -21.77,-68.75 62.02,-62.02c3.04,-3.03 4.03,-7.54 2.56,-11.56 -1.48,-4.03 -5.14,-6.84 -9.42,-7.21 -37.66,-3.24 -74.57,10.2 -101.25,36.89 -36.54,36.54 -46.22,89.91 -29.08,135.4 -1.87,1.58 -3.72,3.25 -5.54,5.05L80.38,434.14c-0.07,0.07 -0.14,0.15 -0.22,0.22 -24.34,24.35 -24.34,63.96 0,88.31 24.35,24.34 63.67,24.05 88.01,-0.3 0.1,-0.1 0.2,-0.2 0.3,-0.31L362.09,313.45c1.76,-1.77 3.4,-3.63 4.95,-5.53 45.5,17.17 98.9,7.51 135.47,-29.06 26.67,-26.69 40.13,-63.59 36.88,-101.25zM136.97,496.37c-8.97,8.97 -23.5,8.96 -32.47,0 -8.97,-8.96 -8.97,-23.5 0,-32.47 8.97,-8.96 23.5,-8.96 32.47,0 8.97,8.96 8.97,23.5 0,32.47z"/>
+</vector>
diff --git a/wiglewifiwardriving/src/main/res/layout/gpx_recycler_element.xml b/wiglewifiwardriving/src/main/res/layout/gpx_recycler_element.xml
index 16b56547b..67f9b7077 100644
--- a/wiglewifiwardriving/src/main/res/layout/gpx_recycler_element.xml
+++ b/wiglewifiwardriving/src/main/res/layout/gpx_recycler_element.xml
@@ -22,7 +22,7 @@
         tools:text="11/15/01 14:33 - 16:03 (867)"/>
     <ImageButton
         android:id="@+id/share_route"
-        android:background="@android:drawable/ic_menu_share"
+        android:background="@drawable/share"
         android:layout_alignParentEnd="true"
         android:layout_alignParentTop="true"
         android:layout_gravity="end"
diff --git a/wiglewifiwardriving/src/main/res/layout/list.xml b/wiglewifiwardriving/src/main/res/layout/list.xml
index 68a128998..20b818bda 100644
--- a/wiglewifiwardriving/src/main/res/layout/list.xml
+++ b/wiglewifiwardriving/src/main/res/layout/list.xml
@@ -257,7 +257,7 @@
             android:layout_margin="5dip"
             android:layout_width="44dip"
             android:layout_height="44dip"
-            android:src="@android:drawable/ic_menu_close_clear_cancel"
+            android:src="@drawable/no_scan"
             android:visibility="gone"
             android:contentDescription="@string/dash_scan_off"/>
         <ImageButton
diff --git a/wiglewifiwardriving/src/main/res/layout/uploadrow.xml b/wiglewifiwardriving/src/main/res/layout/uploadrow.xml
index db324196c..a4b418928 100644
--- a/wiglewifiwardriving/src/main/res/layout/uploadrow.xml
+++ b/wiglewifiwardriving/src/main/res/layout/uploadrow.xml
@@ -24,7 +24,7 @@
             android:layout_height="wrap_content">
             <ImageButton
                 android:id="@+id/view_upload"
-                android:background="@android:drawable/ic_menu_view"
+                android:background="@drawable/view"
                 android:layout_gravity="end"
                 android:layout_height="28dp"
                 android:layout_width="28dp"
@@ -35,7 +35,7 @@
                 />
             <ImageButton
                 android:id="@+id/share_upload"
-                android:background="@android:drawable/ic_menu_share"
+                android:background="@drawable/share"
                 android:layout_gravity="end"
                 android:layout_height="28dp"
                 android:layout_width="28dp"
diff --git a/wiglewifiwardriving/src/main/res/menu/leftmenu.xml b/wiglewifiwardriving/src/main/res/menu/leftmenu.xml
index fe0ff231b..7de7ed237 100644
--- a/wiglewifiwardriving/src/main/res/menu/leftmenu.xml
+++ b/wiglewifiwardriving/src/main/res/menu/leftmenu.xml
@@ -10,13 +10,13 @@
             />
         <item
             android:id="@+id/nav_map"
-            android:icon="@android:drawable/ic_menu_mapmode"
+            android:icon="@drawable/map"
             android:title="@string/tab_map"
             android:contentDescription="@string/tab_map"
             />
         <item
             android:id="@+id/nav_dash"
-            android:icon="@android:drawable/ic_menu_directions"
+            android:icon="@drawable/dashboard"
             android:title="@string/tab_dash"
             android:contentDescription="@string/tab_dash"
             />
@@ -47,19 +47,19 @@
             android:id="@+id/stats_group">
             <item
                 android:id="@+id/nav_user_stats"
-                android:icon="@android:drawable/ic_menu_myplaces"
+                android:icon="@drawable/user_star"
                 android:title="@string/user_stats_app_name"
                 android:contentDescription="@string/user_stats_app_name"
                 />
             <item
                 android:id="@+id/nav_rank"
-                android:icon="@android:drawable/ic_menu_sort_alphabetically"
+                android:icon="@drawable/rankings"
                 android:title="@string/tab_rank"
                 android:contentDescription="@string/tab_rank"
                 />
             <item
                 android:id="@+id/nav_site_stats"
-                android:icon="@drawable/ic_planet_small_white"
+                android:icon="@drawable/w_logo"
                 app:tint="?attr/colorControlNormal"
                 android:title="@string/site_stats_app_name"
                 android:contentDescription="@string/site_stats_app_name"