diff --git a/app/src/main/java/eu/faircode/email/Widget.java b/app/src/main/java/eu/faircode/email/Widget.java
index 57cadaba9a..383da6ffad 100644
--- a/app/src/main/java/eu/faircode/email/Widget.java
+++ b/app/src/main/java/eu/faircode/email/Widget.java
@@ -53,7 +53,7 @@ public class Widget extends AppWidgetProvider {
         for (int id : appWidgetIds) {
             RemoteViews views = new RemoteViews(context.getPackageName(), R.layout.widget);
             views.setOnClickPendingIntent(R.id.widget, pi);
-            views.setTextViewText(R.id.tvCount, count < 0 ? "?" : Integer.toString(count));
+            views.setTextViewText(R.id.tvCount, count < 0 ? "?" : (count > 99 ? "99+" : Integer.toString(count)));
             appWidgetManager.updateAppWidget(id, views);
         }
     }
diff --git a/app/src/main/res/layout/widget.xml b/app/src/main/res/layout/widget.xml
index 371bf72db9..c7ea35bb11 100644
--- a/app/src/main/res/layout/widget.xml
+++ b/app/src/main/res/layout/widget.xml
@@ -8,19 +8,17 @@
     android:padding="6dp">
 
     <ImageView
-        android:layout_width="24dp"
+        android:layout_width="36dp"
         android:layout_height="0dp"
         android:layout_gravity="center_horizontal"
-        android:layout_weight="1"
-        android:src="@drawable/baseline_mail_24"
-        android:tint="@color/colorWidgetForeground" />
+        android:layout_weight="2"
+        android:src="@mipmap/ic_launcher" />
 
     <TextView
         android:id="@+id/tvCount"
         android:layout_width="wrap_content"
         android:layout_height="0dp"
         android:layout_gravity="center_horizontal"
-        android:layout_marginTop="6dp"
         android:layout_weight="1"
         android:text="?"
         android:textColor="@color/colorWidgetForeground"