diff --git a/app/src/main/res/layout/item_folder.xml b/app/src/main/res/layout/item_folder.xml
index 9ed697c5f4..e7f5e4d20e 100644
--- a/app/src/main/res/layout/item_folder.xml
+++ b/app/src/main/res/layout/item_folder.xml
@@ -23,7 +23,8 @@
             android:id="@+id/ivState"
             android:layout_width="24dp"
             android:layout_height="24dp"
-            android:layout_marginStart="6dp"
+            android:layout_marginStart="12dp"
+            android:layout_marginTop="6dp"
             android:layout_marginEnd="6dp"
             android:src="@drawable/baseline_cloud_off_24"
             app:layout_constraintBottom_toTopOf="@+id/barrier1"
@@ -34,7 +35,7 @@
             android:id="@+id/ivUnified"
             android:layout_width="24dp"
             android:layout_height="24dp"
-            android:layout_marginStart="6dp"
+            android:layout_marginStart="12dp"
             android:src="@drawable/baseline_folder_special_24"
             app:layout_constraintBottom_toTopOf="@+id/barrier2"
             app:layout_constraintStart_toEndOf="@id/vwColor"
@@ -60,6 +61,7 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="6dp"
+            android:layout_marginTop="6dp"
             android:layout_marginEnd="6dp"
             android:ellipsize="start"
             android:gravity="center_vertical"
@@ -67,7 +69,7 @@
             android:text="Name"
             android:textAppearance="@style/TextAppearance.AppCompat.Medium"
             app:layout_constraintBottom_toTopOf="@+id/barrier1"
-            app:layout_constraintEnd_toStartOf="@+id/tvAfter"
+            app:layout_constraintEnd_toStartOf="@+id/tvMessages"
             app:layout_constraintStart_toEndOf="@id/vwLevel"
             app:layout_constraintTop_toTopOf="parent" />
 
@@ -75,6 +77,7 @@
             android:id="@+id/tvMessages"
             android:layout_width="wrap_content"
             android:layout_height="24dp"
+            android:layout_marginTop="6dp"
             android:layout_marginEnd="6dp"
             android:gravity="center_vertical"
             android:text="123"
@@ -87,7 +90,8 @@
             android:id="@+id/ivMessages"
             android:layout_width="24dp"
             android:layout_height="24dp"
-            android:layout_marginEnd="6dp"
+            android:layout_marginTop="6dp"
+            android:layout_marginEnd="12dp"
             android:src="@drawable/baseline_mail_outline_24"
             app:layout_constraintBottom_toTopOf="@+id/barrier1"
             app:layout_constraintEnd_toEndOf="parent"
@@ -102,13 +106,15 @@
 
         <TextView
             android:id="@+id/tvType"
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="6dp"
+            android:layout_marginEnd="6dp"
             android:gravity="center_vertical"
             android:text="type"
             android:textAppearance="@android:style/TextAppearance.Small"
             app:layout_constraintBottom_toTopOf="@+id/barrier2"
+            app:layout_constraintEnd_toStartOf="@+id/tvAfter"
             app:layout_constraintStart_toEndOf="@id/vwLevel"
             app:layout_constraintTop_toBottomOf="@id/barrier1" />
 
@@ -128,7 +134,7 @@
             android:id="@+id/ivSync"
             android:layout_width="24dp"
             android:layout_height="24dp"
-            android:layout_marginEnd="6dp"
+            android:layout_marginEnd="12dp"
             android:src="@drawable/baseline_sync_24"
             app:layout_constraintBottom_toTopOf="@+id/barrier2"
             app:layout_constraintEnd_toEndOf="parent"
@@ -146,7 +152,7 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="6dp"
-            android:layout_marginEnd="6dp"
+            android:layout_marginEnd="12dp"
             android:gravity="center_vertical"
             android:text="Keywords"
             android:textAppearance="@android:style/TextAppearance.Small"
@@ -158,8 +164,8 @@
             android:id="@+id/tvError"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginStart="6dp"
-            android:layout_marginEnd="6dp"
+            android:layout_marginStart="12dp"
+            android:layout_marginEnd="12dp"
             android:text="error"
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
             android:textColor="?attr/colorWarning"
@@ -173,10 +179,8 @@
             android:layout_width="match_parent"
             android:layout_height="1dp"
             android:layout_marginTop="6dp"
-            android:layout_marginBottom="6dp"
             android:background="?attr/colorSeparator"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvError" />
-
     </androidx.constraintlayout.widget.ConstraintLayout>
 </FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_message_compact.xml b/app/src/main/res/layout/item_message_compact.xml
index 67837b1ba6..7f6891a3da 100644
--- a/app/src/main/res/layout/item_message_compact.xml
+++ b/app/src/main/res/layout/item_message_compact.xml
@@ -146,20 +146,24 @@
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
             app:layout_constraintBottom_toTopOf="@+id/barrier2"
             app:layout_constraintEnd_toStartOf="@+id/tvFolder"
+            app:layout_constraintHorizontal_weight="2"
             app:layout_constraintStart_toEndOf="@id/ivAttachments"
             app:layout_constraintTop_toBottomOf="@id/padding1" />
 
         <TextView
             android:id="@+id/tvFolder"
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginEnd="6dp"
             android:ellipsize="start"
+            android:gravity="end"
             android:singleLine="true"
-            android:text="folder"
+            android:text="Folder"
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
             app:layout_constraintBottom_toTopOf="@+id/barrier2"
             app:layout_constraintEnd_toStartOf="@+id/tvCount"
+            app:layout_constraintHorizontal_weight="1"
+            app:layout_constraintStart_toEndOf="@+id/tvSubject"
             app:layout_constraintTop_toBottomOf="@id/padding1" />
 
         <TextView
diff --git a/app/src/main/res/layout/widget.xml b/app/src/main/res/layout/widget.xml
index c7ea35bb11..a46db7390f 100644
--- a/app/src/main/res/layout/widget.xml
+++ b/app/src/main/res/layout/widget.xml
@@ -8,11 +8,12 @@
     android:padding="6dp">
 
     <ImageView
-        android:layout_width="36dp"
+        android:layout_width="24dp"
         android:layout_height="0dp"
         android:layout_gravity="center_horizontal"
-        android:layout_weight="2"
-        android:src="@mipmap/ic_launcher" />
+        android:layout_weight="1"
+        android:src="@drawable/baseline_mail_24"
+        android:tint="@color/colorWidgetForeground" />
 
     <TextView
         android:id="@+id/tvCount"
@@ -21,6 +22,7 @@
         android:layout_gravity="center_horizontal"
         android:layout_weight="1"
         android:text="?"
+        android:textAppearance="@style/TextAppearance.AppCompat.Medium"
         android:textColor="@color/colorWidgetForeground"
         android:textSize="18dp"
         android:textStyle="bold" />