diff --git a/src/main/res/layout-w360dp/fragment_conversations_overview.xml b/src/main/res/layout-w360dp/fragment_conversations_overview.xml
deleted file mode 100644
index a600118db..000000000
--- a/src/main/res/layout-w360dp/fragment_conversations_overview.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<android.support.v4.widget.SlidingPaneLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/content_view_spl"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent" >
-
-    <LinearLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="300dp"
-        android:layout_height="match_parent"
-        android:background="@color/primarybackground"
-        android:orientation="vertical" >
-
-        <ListView
-            android:id="@+id/list"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:background="@color/primarybackground"
-            android:divider="@color/divider"
-            android:dividerHeight="1dp" />
-    </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/selected_conversation"
-        android:layout_width="fill_parent"
-        android:layout_height="match_parent"
-        android:layout_weight="1"
-        android:orientation="vertical" >
-    </LinearLayout>
-
-</android.support.v4.widget.SlidingPaneLayout>
\ No newline at end of file
diff --git a/src/main/res/layout-w384dp/fragment_conversations_overview.xml b/src/main/res/layout-w384dp/fragment_conversations_overview.xml
deleted file mode 100644
index c3aa67ae6..000000000
--- a/src/main/res/layout-w384dp/fragment_conversations_overview.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<android.support.v4.widget.SlidingPaneLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/content_view_spl"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent" >
-
-    <LinearLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="345dp"
-        android:layout_height="match_parent"
-        android:background="@color/primarybackground"
-        android:orientation="vertical" >
-
-        <ListView
-            android:id="@+id/list"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:background="@color/primarybackground"
-            android:divider="@color/divider"
-            android:dividerHeight="1dp" />
-    </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/selected_conversation"
-        android:layout_width="fill_parent"
-        android:layout_height="match_parent"
-        android:layout_weight="1"
-        android:orientation="vertical" >
-    </LinearLayout>
-
-</android.support.v4.widget.SlidingPaneLayout>
\ No newline at end of file
diff --git a/src/main/res/layout-w600dp/fragment_conversations_overview.xml b/src/main/res/layout-w600dp/fragment_conversations_overview.xml
deleted file mode 100644
index 331fb1f06..000000000
--- a/src/main/res/layout-w600dp/fragment_conversations_overview.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<android.support.v4.widget.SlidingPaneLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/content_view_spl"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent" >
-
-    <LinearLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="400dp"
-        android:layout_height="match_parent"
-        android:background="@color/primarybackground"
-        android:orientation="vertical" >
-
-        <ListView
-            android:id="@+id/list"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:background="@color/primarybackground"
-            android:divider="@color/divider"
-            android:dividerHeight="1dp" />
-    </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/selected_conversation"
-        android:layout_width="fill_parent"
-        android:layout_height="match_parent"
-        android:layout_weight="1"
-        android:orientation="vertical" >
-    </LinearLayout>
-
-</android.support.v4.widget.SlidingPaneLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/activity_change_password.xml b/src/main/res/layout/activity_change_password.xml
index c33f238fe..28d531c22 100644
--- a/src/main/res/layout/activity_change_password.xml
+++ b/src/main/res/layout/activity_change_password.xml
@@ -13,7 +13,10 @@
 			android:layout_width="match_parent"
 			android:layout_height="match_parent"
 			android:orientation="vertical"
-			android:padding="16dp">
+			android:layout_marginLeft="@dimen/activity_horizontal_margin"
+			android:layout_marginRight="@dimen/activity_horizontal_margin"
+			android:layout_marginTop="@dimen/activity_vertical_margin"
+			android:layout_marginBottom="@dimen/activity_vertical_margin">
 
 			<TextView
 				android:layout_width="wrap_content"
diff --git a/src/main/res/layout/activity_contact_details.xml b/src/main/res/layout/activity_contact_details.xml
index 21635208c..5ecca25e8 100644
--- a/src/main/res/layout/activity_contact_details.xml
+++ b/src/main/res/layout/activity_contact_details.xml
@@ -12,9 +12,12 @@
         <RelativeLayout
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:layout_margin="8dp"
+            android:layout_marginLeft="@dimen/activity_horizontal_margin"
+            android:layout_marginRight="@dimen/activity_horizontal_margin"
+            android:layout_marginTop="@dimen/activity_vertical_margin"
+            android:layout_marginBottom="@dimen/activity_vertical_margin"
             android:background="@drawable/infocard_border"
-            android:padding="16dp" >
+            android:padding="@dimen/infocard_padding" >
 
             <QuickContactBadge
                 android:id="@+id/details_contact_badge"
@@ -96,11 +99,14 @@
             android:id="@+id/details_contact_keys"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:layout_margin="8dp"
+            android:layout_marginLeft="@dimen/activity_horizontal_margin"
+            android:layout_marginRight="@dimen/activity_horizontal_margin"
+            android:layout_marginTop="@dimen/activity_vertical_margin"
+            android:layout_marginBottom="@dimen/activity_vertical_margin"
             android:background="@drawable/infocard_border"
             android:divider="?android:dividerHorizontal"
             android:orientation="vertical"
-            android:padding="8dp"
+            android:padding="@dimen/infocard_padding"
             android:showDividers="middle" >
         </LinearLayout>
     </LinearLayout>
diff --git a/src/main/res/layout/activity_edit_account.xml b/src/main/res/layout/activity_edit_account.xml
index 369870721..0093f032d 100644
--- a/src/main/res/layout/activity_edit_account.xml
+++ b/src/main/res/layout/activity_edit_account.xml
@@ -20,10 +20,13 @@
                 android:id="@+id/editor"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
-                android:layout_margin="8dp"
+                android:layout_marginLeft="@dimen/activity_horizontal_margin"
+                android:layout_marginRight="@dimen/activity_horizontal_margin"
+                android:layout_marginTop="@dimen/activity_vertical_margin"
+                android:layout_marginBottom="@dimen/activity_vertical_margin"
                 android:background="@drawable/infocard_border"
                 android:orientation="vertical"
-                android:padding="16dp">
+                android:padding="@dimen/infocard_padding">
                 <ImageView android:id="@+id/avater"
                     android:layout_width="72dp"
                     android:layout_height="72dp"
@@ -106,10 +109,13 @@
                 android:id="@+id/stats"
                 android:layout_width="fill_parent"
                 android:layout_height="fill_parent"
-                android:layout_margin="8dp"
+                android:layout_marginLeft="@dimen/activity_horizontal_margin"
+                android:layout_marginRight="@dimen/activity_horizontal_margin"
+                android:layout_marginTop="@dimen/activity_vertical_margin"
+                android:layout_marginBottom="@dimen/activity_vertical_margin"
                 android:background="@drawable/infocard_border"
                 android:orientation="vertical"
-                android:padding="16dp"
+                android:padding="@dimen/infocard_padding"
                 android:visibility="gone" >
 
                 <TableLayout
diff --git a/src/main/res/layout/activity_muc_details.xml b/src/main/res/layout/activity_muc_details.xml
index 2032c9ead..332ac2a90 100644
--- a/src/main/res/layout/activity_muc_details.xml
+++ b/src/main/res/layout/activity_muc_details.xml
@@ -12,10 +12,13 @@
 		<LinearLayout
 			android:layout_width="fill_parent"
 			android:layout_height="wrap_content"
-			android:layout_margin="8dp"
+			android:layout_marginLeft="@dimen/activity_horizontal_margin"
+			android:layout_marginRight="@dimen/activity_horizontal_margin"
+			android:layout_marginTop="@dimen/activity_vertical_margin"
+			android:layout_marginBottom="@dimen/activity_vertical_margin"
 			android:background="@drawable/infocard_border"
 			android:orientation="vertical"
-			android:padding="16dp">
+			android:padding="@dimen/infocard_padding">
 
 			<TextView
 				android:id="@+id/muc_jabberid"
@@ -118,10 +121,13 @@
 			android:id="@+id/muc_more_details"
 			android:layout_width="fill_parent"
 			android:layout_height="wrap_content"
-			android:layout_margin="8dp"
+			android:layout_marginLeft="@dimen/activity_horizontal_margin"
+			android:layout_marginRight="@dimen/activity_horizontal_margin"
+			android:layout_marginTop="@dimen/activity_vertical_margin"
+			android:layout_marginBottom="@dimen/activity_vertical_margin"
 			android:background="@drawable/infocard_border"
 			android:orientation="vertical"
-			android:padding="8dp">
+			android:padding="@dimen/infocard_padding">
 
 
 			<LinearLayout
diff --git a/src/main/res/layout/activity_verify_otr.xml b/src/main/res/layout/activity_verify_otr.xml
index 1a4221bce..54f9a542b 100644
--- a/src/main/res/layout/activity_verify_otr.xml
+++ b/src/main/res/layout/activity_verify_otr.xml
@@ -13,7 +13,10 @@
 			android:layout_width="match_parent"
 			android:layout_height="match_parent"
 			android:orientation="vertical"
-			android:padding="16dp">
+			android:layout_marginLeft="@dimen/activity_horizontal_margin"
+			android:layout_marginRight="@dimen/activity_horizontal_margin"
+			android:layout_marginTop="@dimen/activity_vertical_margin"
+			android:layout_marginBottom="@dimen/activity_vertical_margin">
 
 			<TextView
 				android:id="@+id/verification_explanation"
diff --git a/src/main/res/layout/fragment_conversations_overview.xml b/src/main/res/layout/fragment_conversations_overview.xml
index d4145761d..695700288 100644
--- a/src/main/res/layout/fragment_conversations_overview.xml
+++ b/src/main/res/layout/fragment_conversations_overview.xml
@@ -5,7 +5,7 @@
 
     <LinearLayout
         xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="288dp"
+        android:layout_width="@dimen/conversations_overview_width"
         android:layout_height="match_parent"
         android:background="@color/primarybackground"
         android:orientation="vertical" >
diff --git a/src/main/res/values-w360dp/dimens.xml b/src/main/res/values-w360dp/dimens.xml
new file mode 100644
index 000000000..7e37ae16e
--- /dev/null
+++ b/src/main/res/values-w360dp/dimens.xml
@@ -0,0 +1,3 @@
+<resources>
+	<dimen name="conversations_overview_width">304dp</dimen>
+</resources>
diff --git a/src/main/res/values-w384dp/dimens.xml b/src/main/res/values-w384dp/dimens.xml
new file mode 100644
index 000000000..5026848e3
--- /dev/null
+++ b/src/main/res/values-w384dp/dimens.xml
@@ -0,0 +1,3 @@
+<resources>
+	<dimen name="conversations_overview_width">336dp</dimen>
+</resources>
diff --git a/src/main/res/values-w600dp/dimens.xml b/src/main/res/values-w600dp/dimens.xml
new file mode 100644
index 000000000..df6525e6e
--- /dev/null
+++ b/src/main/res/values-w600dp/dimens.xml
@@ -0,0 +1,4 @@
+<resources>
+	<dimen name="conversations_overview_width">416dp</dimen>
+    <dimen name="activity_horizontal_margin">32dp</dimen>
+</resources>
diff --git a/src/main/res/values-w820dp/dimens.xml b/src/main/res/values-w820dp/dimens.xml
deleted file mode 100644
index 3aeac9e75..000000000
--- a/src/main/res/values-w820dp/dimens.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<resources>
-    <!-- Customization of dimensions originally defined in res/values/dimens.xml
-				 (such as screen margins) for screens with more than 820dp of available
-				 width. This would include 7" and 10" devices in landscape (~960dp and
-				 ~1280dp respectively). -->
-    <dimen name="activity_horizontal_margin">64dp</dimen>
-</resources>
diff --git a/src/main/res/values-w960dp/dimens.xml b/src/main/res/values-w960dp/dimens.xml
new file mode 100644
index 000000000..146c0e153
--- /dev/null
+++ b/src/main/res/values-w960dp/dimens.xml
@@ -0,0 +1,3 @@
+<resources>
+    <dimen name="activity_horizontal_margin">64dp</dimen>
+</resources>
diff --git a/src/main/res/values/dimens.xml b/src/main/res/values/dimens.xml
index 47c822467..79e920e98 100644
--- a/src/main/res/values/dimens.xml
+++ b/src/main/res/values/dimens.xml
@@ -1,5 +1,7 @@
 <resources>
     <!-- Default screen margins, per the Android Design guidelines. -->
-    <dimen name="activity_horizontal_margin">16dp</dimen>
-    <dimen name="activity_vertical_margin">16dp</dimen>
+    <dimen name="activity_horizontal_margin">8dp</dimen>
+    <dimen name="activity_vertical_margin">8dp</dimen>
+	<dimen name="infocard_padding">16dp</dimen>
+	<dimen name="conversations_overview_width">288dp</dimen>
 </resources>