diff --git a/app/build.gradle b/app/build.gradle
index 3650acd06..db9fa8ebb 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -34,6 +34,9 @@ android {
         versionCode 20136 // format is Mmmss (where M is 1+the numeric major number
         versionName "1.1.36"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+
+        // per https://developer.android.com/studio/write/vector-asset-studio
+        vectorDrawables.useSupportLibrary = true
     }
     buildTypes {
         release {
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 8bee48f88..bcdf0ae0b 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -75,9 +75,9 @@
         tools:replace="android:icon"
         android:name="com.geeksville.mesh.MeshUtilApplication"
         android:allowBackup="true"
-        android:icon="@mipmap/ic_launcher_new"
+        android:icon="@mipmap/ic_launcher2"
         android:label="@string/app_name"
-        android:roundIcon="@mipmap/ic_launcher_new_round"
+        android:roundIcon="@mipmap/ic_launcher2_round"
         android:supportsRtl="true"
         android:hardwareAccelerated="true"
         android:theme="@style/AppTheme">
@@ -99,13 +99,13 @@
             android:name="com.geeksville.mesh.service.SoftwareUpdateService"
             android:enabled="true"
             android:exported="false"
-            android:permission="android.permission.BIND_JOB_SERVICE"></service>
+            android:permission="android.permission.BIND_JOB_SERVICE" />
 
         <!-- This is the public API for doing mesh radio operations from android apps -->
         <service
             android:name="com.geeksville.mesh.service.MeshService"
             android:enabled="true"
-            android:exported="true">
+            android:exported="true" tools:ignore="ExportedActivity">
             <intent-filter>
                 <action android:name="com.geeksville.mesh.Service" />
             </intent-filter>
diff --git a/app/src/main/ic_launcher2-playstore.png b/app/src/main/ic_launcher2-playstore.png
new file mode 100644
index 000000000..5e8f9939e
Binary files /dev/null and b/app/src/main/ic_launcher2-playstore.png differ
diff --git a/app/src/main/res/drawable/ic_launcher2_background.xml b/app/src/main/res/drawable/ic_launcher2_background.xml
new file mode 100644
index 000000000..8bd903402
--- /dev/null
+++ b/app/src/main/res/drawable/ic_launcher2_background.xml
@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+  <group android:scaleX="3.7795277"
+      android:scaleY="3.7795277">
+    <path
+        android:pathData="M0.1623,0.1772l28.2505,0l0,28.2205l-28.2505,0z"
+        android:strokeWidth="0.529167"
+        android:fillColor="#67ea94"/>
+  </group>
+</vector>
diff --git a/app/src/main/res/drawable/ic_launcher2_foreground.xml b/app/src/main/res/drawable/ic_launcher2_foreground.xml
new file mode 100644
index 000000000..c115779cb
--- /dev/null
+++ b/app/src/main/res/drawable/ic_launcher2_foreground.xml
@@ -0,0 +1,21 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+  <group android:scaleX="2.4944882"
+      android:scaleY="2.4944882"
+      android:translateX="18.36"
+      android:translateY="18.36">
+    <path
+        android:pathData="m16.9229,9.3914 l-4.8076,13.3628 -1.0141,-1.3106 5.3136,-14.7693c0.1142,-0.3174 0.3038,-0.5075 0.5065,-0.5079 0.2028,-0.0003 0.3925,0.1891 0.507,0.5062l5.3259,14.7461 -1.0128,1.3141z"
+        android:strokeLineJoin="round"
+        android:fillColor="#2c2d3c"
+        android:fillType="evenOdd"/>
+    <path
+        android:pathData="m6.8349,22.7403 l5.6159,-15.6089 -1.0141,-1.3106 -5.6159,15.6089z"
+        android:strokeLineJoin="round"
+        android:fillColor="#2c2d3c"
+        android:fillType="evenOdd"/>
+  </group>
+</vector>
diff --git a/app/src/main/res/drawable/ic_launcher_new_background.xml b/app/src/main/res/drawable/ic_launcher_new_background.xml
deleted file mode 100644
index ca3826a46..000000000
--- a/app/src/main/res/drawable/ic_launcher_new_background.xml
+++ /dev/null
@@ -1,74 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector
-    android:height="108dp"
-    android:width="108dp"
-    android:viewportHeight="108"
-    android:viewportWidth="108"
-    xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#3DDC84"
-          android:pathData="M0,0h108v108h-108z"/>
-    <path android:fillColor="#00000000" android:pathData="M9,0L9,108"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M19,0L19,108"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M29,0L29,108"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M39,0L39,108"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M49,0L49,108"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M59,0L59,108"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M69,0L69,108"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M79,0L79,108"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M89,0L89,108"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M99,0L99,108"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M0,9L108,9"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M0,19L108,19"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M0,29L108,29"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M0,39L108,39"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M0,49L108,49"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M0,59L108,59"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M0,69L108,69"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M0,79L108,79"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M0,89L108,89"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M0,99L108,99"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M19,29L89,29"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M19,39L89,39"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M19,49L89,49"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M19,59L89,59"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M19,69L89,69"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M19,79L89,79"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M29,19L29,89"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M39,19L39,89"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M49,19L49,89"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M59,19L59,89"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M69,19L69,89"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-    <path android:fillColor="#00000000" android:pathData="M79,19L79,89"
-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_launcher_new_foreground.xml b/app/src/main/res/drawable/ic_launcher_new_foreground.xml
deleted file mode 100644
index 5d4c3136d..000000000
--- a/app/src/main/res/drawable/ic_launcher_new_foreground.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108"
-    android:tint="#2C2D3C">
-  <group android:scaleX="2.61"
-      android:scaleY="2.61"
-      android:translateX="22.68"
-      android:translateY="22.68">
-      <path
-          android:fillColor="@android:color/white"
-          android:pathData="M12,5c-3.87,0 -7,3.13 -7,7h2c0,-2.76 2.24,-5 5,-5s5,2.24 5,5h2c0,-3.87 -3.13,-7 -7,-7zM13,14.29c0.88,-0.39 1.5,-1.26 1.5,-2.29 0,-1.38 -1.12,-2.5 -2.5,-2.5S9.5,10.62 9.5,12c0,1.02 0.62,1.9 1.5,2.29v3.3L7.59,21 9,22.41l3,-3 3,3L16.41,21 13,17.59v-3.3zM12,1C5.93,1 1,5.93 1,12h2c0,-4.97 4.03,-9 9,-9s9,4.03 9,9h2c0,-6.07 -4.93,-11 -11,-11z"/>
-  </group>
-</vector>
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher2.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher2.xml
new file mode 100644
index 000000000..b3cebe224
--- /dev/null
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher2.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_launcher2_background"/>
+    <foreground android:drawable="@drawable/ic_launcher2_foreground"/>
+</adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher2_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher2_round.xml
new file mode 100644
index 000000000..b3cebe224
--- /dev/null
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher2_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_launcher2_background"/>
+    <foreground android:drawable="@drawable/ic_launcher2_foreground"/>
+</adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_new.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_new.xml
deleted file mode 100644
index 4d3ddb1c9..000000000
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_new.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_new_background"/>
-    <foreground android:drawable="@drawable/ic_launcher_new_foreground"/>
-</adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_new_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_new_round.xml
deleted file mode 100644
index 4d3ddb1c9..000000000
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_new_round.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_new_background"/>
-    <foreground android:drawable="@drawable/ic_launcher_new_foreground"/>
-</adaptive-icon>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher2.png b/app/src/main/res/mipmap-hdpi/ic_launcher2.png
new file mode 100644
index 000000000..b64d9280b
Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher2.png differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher2_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher2_round.png
new file mode 100644
index 000000000..56c520a9c
Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher2_round.png differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_new.png b/app/src/main/res/mipmap-hdpi/ic_launcher_new.png
deleted file mode 100644
index 7775fe6af..000000000
Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_new.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_new_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_new_round.png
deleted file mode 100644
index dcb457c57..000000000
Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_new_round.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher2.png b/app/src/main/res/mipmap-mdpi/ic_launcher2.png
new file mode 100644
index 000000000..2b79c00fa
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher2.png differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher2_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher2_round.png
new file mode 100644
index 000000000..85fb0a2e2
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher2_round.png differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_new.png b/app/src/main/res/mipmap-mdpi/ic_launcher_new.png
deleted file mode 100644
index 24ba1e0e2..000000000
Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher_new.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_new_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_new_round.png
deleted file mode 100644
index 4ee7a542f..000000000
Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher_new_round.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher2.png b/app/src/main/res/mipmap-xhdpi/ic_launcher2.png
new file mode 100644
index 000000000..2de915abc
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher2.png differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher2_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher2_round.png
new file mode 100644
index 000000000..341130c04
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher2_round.png differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_new.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_new.png
deleted file mode 100644
index 1e8fc236b..000000000
Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_new.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_new_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_new_round.png
deleted file mode 100644
index 2e8c86568..000000000
Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_new_round.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher2.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher2.png
new file mode 100644
index 000000000..a4dca3aa8
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher2.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher2_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher2_round.png
new file mode 100644
index 000000000..1a1f6ba53
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher2_round.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_new.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_new.png
deleted file mode 100644
index e7d3091d3..000000000
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_new.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_new_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_new_round.png
deleted file mode 100644
index 0cb845ddb..000000000
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_new_round.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher2.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher2.png
new file mode 100644
index 000000000..6b068589d
Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher2.png differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher2_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher2_round.png
new file mode 100644
index 000000000..2daa1eeed
Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher2_round.png differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_new.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_new.png
deleted file mode 100644
index ab174c1cd..000000000
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_new.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_new_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_new_round.png
deleted file mode 100644
index 77abfd253..000000000
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_new_round.png and /dev/null differ
diff --git a/app/src/main/ic_launcher_new-playstore.png b/deprecated/ic_launcher_new-playstore.png
similarity index 100%
rename from app/src/main/ic_launcher_new-playstore.png
rename to deprecated/ic_launcher_new-playstore.png