diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 197807701e..74c52e0823 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -90,7 +90,7 @@
         </activity>
 
         <activity
-            android:name=".ActivityWidgetList"
+            android:name=".ActivityWidgetUnified"
             android:exported="true">
 
             <intent-filter>
@@ -279,12 +279,12 @@
         </provider>
 
         <receiver
-            android:name=".WidgetCount"
+            android:name=".Widget"
             android:label="@string/title_widget_title_count">
 
             <meta-data
                 android:name="android.appwidget.provider"
-                android:resource="@xml/widget_count" />
+                android:resource="@xml/widget" />
 
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
@@ -292,12 +292,12 @@
         </receiver>
 
         <receiver
-            android:name=".WidgetList"
+            android:name=".WidgetUnified"
             android:label="@string/title_widget_title_list">
 
             <meta-data
                 android:name="android.appwidget.provider"
-                android:resource="@xml/widget_list" />
+                android:resource="@xml/widget_unified" />
 
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
@@ -305,7 +305,7 @@
         </receiver>
 
         <service
-            android:name="WidgetListService"
+            android:name="WidgetUnifiedService"
             android:permission="android.permission.BIND_REMOTEVIEWS" />
 
         <receiver android:name=".ReceiverAutoStart">
diff --git a/app/src/main/java/eu/faircode/email/ActivityBilling.java b/app/src/main/java/eu/faircode/email/ActivityBilling.java
index bdbefda927..4a9016982d 100644
--- a/app/src/main/java/eu/faircode/email/ActivityBilling.java
+++ b/app/src/main/java/eu/faircode/email/ActivityBilling.java
@@ -180,7 +180,7 @@ public class ActivityBilling extends ActivityBase implements PurchasesUpdatedLis
                     .putBoolean("play_store", false)
                     .apply();
 
-            WidgetList.update(context);
+            WidgetUnified.update(context);
             return true;
         } else {
             Log.i("IAB response invalid");
@@ -400,7 +400,7 @@ public class ActivityBilling extends ActivityBase implements PurchasesUpdatedLis
 
             editor.apply();
 
-            WidgetList.update(this);
+            WidgetUnified.update(this);
         }
 
         if (query.size() > 0)
@@ -462,7 +462,7 @@ public class ActivityBilling extends ActivityBase implements PurchasesUpdatedLis
                     for (IBillingListener listener : listeners)
                         listener.onPurchased(purchase.getSku());
 
-                    WidgetList.update(ActivityBilling.this);
+                    WidgetUnified.update(ActivityBilling.this);
                 } else
                     reportError(result, "IAB acknowledged SKU=" + purchase.getSku());
             }
diff --git a/app/src/main/java/eu/faircode/email/ActivityWidgetList.java b/app/src/main/java/eu/faircode/email/ActivityWidgetUnified.java
similarity index 94%
rename from app/src/main/java/eu/faircode/email/ActivityWidgetList.java
rename to app/src/main/java/eu/faircode/email/ActivityWidgetUnified.java
index f47535a743..df59703102 100644
--- a/app/src/main/java/eu/faircode/email/ActivityWidgetList.java
+++ b/app/src/main/java/eu/faircode/email/ActivityWidgetUnified.java
@@ -38,7 +38,7 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-public class ActivityWidgetList extends ActivityBase {
+public class ActivityWidgetUnified extends ActivityBase {
     private int appWidgetId;
 
     private Spinner spAccount;
@@ -65,7 +65,7 @@ public class ActivityWidgetList extends ActivityBase {
         appWidgetId = extras.getInt(
                 AppWidgetManager.EXTRA_APPWIDGET_ID, AppWidgetManager.INVALID_APPWIDGET_ID);
 
-        getSupportActionBar().setSubtitle(R.string.title_widget_title_list);
+        getSupportActionBar().setSubtitle(R.string.title_folder_unified);
         setContentView(R.layout.activity_widget_unified);
 
         spAccount = findViewById(R.id.spAccount);
@@ -85,11 +85,11 @@ public class ActivityWidgetList extends ActivityBase {
                 EntityAccount account = (EntityAccount) spAccount.getSelectedItem();
                 TupleFolderEx folder = (TupleFolderEx) spFolder.getSelectedItem();
 
-                SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(ActivityWidgetList.this);
+                SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(ActivityWidgetUnified.this);
                 SharedPreferences.Editor editor = prefs.edit();
                 if (account != null && account.id > 0)
                     if (folder != null && folder.id > 0)
-                        editor.putString("widget." + appWidgetId + ".name", folder.getDisplayName(ActivityWidgetList.this));
+                        editor.putString("widget." + appWidgetId + ".name", folder.getDisplayName(ActivityWidgetUnified.this));
                     else
                         editor.putString("widget." + appWidgetId + ".name", account.name);
                 else
@@ -100,7 +100,7 @@ public class ActivityWidgetList extends ActivityBase {
                 editor.putBoolean("widget." + appWidgetId + ".flagged", cbFlagged.isChecked());
                 editor.apply();
 
-                WidgetList.init(ActivityWidgetList.this, appWidgetId);
+                WidgetUnified.init(ActivityWidgetUnified.this, appWidgetId);
                 //WidgetUnified.update(ActivityWidgetUnified.this);
 
                 setResult(RESULT_OK, resultValue);
@@ -159,7 +159,7 @@ public class ActivityWidgetList extends ActivityBase {
                     protected void onException(Bundle args, Throwable ex) {
                         Helper.unexpectedError(getSupportFragmentManager(), ex);
                     }
-                }.execute(ActivityWidgetList.this, args, "widget:folders");
+                }.execute(ActivityWidgetUnified.this, args, "widget:folders");
             }
         });
 
diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java b/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java
index 19b4166851..4cc423ebd3 100644
--- a/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java
+++ b/app/src/main/java/eu/faircode/email/FragmentOptionsDisplay.java
@@ -206,7 +206,7 @@ public class FragmentOptionsDisplay extends FragmentBase implements SharedPrefer
             @Override
             public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
                 prefs.edit().putBoolean("threading", checked).apply();
-                WidgetList.update(getContext());
+                WidgetUnified.update(getContext());
             }
         });
 
@@ -336,7 +336,7 @@ public class FragmentOptionsDisplay extends FragmentBase implements SharedPrefer
             @Override
             public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
                 prefs.edit().putBoolean("subject_top", checked).apply();
-                WidgetList.update(getContext());
+                WidgetUnified.update(getContext());
             }
         });
 
@@ -344,7 +344,7 @@ public class FragmentOptionsDisplay extends FragmentBase implements SharedPrefer
             @Override
             public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
                 prefs.edit().putBoolean("subject_italic", checked).apply();
-                WidgetList.update(getContext());
+                WidgetUnified.update(getContext());
             }
         });
 
diff --git a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
index 6cd91769d0..4c37d27b8f 100644
--- a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
+++ b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
@@ -271,7 +271,7 @@ public class ServiceSynchronize extends ServiceBase {
                 last = messages;
 
                 if (changed)
-                    WidgetList.update(ServiceSynchronize.this);
+                    WidgetUnified.update(ServiceSynchronize.this);
             }
         });
     }
@@ -412,7 +412,7 @@ public class ServiceSynchronize extends ServiceBase {
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
         boolean badge = prefs.getBoolean("badge", true);
 
-        WidgetCount.update(this, unseen);
+        Widget.update(this, unseen);
 
         try {
             if (unseen == null || !badge)
diff --git a/app/src/main/java/eu/faircode/email/WidgetCount.java b/app/src/main/java/eu/faircode/email/Widget.java
similarity index 96%
rename from app/src/main/java/eu/faircode/email/WidgetCount.java
rename to app/src/main/java/eu/faircode/email/Widget.java
index 7aff3c3753..49b91fc679 100644
--- a/app/src/main/java/eu/faircode/email/WidgetCount.java
+++ b/app/src/main/java/eu/faircode/email/Widget.java
@@ -33,7 +33,7 @@ import androidx.preference.PreferenceManager;
 import java.text.NumberFormat;
 import java.util.concurrent.ExecutorService;
 
-public class WidgetCount extends AppWidgetProvider {
+public class Widget extends AppWidgetProvider {
     private static final ExecutorService executor =
             Helper.getBackgroundExecutor(1, "widget");
 
@@ -63,7 +63,7 @@ public class WidgetCount extends AppWidgetProvider {
             return;
         }
 
-        int[] appWidgetIds = appWidgetManager.getAppWidgetIds(new ComponentName(context, WidgetCount.class));
+        int[] appWidgetIds = appWidgetManager.getAppWidgetIds(new ComponentName(context, Widget.class));
         update(context, appWidgetManager, appWidgetIds, count);
     }
 
@@ -77,7 +77,7 @@ public class WidgetCount extends AppWidgetProvider {
         PendingIntent pi = PendingIntent.getActivity(context, ActivityView.REQUEST_UNIFIED, view, PendingIntent.FLAG_UPDATE_CURRENT);
 
         for (int appWidgetId : appWidgetIds) {
-            RemoteViews views = new RemoteViews(context.getPackageName(), R.layout.widget_count);
+            RemoteViews views = new RemoteViews(context.getPackageName(), R.layout.widget);
 
             views.setOnClickPendingIntent(R.id.widget, pi);
 
diff --git a/app/src/main/java/eu/faircode/email/WidgetList.java b/app/src/main/java/eu/faircode/email/WidgetUnified.java
similarity index 91%
rename from app/src/main/java/eu/faircode/email/WidgetList.java
rename to app/src/main/java/eu/faircode/email/WidgetUnified.java
index 7eeb44b90b..65d4dd0460 100644
--- a/app/src/main/java/eu/faircode/email/WidgetList.java
+++ b/app/src/main/java/eu/faircode/email/WidgetUnified.java
@@ -32,7 +32,7 @@ import android.widget.RemoteViews;
 
 import androidx.preference.PreferenceManager;
 
-public class WidgetList extends AppWidgetProvider {
+public class WidgetUnified extends AppWidgetProvider {
     @Override
     public void onUpdate(final Context context, final AppWidgetManager appWidgetManager, final int[] appWidgetIds) {
         update(context, appWidgetManager, appWidgetIds);
@@ -59,7 +59,7 @@ public class WidgetList extends AppWidgetProvider {
                 return;
             }
 
-            int[] appWidgetIds = appWidgetManager.getAppWidgetIds(new ComponentName(context, WidgetList.class));
+            int[] appWidgetIds = appWidgetManager.getAppWidgetIds(new ComponentName(context, WidgetUnified.class));
             appWidgetManager.notifyAppWidgetViewDataChanged(appWidgetIds, R.id.lv);
         }
     }
@@ -75,19 +75,17 @@ public class WidgetList extends AppWidgetProvider {
 
         boolean pro = ActivityBilling.isPro(context);
         for (int appWidgetId : appWidgetIds) {
-            RemoteViews views = new RemoteViews(context.getPackageName(), R.layout.widget_list);
+            RemoteViews views = new RemoteViews(context.getPackageName(), R.layout.widget_unified);
 
             views.setViewVisibility(R.id.pro, pro ? View.GONE : View.VISIBLE);
             if (pro) {
                 String name = prefs.getString("widget." + appWidgetId + ".name", null);
-                if (name == null)
-                    views.setTextViewText(R.id.title, context.getString(R.string.title_folder_unified));
-                else
+                if (name != null)
                     views.setTextViewText(R.id.title, name);
 
                 views.setOnClickPendingIntent(R.id.title, pi);
 
-                Intent service = new Intent(context, WidgetListService.class);
+                Intent service = new Intent(context, WidgetUnifiedService.class);
                 service.putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, appWidgetId);
                 service.setData(Uri.parse(service.toUri(Intent.URI_INTENT_SCHEME)));
 
diff --git a/app/src/main/java/eu/faircode/email/WidgetListRemoteViewsFactory.java b/app/src/main/java/eu/faircode/email/WidgetUnifiedRemoteViewsFactory.java
similarity index 97%
rename from app/src/main/java/eu/faircode/email/WidgetListRemoteViewsFactory.java
rename to app/src/main/java/eu/faircode/email/WidgetUnifiedRemoteViewsFactory.java
index 38c16585c2..604b94edd1 100644
--- a/app/src/main/java/eu/faircode/email/WidgetListRemoteViewsFactory.java
+++ b/app/src/main/java/eu/faircode/email/WidgetUnifiedRemoteViewsFactory.java
@@ -38,7 +38,7 @@ import androidx.preference.PreferenceManager;
 import java.util.ArrayList;
 import java.util.List;
 
-public class WidgetListRemoteViewsFactory implements RemoteViewsService.RemoteViewsFactory {
+public class WidgetUnifiedRemoteViewsFactory implements RemoteViewsService.RemoteViewsFactory {
     private Context context;
     private int appWidgetId;
 
@@ -53,7 +53,7 @@ public class WidgetListRemoteViewsFactory implements RemoteViewsService.RemoteVi
     private int colorWidgetRead;
     private List<TupleMessageWidget> messages = new ArrayList<>();
 
-    WidgetListRemoteViewsFactory(final Context context, Intent intent) {
+    WidgetUnifiedRemoteViewsFactory(final Context context, Intent intent) {
         this.context = context;
         this.appWidgetId = intent.getIntExtra(
                 AppWidgetManager.EXTRA_APPWIDGET_ID,
diff --git a/app/src/main/java/eu/faircode/email/WidgetListService.java b/app/src/main/java/eu/faircode/email/WidgetUnifiedService.java
similarity index 85%
rename from app/src/main/java/eu/faircode/email/WidgetListService.java
rename to app/src/main/java/eu/faircode/email/WidgetUnifiedService.java
index acafad75cb..48db1d2f18 100644
--- a/app/src/main/java/eu/faircode/email/WidgetListService.java
+++ b/app/src/main/java/eu/faircode/email/WidgetUnifiedService.java
@@ -22,9 +22,9 @@ package eu.faircode.email;
 import android.content.Intent;
 import android.widget.RemoteViewsService;
 
-public class WidgetListService extends RemoteViewsService {
+public class WidgetUnifiedService extends RemoteViewsService {
     @Override
     public RemoteViewsFactory onGetViewFactory(Intent intent) {
-        return new WidgetListRemoteViewsFactory(this.getApplicationContext(), intent);
+        return new WidgetUnifiedRemoteViewsFactory(this.getApplicationContext(), intent);
     }
 }
diff --git a/app/src/main/res/layout/widget_count.xml b/app/src/main/res/layout/widget.xml
similarity index 100%
rename from app/src/main/res/layout/widget_count.xml
rename to app/src/main/res/layout/widget.xml
diff --git a/app/src/main/res/layout/widget_list.xml b/app/src/main/res/layout/widget_unified.xml
similarity index 96%
rename from app/src/main/res/layout/widget_list.xml
rename to app/src/main/res/layout/widget_unified.xml
index 4febf66d1d..337e717d99 100644
--- a/app/src/main/res/layout/widget_list.xml
+++ b/app/src/main/res/layout/widget_unified.xml
@@ -14,7 +14,7 @@
         android:gravity="center"
         android:paddingTop="6dp"
         android:paddingBottom="6dp"
-        android:text="@string/title_widget_title_list"
+        android:text="@string/title_folder_unified"
         android:textAppearance="@style/TextAppearance.AppCompat.Medium"
         android:textColor="@color/colorWidgetForeground"
         android:textStyle="bold" />
diff --git a/app/src/main/res/xml/widget_count.xml b/app/src/main/res/xml/widget.xml
similarity index 85%
rename from app/src/main/res/xml/widget_count.xml
rename to app/src/main/res/xml/widget.xml
index 98e4374757..d367755204 100644
--- a/app/src/main/res/xml/widget_count.xml
+++ b/app/src/main/res/xml/widget.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
-    android:initialLayout="@layout/widget_count"
+    android:initialLayout="@layout/widget"
     android:minWidth="40dp"
     android:minHeight="40dp"
     android:resizeMode="horizontal|vertical"
diff --git a/app/src/main/res/xml/widget_list.xml b/app/src/main/res/xml/widget_unified.xml
similarity index 72%
rename from app/src/main/res/xml/widget_list.xml
rename to app/src/main/res/xml/widget_unified.xml
index 3584cdf36c..8d6196e76f 100644
--- a/app/src/main/res/xml/widget_list.xml
+++ b/app/src/main/res/xml/widget_unified.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
-    android:configure="eu.faircode.email.ActivityWidgetList"
-    android:initialLayout="@layout/widget_list"
+    android:configure="eu.faircode.email.ActivityWidgetUnified"
+    android:initialLayout="@layout/widget_unified"
     android:minWidth="110dp"
     android:minHeight="110dp"
     android:resizeMode="horizontal|vertical"