diff --git a/app/src/main/java/it/niedermann/owncloud/notes/android/activity/NotesListViewActivity.java b/app/src/main/java/it/niedermann/owncloud/notes/android/activity/NotesListViewActivity.java
index ab22bff1b..3c3182782 100644
--- a/app/src/main/java/it/niedermann/owncloud/notes/android/activity/NotesListViewActivity.java
+++ b/app/src/main/java/it/niedermann/owncloud/notes/android/activity/NotesListViewActivity.java
@@ -630,7 +630,7 @@ public class NotesListViewActivity extends LockedActivity implements NoteClickLi
                     getResources().getDimensionPixelSize(R.dimen.spacer_5x),
                     getResources().getDimensionPixelSize(R.dimen.spacer_3x),
                     getResources().getDimensionPixelSize(R.dimen.spacer_1x),
-                    getResources().getDimensionPixelSize(R.dimen.activity_padding)
+                    getResources().getDimensionPixelSize(R.dimen.spacer_activity_sides)
             ));
         } else {
             LinearLayoutManager layoutManager = new LinearLayoutManager(this);
diff --git a/app/src/main/res/layout/activity_formatting_help.xml b/app/src/main/res/layout/activity_formatting_help.xml
index dc2c1742f..7306f7d08 100644
--- a/app/src/main/res/layout/activity_formatting_help.xml
+++ b/app/src/main/res/layout/activity_formatting_help.xml
@@ -33,8 +33,8 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:padding="@dimen/spacer_2x"
-            android:layout_marginStart="@dimen/activity_padding"
-            android:layout_marginEnd="@dimen/activity_padding"
+            android:layout_marginStart="@dimen/spacer_activity_sides"
+            android:layout_marginEnd="@dimen/spacer_activity_sides"
             android:paddingStart="@dimen/spacer_2x"
             android:paddingEnd="@dimen/spacer_2x"
             android:textAppearance="?android:attr/textAppearanceMedium"
diff --git a/app/src/main/res/layout/dialog_account_switcher.xml b/app/src/main/res/layout/dialog_account_switcher.xml
index f3f0814e2..0b16d54e7 100644
--- a/app/src/main/res/layout/dialog_account_switcher.xml
+++ b/app/src/main/res/layout/dialog_account_switcher.xml
@@ -6,61 +6,70 @@
     android:layout_height="wrap_content"
     android:orientation="vertical">
 
-    <LinearLayout
-        android:id="@+id/accountLayout"
+    <FrameLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="?attr/selectableItemBackground"
-        android:gravity="center_vertical"
-        android:orientation="horizontal"
-        android:padding="@dimen/spacer_3x">
-
-        <androidx.appcompat.widget.AppCompatImageView
-            android:id="@+id/currentAccountItemAvatar"
-            android:layout_width="@dimen/avatar_size"
-            android:layout_height="@dimen/avatar_size"
-            android:contentDescription="@null"
-            android:focusable="false"
-            android:scaleType="center"
-            app:srcCompat="@drawable/ic_account_circle_grey_24dp" />
-
+        android:paddingStart="@dimen/spacer_activity_sides"
+        android:paddingEnd="@dimen/spacer_activity_sides">
 
         <LinearLayout
-            android:layout_width="0dp"
+            android:id="@+id/accountLayout"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/spacer_2x"
-            android:layout_marginEnd="@dimen/spacer_2x"
-            android:layout_weight="1"
-            android:orientation="vertical">
+            android:gravity="center_vertical"
+            android:orientation="horizontal"
+            android:padding="@dimen/spacer_2x"
+            android:paddingStart="@dimen/spacer_1x"
+            android:paddingEnd="@dimen/spacer_1x">
 
-            <TextView
-                android:id="@+id/accountName"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:ellipsize="middle"
-                android:singleLine="true"
-                android:textAppearance="?attr/textAppearanceListItem"
-                tools:text="@tools:sample/full_names" />
+            <androidx.appcompat.widget.AppCompatImageView
+                android:id="@+id/currentAccountItemAvatar"
+                android:layout_width="@dimen/avatar_size"
+                android:layout_height="@dimen/avatar_size"
+                android:contentDescription="@null"
+                android:focusable="false"
+                android:scaleType="center"
+                app:srcCompat="@drawable/ic_account_circle_grey_24dp" />
 
-            <TextView
-                android:id="@+id/accountHost"
-                android:layout_width="wrap_content"
+
+            <LinearLayout
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:ellipsize="middle"
-                android:singleLine="true"
-                android:textAppearance="?attr/textAppearanceListItemSecondary"
-                tools:text="@tools:sample/full_names" />
+                android:layout_marginStart="@dimen/spacer_1x"
+                android:layout_marginEnd="@dimen/spacer_2x"
+                android:layout_weight="1"
+                android:orientation="vertical">
+
+                <TextView
+                    android:id="@+id/accountName"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:ellipsize="middle"
+                    android:singleLine="true"
+                    android:textAppearance="?attr/textAppearanceListItem"
+                    tools:text="@tools:sample/full_names" />
+
+                <TextView
+                    android:id="@+id/accountHost"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:ellipsize="middle"
+                    android:singleLine="true"
+                    android:textAppearance="?attr/textAppearanceListItemSecondary"
+                    tools:text="@tools:sample/full_names" />
+            </LinearLayout>
+
+            <androidx.appcompat.widget.AppCompatImageView
+                android:id="@+id/check"
+                android:layout_width="36dp"
+                android:layout_height="36dp"
+                android:contentDescription="@null"
+                android:focusable="false"
+                android:scaleType="center"
+                app:srcCompat="@drawable/check" />
         </LinearLayout>
-
-        <androidx.appcompat.widget.AppCompatImageView
-            android:id="@+id/check"
-            android:layout_width="36dp"
-            android:layout_height="36dp"
-            android:contentDescription="@null"
-            android:focusable="false"
-            android:scaleType="center"
-            app:srcCompat="@drawable/check" />
-    </LinearLayout>
+    </FrameLayout>
 
     <View
         android:layout_width="match_parent"
@@ -78,20 +87,19 @@
         tools:itemCount="3"
         tools:listitem="@layout/item_account_choose" />
 
+
     <LinearLayout
         android:id="@+id/add_account"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="?attr/selectableItemBackground"
         android:orientation="horizontal"
-        android:paddingStart="@dimen/spacer_3x"
-        android:paddingTop="@dimen/spacer_1x"
-        android:paddingEnd="@dimen/spacer_3x"
-        android:paddingBottom="@dimen/spacer_1x">
+        android:padding="@dimen/spacer_1x">
 
         <androidx.appcompat.widget.AppCompatImageView
             android:layout_width="36dp"
             android:layout_height="36dp"
+            android:layout_marginStart="@dimen/spacer_activity_sides"
             android:contentDescription="@null"
             android:focusable="false"
             android:scaleType="center"
@@ -117,14 +125,12 @@
         android:layout_marginBottom="@dimen/spacer_2x"
         android:background="?attr/selectableItemBackground"
         android:orientation="horizontal"
-        android:paddingStart="@dimen/spacer_3x"
-        android:paddingTop="@dimen/spacer_1x"
-        android:paddingEnd="@dimen/spacer_3x"
-        android:paddingBottom="@dimen/spacer_1x">
+        android:padding="@dimen/spacer_1x">
 
         <androidx.appcompat.widget.AppCompatImageView
             android:layout_width="36dp"
             android:layout_height="36dp"
+            android:layout_marginStart="@dimen/spacer_activity_sides"
             android:contentDescription="@null"
             android:focusable="false"
             android:scaleType="center"
@@ -140,7 +146,6 @@
             android:text="@string/manage_accounts"
             android:textAppearance="@style/TextAppearance.AppCompat.Widget.TextView.SpinnerItem"
             android:textColor="?android:textColorPrimary" />
-
     </LinearLayout>
 </LinearLayout>
 
diff --git a/app/src/main/res/layout/fragment_note_edit.xml b/app/src/main/res/layout/fragment_note_edit.xml
index 618180446..86306e1a4 100644
--- a/app/src/main/res/layout/fragment_note_edit.xml
+++ b/app/src/main/res/layout/fragment_note_edit.xml
@@ -27,8 +27,8 @@
             android:id="@+id/editContent"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/activity_padding"
-            android:layout_marginEnd="@dimen/activity_padding"
+            android:layout_marginStart="@dimen/spacer_activity_sides"
+            android:layout_marginEnd="@dimen/spacer_activity_sides"
             android:background="?attr/colorPrimary"
             android:ems="10"
             android:gravity="top"
diff --git a/app/src/main/res/layout/fragment_note_preview.xml b/app/src/main/res/layout/fragment_note_preview.xml
index b5f81e26c..4899af961 100644
--- a/app/src/main/res/layout/fragment_note_preview.xml
+++ b/app/src/main/res/layout/fragment_note_preview.xml
@@ -24,8 +24,8 @@
                 android:id="@+id/single_note_content"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="@dimen/activity_padding"
-                android:layout_marginEnd="@dimen/activity_padding"
+                android:layout_marginStart="@dimen/spacer_activity_sides"
+                android:layout_marginEnd="@dimen/spacer_activity_sides"
                 android:padding="@dimen/spacer_2x"
                 android:paddingStart="@dimen/spacer_2x"
                 android:paddingEnd="@dimen/spacer_2x"
diff --git a/app/src/main/res/layout/item_account_choose.xml b/app/src/main/res/layout/item_account_choose.xml
index bb6b6182a..bc02aa685 100644
--- a/app/src/main/res/layout/item_account_choose.xml
+++ b/app/src/main/res/layout/item_account_choose.xml
@@ -1,74 +1,83 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout 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/accountLayout"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="?attr/selectableItemBackground"
-    android:orientation="horizontal"
-    android:gravity="center"
-    android:padding="@dimen/spacer_2x">
+    android:paddingStart="@dimen/spacer_activity_sides"
+    android:paddingEnd="@dimen/spacer_activity_sides">
 
-    <FrameLayout
-        android:layout_width="wrap_content"
+    <LinearLayout
+        android:id="@+id/accountLayout"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="@dimen/spacer_1hx">
+        android:gravity="center"
+        android:orientation="horizontal"
+        android:padding="@dimen/spacer_2x"
+        android:paddingStart="@dimen/spacer_1x"
+        android:paddingEnd="@dimen/spacer_1x">
+
+        <FrameLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="@dimen/spacer_1hx">
+
+            <androidx.appcompat.widget.AppCompatImageView
+                android:id="@+id/accountItemAvatar"
+                android:layout_width="@dimen/avatar_size"
+                android:layout_height="@dimen/avatar_size"
+                android:contentDescription="@null"
+                android:focusable="false"
+                android:scaleType="center"
+                app:srcCompat="@drawable/ic_account_circle_grey_24dp" />
+
+            <androidx.appcompat.widget.AppCompatImageView
+                android:id="@+id/currentAccountIndicator"
+                android:layout_width="12dp"
+                android:layout_height="12dp"
+                android:layout_gravity="end|bottom"
+                android:visibility="gone"
+                app:srcCompat="@drawable/check"
+                tools:visibility="visible" />
+        </FrameLayout>
+
+        <LinearLayout
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/spacer_1x"
+            android:layout_marginEnd="@dimen/spacer_2x"
+            android:layout_weight="1"
+            android:orientation="vertical">
+
+            <TextView
+                android:id="@+id/accountName"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:ellipsize="middle"
+                android:singleLine="true"
+                android:textAppearance="?attr/textAppearanceListItem"
+                tools:text="@tools:sample/full_names" />
+
+            <TextView
+                android:id="@+id/accountHost"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:ellipsize="middle"
+                android:singleLine="true"
+                android:textAppearance="?attr/textAppearanceListItemSecondary"
+                tools:text="@tools:sample/full_names" />
+        </LinearLayout>
 
         <androidx.appcompat.widget.AppCompatImageView
-            android:id="@+id/accountItemAvatar"
-            android:layout_width="@dimen/avatar_size"
-            android:layout_height="@dimen/avatar_size"
+            android:id="@+id/delete"
+            android:layout_width="36dp"
+            android:layout_height="36dp"
+            android:background="?attr/selectableItemBackgroundBorderless"
             android:contentDescription="@null"
             android:focusable="false"
             android:scaleType="center"
-            app:srcCompat="@drawable/ic_account_circle_grey_24dp" />
-
-        <androidx.appcompat.widget.AppCompatImageView
-            android:id="@+id/currentAccountIndicator"
-            android:layout_width="12dp"
-            android:layout_height="12dp"
-            android:layout_gravity="end|bottom"
             android:visibility="gone"
-            app:srcCompat="@drawable/check"
+            app:srcCompat="@drawable/ic_delete_grey600_24dp"
             tools:visibility="visible" />
-    </FrameLayout>
-
-    <LinearLayout
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/spacer_1x"
-        android:layout_marginEnd="@dimen/spacer_2x"
-        android:layout_weight="1"
-        android:orientation="vertical">
-
-        <TextView
-            android:id="@+id/accountName"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:ellipsize="middle"
-            android:singleLine="true"
-            android:textAppearance="?attr/textAppearanceListItem"
-            tools:text="@tools:sample/full_names" />
-
-        <TextView
-            android:id="@+id/accountHost"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:ellipsize="middle"
-            android:singleLine="true"
-            android:textAppearance="?attr/textAppearanceListItemSecondary"
-            tools:text="@tools:sample/full_names" />
     </LinearLayout>
-
-    <androidx.appcompat.widget.AppCompatImageView
-        android:id="@+id/delete"
-        android:layout_width="36dp"
-        android:layout_height="36dp"
-        android:background="?attr/selectableItemBackgroundBorderless"
-        android:contentDescription="@null"
-        android:focusable="false"
-        android:scaleType="center"
-        android:visibility="gone"
-        app:srcCompat="@drawable/ic_delete_grey600_24dp"
-        tools:visibility="visible" />
-</LinearLayout>
+</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_notes_list_note_item_with_excerpt.xml b/app/src/main/res/layout/item_notes_list_note_item_with_excerpt.xml
index 0798b954e..966f4b66b 100644
--- a/app/src/main/res/layout/item_notes_list_note_item_with_excerpt.xml
+++ b/app/src/main/res/layout/item_notes_list_note_item_with_excerpt.xml
@@ -31,7 +31,7 @@
         android:layout_height="wrap_content"
         android:background="@drawable/list_item_background_selector"
         android:baselineAligned="false"
-        android:paddingStart="@dimen/activity_padding"
+        android:paddingStart="@dimen/spacer_activity_sides"
         android:paddingEnd="@null">
 
         <FrameLayout
diff --git a/app/src/main/res/layout/item_notes_list_note_item_without_excerpt.xml b/app/src/main/res/layout/item_notes_list_note_item_without_excerpt.xml
index a48b0e050..91232a015 100644
--- a/app/src/main/res/layout/item_notes_list_note_item_without_excerpt.xml
+++ b/app/src/main/res/layout/item_notes_list_note_item_without_excerpt.xml
@@ -32,7 +32,7 @@
         android:background="@drawable/list_item_background_selector"
         android:baselineAligned="false"
         android:gravity="center_vertical"
-        android:paddingStart="@dimen/activity_padding"
+        android:paddingStart="@dimen/spacer_activity_sides"
         android:paddingEnd="@null">
 
         <FrameLayout
diff --git a/app/src/main/res/layout/item_pref.xml b/app/src/main/res/layout/item_pref.xml
index 0d100ce0f..1d84737b7 100644
--- a/app/src/main/res/layout/item_pref.xml
+++ b/app/src/main/res/layout/item_pref.xml
@@ -4,8 +4,8 @@
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
     android:gravity="center_vertical"
-    android:paddingStart="@dimen/activity_padding"
-    android:paddingEnd="@dimen/activity_padding"
+    android:paddingStart="@dimen/spacer_activity_sides"
+    android:paddingEnd="@dimen/spacer_activity_sides"
     android:minHeight="?android:attr/listPreferredItemHeight">
 
     <ImageView
diff --git a/app/src/main/res/layout/item_preference_category.xml b/app/src/main/res/layout/item_preference_category.xml
index 4a7191051..e2cf38895 100644
--- a/app/src/main/res/layout/item_preference_category.xml
+++ b/app/src/main/res/layout/item_preference_category.xml
@@ -6,7 +6,7 @@
     android:layout_height="wrap_content"
     android:layout_marginStart="56dp"
     android:layout_marginEnd="0dp"
-    android:paddingStart="@dimen/activity_padding"
+    android:paddingStart="@dimen/spacer_activity_sides"
     android:paddingTop="@dimen/spacer_3x"
     android:paddingEnd="0dp"
     tools:text="@tools:sample/lorem" />
diff --git a/app/src/main/res/values-w360dp/dimens.xml b/app/src/main/res/values-w360dp/dimens.xml
new file mode 100644
index 000000000..f37b40669
--- /dev/null
+++ b/app/src/main/res/values-w360dp/dimens.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="spacer_activity_sides">@dimen/spacer_1x</dimen>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index eb001ec1f..1ca57c54a 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -11,7 +11,7 @@
 
     <dimen name="avatar_size">36dp</dimen>
 
-    <dimen name="activity_padding">@dimen/spacer_1x</dimen>
+    <dimen name="spacer_activity_sides">0dp</dimen>
 
     <!-- Drawer header -->
     <dimen name="drawer_header_height">100dp</dimen>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index a50e3a180..c19baa08d 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -20,8 +20,8 @@
     </style>
 
     <style name="appBarLayoutStyle" parent="@style/Widget.Design.AppBarLayout">
-        <item name="android:paddingStart">@dimen/activity_padding</item>
-        <item name="android:paddingEnd">@dimen/activity_padding</item>
+        <item name="android:paddingStart">@dimen/spacer_activity_sides</item>
+        <item name="android:paddingEnd">@dimen/spacer_activity_sides</item>
     </style>
 
     <style name="toolbarStyle" parent="@style/Widget.AppCompat.Toolbar">
@@ -29,8 +29,8 @@
     </style>
 
     <style name="actionModeStyle" parent="@style/Widget.AppCompat.ActionMode">
-        <item name="android:paddingStart">@dimen/activity_padding</item>
-        <item name="android:paddingEnd">@dimen/activity_padding</item>
+        <item name="android:paddingStart">@dimen/spacer_activity_sides</item>
+        <item name="android:paddingEnd">@dimen/spacer_activity_sides</item>
     </style>
 
     <style name="fab">