diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 97e6a2da8..e649e8a76 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -15,7 +15,7 @@
         android:label="@string/app_name"
         android:name=".TuskyApplication"
         android:supportsRtl="true"
-        android:theme="@style/AppTheme">
+        android:theme="@style/TuskyTheme">
 
         <activity
             android:name=".SplashActivity"
@@ -49,6 +49,7 @@
         </activity>
         <activity
             android:name=".ComposeActivity"
+            android:theme="@style/TuskyDialogActivityTheme"
             android:windowSoftInputMode="stateVisible|adjustResize">
             <intent-filter>
                 <action android:name="android.intent.action.SEND" />
@@ -68,14 +69,14 @@
         </activity>
         <activity
             android:name=".ViewVideoActivity"
-            android:theme="@style/AppThemeBase"
+            android:theme="@style/TuskyBaseTheme"
             android:configChanges="orientation|keyboardHidden|screenSize" />
         <activity
             android:name=".ViewThreadActivity"
             android:configChanges="orientation|screenSize" />
         <activity android:name=".ViewTagActivity" />
         <activity android:name=".ViewMediaActivity"
-            android:theme="@style/AppThemeBase" />
+            android:theme="@style/TuskyBaseTheme" />
         <activity android:name=".AccountActivity" />
         <activity android:name=".EditProfileActivity" />
         <activity android:name=".PreferencesActivity" />
diff --git a/app/src/main/res/drawable-night/background_dialog_activity.xml b/app/src/main/res/drawable-night/background_dialog_activity.xml
new file mode 100644
index 000000000..37a2b6c1d
--- /dev/null
+++ b/app/src/main/res/drawable-night/background_dialog_activity.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners android:radius="5dp" />
+    <solid android:color="@color/window_background_dark" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/background_dialog_activity.xml b/app/src/main/res/drawable/background_dialog_activity.xml
new file mode 100644
index 000000000..06b36455a
--- /dev/null
+++ b/app/src/main/res/drawable/background_dialog_activity.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners android:radius="5dp" />
+    <solid android:color="@color/window_background_light" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout-w640dp/fragment_timeline.xml b/app/src/main/res/layout-w640dp/fragment_timeline.xml
new file mode 100644
index 000000000..914b593aa
--- /dev/null
+++ b/app/src/main/res/layout-w640dp/fragment_timeline.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="?attr/tab_page_margin_drawable">
+
+    <android.support.v4.widget.SwipeRefreshLayout
+        android:id="@+id/swipe_refresh_layout"
+        android:layout_width="640dp"
+        android:layout_height="match_parent"
+        android:layout_gravity="center_horizontal"
+        android:background="?attr/window_background">
+
+        <android.support.v7.widget.RecyclerView
+            android:id="@+id/recycler_view"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
+    </android.support.v4.widget.SwipeRefreshLayout>
+
+</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-w640dp/fragment_view_thread.xml b/app/src/main/res/layout-w640dp/fragment_view_thread.xml
new file mode 100644
index 000000000..2d6dad873
--- /dev/null
+++ b/app/src/main/res/layout-w640dp/fragment_view_thread.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="?attr/tab_page_margin_drawable">
+
+    <android.support.v4.widget.SwipeRefreshLayout
+        android:id="@+id/swipe_refresh_layout"
+        android:layout_width="640dp"
+        android:layout_height="match_parent"
+        android:layout_gravity="center_horizontal"
+        android:background="?attr/window_background">
+
+        <android.support.v7.widget.RecyclerView
+            android:id="@+id/recycler_view"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:scrollbars="vertical" />
+    </android.support.v4.widget.SwipeRefreshLayout>
+
+</FrameLayout>
\ 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 a62f0614b..4a4090c90 100644
--- a/app/src/main/res/layout/activity_compose.xml
+++ b/app/src/main/res/layout/activity_compose.xml
@@ -25,7 +25,7 @@
 
     <android.support.v4.widget.NestedScrollView
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
+        android:layout_height="@dimen/compose_activity_scrollview_height"
         android:layout_marginBottom="52dp"
         android:layout_marginTop="?attr/actionBarSize">
 
@@ -257,8 +257,8 @@
         <ImageButton
             android:id="@+id/composeEmojiButton"
             style="?attr/image_button_style"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
+            android:layout_width="36dp"
+            android:layout_height="36dp"
             android:layout_marginEnd="4dp"
             android:contentDescription="@string/action_emoji_keyboard"
             android:padding="4dp"
@@ -276,7 +276,7 @@
             android:layout_height="wrap_content"
             android:textColor="?android:textColorTertiary"
             android:textSize="?attr/status_text_medium"
-            tools:text="500"/>
+            tools:text="500" />
 
         <com.keylesspalace.tusky.view.TootButton
             android:id="@+id/composeTootButton"
diff --git a/app/src/main/res/layout/fragment_search.xml b/app/src/main/res/layout/fragment_search.xml
index f2ed42959..a138d36ac 100644
--- a/app/src/main/res/layout/fragment_search.xml
+++ b/app/src/main/res/layout/fragment_search.xml
@@ -2,28 +2,37 @@
 <android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:background="?attr/tab_page_margin_drawable">
 
-    <android.support.v7.widget.RecyclerView
-        android:id="@+id/searchRecyclerView"
-        android:layout_width="match_parent"
+    <FrameLayout
+        android:layout_width="@dimen/timeline_width"
         android:layout_height="match_parent"
-        tools:listitem="@layout/item_account" />
+        android:layout_gravity="center">
 
-    <ProgressBar
-        android:id="@+id/searchProgressBar"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:indeterminate="true"
-        android:visibility="gone" />
+        <android.support.v7.widget.RecyclerView
+            android:id="@+id/searchRecyclerView"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_gravity="center"
+            tools:listitem="@layout/item_account"
+            android:background="?attr/window_background" />
 
-    <TextView
-        android:id="@+id/searchNoResultsText"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:text="@string/search_no_results"
-        android:visibility="gone" />
+        <ProgressBar
+            android:id="@+id/searchProgressBar"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:indeterminate="true"
+            android:visibility="gone" />
+
+        <TextView
+            android:id="@+id/searchNoResultsText"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:text="@string/search_no_results"
+            android:visibility="gone" />
+    </FrameLayout>
 
 </android.support.design.widget.CoordinatorLayout>
diff --git a/app/src/main/res/values-large/dimens.xml b/app/src/main/res/values-large/dimens.xml
new file mode 100644
index 000000000..046974e0d
--- /dev/null
+++ b/app/src/main/res/values-large/dimens.xml
@@ -0,0 +1,6 @@
+<resources>
+    <dimen name="compose_activity_scrollview_height">400dp</dimen>
+
+    <dimen name="status_media_preview_height">160dp</dimen>
+    <dimen name="status_detail_media_preview_height">180dp</dimen>
+</resources>
diff --git a/app/src/main/res/values-large/styles.xml b/app/src/main/res/values-large/styles.xml
new file mode 100644
index 000000000..71044ab1a
--- /dev/null
+++ b/app/src/main/res/values-large/styles.xml
@@ -0,0 +1,12 @@
+<resources>
+    <style name="TuskyDialogActivityTheme" parent="@style/TuskyTheme">
+        <item name="android:windowFrame">@null</item>
+        <item name="android:windowBackground">@drawable/background_dialog_activity</item>
+        <item name="android:windowIsFloating">true</item>
+        <item name="android:windowContentOverlay">@null</item>
+        <item name="android:windowSoftInputMode">stateUnspecified|adjustPan</item>
+        <item name="android:windowCloseOnTouchOutside">false</item>
+        <item name="android:windowActionModeOverlay">true</item>
+    </style>
+
+</resources>
diff --git a/app/src/main/res/values-night-v27/styles.xml b/app/src/main/res/values-night-v27/styles.xml
index c8e6d6fb4..51d8e8165 100644
--- a/app/src/main/res/values-night-v27/styles.xml
+++ b/app/src/main/res/values-night-v27/styles.xml
@@ -1,7 +1,7 @@
 <resources>
 
     <!--Dark Application Theme Styles-->
-    <style name="AppTheme" parent="AppThemeBase">
+    <style name="TuskyTheme" parent="TuskyBaseTheme">
         <item name="android:windowLightNavigationBar">false</item>
         <item name="android:navigationBarColor">@color/window_background_dark</item>
         <item name="android:navigationBarDividerColor">@color/status_divider_dark</item>
diff --git a/app/src/main/res/values-night/styles.xml b/app/src/main/res/values-night/styles.xml
index 273d3e87b..67b0abd55 100644
--- a/app/src/main/res/values-night/styles.xml
+++ b/app/src/main/res/values-night/styles.xml
@@ -1,7 +1,8 @@
 <resources>
     <!--Dark Application Theme Styles-->
-    <style name="AppTheme" parent="AppThemeBase"/>
-    <style name="AppThemeBase" parent="Theme.AppCompat.NoActionBar">
+    <style name="TuskyTheme" parent="TuskyBaseTheme"/>
+    <style name="TuskyDialogActivityTheme" parent="@style/TuskyTheme" />
+    <style name="TuskyBaseTheme" parent="Theme.AppCompat.NoActionBar">
         <item name="colorPrimary">@color/color_primary_dark</item>
         <item name="colorPrimaryDark">@color/color_primary_dark_dark</item>
         <item name="colorAccent">@color/color_accent_dark</item>
diff --git a/app/src/main/res/values-v27/styles.xml b/app/src/main/res/values-v27/styles.xml
index 1b03dc9d9..1730e52cf 100644
--- a/app/src/main/res/values-v27/styles.xml
+++ b/app/src/main/res/values-v27/styles.xml
@@ -1,7 +1,7 @@
 <resources>
 
     <!--Light Application Theme Styles-->
-    <style name="AppTheme" parent="AppThemeBase">
+    <style name="TuskyTheme" parent="TuskyBaseTheme">
         <item name="android:windowLightNavigationBar">true</item>
         <item name="android:navigationBarColor">@color/color_background_light</item>
         <item name="android:navigationBarDividerColor">@color/status_divider_light</item>
diff --git a/app/src/main/res/values-w640dp/dimens.xml b/app/src/main/res/values-w640dp/dimens.xml
new file mode 100644
index 000000000..41b374bda
--- /dev/null
+++ b/app/src/main/res/values-w640dp/dimens.xml
@@ -0,0 +1,3 @@
+<resources>
+    <dimen name="timeline_width">640dp</dimen>
+</resources>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 1947cc76a..bf47bc9b0 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -31,7 +31,7 @@
     <color name="sensitive_media_warning_background_dark">#303030</color>
     <color name="media_preview_unloaded_background_dark">#2F2F2F</color>
     <color name="status_divider_dark">#2f3441</color>
-    <color name="tab_page_margin_dark">#4C534B</color>
+    <color name="tab_page_margin_dark">#1a1c23</color>
     <color name="account_toolbar_icon_collapsed_dark">#FFFFFF</color>
     <color name="account_header_background_dark">#000000</color>
     <color name="compose_media_button_disabled_dark">#586173</color>
@@ -64,7 +64,7 @@
     <color name="sensitive_media_warning_background_light">#b0b0b0</color>
     <color name="media_preview_unloaded_background_light">#cfcfcf</color>
     <color name="status_divider_light">#cfcfcf</color>
-    <color name="tab_page_margin_light">#9F9F9F</color>
+    <color name="tab_page_margin_light">#cfcfcf</color>
     <color name="account_toolbar_icon_collapsed_light">#DE000000</color>
     <color name="account_header_background_light">#EFEFEF</color>
     <color name="compose_media_button_disabled_light">#a3a5ab</color>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 024bd7d10..edf0faca8 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -20,4 +20,8 @@
 
     <dimen name="compose_activity_snackbar_elevation">16dp</dimen>
 
+    <dimen name="compose_activity_scrollview_height">-1px</dimen> <!-- match_parent -->
+
+    <dimen name="timeline_width">-1px</dimen> <!-- match_parent -->
+
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 1847b8807..9bc8e8f8b 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -33,8 +33,9 @@
     </style>
 
     <!--Light Application Theme Styles-->
-    <style name="AppTheme" parent="AppThemeBase"/>
-    <style name="AppThemeBase" parent="Theme.AppCompat.Light.NoActionBar">
+    <style name="TuskyTheme" parent="TuskyBaseTheme"/>
+    <style name="TuskyDialogActivityTheme" parent="@style/TuskyTheme" />
+    <style name="TuskyBaseTheme" parent="Theme.AppCompat.Light.NoActionBar">
         <item name="colorPrimary">@color/color_primary_light</item>
         <item name="colorPrimaryDark">@color/color_primary_dark_light</item>
         <item name="colorAccent">@color/color_accent_light</item>