diff --git a/app/src/main/res/layout-sw600dp/activity_show_account.xml b/app/src/main/res/layout-sw600dp/activity_show_account.xml
index d6cd0fb7e..ce67e1178 100644
--- a/app/src/main/res/layout-sw600dp/activity_show_account.xml
+++ b/app/src/main/res/layout-sw600dp/activity_show_account.xml
@@ -140,8 +140,6 @@
                                 android:textSize="16sp"
                                 android:textAppearance="@style/TextAppearance.AppCompat.Body1" />
                             <TextView
-                                android:layout_marginLeft="10dp"
-                                android:layout_marginStart="10dp"
                                 android:textColor="?attr/color_in_account_header"
                                 android:id="@+id/account_un"
                                 android:maxLines="1"
@@ -438,7 +436,6 @@
             android:id="@+id/account_tabLayout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            app:tabTextAppearance="@android:style/TextAppearance.Widget.TabWidget"
             app:tabMode="fixed"
             app:tabGravity="fill"
             />
diff --git a/app/src/main/res/layout/activity_show_account.xml b/app/src/main/res/layout/activity_show_account.xml
index 673818557..7c41cd40f 100644
--- a/app/src/main/res/layout/activity_show_account.xml
+++ b/app/src/main/res/layout/activity_show_account.xml
@@ -138,8 +138,6 @@
                                 android:textSize="16sp"
                                 android:textAppearance="@style/TextAppearance.AppCompat.Body1" />
                             <TextView
-                                android:layout_marginLeft="10dp"
-                                android:layout_marginStart="10dp"
                                 android:textColor="?attr/color_in_account_header"
                                 android:id="@+id/account_un"
                                 android:maxLines="1"
@@ -436,7 +434,6 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             app:tabSelectedTextColor="?attr/colorAccent"
-            app:tabTextAppearance="@android:style/TextAppearance.Widget.TabWidget"
             app:tabMode="fixed"
             app:tabGravity="fill"
             />
diff --git a/app/src/main/res/layout/drawer_account.xml b/app/src/main/res/layout/drawer_account.xml
index b4d276fdd..713b1b81c 100644
--- a/app/src/main/res/layout/drawer_account.xml
+++ b/app/src/main/res/layout/drawer_account.xml
@@ -20,6 +20,8 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:layout_marginTop="5dp"
+    android:layout_marginBottom="5dp"
     android:id="@+id/main_container"
     android:orientation="horizontal">
     <ImageView
diff --git a/app/src/main/res/layout/drawer_account_follow_request.xml b/app/src/main/res/layout/drawer_account_follow_request.xml
index 444d9dda9..52af2cafa 100644
--- a/app/src/main/res/layout/drawer_account_follow_request.xml
+++ b/app/src/main/res/layout/drawer_account_follow_request.xml
@@ -20,6 +20,8 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:id="@+id/account_container"
+    android:layout_marginTop="5dp"
+    android:layout_marginBottom="5dp"
     android:orientation="horizontal">
     <ImageView
         android:layout_gravity="center"
diff --git a/app/src/main/res/layout/drawer_account_list.xml b/app/src/main/res/layout/drawer_account_list.xml
index a072d21b3..0a754a436 100644
--- a/app/src/main/res/layout/drawer_account_list.xml
+++ b/app/src/main/res/layout/drawer_account_list.xml
@@ -21,6 +21,8 @@
     android:layout_height="wrap_content"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:padding="2dp"
+    android:layout_marginTop="5dp"
+    android:layout_marginBottom="5dp"
     android:id="@+id/account_container"
     android:orientation="horizontal">
     <ImageView
diff --git a/app/src/main/res/layout/drawer_account_main_search.xml b/app/src/main/res/layout/drawer_account_main_search.xml
index afbbfe223..4fd912f7e 100644
--- a/app/src/main/res/layout/drawer_account_main_search.xml
+++ b/app/src/main/res/layout/drawer_account_main_search.xml
@@ -20,6 +20,8 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:id="@+id/main_container"
+    android:layout_marginTop="5dp"
+    android:layout_marginBottom="5dp"
     android:orientation="vertical">
     <TextView
         android:id="@+id/account_search_title"