diff --git a/app/src/main/res/layout-land/activity_login.xml b/app/src/main/res/layout-land/activity_login.xml
index 7265ba671..9ecaf9855 100644
--- a/app/src/main/res/layout-land/activity_login.xml
+++ b/app/src/main/res/layout-land/activity_login.xml
@@ -8,17 +8,17 @@
         android:layout_width="400sp"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
-        android:layout_marginTop="8dp">
+        android:layout_marginTop="@dimen/small_gap">
 
         <android.support.v7.widget.CardView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="32dp"
-            android:layout_marginBottom="16dp"
-            android:layout_marginEnd="16dp"
-            android:layout_marginLeft="16dp"
-            android:layout_marginRight="16dp"
-            android:layout_marginStart="16dp"
+            android:layout_marginTop="@dimen/large_gap"
+            android:layout_marginBottom="@dimen/standard_gap"
+            android:layout_marginEnd="@dimen/standard_gap"
+            android:layout_marginLeft="@dimen/standard_gap"
+            android:layout_marginRight="@dimen/standard_gap"
+            android:layout_marginStart="@dimen/standard_gap"
             app:cardCornerRadius="4dp"
             app:cardElevation="4dp">
 
@@ -34,11 +34,11 @@
                     android:layout_height="wrap_content"
                     android:background="@color/primaryColor"
                     android:gravity="center"
-                    android:paddingBottom="32dp"
-                    android:paddingTop="32dp"
+                    android:paddingBottom="@dimen/large_gap"
+                    android:paddingTop="@dimen/large_gap"
                     android:text="@string/login_to_your_account"
                     android:textColor="@android:color/white"
-                    android:textSize="24sp" />
+                    android:textSize="@dimen/heading_text_size" />
 
                 <FrameLayout
                     android:id="@+id/error_message_container"
@@ -52,12 +52,12 @@
                         android:id="@+id/error_message"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_marginEnd="16dp"
-                        android:layout_marginLeft="16dp"
-                        android:layout_marginRight="16dp"
-                        android:layout_marginStart="16dp"
-                        android:paddingBottom="8dp"
-                        android:paddingTop="8dp"
+                        android:layout_marginEnd="@dimen/standard_gap"
+                        android:layout_marginLeft="@dimen/standard_gap"
+                        android:layout_marginRight="@dimen/standard_gap"
+                        android:layout_marginStart="@dimen/standard_gap"
+                        android:paddingBottom="@dimen/small_gap"
+                        android:paddingTop="@dimen/small_gap"
                         android:textColor="@color/secondaryDarkColor"
                         tools:text="Check your password, something doesnt look right" />
                 </FrameLayout>
@@ -67,12 +67,12 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_below="@id/error_message_container"
-                    android:layout_marginBottom="16dp"
-                    android:layout_marginEnd="16dp"
-                    android:layout_marginLeft="16dp"
-                    android:layout_marginRight="16dp"
-                    android:layout_marginStart="16dp"
-                    android:layout_marginTop="16dp">
+                    android:layout_marginBottom="@dimen/standard_gap"
+                    android:layout_marginEnd="@dimen/standard_gap"
+                    android:layout_marginLeft="@dimen/standard_gap"
+                    android:layout_marginRight="@dimen/standard_gap"
+                    android:layout_marginStart="@dimen/standard_gap"
+                    android:layout_marginTop="@dimen/standard_gap">
 
                     <android.support.design.widget.TextInputEditText
                         android:id="@+id/loginUsername"
@@ -93,11 +93,11 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_below="@id/username_container"
-                    android:layout_marginBottom="16dp"
-                    android:layout_marginEnd="16dp"
-                    android:layout_marginLeft="16dp"
-                    android:layout_marginRight="16dp"
-                    android:layout_marginStart="16dp"
+                    android:layout_marginBottom="@dimen/standard_gap"
+                    android:layout_marginEnd="@dimen/standard_gap"
+                    android:layout_marginLeft="@dimen/standard_gap"
+                    android:layout_marginRight="@dimen/standard_gap"
+                    android:layout_marginStart="@dimen/standard_gap"
                     app:passwordToggleEnabled="false">
 
                     <android.support.design.widget.TextInputEditText
@@ -115,11 +115,11 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_below="@id/password_container"
-                    android:layout_marginBottom="16dp"
-                    android:layout_marginEnd="16dp"
-                    android:layout_marginLeft="16dp"
-                    android:layout_marginRight="16dp"
-                    android:layout_marginStart="16dp"
+                    android:layout_marginBottom="@dimen/standard_gap"
+                    android:layout_marginEnd="@dimen/standard_gap"
+                    android:layout_marginLeft="@dimen/standard_gap"
+                    android:layout_marginRight="@dimen/standard_gap"
+                    android:layout_marginStart="@dimen/standard_gap"
                     android:visibility="gone"
                     app:passwordToggleEnabled="false"
                     tools:visibility="visible">
@@ -141,11 +141,11 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_below="@id/two_factor_container"
-                    android:layout_marginBottom="16dp"
-                    android:layout_marginEnd="16dp"
-                    android:layout_marginLeft="16dp"
-                    android:layout_marginRight="16dp"
-                    android:layout_marginStart="16dp">
+                    android:layout_marginBottom="@dimen/standard_gap"
+                    android:layout_marginEnd="@dimen/standard_gap"
+                    android:layout_marginLeft="@dimen/standard_gap"
+                    android:layout_marginRight="@dimen/standard_gap"
+                    android:layout_marginStart="@dimen/standard_gap">
 
                     <Button
                         android:id="@+id/signupButton"
@@ -153,8 +153,8 @@
                         style="@style/Widget.AppCompat.Button.Borderless.Colored"
                         android:layout_height="wrap_content"
                         android:layout_gravity="center_horizontal"
-                        android:layout_marginEnd="8dp"
-                        android:layout_marginRight="8dp"
+                        android:layout_marginEnd="@dimen/small_gap"
+                        android:layout_marginRight="@dimen/small_gap"
                         android:layout_weight="1"
                         android:text="@string/signup" />
 
@@ -163,35 +163,24 @@
                         android:layout_width="0dp"
                         style="@style/Widget.AppCompat.Button.Colored"
                         android:layout_height="wrap_content"
-                        android:layout_marginLeft="8dp"
-                        android:layout_marginStart="8dp"
+                        android:layout_marginLeft="@dimen/small_gap"
+                        android:layout_marginStart="@dimen/small_gap"
                         android:layout_weight="1"
                         android:enabled="false"
                         android:text="@string/login" />
 
                 </LinearLayout>
 
-                <RelativeLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
+                <fr.free.nrw.commons.ui.widget.HtmlTextView
+                    android:id="@+id/about_privacy_policy"
+                    style="?android:textAppearanceSmall"
                     android:layout_below="@id/buttonFrame"
-                    android:layout_marginBottom="16dp"
-                    android:layout_marginEnd="16dp"
-                    android:layout_marginLeft="16dp"
-                    android:layout_marginRight="16dp"
-                    android:layout_marginStart="16dp">
-
-                    <fr.free.nrw.commons.ui.widget.HtmlTextView
-                        android:id="@+id/about_privacy_policy"
-                        style="?android:textAppearanceSmall"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="16dp"
-                        android:layout_gravity="center_horizontal"
-                        android:text="@string/about_privacy_policy"
-                        android:layout_centerHorizontal="true"/>
-
-                </RelativeLayout>
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="@dimen/standard_gap"
+                    android:layout_gravity="center_horizontal"
+                    android:text="@string/about_privacy_policy"
+                    android:layout_centerHorizontal="true"/>
 
             </RelativeLayout>
         </android.support.v7.widget.CardView>
diff --git a/app/src/main/res/layout-land/welcome_do_upload.xml b/app/src/main/res/layout-land/welcome_do_upload.xml
index e5c7bb3fb..1f02c3183 100644
--- a/app/src/main/res/layout-land/welcome_do_upload.xml
+++ b/app/src/main/res/layout-land/welcome_do_upload.xml
@@ -5,16 +5,15 @@
               android:layout_width="match_parent"
               android:layout_height="match_parent"
               android:background="#0c609c"
-              android:gravity="center"
-        >
+              android:gravity="center">
 
 
     <GridLayout
         android:layout_width="300dp"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
-        android:layout_marginLeft="10dp"
-        android:layout_marginRight="10dp"
+        android:layout_marginEnd="@dimen/standard_gap"
+        android:layout_marginRight="@dimen/standard_gap"
         android:columnCount="2"
         >
 
@@ -69,8 +68,8 @@
                 android:text="@string/tutorial_2_text"
                 android:layout_gravity="center"
                 android:textStyle="bold"
+                android:textSize="@dimen/normal_text"
                 android:textAlignment="center"
-                android:paddingTop="24dp"
                 android:gravity="center_horizontal"
                 android:textColor="@android:color/white"/>
 
@@ -81,7 +80,7 @@
                 android:text="@string/tutorial_2_subtext"
                 android:layout_gravity="center"
                 android:textAlignment="textStart"
-                android:paddingTop="16dp"
+                android:paddingTop="@dimen/standard_gap"
                 android:gravity="start"
                 android:textColor="@android:color/white"
             />
diff --git a/app/src/main/res/layout-land/welcome_dont_upload.xml b/app/src/main/res/layout-land/welcome_dont_upload.xml
index 7ac63e560..1d4d0db80 100644
--- a/app/src/main/res/layout-land/welcome_dont_upload.xml
+++ b/app/src/main/res/layout-land/welcome_dont_upload.xml
@@ -12,24 +12,25 @@
         android:layout_gravity="center"
         android:layout_width="240dp"
         android:layout_height="wrap_content"
-        android:layout_marginRight="10dp"
-        android:layout_marginLeft="10dp"
+        android:layout_marginEnd="@dimen/standard_gap"
+        android:layout_marginRight="@dimen/standard_gap"
         >
 
         <ImageView
             android:src="@drawable/selfie_x"
             android:id="@+id/selfie_x"
             android:layout_width="110dp"
-            android:layout_height="wrap_content"
+            android:layout_height="match_parent"
             android:contentDescription="@string/welcome_image_no_selfies"
             />
 
         <ImageView
             android:src="@drawable/proprietary_x"
             android:id="@+id/proprietary_x"
-            android:layout_marginLeft="10dp"
+            android:layout_marginStart="@dimen/standard_gap"
+            android:layout_marginLeft="@dimen/standard_gap"
             android:layout_width="110dp"
-            android:layout_height="wrap_content"
+            android:layout_height="match_parent"
             android:layout_toRightOf="@+id/selfie_x"
             android:contentDescription="@string/welcome_image_proprietary"
             />
@@ -50,7 +51,7 @@
             android:layout_gravity="center"
             android:textStyle="bold"
             android:textAlignment="center"
-            android:paddingTop="24dp"
+            android:textSize="@dimen/normal_text"
             android:gravity="center_horizontal"
             android:textColor="@android:color/white"/>
 
@@ -61,7 +62,7 @@
             android:text="@string/tutorial_3_subtext"
             android:layout_gravity="center"
             android:textAlignment="textStart"
-            android:paddingTop="16dp"
+            android:paddingTop="@dimen/standard_gap"
             android:gravity="start"
             android:textColor="@android:color/white"
             />
diff --git a/app/src/main/res/layout-land/welcome_final.xml b/app/src/main/res/layout-land/welcome_final.xml
index a9d8c01af..0b99b481f 100644
--- a/app/src/main/res/layout-land/welcome_final.xml
+++ b/app/src/main/res/layout-land/welcome_final.xml
@@ -43,14 +43,15 @@
                 android:text="@string/welcome_final_text"
                 android:layout_gravity="center"
                 android:textStyle="bold"
+                android:textSize="@dimen/normal_text"
                 android:textAlignment="center"
                 android:gravity="center_horizontal"
                 android:textColor="@android:color/white"/>
 
         <Button
                 android:layout_width="120dp"
-                android:layout_height="40dp"
-                android:layout_marginTop="16dp"
+                android:layout_height="@dimen/overflow_button_dimen"
+                android:layout_marginTop="@dimen/standard_gap"
                 android:text="@string/welcome_final_button_text"
                 android:id="@+id/welcomeYesButton"
                 android:layout_gravity="center"
diff --git a/app/src/main/res/layout-land/welcome_image_details.xml b/app/src/main/res/layout-land/welcome_image_details.xml
index a5ae1a762..d112292a1 100644
--- a/app/src/main/res/layout-land/welcome_image_details.xml
+++ b/app/src/main/res/layout-land/welcome_image_details.xml
@@ -12,10 +12,10 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:src="@drawable/sydney_opera_house"
-        android:paddingLeft="24dp"
-        android:paddingRight="24dp"
-        android:paddingTop="24dp"
-        android:paddingBottom="24dp"
+        android:paddingLeft="@dimen/large_gap"
+        android:paddingRight="@dimen/standard_gap"
+        android:paddingTop="@dimen/large_gap"
+        android:paddingBottom="@dimen/large_gap"
         android:adjustViewBounds="true"
         android:layout_gravity="center"
         android:contentDescription="@string/welcome_image_sydney_opera_house"
@@ -34,7 +34,7 @@
             android:layout_gravity="center"
             android:textStyle="bold"
             android:textAlignment="center"
-            android:paddingTop="24dp"
+            android:textSize="@dimen/normal_text"
             android:gravity="center_horizontal"
             android:textColor="@android:color/white"/>
 
@@ -45,7 +45,7 @@
             android:text="@string/tutorial_4_subtext"
             android:layout_gravity="center"
             android:textAlignment="textStart"
-            android:paddingTop="16dp"
+            android:paddingTop="@dimen/standard_gap"
             android:gravity="start"
             android:textColor="@android:color/white"
             />
diff --git a/app/src/main/res/layout-land/welcome_wikipedia.xml b/app/src/main/res/layout-land/welcome_wikipedia.xml
index 1a1531f4c..b4fbe9048 100644
--- a/app/src/main/res/layout-land/welcome_wikipedia.xml
+++ b/app/src/main/res/layout-land/welcome_wikipedia.xml
@@ -13,6 +13,8 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center"
             android:src="@drawable/welcome_wikipedia"
+            android:layout_marginEnd="@dimen/standard_gap"
+            android:layout_marginRight="@dimen/standard_gap"
             android:adjustViewBounds="true"
             android:contentDescription="@string/welcome_image_welcome_wikipedia"
         />
@@ -29,8 +31,8 @@
                 android:text="@string/tutorial_1_text"
                 android:layout_gravity="center"
                 android:textStyle="bold"
+                android:textSize="@dimen/normal_text"
                 android:textAlignment="center"
-                android:paddingTop="24dp"
                 android:gravity="center_horizontal"
                 android:textColor="@android:color/white"/>
 
@@ -41,7 +43,7 @@
                 android:text="@string/tutorial_1_subtext"
                 android:layout_gravity="center"
                 android:textAlignment="center"
-                android:paddingTop="16dp"
+                android:paddingTop="@dimen/standard_gap"
                 android:gravity="center_horizontal"
                 android:textColor="@android:color/white"
             />
diff --git a/app/src/main/res/layout-xlarge/activity_login.xml b/app/src/main/res/layout-xlarge/activity_login.xml
index 90bef2423..32cd47451 100644
--- a/app/src/main/res/layout-xlarge/activity_login.xml
+++ b/app/src/main/res/layout-xlarge/activity_login.xml
@@ -8,17 +8,17 @@
         android:layout_width="400sp"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
-        android:layout_marginTop="8dp">
+        android:layout_marginTop="@dimen/small_gap">
 
         <android.support.v7.widget.CardView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="32dp"
-            android:layout_marginBottom="16dp"
-            android:layout_marginEnd="16dp"
-            android:layout_marginLeft="16dp"
-            android:layout_marginRight="16dp"
-            android:layout_marginStart="16dp"
+            android:layout_marginTop="@dimen/large_gap"
+            android:layout_marginBottom="@dimen/standard_gap"
+            android:layout_marginEnd="@dimen/standard_gap"
+            android:layout_marginLeft="@dimen/standard_gap"
+            android:layout_marginRight="@dimen/standard_gap"
+            android:layout_marginStart="@dimen/standard_gap"
             app:cardCornerRadius="4dp"
             app:cardElevation="4dp">
 
@@ -34,11 +34,11 @@
                     android:layout_height="wrap_content"
                     android:background="@color/primaryColor"
                     android:gravity="center"
-                    android:paddingBottom="32dp"
-                    android:paddingTop="32dp"
+                    android:paddingBottom="@dimen/large_gap"
+                    android:paddingTop="@dimen/large_gap"
                     android:text="@string/login_to_your_account"
                     android:textColor="@android:color/white"
-                    android:textSize="24sp" />
+                    android:textSize="@dimen/heading_text_size" />
 
                 <FrameLayout
                     android:id="@+id/error_message_container"
@@ -52,12 +52,12 @@
                         android:id="@+id/error_message"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_marginEnd="16dp"
-                        android:layout_marginLeft="16dp"
-                        android:layout_marginRight="16dp"
-                        android:layout_marginStart="16dp"
-                        android:paddingBottom="8dp"
-                        android:paddingTop="8dp"
+                        android:layout_marginEnd="@dimen/standard_gap"
+                        android:layout_marginLeft="@dimen/standard_gap"
+                        android:layout_marginRight="@dimen/standard_gap"
+                        android:layout_marginStart="@dimen/standard_gap"
+                        android:paddingBottom="@dimen/small_gap"
+                        android:paddingTop="@dimen/small_gap"
                         android:textColor="@color/secondaryDarkColor"
                         tools:text="Check your password, something doesnt look right" />
                 </FrameLayout>
@@ -67,12 +67,12 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_below="@id/error_message_container"
-                    android:layout_marginBottom="16dp"
-                    android:layout_marginEnd="16dp"
-                    android:layout_marginLeft="16dp"
-                    android:layout_marginRight="16dp"
-                    android:layout_marginStart="16dp"
-                    android:layout_marginTop="16dp">
+                    android:layout_marginBottom="@dimen/standard_gap"
+                    android:layout_marginEnd="@dimen/standard_gap"
+                    android:layout_marginLeft="@dimen/standard_gap"
+                    android:layout_marginRight="@dimen/standard_gap"
+                    android:layout_marginStart="@dimen/standard_gap"
+                    android:layout_marginTop="@dimen/standard_gap">
 
                     <android.support.design.widget.TextInputEditText
                         android:id="@+id/loginUsername"
@@ -93,11 +93,11 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_below="@id/username_container"
-                    android:layout_marginBottom="16dp"
-                    android:layout_marginEnd="16dp"
-                    android:layout_marginLeft="16dp"
-                    android:layout_marginRight="16dp"
-                    android:layout_marginStart="16dp"
+                    android:layout_marginBottom="@dimen/standard_gap"
+                    android:layout_marginEnd="@dimen/standard_gap"
+                    android:layout_marginLeft="@dimen/standard_gap"
+                    android:layout_marginRight="@dimen/standard_gap"
+                    android:layout_marginStart="@dimen/standard_gap"
                     app:passwordToggleEnabled="false">
 
                     <android.support.design.widget.TextInputEditText
@@ -115,11 +115,11 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_below="@id/password_container"
-                    android:layout_marginBottom="16dp"
-                    android:layout_marginEnd="16dp"
-                    android:layout_marginLeft="16dp"
-                    android:layout_marginRight="16dp"
-                    android:layout_marginStart="16dp"
+                    android:layout_marginBottom="@dimen/standard_gap"
+                    android:layout_marginEnd="@dimen/standard_gap"
+                    android:layout_marginLeft="@dimen/standard_gap"
+                    android:layout_marginRight="@dimen/standard_gap"
+                    android:layout_marginStart="@dimen/standard_gap"
                     android:visibility="gone"
                     app:passwordToggleEnabled="false"
                     tools:visibility="visible">
@@ -141,11 +141,11 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_below="@id/two_factor_container"
-                    android:layout_marginBottom="16dp"
-                    android:layout_marginEnd="16dp"
-                    android:layout_marginLeft="16dp"
-                    android:layout_marginRight="16dp"
-                    android:layout_marginStart="16dp">
+                    android:layout_marginBottom="@dimen/standard_gap"
+                    android:layout_marginEnd="@dimen/standard_gap"
+                    android:layout_marginLeft="@dimen/standard_gap"
+                    android:layout_marginRight="@dimen/standard_gap"
+                    android:layout_marginStart="@dimen/standard_gap">
 
                     <Button
                         android:id="@+id/signupButton"
@@ -153,8 +153,8 @@
                         style="@style/Widget.AppCompat.Button.Borderless.Colored"
                         android:layout_height="wrap_content"
                         android:layout_gravity="center_horizontal"
-                        android:layout_marginEnd="8dp"
-                        android:layout_marginRight="8dp"
+                        android:layout_marginEnd="@dimen/small_gap"
+                        android:layout_marginRight="@dimen/small_gap"
                         android:layout_weight="1"
                         android:text="@string/signup" />
 
@@ -163,35 +163,24 @@
                         android:layout_width="0dp"
                         style="@style/Widget.AppCompat.Button.Colored"
                         android:layout_height="wrap_content"
-                        android:layout_marginLeft="8dp"
-                        android:layout_marginStart="8dp"
+                        android:layout_marginLeft="@dimen/small_gap"
+                        android:layout_marginStart="@dimen/small_gap"
                         android:layout_weight="1"
                         android:enabled="false"
                         android:text="@string/login" />
 
                 </LinearLayout>
 
-                <RelativeLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
+                <fr.free.nrw.commons.ui.widget.HtmlTextView
+                    android:id="@+id/about_privacy_policy"
+                    style="?android:textAppearanceSmall"
                     android:layout_below="@id/buttonFrame"
-                    android:layout_marginBottom="16dp"
-                    android:layout_marginEnd="16dp"
-                    android:layout_marginLeft="16dp"
-                    android:layout_marginRight="16dp"
-                    android:layout_marginStart="16dp">
-
-                    <fr.free.nrw.commons.ui.widget.HtmlTextView
-                        android:id="@+id/about_privacy_policy"
-                        style="?android:textAppearanceSmall"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="16dp"
-                        android:layout_gravity="center_horizontal"
-                        android:text="@string/about_privacy_policy"
-                        android:layout_centerHorizontal="true"/>
-
-                </RelativeLayout>
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginBottom="@dimen/standard_gap"
+                    android:layout_gravity="center_horizontal"
+                    android:text="@string/about_privacy_policy"
+                    android:layout_centerHorizontal="true"/>
 
             </RelativeLayout>
         </android.support.v7.widget.CardView>
diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml
index 89049d10d..bbbced3e9 100644
--- a/app/src/main/res/layout/activity_about.xml
+++ b/app/src/main/res/layout/activity_about.xml
@@ -15,12 +15,14 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content" />
 
-        <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_below="@id/toolbar"
-            android:layout_marginLeft="12dp"
-            android:layout_marginRight="12dp"
+            android:layout_marginLeft="@dimen/activity_margin_horizontal"
+            android:layout_marginStart="@dimen/activity_margin_horizontal"
+            android:layout_marginRight="@dimen/activity_margin_horizontal"
+            android:layout_marginEnd="@dimen/activity_margin_horizontal"
             android:gravity="center"
             android:orientation="vertical">
 
@@ -47,7 +49,7 @@
                 style="?android:textAppearanceSmall"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="16dp"
+                android:layout_marginTop="@dimen/standard_gap"
                 android:gravity="center"
                 android:text="@string/about_license" />
 
@@ -56,7 +58,7 @@
                 style="?android:textAppearanceSmall"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="8dp"
+                android:layout_marginTop="@dimen/small_gap"
                 android:gravity="center"
                 android:text="@string/about_improve" />
 
@@ -65,7 +67,7 @@
                 style="?android:textAppearanceSmall"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="16dp"
+                android:layout_marginTop="@dimen/standard_gap"
                 android:gravity="center"
                 android:text="@string/about_privacy_policy" />
 
@@ -74,7 +76,7 @@
                 style="?android:textAppearanceSmall"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="16dp"
+                android:layout_marginTop="@dimen/standard_gap"
                 android:gravity="center"
                 android:text="@string/about_credits" />
 
@@ -83,7 +85,7 @@
                 style="?android:textAppearanceSmall"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="32dp"
+                android:layout_marginTop="@dimen/large_gap"
                 android:alpha="0.2"
                 android:gravity="center" />
 
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index b1bc7152d..278e3464f 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -8,17 +8,17 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
-        android:layout_marginTop="8dp">
+        android:layout_marginTop="@dimen/small_gap">
 
         <android.support.v7.widget.CardView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="16dp"
-            android:layout_marginEnd="16dp"
-            android:layout_marginLeft="16dp"
-            android:layout_marginRight="16dp"
-            android:layout_marginStart="16dp"
-            android:layout_marginTop="32dp"
+            android:layout_marginBottom="@dimen/standard_gap"
+            android:layout_marginEnd="@dimen/standard_gap"
+            android:layout_marginLeft="@dimen/standard_gap"
+            android:layout_marginRight="@dimen/standard_gap"
+            android:layout_marginStart="@dimen/standard_gap"
+            android:layout_marginTop="@dimen/large_gap"
             app:cardCornerRadius="4dp"
             app:cardElevation="4dp">
 
@@ -34,11 +34,11 @@
                     android:layout_height="wrap_content"
                     android:background="@color/primaryColor"
                     android:gravity="center"
-                    android:paddingBottom="32dp"
-                    android:paddingTop="32dp"
+                    android:paddingBottom="@dimen/large_gap"
+                    android:paddingTop="@dimen/large_gap"
                     android:text="@string/login_to_your_account"
                     android:textColor="@android:color/white"
-                    android:textSize="24sp" />
+                    android:textSize="@dimen/heading_text_size" />
 
                 <FrameLayout
                     android:id="@+id/error_message_container"
@@ -52,12 +52,12 @@
                         android:id="@+id/error_message"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_marginEnd="16dp"
-                        android:layout_marginLeft="16dp"
-                        android:layout_marginRight="16dp"
-                        android:layout_marginStart="16dp"
-                        android:paddingBottom="8dp"
-                        android:paddingTop="8dp"
+                        android:layout_marginEnd="@dimen/standard_gap"
+                        android:layout_marginLeft="@dimen/standard_gap"
+                        android:layout_marginRight="@dimen/standard_gap"
+                        android:layout_marginStart="@dimen/standard_gap"
+                        android:paddingBottom="@dimen/small_gap"
+                        android:paddingTop="@dimen/small_gap"
                         android:textColor="@color/secondaryDarkColor"
                         tools:text="Check your password, something doesnt look right" />
                 </FrameLayout>
@@ -67,12 +67,12 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_below="@id/error_message_container"
-                    android:layout_marginBottom="16dp"
-                    android:layout_marginEnd="16dp"
-                    android:layout_marginLeft="16dp"
-                    android:layout_marginRight="16dp"
-                    android:layout_marginStart="16dp"
-                    android:layout_marginTop="16dp">
+                    android:layout_marginBottom="@dimen/standard_gap"
+                    android:layout_marginEnd="@dimen/standard_gap"
+                    android:layout_marginLeft="@dimen/standard_gap"
+                    android:layout_marginRight="@dimen/standard_gap"
+                    android:layout_marginStart="@dimen/standard_gap"
+                    android:layout_marginTop="@dimen/standard_gap">
 
                     <android.support.design.widget.TextInputEditText
                         android:id="@+id/loginUsername"
@@ -93,11 +93,11 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_below="@id/username_container"
-                    android:layout_marginBottom="16dp"
-                    android:layout_marginEnd="16dp"
-                    android:layout_marginLeft="16dp"
-                    android:layout_marginRight="16dp"
-                    android:layout_marginStart="16dp"
+                    android:layout_marginBottom="@dimen/standard_gap"
+                    android:layout_marginEnd="@dimen/standard_gap"
+                    android:layout_marginLeft="@dimen/standard_gap"
+                    android:layout_marginRight="@dimen/standard_gap"
+                    android:layout_marginStart="@dimen/standard_gap"
                     app:passwordToggleEnabled="false">
 
                     <android.support.design.widget.TextInputEditText
@@ -115,11 +115,11 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_below="@id/password_container"
-                    android:layout_marginBottom="16dp"
-                    android:layout_marginEnd="16dp"
-                    android:layout_marginLeft="16dp"
-                    android:layout_marginRight="16dp"
-                    android:layout_marginStart="16dp"
+                    android:layout_marginBottom="@dimen/standard_gap"
+                    android:layout_marginEnd="@dimen/standard_gap"
+                    android:layout_marginLeft="@dimen/standard_gap"
+                    android:layout_marginRight="@dimen/standard_gap"
+                    android:layout_marginStart="@dimen/standard_gap"
                     android:visibility="gone"
                     app:passwordToggleEnabled="false"
                     tools:visibility="visible">
@@ -141,11 +141,11 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_below="@id/two_factor_container"
-                    android:layout_marginBottom="16dp"
-                    android:layout_marginEnd="16dp"
-                    android:layout_marginLeft="16dp"
-                    android:layout_marginRight="16dp"
-                    android:layout_marginStart="16dp">
+                    android:layout_marginBottom="@dimen/standard_gap"
+                    android:layout_marginEnd="@dimen/standard_gap"
+                    android:layout_marginLeft="@dimen/standard_gap"
+                    android:layout_marginRight="@dimen/standard_gap"
+                    android:layout_marginStart="@dimen/standard_gap">
 
                     <Button
                         android:id="@+id/signupButton"
@@ -153,8 +153,8 @@
                         style="@style/Widget.AppCompat.Button.Borderless.Colored"
                         android:layout_height="wrap_content"
                         android:layout_gravity="center_horizontal"
-                        android:layout_marginEnd="8dp"
-                        android:layout_marginRight="8dp"
+                        android:layout_marginEnd="@dimen/small_gap"
+                        android:layout_marginRight="@dimen/small_gap"
                         android:layout_weight="1"
                         android:text="@string/signup" />
 
@@ -163,35 +163,24 @@
                         android:layout_width="0dp"
                         style="@style/Widget.AppCompat.Button.Colored"
                         android:layout_height="wrap_content"
-                        android:layout_marginLeft="8dp"
-                        android:layout_marginStart="8dp"
+                        android:layout_marginLeft="@dimen/small_gap"
+                        android:layout_marginStart="@dimen/small_gap"
                         android:layout_weight="1"
                         android:enabled="false"
                         android:text="@string/login" />
 
                 </LinearLayout>
 
-                <RelativeLayout
-                    android:layout_width="match_parent"
+                <fr.free.nrw.commons.ui.widget.HtmlTextView
+                    android:id="@+id/about_privacy_policy"
+                    style="?android:textAppearanceSmall"
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_below="@id/buttonFrame"
-                    android:layout_marginBottom="16dp"
-                    android:layout_marginEnd="16dp"
-                    android:layout_marginLeft="16dp"
-                    android:layout_marginRight="16dp"
-                    android:layout_marginStart="16dp">
-
-                    <fr.free.nrw.commons.ui.widget.HtmlTextView
-                        android:id="@+id/about_privacy_policy"
-                        style="?android:textAppearanceSmall"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="16dp"
-                        android:layout_gravity="center_horizontal"
-                        android:text="@string/about_privacy_policy"
-                        android:layout_centerHorizontal="true"/>
-
-                </RelativeLayout>
+                    android:layout_centerHorizontal="true"
+                    android:layout_gravity="center_horizontal"
+                    android:layout_marginBottom="@dimen/standard_gap"
+                    android:text="@string/about_privacy_policy" />
 
             </RelativeLayout>
         </android.support.v7.widget.CardView>
diff --git a/app/src/main/res/layout/activity_multiple_uploads.xml b/app/src/main/res/layout/activity_multiple_uploads.xml
index 8095a5dce..115c2cf89 100644
--- a/app/src/main/res/layout/activity_multiple_uploads.xml
+++ b/app/src/main/res/layout/activity_multiple_uploads.xml
@@ -20,7 +20,7 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_below="@id/toolbar"
-            android:orientation="vertical"></FrameLayout>
+            android:orientation="vertical" />
     </RelativeLayout>
 
     <android.support.design.widget.NavigationView
diff --git a/app/src/main/res/layout/activity_nearby.xml b/app/src/main/res/layout/activity_nearby.xml
index 6f74e8a60..726c49fe0 100644
--- a/app/src/main/res/layout/activity_nearby.xml
+++ b/app/src/main/res/layout/activity_nearby.xml
@@ -15,7 +15,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content" />
 
-        <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:orientation="horizontal"
@@ -25,13 +25,12 @@
             <ProgressBar
                 android:id="@+id/progressBar"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_centerInParent="true" />
+                android:layout_height="wrap_content" />
 
             <FrameLayout
                 android:id="@+id/container"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"></FrameLayout>
+                android:layout_height="match_parent" />
 
         </LinearLayout>
     </RelativeLayout>
diff --git a/app/src/main/res/layout/activity_share.xml b/app/src/main/res/layout/activity_share.xml
index a75012077..e915517b5 100644
--- a/app/src/main/res/layout/activity_share.xml
+++ b/app/src/main/res/layout/activity_share.xml
@@ -9,14 +9,13 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-
         <include
             android:id="@+id/toolbar"
             layout="@layout/toolbar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content" />
 
-        <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        <FrameLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_below="@id/toolbar"
diff --git a/app/src/main/res/layout/activity_welcome.xml b/app/src/main/res/layout/activity_welcome.xml
index 34fbbc281..6fa7c7847 100644
--- a/app/src/main/res/layout/activity_welcome.xml
+++ b/app/src/main/res/layout/activity_welcome.xml
@@ -12,7 +12,7 @@
 
     <com.viewpagerindicator.CirclePageIndicator
         android:id="@+id/welcomePagerIndicator"
-        android:layout_height="24dp"
+        android:layout_height="@dimen/half_standard_height"
         android:layout_width="match_parent"
         android:layout_gravity="bottom" />
 
diff --git a/app/src/main/res/layout/detail_category_item.xml b/app/src/main/res/layout/detail_category_item.xml
index 89197db5d..51302fd0d 100644
--- a/app/src/main/res/layout/detail_category_item.xml
+++ b/app/src/main/res/layout/detail_category_item.xml
@@ -13,17 +13,17 @@
         android:background="?attr/subBackground"
         android:foreground="?attr/selectableItemBackground"
         android:gravity="center_vertical"
-        android:minHeight="48dp"
-        android:padding="12dp"
+        android:minHeight="@dimen/overflow_button_dimen"
+        android:padding="@dimen/quarter_standard_height"
         android:textColor="@android:color/white"
-        android:textSize="14sp"
-        app:drawablePadding="6dp"
+        android:textSize="@dimen/description_text_size"
+        app:drawablePadding="@dimen/small_gap"
         app:drawableStart="@drawable/ic_info_outline_white_24dp"
         />
 
     <fr.free.nrw.commons.media.MediaDetailSpacer
         android:layout_width="match_parent"
-        android:layout_height="8dp"
+        android:layout_height="@dimen/small_gap"
         />
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/dialog_nearby_info.xml b/app/src/main/res/layout/dialog_nearby_info.xml
index e34c01c70..4010d3615 100644
--- a/app/src/main/res/layout/dialog_nearby_info.xml
+++ b/app/src/main/res/layout/dialog_nearby_info.xml
@@ -41,16 +41,18 @@
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_vertical"
-                    android:layout_marginLeft="12dp"
-                    android:layout_marginRight="12dp"
+                    android:layout_marginLeft="@dimen/quarter_standard_height"
+                    android:layout_marginRight="@dimen/quarter_standard_height"
+                    android:layout_marginStart="@dimen/quarter_standard_height"
+                    android:layout_marginEnd="@dimen/quarter_standard_height"
                     android:layout_weight="1"
                     android:ellipsize="end"
                     android:fontFamily="serif"
                     android:lineSpacingMultiplier="0.9"
                     android:maxLines="3"
-                    android:paddingBottom="4dp"
+                    android:paddingBottom="@dimen/tiny_gap"
                     android:textColor="@android:color/black"
-                    android:textSize="20sp"
+                    android:textSize="@dimen/subheading_text_size"
                     tools:text="Lorem ipsum" />
 
                 <ImageView
@@ -58,7 +60,7 @@
                     android:layout_width="@dimen/overflow_button_dimen"
                     android:layout_height="@dimen/overflow_button_dimen"
                     android:layout_gravity="center_vertical"
-                    android:padding="12dp"
+                    android:padding="@dimen/quarter_standard_height"
                     android:background="@android:color/white"
                     android:contentDescription="@string/abc_action_menu_overflow_description"
                     app:srcCompat="@drawable/ic_more_vert_white_24dp" />
@@ -67,8 +69,8 @@
             <View
                 android:layout_width="match_parent"
                 android:layout_height="0.5dp"
-                android:layout_marginLeft="16dp"
-                android:layout_marginRight="16dp"
+                android:layout_marginLeft="@dimen/standard_gap"
+                android:layout_marginRight="@dimen/standard_gap"
                 android:background="@android:color/black" />
 
             <TextView
@@ -76,11 +78,11 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:lineSpacingMultiplier="1.3"
-                android:paddingLeft="16dp"
-                android:paddingRight="16dp"
-                android:paddingTop="8dp"
+                android:paddingLeft="@dimen/standard_gap"
+                android:paddingRight="@dimen/standard_gap"
+                android:paddingTop="@dimen/small_gap"
                 android:textIsSelectable="true"
-                android:textSize="16sp"
+                android:textSize="@dimen/normal_text"
                 android:textColor="@android:color/black"
                 tools:text="Lorem ipsum" />
 
@@ -103,9 +105,9 @@
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:paddingBottom="16dp"
-                android:paddingTop="16dp"
-                android:text="GET DIRECTIONS"
+                android:paddingBottom="@dimen/standard_gap"
+                android:paddingTop="@dimen/standard_gap"
+                android:text="@string/get_directions"
                 android:textColor="@android:color/black" />
 
             <TextView
@@ -114,9 +116,9 @@
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:paddingBottom="16dp"
-                android:paddingTop="16dp"
-                android:text="READ ARTICLE"
+                android:paddingBottom="@dimen/standard_gap"
+                android:paddingTop="@dimen/standard_gap"
+                android:text="@string/read_article"
                 android:textColor="@android:color/black" />
 
         </LinearLayout>
diff --git a/app/src/main/res/layout/drawer_header.xml b/app/src/main/res/layout/drawer_header.xml
index c27cab1ba..9bd3ae3a3 100644
--- a/app/src/main/res/layout/drawer_header.xml
+++ b/app/src/main/res/layout/drawer_header.xml
@@ -1,28 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_height="match_parent"
     android:layout_width="match_parent"
     android:background="@android:color/darker_gray">
-<ImageView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/pictureOfTheDay"
-    android:layout_width="match_parent"
-    android:layout_height="172dp"
-    android:background="@android:color/darker_gray"
-    android:paddingLeft="16dp"
-    android:paddingTop="16dp"
-    android:paddingRight="16dp"
-    android:paddingBottom="5dp"
-    android:src="@drawable/commons_logo_large"/>
+
+    <ImageView
+        android:id="@+id/pictureOfTheDay"
+        android:layout_width="match_parent"
+        android:layout_height="172dp"
+        android:background="@android:color/darker_gray"
+        android:paddingLeft="@dimen/standard_gap"
+        android:paddingTop="@dimen/standard_gap"
+        android:paddingRight="@dimen/standard_gap"
+        android:paddingBottom="@dimen/small_gap"
+        android:src="@drawable/commons_logo_large"/>
 
     <TextView
         android:id="@+id/username"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="TextView"
+        tools:text="TextView"
         android:textColor="@color/item_white_background"
-        android:textSize="22sp"
+        android:textSize="@dimen/subheading_text_size"
         android:layout_below="@+id/pictureOfTheDay"
         android:layout_centerHorizontal="true"
-        android:paddingBottom="5dp"/>
+        android:paddingBottom="@dimen/small_gap"/>
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_categorization.xml b/app/src/main/res/layout/fragment_categorization.xml
index 4cdb9604c..880d0d5be 100644
--- a/app/src/main/res/layout/fragment_categorization.xml
+++ b/app/src/main/res/layout/fragment_categorization.xml
@@ -4,12 +4,12 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="?attr/fragmentCategorisationBackground"
-    android:paddingBottom="8dip"
-    android:paddingLeft="16dip"
-    android:paddingStart="16dip"
-    android:paddingRight="16dip"
-    android:paddingEnd="16dip"
-    android:paddingTop="8dip"
+    android:paddingBottom="@dimen/small_gap"
+    android:paddingLeft="@dimen/standard_gap"
+    android:paddingStart="@dimen/standard_gap"
+    android:paddingRight="@dimen/standard_gap"
+    android:paddingEnd="@dimen/standard_gap"
+    android:paddingTop="@dimen/small_gap"
     android:theme="@style/DarkAppTheme"
     >
 
@@ -34,8 +34,8 @@
             android:layout_height="wrap_content"
             android:indeterminate="true"
             android:indeterminateOnly="true"
-            android:layout_marginRight="4dp"
-            android:layout_marginEnd="4dp"
+            android:layout_marginRight="@dimen/tiny_gap"
+            android:layout_marginEnd="@dimen/tiny_gap"
             android:layout_gravity="center_vertical|right|end"
             style="?android:progressBarStyleSmall"
             android:visibility="gone"
@@ -54,7 +54,7 @@
         android:id="@+id/categoriesExplanation"
         android:layout_height="wrap_content"
         android:layout_width="match_parent"
-        android:layout_marginTop="48dp"
+        android:layout_marginTop="@dimen/huge_gap"
         android:gravity="center"
         android:focusable="true"
         android:text="@string/categories_skip_explanation"
diff --git a/app/src/main/res/layout/fragment_media_detail.xml b/app/src/main/res/layout/fragment_media_detail.xml
index 35bcade7a..cffca14c6 100644
--- a/app/src/main/res/layout/fragment_media_detail.xml
+++ b/app/src/main/res/layout/fragment_media_detail.xml
@@ -43,29 +43,29 @@
             <fr.free.nrw.commons.media.MediaDetailSpacer
                 android:id="@+id/mediaDetailSpacer"
                 android:layout_width="match_parent"
-                android:layout_height="16dp" />
+                android:layout_height="@dimen/standard_gap" />
 
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:background="?attr/fragmentCategorisationBackground"
                 android:orientation="vertical"
-                android:padding="16dp">
+                android:padding="@dimen/standard_gap">
 
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:background="?attr/subBackground"
                     android:orientation="vertical"
-                    android:padding="16dp">
+                    android:padding="@dimen/standard_gap">
 
                     <TextView
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:paddingBottom="6dp"
+                        android:paddingBottom="@dimen/tiny_gap"
                         android:text="@string/media_detail_title"
                         android:textColor="@android:color/white"
-                        android:textSize="16sp"
+                        android:textSize="@dimen/normal_text"
                         android:textStyle="bold" />
 
                     <TextView
@@ -74,30 +74,30 @@
                         android:layout_height="wrap_content"
                         android:layout_gravity="start"
                         android:background="?attr/subBackground"
-                        android:padding="12dp"
+                        android:padding="@dimen/small_gap"
                         android:text="@string/media_detail_media_title"
                         android:textColor="@android:color/white"
-                        android:textSize="14sp" />
+                        android:textSize="@dimen/description_text_size" />
                 </LinearLayout>
 
                 <fr.free.nrw.commons.media.MediaDetailSpacer
                     android:layout_width="match_parent"
-                    android:layout_height="8dp" />
+                    android:layout_height="@dimen/small_gap" />
 
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:background="?attr/subBackground"
                     android:orientation="vertical"
-                    android:padding="16dp">
+                    android:padding="@dimen/standard_gap">
 
                     <TextView
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:paddingBottom="6dp"
+                        android:paddingBottom="@dimen/tiny_gap"
                         android:text="@string/media_detail_description"
                         android:textColor="@android:color/white"
-                        android:textSize="16sp"
+                        android:textSize="@dimen/normal_text"
                         android:textStyle="bold" />
 
                     <TextView
@@ -106,30 +106,30 @@
                         android:layout_height="wrap_content"
                         android:layout_gravity="start"
                         android:background="?attr/subBackground"
-                        android:padding="12dp"
+                        android:padding="@dimen/small_gap"
                         android:text="@string/media_detail_description_explanation"
                         android:textColor="@android:color/white"
-                        android:textSize="14sp" />
+                        android:textSize="@dimen/description_text_size" />
                 </LinearLayout>
 
                 <fr.free.nrw.commons.media.MediaDetailSpacer
                     android:layout_width="match_parent"
-                    android:layout_height="8dp" />
+                    android:layout_height="@dimen/small_gap" />
 
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:background="?attr/subBackground"
                     android:orientation="vertical"
-                    android:padding="16dp">
+                    android:padding="@dimen/standard_gap">
 
                     <TextView
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:paddingBottom="6dp"
+                        android:paddingBottom="@dimen/tiny_gap"
                         android:text="@string/media_detail_license"
                         android:textColor="@android:color/white"
-                        android:textSize="16sp"
+                        android:textSize="@dimen/normal_text"
                         android:textStyle="bold" />
 
                     <fr.free.nrw.commons.ui.widget.CompatTextView
@@ -140,11 +140,11 @@
                         android:background="?attr/subBackground"
                         android:foreground="?attr/selectableItemBackground"
                         android:gravity="center_vertical"
-                        android:padding="12dp"
+                        android:padding="@dimen/small_gap"
                         android:text="@string/media_detail_license"
                         android:textColor="@android:color/white"
-                        android:textSize="14sp"
-                        app:drawablePadding="6dp"
+                        android:textSize="@dimen/description_text_size"
+                        app:drawablePadding="@dimen/tiny_gap"
                         app:drawableStart="@drawable/ic_info_outline_white_24dp"
                         tools:text="License link" />
                 </LinearLayout>
@@ -154,15 +154,15 @@
                     android:layout_height="wrap_content"
                     android:background="?attr/subBackground"
                     android:orientation="vertical"
-                    android:padding="16dp">
+                    android:padding="@dimen/standard_gap">
 
                     <TextView
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:paddingBottom="6dp"
+                        android:paddingBottom="@dimen/tiny_gap"
                         android:text="@string/media_detail_coordinates"
                         android:textColor="@android:color/white"
-                        android:textSize="16sp"
+                        android:textSize="@dimen/normal_text"
                         android:textStyle="bold" />
 
                     <fr.free.nrw.commons.ui.widget.CompatTextView
@@ -173,35 +173,35 @@
                         android:background="?attr/subBackground"
                         android:foreground="?attr/selectableItemBackground"
                         android:gravity="center_vertical"
-                        android:padding="12dp"
+                        android:padding="@dimen/small_gap"
                         android:text="@string/media_detail_coordinates"
                         android:textColor="@android:color/white"
-                        android:textSize="14sp"
-                        app:drawablePadding="6dp"
+                        android:textSize="@dimen/description_text_size"
+                        app:drawablePadding="@dimen/tiny_gap"
                         app:drawableStart="@drawable/ic_map_white_24dp"
                         tools:text="Coordinates link" />
                 </LinearLayout>
 
                 <fr.free.nrw.commons.media.MediaDetailSpacer
                     android:layout_width="match_parent"
-                    android:layout_height="8dp" />
+                    android:layout_height="@dimen/small_gap" />
 
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:background="?attr/subBackground"
                     android:orientation="vertical"
-                    android:padding="16dp"
+                    android:padding="@dimen/standard_gap"
                     android:textStyle="bold">
 
                     <TextView
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_gravity="start"
-                        android:paddingBottom="6dp"
+                        android:paddingBottom="@dimen/tiny_gap"
                         android:text="@string/detail_panel_cats_label"
                         android:textColor="@android:color/white"
-                        android:textSize="16sp"
+                        android:textSize="@dimen/normal_text"
                         android:textStyle="bold" />
 
                     <LinearLayout
@@ -213,22 +213,22 @@
 
                 <fr.free.nrw.commons.media.MediaDetailSpacer
                     android:layout_width="match_parent"
-                    android:layout_height="8dp" />
+                    android:layout_height="@dimen/small_gap" />
 
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:background="?attr/subBackground"
                     android:orientation="vertical"
-                    android:padding="16dp">
+                    android:padding="@dimen/standard_gap">
 
                     <TextView
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:paddingBottom="6dp"
+                        android:paddingBottom="@dimen/tiny_gap"
                         android:text="@string/media_detail_uploaded_date"
                         android:textColor="@android:color/white"
-                        android:textSize="16sp"
+                        android:textSize="@dimen/normal_text"
                         android:textStyle="bold" />
 
                     <TextView
@@ -237,10 +237,10 @@
                         android:layout_height="wrap_content"
                         android:layout_gravity="start"
                         android:background="?attr/subBackground"
-                        android:padding="12dp"
+                        android:padding="@dimen/small_gap"
                         android:text="@string/media_detail_uploaded_date"
                         android:textColor="@android:color/white"
-                        android:textSize="14sp" />
+                        android:textSize="@dimen/description_text_size" />
                 </LinearLayout>
 
             </LinearLayout>
diff --git a/app/src/main/res/layout/fragment_no_permissions.xml b/app/src/main/res/layout/fragment_no_permissions.xml
index 8ea6f3a45..6dd2a6811 100644
--- a/app/src/main/res/layout/fragment_no_permissions.xml
+++ b/app/src/main/res/layout/fragment_no_permissions.xml
@@ -9,11 +9,11 @@
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:gravity="center"
-        android:paddingLeft="30dp"
-        android:paddingRight="30dp"
+        android:paddingLeft="@dimen/large_gap"
+        android:paddingRight="@dimen/large_gap"
         android:text="@string/nearby_needs_permissions"
         android:textAlignment="center"
-        android:textSize="18sp" />
+        android:textSize="@dimen/subheading_text_size" />
 
 
 </FrameLayout>
diff --git a/app/src/main/res/layout/fragment_single_upload.xml b/app/src/main/res/layout/fragment_single_upload.xml
index 4e65667a2..d9dc87479 100644
--- a/app/src/main/res/layout/fragment_single_upload.xml
+++ b/app/src/main/res/layout/fragment_single_upload.xml
@@ -5,12 +5,12 @@
     android:layout_gravity="fill"
     android:orientation="vertical"
     android:background="?attr/fragmentCategorisationBackground"
-    android:paddingBottom="8dip"
-    android:paddingLeft="16dip"
-    android:paddingStart="16dip"
-    android:paddingRight="16dip"
-    android:paddingEnd="16dip"
-    android:paddingTop="8dip"
+    android:paddingBottom="@dimen/small_gap"
+    android:paddingLeft="@dimen/standard_gap"
+    android:paddingStart="@dimen/standard_gap"
+    android:paddingRight="@dimen/standard_gap"
+    android:paddingEnd="@dimen/standard_gap"
+    android:paddingTop="@dimen/small_gap"
     android:theme="@style/DarkAppTheme"
     >
 
@@ -56,7 +56,7 @@
         android:text="@string/share_license_summary"
         android:id="@+id/share_license_summary"
         android:gravity="center"
-        android:layout_marginTop="16dp"
+        android:layout_marginTop="@dimen/standard_gap"
         />
 
     <fr.free.nrw.commons.ui.widget.HtmlTextView
@@ -65,7 +65,7 @@
         android:id="@+id/media_upload_policy"
         android:text="@string/media_upload_policy"
         android:gravity="start"
-        android:layout_marginTop="16dp"
+        android:layout_marginTop="@dimen/standard_gap"
         />
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/item_place.xml b/app/src/main/res/layout/item_place.xml
index 88784857b..1a87f9d43 100644
--- a/app/src/main/res/layout/item_place.xml
+++ b/app/src/main/res/layout/item_place.xml
@@ -10,9 +10,9 @@
         android:id="@+id/icon"
         android:layout_width="40dp"
         android:layout_height="40dp"
-        android:layout_marginLeft="16dp"
-        android:layout_marginStart="16dp"
-        android:layout_marginTop="16dp"
+        android:layout_marginLeft="@dimen/standard_gap"
+        android:layout_marginStart="@dimen/standard_gap"
+        android:layout_marginTop="@dimen/standard_gap"
         android:background="@android:color/white"
         android:contentDescription="@string/no_image_found"
         android:scaleType="centerCrop"
@@ -25,9 +25,9 @@
         android:layout_height="wrap_content"
         android:layout_alignParentEnd="true"
         android:layout_alignParentRight="true"
-        android:layout_marginLeft="16dp"
-        android:layout_marginRight="16dp"
-        android:layout_marginTop="16dp"
+        android:layout_marginLeft="@dimen/standard_gap"
+        android:layout_marginRight="@dimen/standard_gap"
+        android:layout_marginTop="@dimen/standard_gap"
         android:textAppearance="@style/TextAppearance.AppCompat.Caption"
         tools:text="@string/placeholder_place_distance"
         />
@@ -37,8 +37,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_alignTop="@id/distance"
-        android:layout_marginLeft="16dp"
-        android:layout_marginStart="16dp"
+        android:layout_marginLeft="@dimen/standard_gap"
+        android:layout_marginStart="@dimen/standard_gap"
         android:layout_toEndOf="@id/icon"
         android:layout_toLeftOf="@id/distance"
         android:layout_toRightOf="@id/icon"
@@ -58,7 +58,7 @@
         android:layout_alignRight="@id/distance"
         android:layout_alignStart="@id/tvName"
         android:layout_below="@id/tvName"
-        android:layout_marginBottom="16dp"
+        android:layout_marginBottom="@dimen/standard_gap"
         android:ellipsize="end"
         android:maxLines="4"
         android:textAppearance="@style/TextAppearance.AppCompat.Body1"
diff --git a/app/src/main/res/layout/layout_categories_item.xml b/app/src/main/res/layout/layout_categories_item.xml
index f9b84fb73..d301e9098 100644
--- a/app/src/main/res/layout/layout_categories_item.xml
+++ b/app/src/main/res/layout/layout_categories_item.xml
@@ -6,7 +6,7 @@
     android:checkMark="?android:attr/textCheckMark"
     android:checked="false"
     android:gravity="center_vertical"
-    android:padding="4dp"
+    android:padding="@dimen/tiny_gap"
     android:theme="@style/DarkAppTheme">
 
 </CheckedTextView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/layout_contribution.xml b/app/src/main/res/layout/layout_contribution.xml
index 2baf33554..87e7fe9e3 100644
--- a/app/src/main/res/layout/layout_contribution.xml
+++ b/app/src/main/res/layout/layout_contribution.xml
@@ -31,7 +31,7 @@
         android:layout_gravity="center|bottom"
         android:background="#AA000000"
         android:orientation="vertical"
-        android:padding="8dp"
+        android:padding="@dimen/small_gap"
         >
         <ProgressBar
             android:id="@+id/contributionProgress"
diff --git a/app/src/main/res/layout/layout_upload_item.xml b/app/src/main/res/layout/layout_upload_item.xml
index ec9cad08c..fb552560a 100644
--- a/app/src/main/res/layout/layout_upload_item.xml
+++ b/app/src/main/res/layout/layout_upload_item.xml
@@ -24,7 +24,7 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center|bottom"
         android:background="#77000000"
-        android:padding="4dp"
+        android:padding="@dimen/tiny_gap"
         >
 
         <TextView
diff --git a/app/src/main/res/layout/welcome_do_upload.xml b/app/src/main/res/layout/welcome_do_upload.xml
index 553298a14..b2befbf12 100644
--- a/app/src/main/res/layout/welcome_do_upload.xml
+++ b/app/src/main/res/layout/welcome_do_upload.xml
@@ -12,8 +12,6 @@
         android:layout_width="wrap_content"
         android:layout_height="240dp"
         android:layout_gravity="center_horizontal"
-        android:layout_marginLeft="10dp"
-        android:layout_marginRight="10dp"
         android:columnCount="2"
         >
 
@@ -62,20 +60,21 @@
         android:text="@string/tutorial_2_text"
         android:layout_gravity="center"
         android:textStyle="bold"
+        android:textSize="@dimen/normal_text"
         android:textAlignment="center"
-        android:paddingTop="24dp"
+        android:paddingTop="@dimen/standard_gap"
         android:gravity="center_horizontal"
         android:textColor="@android:color/white"
         />
 
     <TextView
-        android:layout_width="293dp"
+        android:layout_width="295dp"
         android:layout_height="wrap_content"
         android:maxWidth="240dp"
         android:text="@string/tutorial_2_subtext"
         android:layout_gravity="center"
         android:textAlignment="textStart"
-        android:paddingTop="16dp"
+        android:paddingTop="@dimen/standard_gap"
         android:gravity="start"
         android:textColor="@android:color/white"
         />
diff --git a/app/src/main/res/layout/welcome_dont_upload.xml b/app/src/main/res/layout/welcome_dont_upload.xml
index de748ce68..8d352547e 100644
--- a/app/src/main/res/layout/welcome_dont_upload.xml
+++ b/app/src/main/res/layout/welcome_dont_upload.xml
@@ -9,10 +9,9 @@
 
     <LinearLayout
         android:gravity="center"
-        android:layout_width="match_parent"
+        android:layout_width="wrap_content"
         android:layout_height="240dp"
-        android:layout_marginLeft="10dp"
-        android:layout_marginRight="10dp"
+        android:layout_gravity="center_horizontal"
         >
 
         <ImageView
@@ -26,7 +25,8 @@
         <ImageView
             android:src="@drawable/proprietary_x"
             android:id="@+id/proprietary_x"
-            android:layout_marginLeft="10dp"
+            android:layout_marginLeft="@dimen/standard_gap"
+            android:layout_marginStart="@dimen/standard_gap"
             android:layout_width="140dp"
             android:layout_height="wrap_content"
             android:contentDescription="@string/welcome_image_proprietary"
@@ -41,20 +41,21 @@
         android:text="@string/tutorial_3_text"
         android:layout_gravity="center"
         android:textStyle="bold"
+        android:textSize="@dimen/normal_text"
         android:textAlignment="center"
-        android:paddingTop="24dp"
+        android:paddingTop="@dimen/standard_gap"
         android:gravity="center_horizontal"
         android:textColor="@android:color/white"
         />
 
     <TextView
-        android:layout_width="278dp"
+        android:layout_width="295dp"
         android:layout_height="wrap_content"
         android:maxWidth="240dp"
         android:text="@string/tutorial_3_subtext"
         android:layout_gravity="center"
         android:textAlignment="textStart"
-        android:paddingTop="16dp"
+        android:paddingTop="@dimen/standard_gap"
         android:gravity="start"
         android:textColor="@android:color/white"
         />
diff --git a/app/src/main/res/layout/welcome_final.xml b/app/src/main/res/layout/welcome_final.xml
index 175ddda64..7f323253b 100644
--- a/app/src/main/res/layout/welcome_final.xml
+++ b/app/src/main/res/layout/welcome_final.xml
@@ -9,10 +9,9 @@
 
     <LinearLayout
         android:gravity="center"
-        android:layout_width="match_parent"
+        android:layout_width="wrap_content"
+        android:layout_gravity="center_horizontal"
         android:layout_height="180dp"
-        android:layout_marginLeft="10dp"
-        android:layout_marginRight="10dp"
         >
 
         <ImageView
@@ -20,7 +19,6 @@
             android:id="@+id/welcome_wikipedia"
             android:layout_width="150dp"
             android:layout_height="180dp"
-            android:layout_marginLeft="30dp"
             android:contentDescription="@string/welcome_image_welcome_wikipedia"
             />
 
@@ -29,7 +27,8 @@
             android:layout_width="160dp"
             android:layout_height="120dp"
             android:layout_gravity="center"
-            android:layout_marginLeft="10dp"
+            android:layout_marginLeft="@dimen/standard_gap"
+            android:layout_marginStart="@dimen/standard_gap"
             android:contentDescription="@string/welcome_image_welcome_copyright"
             />
 
@@ -42,6 +41,7 @@
         android:text="@string/welcome_final_text"
         android:layout_gravity="center"
         android:textStyle="bold"
+        android:textSize="@dimen/normal_text"
         android:textAlignment="center"
         android:gravity="center_horizontal"
         android:textColor="@android:color/white"
@@ -49,10 +49,11 @@
 
     <Button
         android:layout_width="120dp"
-        android:layout_height="40dp"
-        android:layout_marginTop="16dp"
+        android:layout_height="@dimen/overflow_button_dimen"
+        android:layout_marginTop="@dimen/standard_gap"
         android:text="@string/welcome_final_button_text"
         android:id="@+id/welcomeYesButton"
+        android:textSize="@dimen/normal_text"
         android:layout_gravity="center"
         android:background="@android:color/white"
         android:textColor="#0c609c"
diff --git a/app/src/main/res/layout/welcome_image_details.xml b/app/src/main/res/layout/welcome_image_details.xml
index e11b74af2..0b4618b37 100644
--- a/app/src/main/res/layout/welcome_image_details.xml
+++ b/app/src/main/res/layout/welcome_image_details.xml
@@ -10,8 +10,8 @@
     <ImageView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:paddingLeft="24dp"
-        android:paddingRight="24dp"
+        android:paddingLeft="@dimen/large_gap"
+        android:paddingRight="@dimen/large_gap"
         android:src="@drawable/sydney_opera_house"
         android:adjustViewBounds="true"
         android:layout_gravity="center"
@@ -25,8 +25,9 @@
         android:text="@string/tutorial_4_text"
         android:layout_gravity="center"
         android:textStyle="bold"
+        android:textSize="@dimen/normal_text"
         android:textAlignment="center"
-        android:paddingTop="24dp"
+        android:paddingTop="@dimen/standard_gap"
         android:gravity="center_horizontal"
         android:textColor="@android:color/white"
         />
@@ -38,7 +39,7 @@
         android:text="@string/tutorial_4_subtext"
         android:layout_gravity="center"
         android:textAlignment="textStart"
-        android:paddingTop="16dp"
+        android:paddingTop="@dimen/standard_gap"
         android:gravity="start"
         android:textColor="@android:color/white"
         />
diff --git a/app/src/main/res/layout/welcome_wikipedia.xml b/app/src/main/res/layout/welcome_wikipedia.xml
index ea0b6a92a..ece52628e 100644
--- a/app/src/main/res/layout/welcome_wikipedia.xml
+++ b/app/src/main/res/layout/welcome_wikipedia.xml
@@ -24,7 +24,8 @@
         android:layout_gravity="center"
         android:textStyle="bold"
         android:textAlignment="center"
-        android:paddingTop="24dp"
+        android:textSize="@dimen/normal_text"
+        android:paddingTop="@dimen/standard_gap"
         android:gravity="center_horizontal"
         android:textColor="@android:color/white"
         />
@@ -36,7 +37,7 @@
         android:text="@string/tutorial_1_subtext"
         android:layout_gravity="center"
         android:textAlignment="center"
-        android:paddingTop="16dp"
+        android:paddingTop="@dimen/standard_gap"
         android:gravity="center_horizontal"
         android:textColor="@android:color/white"
         />
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 40c859118..992c1924c 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -1,4 +1,25 @@
 <resources>
     <dimen name="bottom_peak_height">240dp</dimen>
+
+    <!-- Standard margin / padding for the containing activity -->
+    <dimen name="activity_margin_horizontal">16dp</dimen>
+    <dimen name="activity_margin_vertical">16dp</dimen>
+
+    <!-- Standard margins / padding -->
+    <dimen name="huge_gap">48dp</dimen>
+    <dimen name="large_gap">32dp</dimen>
+    <dimen name="standard_gap">16dp</dimen>
+    <dimen name="small_gap">8dp</dimen>
+    <dimen name="tiny_gap">4dp</dimen>
+
+    <!-- Component sizes -->
     <dimen name="overflow_button_dimen">48dp</dimen>
+    <dimen name="half_standard_height">24dp</dimen>
+    <dimen name="quarter_standard_height">12dp</dimen>
+
+    <!-- Text sizes -->
+    <dimen name="heading_text_size">24sp</dimen>
+    <dimen name="subheading_text_size">20sp</dimen>
+    <dimen name="normal_text">16sp</dimen>
+    <dimen name="description_text_size">14sp</dimen>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ca7b119c0..3c9c67947 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -211,4 +211,6 @@
   <string name="nearby_location_has_not_changed">Location has not changed.</string>
   <string name="nearby_location_not_available">Location not available.</string>
   <string name="location_permission_rationale_nearby">Permission required to display a list of nearby places</string>
+    <string name="get_directions">GET DIRECTIONS</string>
+  <string name="read_article">READ ARTICLE</string>
 </resources>