diff --git a/briar-android/artwork/notification_signout.svg b/briar-android/artwork/notification_signout.svg
new file mode 100644
index 000000000..ac9680fe8
--- /dev/null
+++ b/briar-android/artwork/notification_signout.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="M16,17V14H9V10H16V7L21,12L16,17M14,2A2,2 0 0,1 16,4V6H14V4H5V20H14V18H16V20A2,2 0 0,1 14,22H5A2,2 0 0,1 3,20V4A2,2 0 0,1 5,2H14Z" /></svg>
\ No newline at end of file
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/AndroidNotificationManagerImpl.java b/briar-android/src/main/java/org/briarproject/briar/android/AndroidNotificationManagerImpl.java
index 7bad14178..90965b6b9 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/AndroidNotificationManagerImpl.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/AndroidNotificationManagerImpl.java
@@ -255,7 +255,7 @@ class AndroidNotificationManagerImpl implements AndroidNotificationManager,
 				R.string.ongoing_notification_title;
 		int text = locked ? R.string.lock_tap_to_unlock :
 				R.string.ongoing_notification_text;
-		int icon = locked ? R.drawable.startup_lock :
+		int icon = locked ? R.drawable.ic_lock :
 				R.drawable.notification_ongoing;
 		// Ongoing foreground notification that shows BriarService is running
 		NotificationCompat.Builder b =
@@ -624,7 +624,7 @@ class AndroidNotificationManagerImpl implements AndroidNotificationManager,
 
 		NotificationCompat.Builder b =
 				new NotificationCompat.Builder(appContext, REMINDER_CHANNEL_ID);
-		b.setSmallIcon(R.drawable.ic_signout);
+		b.setSmallIcon(R.drawable.notification_signout);
 		b.setColor(getColor(appContext, R.color.briar_primary));
 		b.setContentTitle(
 				appContext.getText(R.string.reminder_notification_title));
diff --git a/briar-android/src/main/res/drawable-anydpi-v24/ic_lock.xml b/briar-android/src/main/res/drawable-anydpi-v24/ic_lock.xml
new file mode 100644
index 000000000..cf2c80ccf
--- /dev/null
+++ b/briar-android/src/main/res/drawable-anydpi-v24/ic_lock.xml
@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="#FFFFFF">
+  <group android:scaleX="0.92"
+      android:scaleY="0.92"
+      android:translateX="0.96"
+      android:translateY="0.96">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M18,8h-1L17,6c0,-2.76 -2.24,-5 -5,-5S7,3.24 7,6v2L6,8c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,10c0,-1.1 -0.9,-2 -2,-2zM12,17c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2zM15.1,8L8.9,8L8.9,6c0,-1.71 1.39,-3.1 3.1,-3.1 1.71,0 3.1,1.39 3.1,3.1v2z"/>
+  </group>
+</vector>
diff --git a/briar-android/src/main/res/drawable/notification_blog.xml b/briar-android/src/main/res/drawable-anydpi-v24/notification_blog.xml
similarity index 58%
rename from briar-android/src/main/res/drawable/notification_blog.xml
rename to briar-android/src/main/res/drawable-anydpi-v24/notification_blog.xml
index d5218f632..3432e1312 100644
--- a/briar-android/src/main/res/drawable/notification_blog.xml
+++ b/briar-android/src/main/res/drawable-anydpi-v24/notification_blog.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportHeight="24.0"
-        android:viewportWidth="24.0">
+	android:width="24dp"
+	android:height="24dp"
+	android:viewportWidth="24.0"
+	android:viewportHeight="24.0">
 	<path
 		android:fillColor="#FFFFFFFF"
-		android:pathData="M13,12h7v1.5h-7zM13,9.5h7L20,11h-7zM13,14.5h7L20,16h-7zM21,4L3,4c-1.1,0 -2,0.9 -2,2v13c0,1.1 0.9,2 2,2h18c1.1,0 2,-0.9 2,-2L23,6c0,-1.1 -0.9,-2 -2,-2zM21,19h-9L12,6h9v13z"/>
+		android:pathData="M13,12h7v1.5h-7zM13,9.5h7L20,11h-7zM13,14.5h7L20,16h-7zM21,4L3,4c-1.1,0 -2,0.9 -2,2v13c0,1.1 0.9,2 2,2h18c1.1,0 2,-0.9 2,-2L23,6c0,-1.1 -0.9,-2 -2,-2zM21,19h-9L12,6h9v13z" />
 </vector>
diff --git a/briar-android/src/main/res/drawable/notification_contact_added.xml b/briar-android/src/main/res/drawable-anydpi-v24/notification_contact_added.xml
similarity index 68%
rename from briar-android/src/main/res/drawable/notification_contact_added.xml
rename to briar-android/src/main/res/drawable-anydpi-v24/notification_contact_added.xml
index 48c8339f0..dbeb8ef60 100644
--- a/briar-android/src/main/res/drawable/notification_contact_added.xml
+++ b/briar-android/src/main/res/drawable-anydpi-v24/notification_contact_added.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportHeight="24.0"
-        android:viewportWidth="24.0">
+	android:width="24dp"
+	android:height="24dp"
+	android:viewportWidth="24.0"
+	android:viewportHeight="24.0">
 	<path
 		android:fillColor="#FFFFFFFF"
-		android:pathData="M20,0L4,0v2h16L20,0zM4,24h16v-2L4,22v2zM20,4L4,4c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2zM12,6.75c1.24,0 2.25,1.01 2.25,2.25s-1.01,2.25 -2.25,2.25S9.75,10.24 9.75,9 10.76,6.75 12,6.75zM17,17L7,17v-1.5c0,-1.67 3.33,-2.5 5,-2.5s5,0.83 5,2.5L17,17z"/>
+		android:pathData="M20,0L4,0v2h16L20,0zM4,24h16v-2L4,22v2zM20,4L4,4c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2zM12,6.75c1.24,0 2.25,1.01 2.25,2.25s-1.01,2.25 -2.25,2.25S9.75,10.24 9.75,9 10.76,6.75 12,6.75zM17,17L7,17v-1.5c0,-1.67 3.33,-2.5 5,-2.5s5,0.83 5,2.5L17,17z" />
 </vector>
diff --git a/briar-android/src/main/res/drawable/notification_forum.xml b/briar-android/src/main/res/drawable-anydpi-v24/notification_forum.xml
similarity index 100%
rename from briar-android/src/main/res/drawable/notification_forum.xml
rename to briar-android/src/main/res/drawable-anydpi-v24/notification_forum.xml
diff --git a/briar-android/src/main/res/drawable/notification_ongoing.xml b/briar-android/src/main/res/drawable-anydpi-v24/notification_ongoing.xml
similarity index 100%
rename from briar-android/src/main/res/drawable/notification_ongoing.xml
rename to briar-android/src/main/res/drawable-anydpi-v24/notification_ongoing.xml
diff --git a/briar-android/src/main/res/drawable/notification_private_group.xml b/briar-android/src/main/res/drawable-anydpi-v24/notification_private_group.xml
similarity index 74%
rename from briar-android/src/main/res/drawable/notification_private_group.xml
rename to briar-android/src/main/res/drawable-anydpi-v24/notification_private_group.xml
index 55cbde9ee..cbe143955 100644
--- a/briar-android/src/main/res/drawable/notification_private_group.xml
+++ b/briar-android/src/main/res/drawable-anydpi-v24/notification_private_group.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportHeight="24.0"
-        android:viewportWidth="24.0">
+	android:width="24dp"
+	android:height="24dp"
+	android:viewportWidth="24.0"
+	android:viewportHeight="24.0">
 	<path
 		android:fillColor="#FFFFFFFF"
-		android:pathData="M16,11c1.66,0 2.99,-1.34 2.99,-3S17.66,5 16,5c-1.66,0 -3,1.34 -3,3s1.34,3 3,3zM8,11c1.66,0 2.99,-1.34 2.99,-3S9.66,5 8,5C6.34,5 5,6.34 5,8s1.34,3 3,3zM8,13c-2.33,0 -7,1.17 -7,3.5L1,19h14v-2.5c0,-2.33 -4.67,-3.5 -7,-3.5zM16,13c-0.29,0 -0.62,0.02 -0.97,0.05 1.16,0.84 1.97,1.97 1.97,3.45L17,19h6v-2.5c0,-2.33 -4.67,-3.5 -7,-3.5z"/>
+		android:pathData="M16,11c1.66,0 2.99,-1.34 2.99,-3S17.66,5 16,5c-1.66,0 -3,1.34 -3,3s1.34,3 3,3zM8,11c1.66,0 2.99,-1.34 2.99,-3S9.66,5 8,5C6.34,5 5,6.34 5,8s1.34,3 3,3zM8,13c-2.33,0 -7,1.17 -7,3.5L1,19h14v-2.5c0,-2.33 -4.67,-3.5 -7,-3.5zM16,13c-0.29,0 -0.62,0.02 -0.97,0.05 1.16,0.84 1.97,1.97 1.97,3.45L17,19h6v-2.5c0,-2.33 -4.67,-3.5 -7,-3.5z" />
 </vector>
diff --git a/briar-android/src/main/res/drawable/notification_private_message.xml b/briar-android/src/main/res/drawable-anydpi-v24/notification_private_message.xml
similarity index 60%
rename from briar-android/src/main/res/drawable/notification_private_message.xml
rename to briar-android/src/main/res/drawable-anydpi-v24/notification_private_message.xml
index b42ea09e2..48240fe75 100644
--- a/briar-android/src/main/res/drawable/notification_private_message.xml
+++ b/briar-android/src/main/res/drawable-anydpi-v24/notification_private_message.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportHeight="24.0"
-        android:viewportWidth="24.0">
+	android:width="24dp"
+	android:height="24dp"
+	android:viewportWidth="24.0"
+	android:viewportHeight="24.0">
 	<path
 		android:fillColor="#FFFFFFFF"
-		android:pathData="M20,2L4,2c-1.1,0 -1.99,0.9 -1.99,2L2,22l4,-4h14c1.1,0 2,-0.9 2,-2L22,4c0,-1.1 -0.9,-2 -2,-2zM18,14L6,14v-2h12v2zM18,11L6,11L6,9h12v2zM18,8L6,8L6,6h12v2z"/>
+		android:pathData="M20,2L4,2c-1.1,0 -1.99,0.9 -1.99,2L2,22l4,-4h14c1.1,0 2,-0.9 2,-2L22,4c0,-1.1 -0.9,-2 -2,-2zM18,14L6,14v-2h12v2zM18,11L6,11L6,9h12v2zM18,8L6,8L6,6h12v2z" />
 </vector>
diff --git a/briar-android/src/main/res/drawable-anydpi-v24/notification_signout.xml b/briar-android/src/main/res/drawable-anydpi-v24/notification_signout.xml
new file mode 100644
index 000000000..73940840c
--- /dev/null
+++ b/briar-android/src/main/res/drawable-anydpi-v24/notification_signout.xml
@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="#FFFFFF">
+  <group android:scaleX="0.92"
+      android:scaleY="0.92"
+      android:translateX="0.96"
+      android:translateY="0.96">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M16,17V14H9V10H16V7L21,12L16,17M14,2A2,2 0,0 1,16 4V6H14V4H5V20H14V18H16V20A2,2 0,0 1,14 22H5A2,2 0,0 1,3 20V4A2,2 0,0 1,5 2H14Z"/>
+  </group>
+</vector>
diff --git a/briar-android/src/main/res/drawable-hdpi/ic_lock.png b/briar-android/src/main/res/drawable-hdpi/ic_lock.png
new file mode 100644
index 000000000..cf1d2dbfe
Binary files /dev/null and b/briar-android/src/main/res/drawable-hdpi/ic_lock.png differ
diff --git a/briar-android/src/main/res/drawable-hdpi/notification_blog.png b/briar-android/src/main/res/drawable-hdpi/notification_blog.png
new file mode 100644
index 000000000..d8af309d6
Binary files /dev/null and b/briar-android/src/main/res/drawable-hdpi/notification_blog.png differ
diff --git a/briar-android/src/main/res/drawable-hdpi/notification_contact_added.png b/briar-android/src/main/res/drawable-hdpi/notification_contact_added.png
new file mode 100644
index 000000000..562bde2a2
Binary files /dev/null and b/briar-android/src/main/res/drawable-hdpi/notification_contact_added.png differ
diff --git a/briar-android/src/main/res/drawable-hdpi/notification_forum.png b/briar-android/src/main/res/drawable-hdpi/notification_forum.png
new file mode 100644
index 000000000..b97be3b09
Binary files /dev/null and b/briar-android/src/main/res/drawable-hdpi/notification_forum.png differ
diff --git a/briar-android/src/main/res/drawable-hdpi/notification_ongoing.png b/briar-android/src/main/res/drawable-hdpi/notification_ongoing.png
new file mode 100644
index 000000000..199c06400
Binary files /dev/null and b/briar-android/src/main/res/drawable-hdpi/notification_ongoing.png differ
diff --git a/briar-android/src/main/res/drawable-hdpi/notification_private_group.png b/briar-android/src/main/res/drawable-hdpi/notification_private_group.png
new file mode 100644
index 000000000..9bffc2f60
Binary files /dev/null and b/briar-android/src/main/res/drawable-hdpi/notification_private_group.png differ
diff --git a/briar-android/src/main/res/drawable-hdpi/notification_private_message.png b/briar-android/src/main/res/drawable-hdpi/notification_private_message.png
new file mode 100644
index 000000000..9f28a4ddd
Binary files /dev/null and b/briar-android/src/main/res/drawable-hdpi/notification_private_message.png differ
diff --git a/briar-android/src/main/res/drawable-hdpi/notification_signout.png b/briar-android/src/main/res/drawable-hdpi/notification_signout.png
new file mode 100644
index 000000000..7fa1f7ed8
Binary files /dev/null and b/briar-android/src/main/res/drawable-hdpi/notification_signout.png differ
diff --git a/briar-android/src/main/res/drawable-mdpi/ic_lock.png b/briar-android/src/main/res/drawable-mdpi/ic_lock.png
new file mode 100644
index 000000000..780388e39
Binary files /dev/null and b/briar-android/src/main/res/drawable-mdpi/ic_lock.png differ
diff --git a/briar-android/src/main/res/drawable-mdpi/notification_blog.png b/briar-android/src/main/res/drawable-mdpi/notification_blog.png
new file mode 100644
index 000000000..34c7dc551
Binary files /dev/null and b/briar-android/src/main/res/drawable-mdpi/notification_blog.png differ
diff --git a/briar-android/src/main/res/drawable-mdpi/notification_contact_added.png b/briar-android/src/main/res/drawable-mdpi/notification_contact_added.png
new file mode 100644
index 000000000..194314c65
Binary files /dev/null and b/briar-android/src/main/res/drawable-mdpi/notification_contact_added.png differ
diff --git a/briar-android/src/main/res/drawable-mdpi/notification_forum.png b/briar-android/src/main/res/drawable-mdpi/notification_forum.png
new file mode 100644
index 000000000..ef1e2504d
Binary files /dev/null and b/briar-android/src/main/res/drawable-mdpi/notification_forum.png differ
diff --git a/briar-android/src/main/res/drawable-mdpi/notification_ongoing.png b/briar-android/src/main/res/drawable-mdpi/notification_ongoing.png
new file mode 100644
index 000000000..b68561b2b
Binary files /dev/null and b/briar-android/src/main/res/drawable-mdpi/notification_ongoing.png differ
diff --git a/briar-android/src/main/res/drawable-mdpi/notification_private_group.png b/briar-android/src/main/res/drawable-mdpi/notification_private_group.png
new file mode 100644
index 000000000..4f52bc248
Binary files /dev/null and b/briar-android/src/main/res/drawable-mdpi/notification_private_group.png differ
diff --git a/briar-android/src/main/res/drawable-mdpi/notification_private_message.png b/briar-android/src/main/res/drawable-mdpi/notification_private_message.png
new file mode 100644
index 000000000..f095ee707
Binary files /dev/null and b/briar-android/src/main/res/drawable-mdpi/notification_private_message.png differ
diff --git a/briar-android/src/main/res/drawable-mdpi/notification_signout.png b/briar-android/src/main/res/drawable-mdpi/notification_signout.png
new file mode 100644
index 000000000..07db32ef1
Binary files /dev/null and b/briar-android/src/main/res/drawable-mdpi/notification_signout.png differ
diff --git a/briar-android/src/main/res/drawable-xhdpi/ic_lock.png b/briar-android/src/main/res/drawable-xhdpi/ic_lock.png
new file mode 100644
index 000000000..970eb9928
Binary files /dev/null and b/briar-android/src/main/res/drawable-xhdpi/ic_lock.png differ
diff --git a/briar-android/src/main/res/drawable-xhdpi/notification_blog.png b/briar-android/src/main/res/drawable-xhdpi/notification_blog.png
new file mode 100644
index 000000000..c6c16bd11
Binary files /dev/null and b/briar-android/src/main/res/drawable-xhdpi/notification_blog.png differ
diff --git a/briar-android/src/main/res/drawable-xhdpi/notification_contact_added.png b/briar-android/src/main/res/drawable-xhdpi/notification_contact_added.png
new file mode 100644
index 000000000..2f5d2afa3
Binary files /dev/null and b/briar-android/src/main/res/drawable-xhdpi/notification_contact_added.png differ
diff --git a/briar-android/src/main/res/drawable-xhdpi/notification_forum.png b/briar-android/src/main/res/drawable-xhdpi/notification_forum.png
new file mode 100644
index 000000000..990c390c7
Binary files /dev/null and b/briar-android/src/main/res/drawable-xhdpi/notification_forum.png differ
diff --git a/briar-android/src/main/res/drawable-xhdpi/notification_ongoing.png b/briar-android/src/main/res/drawable-xhdpi/notification_ongoing.png
new file mode 100644
index 000000000..8cdafa9d3
Binary files /dev/null and b/briar-android/src/main/res/drawable-xhdpi/notification_ongoing.png differ
diff --git a/briar-android/src/main/res/drawable-xhdpi/notification_private_group.png b/briar-android/src/main/res/drawable-xhdpi/notification_private_group.png
new file mode 100644
index 000000000..5082366e6
Binary files /dev/null and b/briar-android/src/main/res/drawable-xhdpi/notification_private_group.png differ
diff --git a/briar-android/src/main/res/drawable-xhdpi/notification_private_message.png b/briar-android/src/main/res/drawable-xhdpi/notification_private_message.png
new file mode 100644
index 000000000..4b1ff6684
Binary files /dev/null and b/briar-android/src/main/res/drawable-xhdpi/notification_private_message.png differ
diff --git a/briar-android/src/main/res/drawable-xhdpi/notification_signout.png b/briar-android/src/main/res/drawable-xhdpi/notification_signout.png
new file mode 100644
index 000000000..68f0c37d9
Binary files /dev/null and b/briar-android/src/main/res/drawable-xhdpi/notification_signout.png differ
diff --git a/briar-android/src/main/res/drawable-xxhdpi/ic_lock.png b/briar-android/src/main/res/drawable-xxhdpi/ic_lock.png
new file mode 100644
index 000000000..848892ae9
Binary files /dev/null and b/briar-android/src/main/res/drawable-xxhdpi/ic_lock.png differ
diff --git a/briar-android/src/main/res/drawable-xxhdpi/notification_blog.png b/briar-android/src/main/res/drawable-xxhdpi/notification_blog.png
new file mode 100644
index 000000000..3f16ce360
Binary files /dev/null and b/briar-android/src/main/res/drawable-xxhdpi/notification_blog.png differ
diff --git a/briar-android/src/main/res/drawable-xxhdpi/notification_contact_added.png b/briar-android/src/main/res/drawable-xxhdpi/notification_contact_added.png
new file mode 100644
index 000000000..6eb750cfd
Binary files /dev/null and b/briar-android/src/main/res/drawable-xxhdpi/notification_contact_added.png differ
diff --git a/briar-android/src/main/res/drawable-xxhdpi/notification_forum.png b/briar-android/src/main/res/drawable-xxhdpi/notification_forum.png
new file mode 100644
index 000000000..68473d897
Binary files /dev/null and b/briar-android/src/main/res/drawable-xxhdpi/notification_forum.png differ
diff --git a/briar-android/src/main/res/drawable-xxhdpi/notification_ongoing.png b/briar-android/src/main/res/drawable-xxhdpi/notification_ongoing.png
new file mode 100644
index 000000000..af6015742
Binary files /dev/null and b/briar-android/src/main/res/drawable-xxhdpi/notification_ongoing.png differ
diff --git a/briar-android/src/main/res/drawable-xxhdpi/notification_private_group.png b/briar-android/src/main/res/drawable-xxhdpi/notification_private_group.png
new file mode 100644
index 000000000..a1854cad9
Binary files /dev/null and b/briar-android/src/main/res/drawable-xxhdpi/notification_private_group.png differ
diff --git a/briar-android/src/main/res/drawable-xxhdpi/notification_private_message.png b/briar-android/src/main/res/drawable-xxhdpi/notification_private_message.png
new file mode 100644
index 000000000..af4463c7a
Binary files /dev/null and b/briar-android/src/main/res/drawable-xxhdpi/notification_private_message.png differ
diff --git a/briar-android/src/main/res/drawable-xxhdpi/notification_signout.png b/briar-android/src/main/res/drawable-xxhdpi/notification_signout.png
new file mode 100644
index 000000000..1b62d66bc
Binary files /dev/null and b/briar-android/src/main/res/drawable-xxhdpi/notification_signout.png differ