diff --git a/app/src/main/java/com/keylesspalace/tusky/MastodonAPI.java b/app/src/main/java/com/keylesspalace/tusky/MastodonAPI.java
index 66019ad1..e6a78016 100644
--- a/app/src/main/java/com/keylesspalace/tusky/MastodonAPI.java
+++ b/app/src/main/java/com/keylesspalace/tusky/MastodonAPI.java
@@ -55,7 +55,7 @@ public interface MastodonAPI {
 
     @Multipart
     @POST("api/v1/media")
-    Call<Media> uploadMedia(@Part("file") MultipartBody.Part file);
+    Call<Media> uploadMedia(@Part MultipartBody.Part file);
 
     @FormUrlEncoded
     @POST("api/v1/statuses")
diff --git a/app/src/main/res/layout/activity_account.xml b/app/src/main/res/layout/activity_account.xml
index 1b047bc0..32399cb1 100644
--- a/app/src/main/res/layout/activity_account.xml
+++ b/app/src/main/res/layout/activity_account.xml
@@ -12,6 +12,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:theme="@style/AppTheme.Account.AppBarLayout"
+        app:popupTheme="@style/AppTheme.Account.ToolbarPopupTheme.Dark"
         android:id="@+id/account_app_bar_layout">
 
         <android.support.design.widget.CollapsingToolbarLayout
diff --git a/app/src/main/res/layout/activity_blocks.xml b/app/src/main/res/layout/activity_blocks.xml
index aa8a3730..aec7c626 100644
--- a/app/src/main/res/layout/activity_blocks.xml
+++ b/app/src/main/res/layout/activity_blocks.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/activity_view_thread"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -15,6 +16,8 @@
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
+            android:theme="@style/AppTheme.Account.AppBarLayout"
+            app:popupTheme="@style/AppTheme.Account.ToolbarPopupTheme.Dark"
             android:elevation="4dp"
             android:background="?attr/toolbar_background_color" />
 
@@ -32,4 +35,4 @@
 
     </FrameLayout>
 
-</RelativeLayout>
\ No newline at end of file
+</android.support.design.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_compose.xml b/app/src/main/res/layout/activity_compose.xml
index dfb05a2c..a1bd33f8 100644
--- a/app/src/main/res/layout/activity_compose.xml
+++ b/app/src/main/res/layout/activity_compose.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout 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"
     android:id="@+id/activity_compose"
     android:layout_width="match_parent"
@@ -15,6 +15,8 @@
             android:layout_height="?attr/actionBarSize"
             android:elevation="4dp"
             android:layout_marginBottom="16dp"
+            android:theme="@style/AppTheme.Account.AppBarLayout"
+            app:popupTheme="@style/AppTheme.Account.ToolbarPopupTheme.Dark"
             android:background="?attr/toolbar_background_color" />
 
         <LinearLayout
@@ -88,4 +90,4 @@
         android:layout_height="wrap_content"
         app:srcCompat="@drawable/ic_send_24dp"/>
 
-</FrameLayout>
\ No newline at end of file
+</android.support.design.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_favourites.xml b/app/src/main/res/layout/activity_favourites.xml
index f64acdbf..0cad8874 100644
--- a/app/src/main/res/layout/activity_favourites.xml
+++ b/app/src/main/res/layout/activity_favourites.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/activity_view_thread"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -16,6 +17,8 @@
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
             android:elevation="4dp"
+            android:theme="@style/AppTheme.Account.AppBarLayout"
+            app:popupTheme="@style/AppTheme.Account.ToolbarPopupTheme.Dark"
             android:background="?attr/toolbar_background_color" />
 
         <FrameLayout
@@ -32,4 +35,4 @@
 
     </FrameLayout>
 
-</RelativeLayout>
\ No newline at end of file
+</android.support.design.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index 4aab7117..6a3a901f 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:orientation="vertical"
     android:layout_width="match_parent"
@@ -60,4 +60,4 @@
 
     </RelativeLayout>
 
-</LinearLayout>
\ No newline at end of file
+</android.support.design.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 031b9ccf..004527b6 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/activity_main"
@@ -20,6 +20,8 @@
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
+            android:theme="@style/AppTheme.Account.AppBarLayout"
+            app:popupTheme="@style/AppTheme.Account.ToolbarPopupTheme.Dark"
             android:elevation="4dp"
             android:background="?attr/toolbar_background_color" />
 
@@ -70,4 +72,4 @@
         android:layout_margin="16dp"
         android:layout_height="wrap_content"
         app:srcCompat="@drawable/ic_create_24dp"/>
-</FrameLayout>
\ No newline at end of file
+</android.support.design.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_report.xml b/app/src/main/res/layout/activity_report.xml
index 18e58158..9b884f32 100644
--- a/app/src/main/res/layout/activity_report.xml
+++ b/app/src/main/res/layout/activity_report.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
@@ -9,6 +10,8 @@
         android:layout_width="match_parent"
         android:layout_height="?attr/actionBarSize"
         android:elevation="4dp"
+        android:theme="@style/AppTheme.Account.AppBarLayout"
+        app:popupTheme="@style/AppTheme.Account.ToolbarPopupTheme.Dark"
         android:background="?attr/toolbar_background_color" />
 
     <android.support.v7.widget.RecyclerView
diff --git a/app/src/main/res/layout/activity_splash.xml b/app/src/main/res/layout/activity_splash.xml
index 11c059c1..1323be38 100644
--- a/app/src/main/res/layout/activity_splash.xml
+++ b/app/src/main/res/layout/activity_splash.xml
@@ -6,22 +6,14 @@
     android:orientation="vertical"
     android:background="@color/color_background_dark"
     android:layout_height="match_parent">
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:orientation="vertical"
-        android:gravity="center"
-        android:layout_weight="1"
-        android:layout_height="0dp">
-
-        <com.mikhaellopez.circularfillableloaders.CircularFillableLoaders
-            android:id="@+id/circularFillableLoaders"
-            android:layout_width="200dp"
-            android:layout_height="200dp"
-            android:src="@mipmap/ic_logo"
-            app:cfl_border="true"
-            app:cfl_border_width="4dp"
-            app:cfl_progress="80"
-            app:cfl_wave_amplitude="0.08"
-            app:cfl_wave_color="@color/color_primary_dark" />
-    </LinearLayout>
+    <com.mikhaellopez.circularfillableloaders.CircularFillableLoaders
+        android:id="@+id/circularFillableLoaders"
+        android:layout_width="200dp"
+        android:layout_height="200dp"
+        android:src="@mipmap/ic_logo"
+        app:cfl_border="true"
+        app:cfl_border_width="4dp"
+        app:cfl_progress="80"
+        app:cfl_wave_amplitude="0.08"
+        app:cfl_wave_color="@color/color_primary_dark" />
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_view_tag.xml b/app/src/main/res/layout/activity_view_tag.xml
index 93c3b732..808c0357 100644
--- a/app/src/main/res/layout/activity_view_tag.xml
+++ b/app/src/main/res/layout/activity_view_tag.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/activity_view_thread"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -15,6 +16,8 @@
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
+            android:theme="@style/AppTheme.Account.AppBarLayout"
+            app:popupTheme="@style/AppTheme.Account.ToolbarPopupTheme.Dark"
             android:elevation="4dp"
             android:background="?attr/toolbar_background_color" />
 
@@ -32,4 +35,4 @@
 
     </FrameLayout>
 
-</RelativeLayout>
\ No newline at end of file
+</android.support.design.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_view_thread.xml b/app/src/main/res/layout/activity_view_thread.xml
index a8cc6100..d808ea49 100644
--- a/app/src/main/res/layout/activity_view_thread.xml
+++ b/app/src/main/res/layout/activity_view_thread.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/activity_view_thread"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -15,6 +16,8 @@
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
+            android:theme="@style/AppTheme.Account.AppBarLayout"
+            app:popupTheme="@style/AppTheme.Account.ToolbarPopupTheme.Dark"
             android:elevation="4dp"
             android:background="?attr/toolbar_background_color" />
 
@@ -32,4 +35,4 @@
 
     </FrameLayout>
 
-</RelativeLayout>
\ No newline at end of file
+</android.support.design.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_view_video.xml b/app/src/main/res/layout/activity_view_video.xml
index d904f05e..77001cba 100644
--- a/app/src/main/res/layout/activity_view_video.xml
+++ b/app/src/main/res/layout/activity_view_video.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -11,4 +11,4 @@
         android:layout_height="match_parent"
         android:layout_centerInParent="true" />
 
-</RelativeLayout>
\ No newline at end of file
+</android.support.design.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 8546465d..ac08ab61 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -78,6 +78,8 @@
 
     <style name="AppTheme.Account.ToolbarPopupTheme.Dark" parent="ThemeOverlay.AppCompat">
         <item name="android:textColorPrimary">@color/text_color_primary_dark</item>
+        <item name="android:windowActionBarOverlay">true</item>
+        <item name="windowActionBarOverlay">true</item>
     </style>
 
     <!--Light Application Theme Styles-->
@@ -138,6 +140,8 @@
 
     <style name="AppTheme.Account.ToolbarPopupTheme.Light" parent="ThemeOverlay.AppCompat">
         <item name="android:textColorPrimary">@color/text_color_primary_light</item>
+        <item name="android:windowActionBarOverlay">true</item>
+        <item name="windowActionBarOverlay">true</item>
     </style>
 
 </resources>