diff --git a/app/src/main/java/org/dystopia/email/ServiceSynchronize.java b/app/src/main/java/org/dystopia/email/ServiceSynchronize.java
index 10b830f8..1cdfe3b1 100644
--- a/app/src/main/java/org/dystopia/email/ServiceSynchronize.java
+++ b/app/src/main/java/org/dystopia/email/ServiceSynchronize.java
@@ -368,12 +368,13 @@ public class ServiceSynchronize extends LifecycleService {
             builder = new Notification.Builder(this, "notification");
 
         builder
-                .setSmallIcon(R.drawable.baseline_email_white_24)
+                .setSmallIcon(R.drawable.ic_mail_icon)
                 .setContentTitle(getResources().getQuantityString(R.plurals.title_notification_unseen, messages.size(), messages.size()))
                 .setContentText("")
                 .setContentIntent(piView)
                 .setNumber(messages.size())
                 .setShowWhen(false)
+                .setColor(ContextCompat.getColor(getBaseContext(), R.color.colorPrimary))
                 .setDeleteIntent(piClear)
                 .setPriority(Notification.PRIORITY_DEFAULT)
                 .setCategory(Notification.CATEGORY_STATUS)
@@ -449,7 +450,7 @@ public class ServiceSynchronize extends LifecycleService {
 
             mbuilder
                     .addExtras(args)
-                    .setSmallIcon(R.drawable.baseline_mail_24)
+                    .setSmallIcon(R.drawable.ic_stat_name)
                     .setContentTitle(MessageHelper.getFormattedAddresses(message.from, true))
                     .setContentIntent(piContent)
                     .setSound(uri)
diff --git a/app/src/main/res/drawable-hdpi/baseline_email_black_18.png b/app/src/main/res/drawable-hdpi/baseline_email_black_18.png
deleted file mode 100644
index ce77a99e..00000000
Binary files a/app/src/main/res/drawable-hdpi/baseline_email_black_18.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/baseline_email_black_24.png b/app/src/main/res/drawable-hdpi/baseline_email_black_24.png
deleted file mode 100644
index b981becf..00000000
Binary files a/app/src/main/res/drawable-hdpi/baseline_email_black_24.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/baseline_email_black_36.png b/app/src/main/res/drawable-hdpi/baseline_email_black_36.png
deleted file mode 100644
index b52a4948..00000000
Binary files a/app/src/main/res/drawable-hdpi/baseline_email_black_36.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/baseline_email_black_48.png b/app/src/main/res/drawable-hdpi/baseline_email_black_48.png
deleted file mode 100644
index c652f996..00000000
Binary files a/app/src/main/res/drawable-hdpi/baseline_email_black_48.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/baseline_email_white_18.png b/app/src/main/res/drawable-hdpi/baseline_email_white_18.png
deleted file mode 100644
index e749dc5e..00000000
Binary files a/app/src/main/res/drawable-hdpi/baseline_email_white_18.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/baseline_email_white_24.png b/app/src/main/res/drawable-hdpi/baseline_email_white_24.png
deleted file mode 100644
index bf040329..00000000
Binary files a/app/src/main/res/drawable-hdpi/baseline_email_white_24.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/baseline_email_white_36.png b/app/src/main/res/drawable-hdpi/baseline_email_white_36.png
deleted file mode 100644
index e9927464..00000000
Binary files a/app/src/main/res/drawable-hdpi/baseline_email_white_36.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/baseline_email_white_48.png b/app/src/main/res/drawable-hdpi/baseline_email_white_48.png
deleted file mode 100644
index 928fdfb1..00000000
Binary files a/app/src/main/res/drawable-hdpi/baseline_email_white_48.png and /dev/null differ
diff --git a/app/src/main/res/drawable-hdpi/ic_mail_icon.png b/app/src/main/res/drawable-hdpi/ic_mail_icon.png
new file mode 100644
index 00000000..605ac3ec
Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_mail_icon.png differ
diff --git a/app/src/main/res/drawable-mdpi/baseline_email_black_18.png b/app/src/main/res/drawable-mdpi/baseline_email_black_18.png
deleted file mode 100644
index 009e9911..00000000
Binary files a/app/src/main/res/drawable-mdpi/baseline_email_black_18.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/baseline_email_black_24.png b/app/src/main/res/drawable-mdpi/baseline_email_black_24.png
deleted file mode 100644
index fb57102c..00000000
Binary files a/app/src/main/res/drawable-mdpi/baseline_email_black_24.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/baseline_email_black_36.png b/app/src/main/res/drawable-mdpi/baseline_email_black_36.png
deleted file mode 100644
index b981becf..00000000
Binary files a/app/src/main/res/drawable-mdpi/baseline_email_black_36.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/baseline_email_black_48.png b/app/src/main/res/drawable-mdpi/baseline_email_black_48.png
deleted file mode 100644
index 9fd561fb..00000000
Binary files a/app/src/main/res/drawable-mdpi/baseline_email_black_48.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/baseline_email_white_18.png b/app/src/main/res/drawable-mdpi/baseline_email_white_18.png
deleted file mode 100644
index ebb58da9..00000000
Binary files a/app/src/main/res/drawable-mdpi/baseline_email_white_18.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/baseline_email_white_24.png b/app/src/main/res/drawable-mdpi/baseline_email_white_24.png
deleted file mode 100644
index ea25d6da..00000000
Binary files a/app/src/main/res/drawable-mdpi/baseline_email_white_24.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/baseline_email_white_36.png b/app/src/main/res/drawable-mdpi/baseline_email_white_36.png
deleted file mode 100644
index bf040329..00000000
Binary files a/app/src/main/res/drawable-mdpi/baseline_email_white_36.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/baseline_email_white_48.png b/app/src/main/res/drawable-mdpi/baseline_email_white_48.png
deleted file mode 100644
index 9c97a103..00000000
Binary files a/app/src/main/res/drawable-mdpi/baseline_email_white_48.png and /dev/null differ
diff --git a/app/src/main/res/drawable-mdpi/ic_mail_icon.png b/app/src/main/res/drawable-mdpi/ic_mail_icon.png
new file mode 100644
index 00000000..02001218
Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_mail_icon.png differ
diff --git a/app/src/main/res/drawable-xhdpi/baseline_email_black_18.png b/app/src/main/res/drawable-xhdpi/baseline_email_black_18.png
deleted file mode 100644
index b981becf..00000000
Binary files a/app/src/main/res/drawable-xhdpi/baseline_email_black_18.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/baseline_email_black_24.png b/app/src/main/res/drawable-xhdpi/baseline_email_black_24.png
deleted file mode 100644
index 9fd561fb..00000000
Binary files a/app/src/main/res/drawable-xhdpi/baseline_email_black_24.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/baseline_email_black_36.png b/app/src/main/res/drawable-xhdpi/baseline_email_black_36.png
deleted file mode 100644
index c652f996..00000000
Binary files a/app/src/main/res/drawable-xhdpi/baseline_email_black_36.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/baseline_email_black_48.png b/app/src/main/res/drawable-xhdpi/baseline_email_black_48.png
deleted file mode 100644
index e2d1d37e..00000000
Binary files a/app/src/main/res/drawable-xhdpi/baseline_email_black_48.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/baseline_email_white_18.png b/app/src/main/res/drawable-xhdpi/baseline_email_white_18.png
deleted file mode 100644
index bf040329..00000000
Binary files a/app/src/main/res/drawable-xhdpi/baseline_email_white_18.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/baseline_email_white_24.png b/app/src/main/res/drawable-xhdpi/baseline_email_white_24.png
deleted file mode 100644
index 9c97a103..00000000
Binary files a/app/src/main/res/drawable-xhdpi/baseline_email_white_24.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/baseline_email_white_36.png b/app/src/main/res/drawable-xhdpi/baseline_email_white_36.png
deleted file mode 100644
index 928fdfb1..00000000
Binary files a/app/src/main/res/drawable-xhdpi/baseline_email_white_36.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/baseline_email_white_48.png b/app/src/main/res/drawable-xhdpi/baseline_email_white_48.png
deleted file mode 100644
index 298c951a..00000000
Binary files a/app/src/main/res/drawable-xhdpi/baseline_email_white_48.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_mail_icon.png b/app/src/main/res/drawable-xhdpi/ic_mail_icon.png
new file mode 100644
index 00000000..36b2e727
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_mail_icon.png differ
diff --git a/app/src/main/res/drawable-xxhdpi/baseline_email_black_18.png b/app/src/main/res/drawable-xxhdpi/baseline_email_black_18.png
deleted file mode 100644
index b52a4948..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/baseline_email_black_18.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/baseline_email_black_24.png b/app/src/main/res/drawable-xxhdpi/baseline_email_black_24.png
deleted file mode 100644
index c652f996..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/baseline_email_black_24.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/baseline_email_black_36.png b/app/src/main/res/drawable-xxhdpi/baseline_email_black_36.png
deleted file mode 100644
index 4c5be939..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/baseline_email_black_36.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/baseline_email_black_48.png b/app/src/main/res/drawable-xxhdpi/baseline_email_black_48.png
deleted file mode 100644
index 14944f2f..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/baseline_email_black_48.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/baseline_email_white_18.png b/app/src/main/res/drawable-xxhdpi/baseline_email_white_18.png
deleted file mode 100644
index e9927464..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/baseline_email_white_18.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/baseline_email_white_24.png b/app/src/main/res/drawable-xxhdpi/baseline_email_white_24.png
deleted file mode 100644
index 928fdfb1..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/baseline_email_white_24.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/baseline_email_white_36.png b/app/src/main/res/drawable-xxhdpi/baseline_email_white_36.png
deleted file mode 100644
index deede4df..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/baseline_email_white_36.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/baseline_email_white_48.png b/app/src/main/res/drawable-xxhdpi/baseline_email_white_48.png
deleted file mode 100644
index b73b9a80..00000000
Binary files a/app/src/main/res/drawable-xxhdpi/baseline_email_white_48.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxhdpi/ic_mail_icon.png b/app/src/main/res/drawable-xxhdpi/ic_mail_icon.png
new file mode 100644
index 00000000..4e205f1e
Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_mail_icon.png differ
diff --git a/app/src/main/res/drawable-xxxhdpi/baseline_email_black_18.png b/app/src/main/res/drawable-xxxhdpi/baseline_email_black_18.png
deleted file mode 100644
index c652f996..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/baseline_email_black_18.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/baseline_email_black_24.png b/app/src/main/res/drawable-xxxhdpi/baseline_email_black_24.png
deleted file mode 100644
index e2d1d37e..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/baseline_email_black_24.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/baseline_email_black_36.png b/app/src/main/res/drawable-xxxhdpi/baseline_email_black_36.png
deleted file mode 100644
index 14944f2f..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/baseline_email_black_36.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/baseline_email_black_48.png b/app/src/main/res/drawable-xxxhdpi/baseline_email_black_48.png
deleted file mode 100644
index 280b2abf..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/baseline_email_black_48.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/baseline_email_white_18.png b/app/src/main/res/drawable-xxxhdpi/baseline_email_white_18.png
deleted file mode 100644
index 928fdfb1..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/baseline_email_white_18.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/baseline_email_white_24.png b/app/src/main/res/drawable-xxxhdpi/baseline_email_white_24.png
deleted file mode 100644
index 298c951a..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/baseline_email_white_24.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/baseline_email_white_36.png b/app/src/main/res/drawable-xxxhdpi/baseline_email_white_36.png
deleted file mode 100644
index b73b9a80..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/baseline_email_white_36.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/baseline_email_white_48.png b/app/src/main/res/drawable-xxxhdpi/baseline_email_white_48.png
deleted file mode 100644
index 89f65523..00000000
Binary files a/app/src/main/res/drawable-xxxhdpi/baseline_email_white_48.png and /dev/null differ
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_mail_icon.png b/app/src/main/res/drawable-xxxhdpi/ic_mail_icon.png
new file mode 100644
index 00000000..ef86d926
Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_mail_icon.png differ
diff --git a/app/src/main/res/layout/widget.xml b/app/src/main/res/layout/widget.xml
index bf75d6ef..d2ba3c44 100644
--- a/app/src/main/res/layout/widget.xml
+++ b/app/src/main/res/layout/widget.xml
@@ -4,14 +4,15 @@
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:background="@color/colorWidgetBackground"
-    android:orientation="vertical"
+    android:orientation="horizontal"
     android:padding="6dp">
 
     <ImageView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:paddingRight="@dimen/widget_padding"
         android:layout_gravity="center_horizontal"
-        android:src="@drawable/baseline_mail_24"
+        android:src="@drawable/ic_action_name"
         android:tint="@color/colorWidgetForeground" />
 
     <TextView
@@ -19,7 +20,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
-        android:text="?"
+        android:text="--"
         android:textColor="@color/colorWidgetForeground"
         android:textSize="15sp"
         android:textStyle="bold" />
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
deleted file mode 100644
index 4fa8e560..00000000
Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
deleted file mode 100644
index c1ae2020..00000000
Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
deleted file mode 100644
index fdfed799..00000000
Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
deleted file mode 100644
index 5ffa770c..00000000
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png and /dev/null differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
deleted file mode 100644
index 48aaee28..00000000
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png and /dev/null differ
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index fd09eca2..2f24fc12 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <dimen name="layout_margin">12dp</dimen>
+    <dimen name="widget_padding">6dp</dimen>
 </resources>
diff --git a/app/src/main/res/xml/widget.xml b/app/src/main/res/xml/widget.xml
index e9727198..70aa8914 100644
--- a/app/src/main/res/xml/widget.xml
+++ b/app/src/main/res/xml/widget.xml
@@ -3,6 +3,6 @@
     android:initialLayout="@layout/widget"
     android:minWidth="40dp"
     android:minHeight="40dp"
-    android:previewImage="@drawable/baseline_mail_24"
+    android:previewImage="@drawable/ic_shortcut_icon"
     android:resizeMode="none"
     android:updatePeriodMillis="0" />
\ No newline at end of file