diff --git a/app/src/main/res/layout/fragment_accounts.xml b/app/src/main/res/layout/fragment_accounts.xml
index 3cec997b3a..5273940ae2 100644
--- a/app/src/main/res/layout/fragment_accounts.xml
+++ b/app/src/main/res/layout/fragment_accounts.xml
@@ -15,6 +15,7 @@
             android:layout_width="0dp"
             android:layout_height="0dp"
             android:clipToPadding="false"
+            android:paddingTop="6dp"
             android:paddingBottom="90dp"
             android:scrollbarStyle="outsideOverlay"
             android:scrollbars="vertical"
@@ -47,10 +48,10 @@
         android:layout_height="wrap_content"
         android:layout_gravity="end|bottom"
         android:layout_margin="@dimen/fab_padding"
-        app:srcCompat="@drawable/baseline_edit_24"
         android:tint="@color/colorActionForeground"
         android:tooltipText="@string/title_compose"
-        app:backgroundTint="?attr/colorAccent" />
+        app:backgroundTint="?attr/colorAccent"
+        app:srcCompat="@drawable/baseline_edit_24" />
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/fab"
@@ -58,8 +59,8 @@
         android:layout_height="wrap_content"
         android:layout_gravity="end|bottom"
         android:layout_margin="@dimen/fab_padding"
-        app:srcCompat="@drawable/baseline_add_24"
         android:tint="@color/colorActionForeground"
         android:tooltipText="@string/title_add"
-        app:backgroundTint="?attr/colorAccent" />
+        app:backgroundTint="?attr/colorAccent"
+        app:srcCompat="@drawable/baseline_add_24" />
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/fragment_answers.xml b/app/src/main/res/layout/fragment_answers.xml
index b45204ae52..5c209860aa 100644
--- a/app/src/main/res/layout/fragment_answers.xml
+++ b/app/src/main/res/layout/fragment_answers.xml
@@ -15,6 +15,7 @@
             android:layout_width="0dp"
             android:layout_height="0dp"
             android:clipToPadding="false"
+            android:paddingTop="6dp"
             android:paddingBottom="90dp"
             android:scrollbarStyle="outsideOverlay"
             android:scrollbars="vertical"
@@ -47,8 +48,8 @@
         android:layout_height="wrap_content"
         android:layout_gravity="end|bottom"
         android:layout_margin="@dimen/fab_padding"
-        app:srcCompat="@drawable/baseline_add_24"
         android:tint="@color/colorActionForeground"
         android:tooltipText="@string/title_add"
-        app:backgroundTint="?attr/colorAccent" />
+        app:backgroundTint="?attr/colorAccent"
+        app:srcCompat="@drawable/baseline_add_24" />
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/fragment_folders.xml b/app/src/main/res/layout/fragment_folders.xml
index 40d5d254f8..8b8f681463 100644
--- a/app/src/main/res/layout/fragment_folders.xml
+++ b/app/src/main/res/layout/fragment_folders.xml
@@ -90,6 +90,7 @@
                 android:layout_width="0dp"
                 android:layout_height="0dp"
                 android:clipToPadding="false"
+                android:paddingTop="6dp"
                 android:paddingBottom="90dp"
                 android:scrollbarStyle="outsideOverlay"
                 android:scrollbars="vertical"
diff --git a/app/src/main/res/layout/fragment_identities.xml b/app/src/main/res/layout/fragment_identities.xml
index c6b6bff28e..c779d0adf7 100644
--- a/app/src/main/res/layout/fragment_identities.xml
+++ b/app/src/main/res/layout/fragment_identities.xml
@@ -15,6 +15,7 @@
             android:layout_width="0dp"
             android:layout_height="0dp"
             android:clipToPadding="false"
+            android:paddingTop="6dp"
             android:paddingBottom="90dp"
             android:scrollbarStyle="outsideOverlay"
             android:scrollbars="vertical"
@@ -47,8 +48,8 @@
         android:layout_height="wrap_content"
         android:layout_gravity="end|bottom"
         android:layout_margin="@dimen/fab_padding"
-        app:srcCompat="@drawable/baseline_add_24"
         android:tint="@color/colorActionForeground"
         android:tooltipText="@string/title_add"
-        app:backgroundTint="?attr/colorAccent" />
+        app:backgroundTint="?attr/colorAccent"
+        app:srcCompat="@drawable/baseline_add_24" />
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/fragment_messages.xml b/app/src/main/res/layout/fragment_messages.xml
index 3510796559..ffdcfbb637 100644
--- a/app/src/main/res/layout/fragment_messages.xml
+++ b/app/src/main/res/layout/fragment_messages.xml
@@ -148,6 +148,7 @@
                 android:layout_width="0dp"
                 android:layout_height="0dp"
                 android:clipToPadding="false"
+                android:paddingTop="6dp"
                 android:paddingBottom="90dp"
                 android:scrollbarStyle="outsideOverlay"
                 android:scrollbars="none"
diff --git a/app/src/main/res/layout/fragment_rules.xml b/app/src/main/res/layout/fragment_rules.xml
index c020b82dca..6343a092f3 100644
--- a/app/src/main/res/layout/fragment_rules.xml
+++ b/app/src/main/res/layout/fragment_rules.xml
@@ -15,6 +15,7 @@
             android:layout_width="0dp"
             android:layout_height="0dp"
             android:clipToPadding="false"
+            android:paddingTop="6dp"
             android:paddingBottom="90dp"
             android:scrollbarStyle="outsideOverlay"
             android:scrollbars="vertical"
@@ -47,8 +48,8 @@
         android:layout_height="wrap_content"
         android:layout_gravity="end|bottom"
         android:layout_margin="@dimen/fab_padding"
-        app:srcCompat="@drawable/baseline_add_24"
         android:tint="@color/colorActionForeground"
         android:tooltipText="@string/title_add"
-        app:backgroundTint="?attr/colorAccent" />
+        app:backgroundTint="?attr/colorAccent"
+        app:srcCompat="@drawable/baseline_add_24" />
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/item_message_date.xml b/app/src/main/res/layout/item_message_date.xml
index 772a5394a0..29625e2bda 100644
--- a/app/src/main/res/layout/item_message_date.xml
+++ b/app/src/main/res/layout/item_message_date.xml
@@ -8,7 +8,6 @@
         android:id="@+id/tvDate"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:background="?android:attr/windowBackground"
         android:gravity="center_horizontal"
         android:padding="6dp"
         android:text="Today"