diff --git a/app/src/main/res/layout/activity_account.xml b/app/src/main/res/layout/activity_account.xml
index 3b4d7c24a..1ef1a54c5 100644
--- a/app/src/main/res/layout/activity_account.xml
+++ b/app/src/main/res/layout/activity_account.xml
@@ -76,9 +76,9 @@
                         android:layout_height="wrap_content"
                         android:layout_marginEnd="10dp"
                         android:layout_marginRight="10dp"
-                        android:textSize="?attr/status_text_medium"
                         android:text="@string/follows_you"
                         android:textColor="?android:textColorPrimary"
+                        android:textSize="?attr/status_text_medium"
                         app:layout_constraintEnd_toEndOf="@id/follow_btn"
                         app:layout_constraintTop_toBottomOf="@id/follow_btn" />
 
@@ -100,8 +100,8 @@
                         android:layout_height="wrap_content"
                         android:ellipsize="end"
                         android:maxLines="1"
-                        android:textSize="?attr/status_text_medium"
                         android:textColor="?android:textColorSecondary"
+                        android:textSize="?attr/status_text_medium"
                         app:layout_constraintTop_toBottomOf="@id/account_display_name"
                         tools:text="\@Tusky" />
 
@@ -126,8 +126,8 @@
                         android:layout_below="@id/account_username"
                         android:paddingBottom="16dp"
                         android:paddingTop="10dp"
-                        android:textSize="?attr/status_text_medium"
                         android:textColor="?android:textColorTertiary"
+                        android:textSize="?attr/status_text_medium"
                         app:layout_constraintTop_toBottomOf="@id/account_username"
                         tools:text="This is a test description" />
 
@@ -138,10 +138,10 @@
                         android:layout_marginBottom="8dp"
                         android:background="@android:color/transparent"
                         android:textColor="@color/account_tab_font_color"
+                        android:textSize="?attr/status_text_medium"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintHorizontal_bias="0"
                         app:layout_constraintStart_toStartOf="parent"
-                        android:textSize="?attr/status_text_medium"
                         app:layout_constraintTop_toBottomOf="@id/account_note"
                         tools:text="3000 Followers" />
 
@@ -150,11 +150,11 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:textColor="@color/account_tab_font_color"
+                        android:textSize="?attr/status_text_medium"
                         app:layout_constraintBottom_toBottomOf="@id/followers_tv"
                         app:layout_constraintEnd_toStartOf="@id/statuses_btn"
                         app:layout_constraintHorizontal_bias="0"
                         app:layout_constraintStart_toEndOf="@id/followers_tv"
-                        android:textSize="?attr/status_text_medium"
                         app:layout_constraintTop_toTopOf="@id/followers_tv"
                         tools:text="500 Following" />
 
@@ -163,8 +163,8 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:textColor="@color/account_tab_font_color"
-                        app:layout_constraintEnd_toEndOf="parent"
                         android:textSize="?attr/status_text_medium"
+                        app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintHorizontal_bias="0"
                         app:layout_constraintStart_toEndOf="@id/following_tv"
                         app:layout_constraintTop_toTopOf="@id/followers_tv"
@@ -200,9 +200,10 @@
             android:layout_height="wrap_content"
             android:background="?android:colorBackground"
             app:tabGravity="fill"
+            app:tabIndicatorHeight="3dp"
             app:tabMaxWidth="0dp"
-            app:tabTextAppearance="@style/TuskyTabAppearance"
-            app:tabSelectedTextColor="?attr/colorAccent">
+            app:tabSelectedTextColor="?attr/colorAccent"
+            app:tabTextAppearance="@style/TuskyTabAppearance">
 
             <android.support.design.widget.TabItem
                 android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index c2f45ef43..262f5e2e6 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/activity_main"
@@ -13,35 +12,36 @@
         android:layout_height="match_parent">
 
         <ImageButton
+            android:id="@+id/drawer_toggle"
+            style="?attr/image_button_style"
             android:layout_width="?attr/actionBarSize"
             android:layout_height="?attr/actionBarSize"
-            android:id="@+id/drawer_toggle"
-            app:srcCompat="@drawable/ic_menu_24dp"
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentStart="true"
+            android:layout_alignParentTop="true"
+            android:background="?android:colorBackground"
+            android:contentDescription="@string/action_open_drawer"
             app:layout_anchor="@id/pager"
             app:layout_anchorGravity="top|left"
-            android:layout_alignParentTop="true"
-            android:layout_alignParentStart="true"
-            android:layout_alignParentLeft="true"
-            style="?attr/image_button_style"
-            android:background="?android:colorBackground"
-            android:contentDescription="@string/action_open_drawer" />
+            app:srcCompat="@drawable/ic_menu_24dp" />
 
         <android.support.design.widget.TabLayout
             android:id="@+id/tab_layout"
             android:layout_width="wrap_content"
             android:layout_height="?attr/actionBarSize"
+            android:layout_alignParentEnd="true"
+            android:layout_alignParentRight="true"
+            android:layout_alignParentTop="true"
+            android:layout_toEndOf="@id/drawer_toggle"
+            android:layout_toRightOf="@id/drawer_toggle"
             android:background="?android:colorBackground"
             app:tabGravity="fill"
+            app:tabIndicatorHeight="3dp"
             app:tabMaxWidth="0dp"
             app:tabPaddingEnd="1dp"
             app:tabPaddingStart="1dp"
             app:tabPaddingTop="4dp"
-            app:tabTextAppearance="@style/TabLayoutTextStyle"
-            android:layout_alignParentTop="true"
-            android:layout_alignParentEnd="true"
-            android:layout_alignParentRight="true"
-            android:layout_toEndOf="@id/drawer_toggle"
-            android:layout_toRightOf="@id/drawer_toggle">
+            app:tabTextAppearance="@style/TabLayoutTextStyle">
 
             <android.support.design.widget.TabItem
                 android:layout_width="wrap_content"
@@ -69,8 +69,8 @@
             android:id="@+id/pager"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_below="@id/tab_layout"
-            android:layout_alignParentBottom="true" />
+            android:layout_alignParentBottom="true"
+            android:layout_below="@id/tab_layout" />
 
     </RelativeLayout>