diff --git a/android/.idea/assetWizardSettings.xml b/android/.idea/assetWizardSettings.xml
index 28bdeb3..48cc759 100644
--- a/android/.idea/assetWizardSettings.xml
+++ b/android/.idea/assetWizardSettings.xml
@@ -3,6 +3,59 @@
   <component name="WizardSettings">
     <option name="children">
       <map>
+        <entry key="imageWizard">
+          <value>
+            <PersistentState>
+              <option name="children">
+                <map>
+                  <entry key="imageAssetPanel">
+                    <value>
+                      <PersistentState>
+                        <option name="children">
+                          <map>
+                            <entry key="launcherLegacy">
+                              <value>
+                                <PersistentState>
+                                  <option name="values">
+                                    <map>
+                                      <entry key="assetType" value="IMAGE" />
+                                      <entry key="cropped" value="true" />
+                                      <entry key="iconShape" value="NONE" />
+                                      <entry key="imageAsset" value="F:\Eigene Dateien\Dropbox\Programming\Java\AndroidStudioProjects\SimpleCloudNotifier\data\icon_512_nobox.png" />
+                                      <entry key="outputName" value="ic_notification_full" />
+                                    </map>
+                                  </option>
+                                </PersistentState>
+                              </value>
+                            </entry>
+                            <entry key="notification">
+                              <value>
+                                <PersistentState>
+                                  <option name="values">
+                                    <map>
+                                      <entry key="assetType" value="IMAGE" />
+                                      <entry key="imageAsset" value="F:\Eigene Dateien\Dropbox\Programming\Java\AndroidStudioProjects\SimpleCloudNotifier\data\icon_512_transparent.png" />
+                                      <entry key="outputName" value="ic_notification_white" />
+                                    </map>
+                                  </option>
+                                </PersistentState>
+                              </value>
+                            </entry>
+                          </map>
+                        </option>
+                        <option name="values">
+                          <map>
+                            <entry key="outputIconType" value="LAUNCHER_LEGACY" />
+                          </map>
+                        </option>
+                      </PersistentState>
+                    </value>
+                  </entry>
+                </map>
+              </option>
+            </PersistentState>
+          </value>
+        </entry>
         <entry key="vectorWizard">
           <value>
             <PersistentState>
diff --git a/android/app/src/main/ic_bfb_raster-web.png b/android/app/src/main/ic_bfb_raster-web.png
new file mode 100644
index 0000000..846e05a
Binary files /dev/null and b/android/app/src/main/ic_bfb_raster-web.png differ
diff --git a/android/app/src/main/ic_notification_full-web.png b/android/app/src/main/ic_notification_full-web.png
new file mode 100644
index 0000000..f18d46e
Binary files /dev/null and b/android/app/src/main/ic_notification_full-web.png differ
diff --git a/android/app/src/main/java/com/blackforestbytes/simplecloudnotifier/SCNApp.java b/android/app/src/main/java/com/blackforestbytes/simplecloudnotifier/SCNApp.java
index daf675c..35c421a 100644
--- a/android/app/src/main/java/com/blackforestbytes/simplecloudnotifier/SCNApp.java
+++ b/android/app/src/main/java/com/blackforestbytes/simplecloudnotifier/SCNApp.java
@@ -97,16 +97,4 @@ public class SCNApp extends Application implements LifecycleObserver
     {
         isBackground = false;
     }
-}
-
-/*
- ==TODO==
-
-[ ]  - test notification channels
-[ ]  - startup time
-[ ]  - periodically get non-ack (option - even when not in-app)
-
-[ ]  - publish (+ HN post ?)
-
-
-*/
\ No newline at end of file
+}
\ No newline at end of file
diff --git a/android/app/src/main/java/com/blackforestbytes/simplecloudnotifier/model/SCNSettings.java b/android/app/src/main/java/com/blackforestbytes/simplecloudnotifier/model/SCNSettings.java
index dae24b0..c729bd6 100644
--- a/android/app/src/main/java/com/blackforestbytes/simplecloudnotifier/model/SCNSettings.java
+++ b/android/app/src/main/java/com/blackforestbytes/simplecloudnotifier/model/SCNSettings.java
@@ -192,7 +192,7 @@ public class SCNSettings
         FirebaseInstanceId.getInstance().getInstanceId().addOnSuccessListener(a, instanceIdResult ->
         {
             String newToken = instanceIdResult.getToken();
-            Log.e("FB::GetInstanceId", newToken);
+            Log.d("FB::GetInstanceId", newToken);
             SCNSettings.inst().setServerToken(newToken, null);
         }).addOnCompleteListener(r ->
         {
@@ -227,7 +227,7 @@ public class SCNSettings
             FirebaseInstanceId.getInstance().getInstanceId().addOnSuccessListener(a, instanceIdResult ->
             {
                 String newToken = instanceIdResult.getToken();
-                Log.e("FB::GetInstanceId", newToken);
+                Log.d("FB::GetInstanceId", newToken);
                 SCNSettings.inst().setServerToken(newToken, loader); // does register in here
             }).addOnCompleteListener(r ->
             {
diff --git a/android/app/src/main/java/com/blackforestbytes/simplecloudnotifier/service/NotificationService.java b/android/app/src/main/java/com/blackforestbytes/simplecloudnotifier/service/NotificationService.java
index d35b3b5..b86b5b8 100644
--- a/android/app/src/main/java/com/blackforestbytes/simplecloudnotifier/service/NotificationService.java
+++ b/android/app/src/main/java/com/blackforestbytes/simplecloudnotifier/service/NotificationService.java
@@ -6,6 +6,7 @@ import android.app.NotificationManager;
 import android.app.PendingIntent;
 import android.content.Context;
 import android.content.Intent;
+import android.graphics.BitmapFactory;
 import android.graphics.Color;
 import android.media.AudioManager;
 import android.net.Uri;
@@ -165,7 +166,8 @@ public class NotificationService
     private void showBackground_old(CMessage msg, Context ctxt, NotificationSettings ns, PriorityEnum prio)
     {
         NotificationCompat.Builder mBuilder = new NotificationCompat.Builder(ctxt, getChannel(prio));
-        mBuilder.setSmallIcon(R.drawable.ic_bfb);
+        mBuilder.setSmallIcon(R.drawable.ic_notification_white);
+        mBuilder.setLargeIcon(BitmapFactory.decodeResource(ctxt.getResources(), R.mipmap.ic_notification_full));
         mBuilder.setContentTitle(msg.Title);
         mBuilder.setContentText(msg.Content);
         mBuilder.setShowWhen(true);
@@ -208,12 +210,16 @@ public class NotificationService
     private void showBackground_new(CMessage msg, Context ctxt, NotificationSettings ns, PriorityEnum prio)
     {
         NotificationCompat.Builder mBuilder = new NotificationCompat.Builder(ctxt, getChannel(prio));
-        mBuilder.setSmallIcon(R.drawable.ic_bfb);
+        mBuilder.setSmallIcon(R.drawable.ic_notification_white);
+        mBuilder.setLargeIcon(BitmapFactory.decodeResource(ctxt.getResources(), R.mipmap.ic_notification_full));
         mBuilder.setContentTitle(msg.Title);
         mBuilder.setContentText(msg.Content);
         mBuilder.setShowWhen(true);
         mBuilder.setWhen(msg.Timestamp * 1000);
         mBuilder.setAutoCancel(true);
+        mBuilder.setCategory(Notification.CATEGORY_MESSAGE);
+        mBuilder.setStyle(new NotificationCompat.InboxStyle());
+        mBuilder.setGroup(prio.toString());
 
         if (ns.EnableLED) mBuilder.setLights(ns.LEDColor, 500, 500);
 
diff --git a/android/app/src/main/res/drawable-hdpi/ic_notification_white.png b/android/app/src/main/res/drawable-hdpi/ic_notification_white.png
new file mode 100644
index 0000000..ae5e491
Binary files /dev/null and b/android/app/src/main/res/drawable-hdpi/ic_notification_white.png differ
diff --git a/android/app/src/main/res/drawable-mdpi/ic_notification_white.png b/android/app/src/main/res/drawable-mdpi/ic_notification_white.png
new file mode 100644
index 0000000..c6945b3
Binary files /dev/null and b/android/app/src/main/res/drawable-mdpi/ic_notification_white.png differ
diff --git a/android/app/src/main/res/drawable-xhdpi/ic_notification_white.png b/android/app/src/main/res/drawable-xhdpi/ic_notification_white.png
new file mode 100644
index 0000000..125fc41
Binary files /dev/null and b/android/app/src/main/res/drawable-xhdpi/ic_notification_white.png differ
diff --git a/android/app/src/main/res/drawable-xxhdpi/ic_notification_white.png b/android/app/src/main/res/drawable-xxhdpi/ic_notification_white.png
new file mode 100644
index 0000000..862d409
Binary files /dev/null and b/android/app/src/main/res/drawable-xxhdpi/ic_notification_white.png differ
diff --git a/android/app/src/main/res/drawable-xxxhdpi/ic_notification_white.png b/android/app/src/main/res/drawable-xxxhdpi/ic_notification_white.png
new file mode 100644
index 0000000..fe0e47b
Binary files /dev/null and b/android/app/src/main/res/drawable-xxxhdpi/ic_notification_white.png differ
diff --git a/android/app/src/main/res/drawable/ic_bfb.xml b/android/app/src/main/res/drawable/ic_bfb.xml
deleted file mode 100644
index e1e1774..0000000
--- a/android/app/src/main/res/drawable/ic_bfb.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<vector android:height="24dp" android:viewportHeight="1000"
-    android:viewportWidth="1000" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#FF000000"
-        android:pathData="M500,500m-500,0a500,500 0,1 1,1000 0a500,500 0,1 1,-1000 0"
-        android:strokeColor="#000000" android:strokeWidth="1"/>
-    <path android:fillColor="#ffffff" android:pathData="M300,694L700,694L500,136L300,694"/>
-    <path android:fillColor="#ffffff" android:pathData="M473,559L527,559L527,774L473,774"/>
-    <path android:fillColor="#000000" android:pathData="M376,640L624,640L500,295L376,640"/>
-    <path android:fillColor="#ffffff" android:pathData="M100,730L500,730L300,172L100,730"/>
-    <path android:fillColor="#000000" android:pathData="M176,676L424,676L300,331L176,676"/>
-    <path android:fillColor="#ffffff" android:pathData="M273,595L327,595L327,810L273,810"/>
-    <path android:fillColor="#ffffff" android:pathData="M500,730L900,730L700,172L500,730"/>
-    <path android:fillColor="#000000" android:pathData="M576,676L824,676L700,331L576,676"/>
-    <path android:fillColor="#ffffff" android:pathData="M673,595L727,595L727,810L673,810"/>
-</vector>
diff --git a/android/app/src/main/res/mipmap-hdpi/ic_notification_full.png b/android/app/src/main/res/mipmap-hdpi/ic_notification_full.png
new file mode 100644
index 0000000..e5489a6
Binary files /dev/null and b/android/app/src/main/res/mipmap-hdpi/ic_notification_full.png differ
diff --git a/android/app/src/main/res/mipmap-mdpi/ic_notification_full.png b/android/app/src/main/res/mipmap-mdpi/ic_notification_full.png
new file mode 100644
index 0000000..2d5ffbf
Binary files /dev/null and b/android/app/src/main/res/mipmap-mdpi/ic_notification_full.png differ
diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_notification_full.png b/android/app/src/main/res/mipmap-xhdpi/ic_notification_full.png
new file mode 100644
index 0000000..6521702
Binary files /dev/null and b/android/app/src/main/res/mipmap-xhdpi/ic_notification_full.png differ
diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_notification_full.png b/android/app/src/main/res/mipmap-xxhdpi/ic_notification_full.png
new file mode 100644
index 0000000..112fced
Binary files /dev/null and b/android/app/src/main/res/mipmap-xxhdpi/ic_notification_full.png differ
diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_notification_full.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_notification_full.png
new file mode 100644
index 0000000..ca4f53f
Binary files /dev/null and b/android/app/src/main/res/mipmap-xxxhdpi/ic_notification_full.png differ
diff --git a/data/icon_512_nobox.png b/data/icon_512_nobox.png
new file mode 100644
index 0000000..027b4b2
Binary files /dev/null and b/data/icon_512_nobox.png differ
diff --git a/data/icon_512_transparent.png b/data/icon_512_transparent.png
new file mode 100644
index 0000000..90662c0
Binary files /dev/null and b/data/icon_512_transparent.png differ