From 69e7161c61472ee4a175db9672c0086545b37d81 Mon Sep 17 00:00:00 2001
From: Yash Khare <yashsja@gmail.com>
Date: Wed, 12 Feb 2020 09:56:33 +0530
Subject: [PATCH] Fixes #3197 Replace hardcoded dimensions with dimen resource
 values (#3402)

---
 .../main/res/drawable/bg_delete_button.xml    |   4 +-
 .../main/res/drawable/ic_action_website.xml   |   4 +-
 .../main/res/drawable/ic_add_white_24dp.xml   |   4 +-
 .../main/res/drawable/ic_check_black_24dp.xml |   4 +-
 .../res/drawable/ic_check_box_black_24dp.xml  |   4 +-
 .../ic_check_box_outline_blank_black_24dp.xml |   4 +-
 .../main/res/drawable/ic_clear_black_24dp.xml |   4 +-
 .../res/drawable/ic_commons_icon_vector.xml   |   4 +-
 .../drawable/ic_custom_bookmark_marker.xml    |   2 +-
 .../drawable/ic_custom_greyed_out_marker.xml  |   2 +-
 .../res/drawable/ic_custom_map_marker.xml     |   2 +-
 .../drawable/ic_custom_map_marker_green.xml   |   2 +-
 .../drawable/ic_custom_map_marker_grey.xml    |   2 +-
 .../res/drawable/ic_directions_black_24dp.xml |   4 +-
 .../main/res/drawable/ic_done_black_24dp.xml  |   4 +-
 .../res/drawable/ic_download_white_24dp.xml   |   4 +-
 .../main/res/drawable/ic_edit_black_24dp.xml  |   4 +-
 .../drawable/ic_error_outline_black_24dp.xml  |   4 +-
 .../main/res/drawable/ic_error_red_24dp.xml   |   4 +-
 .../drawable/ic_exit_to_app_black_24dp.xml    |   4 +-
 .../drawable/ic_expand_less_black_24dp.xml    |   4 +-
 app/src/main/res/drawable/ic_explore_24dp.xml |   4 +-
 .../res/drawable/ic_feedback_black_24dp.xml   |   4 +-
 .../main/res/drawable/ic_help_black_24dp.xml  |   4 +-
 .../main/res/drawable/ic_home_black_24dp.xml  |   4 +-
 .../main/res/drawable/ic_image_black_24dp.xml |   4 +-
 .../ic_indeterminate_check_box_black_24dp.xml |   4 +-
 .../res/drawable/ic_info_outline_24dp.xml     |   4 +-
 .../main/res/drawable/ic_list_white_24dp.xml  |   4 +-
 .../res/drawable/ic_location_white_24dp.xml   |   4 +-
 .../main/res/drawable/ic_map_white_24dp.xml   |   4 +-
 .../res/drawable/ic_message_black_24dp.xml    |   4 +-
 .../res/drawable/ic_more_vert_white_24dp.xml  |   4 +-
 .../drawable/ic_my_location_black_24dp.xml    |   4 +-
 .../ic_notifications_off_black_24dp.xml       |   4 +-
 .../drawable/ic_notifications_white_24dp.xml  |   4 +-
 app/src/main/res/drawable/ic_overflow.xml     |   4 +-
 .../drawable/ic_photo_camera_white_24dp.xml   |   4 +-
 .../main/res/drawable/ic_photo_white_24dp.xml |   4 +-
 .../res/drawable/ic_refresh_white_24dp.xml    |   4 +-
 .../drawable/ic_round_star_border_24px.xml    |   4 +-
 .../drawable/ic_round_star_filled_24px.xml    |   4 +-
 .../main/res/drawable/ic_save_white_24dp.xml  |   4 +-
 .../main/res/drawable/ic_send_white_24dp.xml  |   4 +-
 .../res/drawable/ic_settings_black_24dp.xml   |   4 +-
 .../main/res/drawable/ic_share_black_24dp.xml |   4 +-
 app/src/main/res/drawable/ic_thanks.xml       |   4 +-
 .../res/drawable/ic_wikidata_logo_24dp.xml    |   4 +-
 .../res/drawable/ic_wikipedia_logo_24dp.xml   |   4 +-
 .../main/res/drawable/notification_badge.xml  |   4 +-
 .../main/res/drawable/round_icon_airport.xml  |   4 +-
 .../main/res/drawable/round_icon_bridge.xml   |   4 +-
 .../main/res/drawable/round_icon_church.xml   |   4 +-
 app/src/main/res/drawable/round_icon_city.xml |   4 +-
 .../main/res/drawable/round_icon_forest.xml   |   4 +-
 .../res/drawable/round_icon_gatehouse.xml     |   4 +-
 .../drawable/round_icon_generic_building.xml  |   4 +-
 .../main/res/drawable/round_icon_house.xml    |   4 +-
 .../main/res/drawable/round_icon_island.xml   |   4 +-
 .../res/drawable/round_icon_milestone.xml     |   4 +-
 .../main/res/drawable/round_icon_mountain.xml |   4 +-
 .../main/res/drawable/round_icon_ocean.xml    |   4 +-
 app/src/main/res/drawable/round_icon_park.xml |   4 +-
 .../drawable/round_icon_railway_station.xml   |   4 +-
 .../main/res/drawable/round_icon_river.xml    |   4 +-
 app/src/main/res/drawable/round_icon_road.xml |   4 +-
 .../main/res/drawable/round_icon_school.xml   |   4 +-
 .../main/res/drawable/round_icon_unknown.xml  |   4 +-
 .../res/drawable/round_icon_waterfall.xml     |   4 +-
 .../main/res/drawable/thumbnail_selected.xml  |  10 +-
 .../main/res/layout-land/activity_login.xml   |  24 ++---
 .../res/layout-land/welcome_do_upload.xml     |   4 +-
 .../res/layout-land/welcome_dont_upload.xml   |   4 +-
 .../res/layout-land/welcome_image_example.xml |   4 +-
 .../res/layout-land/welcome_wikipedia.xml     |   4 +-
 app/src/main/res/layout-v21/drawer_view.xml   |   2 +-
 .../main/res/layout-xlarge/activity_login.xml |  24 ++---
 .../main/res/layout/activity_achievements.xml | 100 +++++++++---------
 .../main/res/layout/activity_bookmarks.xml    |   8 +-
 app/src/main/res/layout/activity_login.xml    |  22 ++--
 .../main/res/layout/activity_notification.xml |   6 +-
 app/src/main/res/layout/activity_quiz.xml     |  10 +-
 .../main/res/layout/activity_quiz_result.xml  |  10 +-
 app/src/main/res/layout/activity_review.xml   |  18 ++--
 app/src/main/res/layout/activity_upload.xml   |  18 ++--
 app/src/main/res/layout/activity_welcome.xml  |   2 +-
 .../main/res/layout/bottom_sheet_details.xml  |  64 +++++------
 .../res/layout/custom_nearby_tab_layout.xml   |   8 +-
 app/src/main/res/layout/drawer_header.xml     |  16 +--
 app/src/main/res/layout/drawer_view.xml       |   2 +-
 app/src/main/res/layout/filter_chip_view.xml  |   4 +-
 .../res/layout/filter_search_view_layout.xml  |   4 +-
 .../layout/fragment_bookmarks_pictures.xml    |   2 +-
 .../main/res/layout/fragment_browse_image.xml |   4 +-
 .../res/layout/fragment_category_images.xml   |   2 +-
 .../res/layout/fragment_contributions.xml     |   4 +-
 .../layout/fragment_contributions_list.xml    |  10 +-
 .../res/layout/fragment_media_license.xml     |  14 +--
 .../res/layout/fragment_nearby_parent.xml     |  32 +++---
 .../main/res/layout/fragment_review_image.xml |  16 +--
 .../res/layout/fragment_search_history.xml    |  10 +-
 .../layout/fragment_similar_image_dialog.xml  |  22 ++--
 .../fragment_upload_media_detail_fragment.xml |  24 ++---
 .../main/res/layout/image_alert_layout.xml    |   4 +-
 app/src/main/res/layout/item_notification.xml |  24 ++---
 app/src/main/res/layout/item_place.xml        |  10 +-
 .../main/res/layout/item_upload_thumbnail.xml |  12 +--
 app/src/main/res/layout/layout_campagin.xml   |  26 ++---
 .../res/layout/layout_category_images.xml     |   6 +-
 .../main/res/layout/layout_contribution.xml   |  16 +--
 app/src/main/res/layout/nearby_card_view.xml  |  32 +++---
 .../main/res/layout/nearby_filter_list.xml    |   8 +-
 .../res/layout/nearby_permission_dialog.xml   |   8 +-
 app/src/main/res/layout/nearby_row_button.xml |  32 +++---
 .../res/layout/nearby_search_list_item.xml    |   2 +-
 .../layout/nearby_search_list_item_dark.xml   |   2 +-
 app/src/main/res/layout/notification_icon.xml |   6 +-
 .../main/res/layout/pic_of_day_app_widget.xml |  16 +--
 app/src/main/res/layout/question_layout.xml   |   4 +-
 .../main/res/layout/row_item_description.xml  |   4 +-
 .../res/layout/row_item_languages_spinner.xml |  10 +-
 .../res/layout/upload_categories_fragment.xml |  10 +-
 app/src/main/res/layout/welcome_bullet.xml    |   2 +-
 app/src/main/res/layout/welcome_final.xml     |   4 +-
 app/src/main/res/values/dimens.xml            |  36 +++++++
 125 files changed, 542 insertions(+), 506 deletions(-)

diff --git a/app/src/main/res/drawable/bg_delete_button.xml b/app/src/main/res/drawable/bg_delete_button.xml
index 199940e1b..819986f5b 100644
--- a/app/src/main/res/drawable/bg_delete_button.xml
+++ b/app/src/main/res/drawable/bg_delete_button.xml
@@ -11,7 +11,7 @@
             <solid
                 android:color="@color/deleteButton"/>
             <corners
-                android:radius="3dp" />
+                android:radius="@dimen/progressbar_stroke" />
             <stroke
                 android:width="5px"
                 android:color="@color/deleteRed" />
@@ -25,7 +25,7 @@
             <solid
                 android:color="@color/deleteButtonDark"/>
             <corners
-                android:radius="3dp" />
+                android:radius="@dimen/progressbar_stroke" />
         </shape>
     </item>
 
diff --git a/app/src/main/res/drawable/ic_action_website.xml b/app/src/main/res/drawable/ic_action_website.xml
index bad3beb94..7a5a425cc 100644
--- a/app/src/main/res/drawable/ic_action_website.xml
+++ b/app/src/main/res/drawable/ic_action_website.xml
@@ -1,9 +1,9 @@
 <vector
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="24dp"
+    android:height="@dimen/half_standard_height"
     android:viewportHeight="48.625"
     android:viewportWidth="48.625"
-    android:width="24dp"
+    android:width="@dimen/half_standard_height"
     android:tint="?attr/iconsTheme">
     <path
         android:fillColor="#474747"
diff --git a/app/src/main/res/drawable/ic_add_white_24dp.xml b/app/src/main/res/drawable/ic_add_white_24dp.xml
index b9b8eca8b..c41274b6b 100644
--- a/app/src/main/res/drawable/ic_add_white_24dp.xml
+++ b/app/src/main/res/drawable/ic_add_white_24dp.xml
@@ -1,6 +1,6 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
+        android:width="@dimen/half_standard_height"
+        android:height="@dimen/half_standard_height"
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
diff --git a/app/src/main/res/drawable/ic_check_black_24dp.xml b/app/src/main/res/drawable/ic_check_black_24dp.xml
index 3c728c59f..7f52972a1 100644
--- a/app/src/main/res/drawable/ic_check_black_24dp.xml
+++ b/app/src/main/res/drawable/ic_check_black_24dp.xml
@@ -1,6 +1,6 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
+        android:width="@dimen/half_standard_height"
+        android:height="@dimen/half_standard_height"
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
diff --git a/app/src/main/res/drawable/ic_check_box_black_24dp.xml b/app/src/main/res/drawable/ic_check_box_black_24dp.xml
index b253a8d72..50183ad0f 100644
--- a/app/src/main/res/drawable/ic_check_box_black_24dp.xml
+++ b/app/src/main/res/drawable/ic_check_box_black_24dp.xml
@@ -1,6 +1,6 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
+        android:width="@dimen/half_standard_height"
+        android:height="@dimen/half_standard_height"
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
diff --git a/app/src/main/res/drawable/ic_check_box_outline_blank_black_24dp.xml b/app/src/main/res/drawable/ic_check_box_outline_blank_black_24dp.xml
index c02856a75..597de42ae 100644
--- a/app/src/main/res/drawable/ic_check_box_outline_blank_black_24dp.xml
+++ b/app/src/main/res/drawable/ic_check_box_outline_blank_black_24dp.xml
@@ -1,6 +1,6 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
+        android:width="@dimen/half_standard_height"
+        android:height="@dimen/half_standard_height"
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
diff --git a/app/src/main/res/drawable/ic_clear_black_24dp.xml b/app/src/main/res/drawable/ic_clear_black_24dp.xml
index 8b45f42a3..612b0bee5 100644
--- a/app/src/main/res/drawable/ic_clear_black_24dp.xml
+++ b/app/src/main/res/drawable/ic_clear_black_24dp.xml
@@ -1,5 +1,5 @@
-<vector android:height="24dp" android:tint="#FF0031"
+<vector android:height="@dimen/half_standard_height" android:tint="#FF0031"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    android:width="@dimen/half_standard_height" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#FF000000" android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_commons_icon_vector.xml b/app/src/main/res/drawable/ic_commons_icon_vector.xml
index 5af95beec..3b7d76947 100644
--- a/app/src/main/res/drawable/ic_commons_icon_vector.xml
+++ b/app/src/main/res/drawable/ic_commons_icon_vector.xml
@@ -1,8 +1,8 @@
 <vector
-    android:height="24dp"
+    android:height="@dimen/half_standard_height"
     android:viewportHeight="342.03146"
     android:viewportWidth="342.03104"
-    android:width="24dp"
+    android:width="@dimen/half_standard_height"
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:tint="@color/button_color_selector">
     <path android:fillColor="#000000" android:pathData="M146.6,340.1C113.2,333.3 84.6,314 66.1,286 34.6,238.1 39.8,173.2 78.5,132.3l6.9,-7.3 16.8,16.8 16.8,16.8 4.5,-4.4c2.5,-2.4 4.7,-4.2 4.9,-4 0.9,1 9,32 8.5,32.5 -0.5,0.5 -30.4,-7.2 -32.2,-8.2 -0.5,-0.3 1.1,-2.4 3.4,-4.8 4.2,-4.2 4.2,-4.3 2.4,-6.6 -1,-1.3 -3,-3.4 -4.5,-4.6l-2.7,-2.2 -4.7,6.2c-9,12 -15.3,27.5 -17.4,42.9 -1,7.1 -0.5,7.8 4.4,7.8 6.9,0 7.5,-0.6 7.5,-7.5l0,-6.3 15,8.6c8.3,4.7 15,8.9 15,9.2 -0,0.5 -26.5,15.8 -29.2,16.9 -0.4,0.2 -0.8,-2.6 -0.8,-6.3l0,-6.6 -5.9,0c-3.3,0 -6.1,0.3 -6.4,0.8 -0.9,1.6 1.6,15.2 4.4,23.8 3.4,10.3 9.3,21.2 14.9,27.6l3.8,4.4 4.3,-4.2 4.3,-4.2 -4.2,-4.3c-2.3,-2.4 -4.2,-4.6 -4.2,-4.9 0,-0.8 31.9,-9.2 32.6,-8.6 0.3,0.3 -1.4,7.9 -3.8,16.8l-4.4,16.3 -4.6,-4.2c-5.2,-4.8 -6.4,-4.7 -10.4,0.6l-2.7,3.6 4.3,3.7c10.6,9.1 30.3,17.4 44.4,18.6l7.6,0.6 0,-6.1 0,-6.1 -6.5,0c-3.6,0 -6.5,-0.3 -6.5,-0.7 0,-1 16.4,-29.3 17,-29.3 0.6,0 17,28.3 17,29.3 0,0.4 -2.9,0.7 -6.5,0.7l-6.5,0 0,6.1 0,6.1 7.6,-0.6c14.1,-1.2 33.8,-9.4 44.5,-18.6l4.4,-3.7 -2.2,-2.8c-1.2,-1.6 -3.1,-3.5 -4.2,-4.2 -1.8,-1.3 -2.4,-1 -6.6,2.9l-4.6,4.3 -3.7,-13.5c-5.1,-18.3 -5.4,-19.9 -3.9,-19.9 1.4,0 31.3,8 31.8,8.5 0.2,0.2 -1.6,2.4 -3.9,5l-4.3,4.6 4.2,4.2 4.2,4.2 3.8,-4.4c5.6,-6.4 11.5,-17.3 14.9,-27.6 2.8,-8.6 5.4,-22.1 4.4,-23.8 -0.2,-0.4 -3.1,-0.8 -6.4,-0.8l-5.9,0 0,6.6c0,3.6 -0.4,6.4 -0.8,6.3 -2.7,-1.1 -29.1,-16.4 -29.2,-16.9 -0,-0.3 6.7,-4.5 15,-9.2l15,-8.6 0,6.4 0,6.4 3.4,0.6c1.9,0.4 4.8,0.3 6.4,-0 2.8,-0.6 3,-0.9 2.5,-4.8 -1.8,-15.8 -8.7,-33.3 -17.8,-45.4l-4.7,-6.2 -2.7,2.2c-1.5,1.2 -3.5,3.3 -4.5,4.6 -1.8,2.3 -1.7,2.4 2.4,6.6 2.3,2.4 3.8,4.5 3.4,4.8 -1.8,1.1 -31.7,8.7 -32.2,8.2 -0.5,-0.5 7.6,-31.4 8.5,-32.5 0.2,-0.2 2.4,1.5 4.9,4l4.5,4.4 4.2,-4.2c3.5,-3.5 4,-4.4 2.9,-5.7 -2.1,-2.5 -9,-6.1 -22.1,-11.6 -17.1,-7.1 -26.4,-12.1 -33.6,-17.9 -10.7,-8.7 -19.3,-22.2 -24,-37.6 -1,-3.3 -1.9,-6.2 -2.1,-6.4 -0.1,-0.2 -5.2,1.4 -11.2,3.5 -6,2.1 -11.3,3.6 -11.6,3.2 -0.3,-0.3 1.9,-4.2 5,-8.5 9.2,-12.8 20.4,-38.4 28,-64.2l2.8,-9.3 3,4.8c16.2,26.1 40.8,71.5 39.3,73 -0.4,0.4 -2.2,-0.7 -3.9,-2.4 -3.9,-3.7 -8.1,-5.9 -13.1,-6.8 -3.7,-0.7 -3.8,-0.7 -3.1,2.2 2.4,9.9 9.8,20.2 17.8,24.9 2.2,1.3 11.7,5.7 21.1,9.7 20.6,8.9 28.7,14.1 39.7,25.7 16.7,17.5 26.7,36.9 31.9,61.4 3,14.3 3,35.1 -0.1,49.7 -10.6,50.7 -50.6,89.6 -101.1,98.5 -11.9,2.1 -34.9,1.8 -46.4,-0.5zM162.6,258.1c-26.3,-5.8 -40.9,-34.6 -29.6,-58.5 4.2,-9 10.8,-15.7 20,-20.3 7.3,-3.6 7.9,-3.7 18.1,-3.7 10.2,0 10.9,0.1 18.1,3.7 33,16.3 31.1,63.3 -3.1,76.8 -6.1,2.4 -17.3,3.4 -23.5,2z"/>
diff --git a/app/src/main/res/drawable/ic_custom_bookmark_marker.xml b/app/src/main/res/drawable/ic_custom_bookmark_marker.xml
index c615405c2..6edbfe427 100644
--- a/app/src/main/res/drawable/ic_custom_bookmark_marker.xml
+++ b/app/src/main/res/drawable/ic_custom_bookmark_marker.xml
@@ -1,5 +1,5 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
+    android:width="@dimen/half_standard_height"
     android:height="28dp"
     android:viewportWidth="24.0"
     android:viewportHeight="28.0">
diff --git a/app/src/main/res/drawable/ic_custom_greyed_out_marker.xml b/app/src/main/res/drawable/ic_custom_greyed_out_marker.xml
index d9a960a23..70521cbe9 100644
--- a/app/src/main/res/drawable/ic_custom_greyed_out_marker.xml
+++ b/app/src/main/res/drawable/ic_custom_greyed_out_marker.xml
@@ -1,5 +1,5 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
+    android:width="@dimen/half_standard_height"
     android:height="28dp"
     android:viewportWidth="24.0"
     android:viewportHeight="28.0">
diff --git a/app/src/main/res/drawable/ic_custom_map_marker.xml b/app/src/main/res/drawable/ic_custom_map_marker.xml
index 01b540076..54a9ac5f8 100644
--- a/app/src/main/res/drawable/ic_custom_map_marker.xml
+++ b/app/src/main/res/drawable/ic_custom_map_marker.xml
@@ -1,5 +1,5 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
+    android:width="@dimen/half_standard_height"
     android:height="28dp"
     android:viewportWidth="24.0"
     android:viewportHeight="28.0">
diff --git a/app/src/main/res/drawable/ic_custom_map_marker_green.xml b/app/src/main/res/drawable/ic_custom_map_marker_green.xml
index 1d33fa712..6c7eb95fe 100644
--- a/app/src/main/res/drawable/ic_custom_map_marker_green.xml
+++ b/app/src/main/res/drawable/ic_custom_map_marker_green.xml
@@ -1,5 +1,5 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
+    android:width="@dimen/half_standard_height"
     android:height="28dp"
     android:viewportWidth="24.0"
     android:viewportHeight="28.0">
diff --git a/app/src/main/res/drawable/ic_custom_map_marker_grey.xml b/app/src/main/res/drawable/ic_custom_map_marker_grey.xml
index e3ca5674a..e5c5588a4 100644
--- a/app/src/main/res/drawable/ic_custom_map_marker_grey.xml
+++ b/app/src/main/res/drawable/ic_custom_map_marker_grey.xml
@@ -1,5 +1,5 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
+    android:width="@dimen/half_standard_height"
     android:height="28dp"
     android:viewportWidth="24.0"
     android:viewportHeight="28.0">
diff --git a/app/src/main/res/drawable/ic_directions_black_24dp.xml b/app/src/main/res/drawable/ic_directions_black_24dp.xml
index fe95ed7b1..0924d9e52 100644
--- a/app/src/main/res/drawable/ic_directions_black_24dp.xml
+++ b/app/src/main/res/drawable/ic_directions_black_24dp.xml
@@ -1,6 +1,6 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
+        android:width="@dimen/half_standard_height"
+        android:height="@dimen/half_standard_height"
         android:viewportWidth="24.0"
         android:viewportHeight="24.0"
         android:tint="@color/button_color_selector"
diff --git a/app/src/main/res/drawable/ic_done_black_24dp.xml b/app/src/main/res/drawable/ic_done_black_24dp.xml
index b28231b6e..d2e4b98d2 100644
--- a/app/src/main/res/drawable/ic_done_black_24dp.xml
+++ b/app/src/main/res/drawable/ic_done_black_24dp.xml
@@ -1,5 +1,5 @@
-<vector android:height="24dp" android:tint="#21FF31"
+<vector android:height="@dimen/half_standard_height" android:tint="#21FF31"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    android:width="@dimen/half_standard_height" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#FF000000" android:pathData="M9,16.2L4.8,12l-1.4,1.4L9,19 21,7l-1.4,-1.4L9,16.2z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_download_white_24dp.xml b/app/src/main/res/drawable/ic_download_white_24dp.xml
index b8e836142..ae4b97919 100644
--- a/app/src/main/res/drawable/ic_download_white_24dp.xml
+++ b/app/src/main/res/drawable/ic_download_white_24dp.xml
@@ -1,5 +1,5 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
+<vector android:height="@dimen/half_standard_height" android:tint="#FFFFFF"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    android:width="@dimen/half_standard_height" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#FF000000" android:pathData="M19,9h-4V3H9v6H5l7,7 7,-7zM5,18v2h14v-2H5z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_edit_black_24dp.xml b/app/src/main/res/drawable/ic_edit_black_24dp.xml
index 2ab2fb753..0aefb9b8b 100644
--- a/app/src/main/res/drawable/ic_edit_black_24dp.xml
+++ b/app/src/main/res/drawable/ic_edit_black_24dp.xml
@@ -1,6 +1,6 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
+        android:width="@dimen/half_standard_height"
+        android:height="@dimen/half_standard_height"
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
diff --git a/app/src/main/res/drawable/ic_error_outline_black_24dp.xml b/app/src/main/res/drawable/ic_error_outline_black_24dp.xml
index 850263ee7..f479a1345 100644
--- a/app/src/main/res/drawable/ic_error_outline_black_24dp.xml
+++ b/app/src/main/res/drawable/ic_error_outline_black_24dp.xml
@@ -1,6 +1,6 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="48dp"
-        android:height="48dp"
+        android:width="@dimen/fragment_height"
+        android:height="@dimen/fragment_height"
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
diff --git a/app/src/main/res/drawable/ic_error_red_24dp.xml b/app/src/main/res/drawable/ic_error_red_24dp.xml
index e1569395b..ca3a45c28 100644
--- a/app/src/main/res/drawable/ic_error_red_24dp.xml
+++ b/app/src/main/res/drawable/ic_error_red_24dp.xml
@@ -1,5 +1,5 @@
-<vector android:height="24dp" android:tint="#FF0000"
+<vector android:height="@dimen/half_standard_height" android:tint="#FF0000"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    android:width="@dimen/half_standard_height" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#FF000000" android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM13,17h-2v-2h2v2zM13,13h-2L11,7h2v6z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_exit_to_app_black_24dp.xml b/app/src/main/res/drawable/ic_exit_to_app_black_24dp.xml
index 6f40d7725..21ec591fc 100644
--- a/app/src/main/res/drawable/ic_exit_to_app_black_24dp.xml
+++ b/app/src/main/res/drawable/ic_exit_to_app_black_24dp.xml
@@ -1,6 +1,6 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
+        android:width="@dimen/half_standard_height"
+        android:height="@dimen/half_standard_height"
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
diff --git a/app/src/main/res/drawable/ic_expand_less_black_24dp.xml b/app/src/main/res/drawable/ic_expand_less_black_24dp.xml
index 3afdf9682..db70401a8 100644
--- a/app/src/main/res/drawable/ic_expand_less_black_24dp.xml
+++ b/app/src/main/res/drawable/ic_expand_less_black_24dp.xml
@@ -1,6 +1,6 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
+        android:width="@dimen/half_standard_height"
+        android:height="@dimen/half_standard_height"
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
diff --git a/app/src/main/res/drawable/ic_explore_24dp.xml b/app/src/main/res/drawable/ic_explore_24dp.xml
index 6b0553ff1..383422cb8 100644
--- a/app/src/main/res/drawable/ic_explore_24dp.xml
+++ b/app/src/main/res/drawable/ic_explore_24dp.xml
@@ -1,6 +1,6 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
+    android:width="@dimen/half_standard_height"
+    android:height="@dimen/half_standard_height"
     android:viewportWidth="24.0"
     android:viewportHeight="24.0">
     <path
diff --git a/app/src/main/res/drawable/ic_feedback_black_24dp.xml b/app/src/main/res/drawable/ic_feedback_black_24dp.xml
index 29f9baabd..f99f442c5 100644
--- a/app/src/main/res/drawable/ic_feedback_black_24dp.xml
+++ b/app/src/main/res/drawable/ic_feedback_black_24dp.xml
@@ -1,6 +1,6 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
+        android:width="@dimen/half_standard_height"
+        android:height="@dimen/half_standard_height"
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
diff --git a/app/src/main/res/drawable/ic_help_black_24dp.xml b/app/src/main/res/drawable/ic_help_black_24dp.xml
index 1517747d0..80de04a25 100644
--- a/app/src/main/res/drawable/ic_help_black_24dp.xml
+++ b/app/src/main/res/drawable/ic_help_black_24dp.xml
@@ -1,6 +1,6 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
+        android:width="@dimen/half_standard_height"
+        android:height="@dimen/half_standard_height"
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
diff --git a/app/src/main/res/drawable/ic_home_black_24dp.xml b/app/src/main/res/drawable/ic_home_black_24dp.xml
index 70fb2910c..c9acc83cd 100644
--- a/app/src/main/res/drawable/ic_home_black_24dp.xml
+++ b/app/src/main/res/drawable/ic_home_black_24dp.xml
@@ -1,6 +1,6 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
+        android:width="@dimen/half_standard_height"
+        android:height="@dimen/half_standard_height"
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
diff --git a/app/src/main/res/drawable/ic_image_black_24dp.xml b/app/src/main/res/drawable/ic_image_black_24dp.xml
index 63aa7d33b..0d80803ee 100644
--- a/app/src/main/res/drawable/ic_image_black_24dp.xml
+++ b/app/src/main/res/drawable/ic_image_black_24dp.xml
@@ -1,6 +1,6 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="48dp"
-        android:height="48dp"
+        android:width="@dimen/fragment_height"
+        android:height="@dimen/fragment_height"
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
diff --git a/app/src/main/res/drawable/ic_indeterminate_check_box_black_24dp.xml b/app/src/main/res/drawable/ic_indeterminate_check_box_black_24dp.xml
index 793843e26..4694f807d 100644
--- a/app/src/main/res/drawable/ic_indeterminate_check_box_black_24dp.xml
+++ b/app/src/main/res/drawable/ic_indeterminate_check_box_black_24dp.xml
@@ -1,6 +1,6 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
+        android:width="@dimen/half_standard_height"
+        android:height="@dimen/half_standard_height"
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
diff --git a/app/src/main/res/drawable/ic_info_outline_24dp.xml b/app/src/main/res/drawable/ic_info_outline_24dp.xml
index 9567ecd77..075dc65f2 100644
--- a/app/src/main/res/drawable/ic_info_outline_24dp.xml
+++ b/app/src/main/res/drawable/ic_info_outline_24dp.xml
@@ -1,6 +1,6 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
+        android:width="@dimen/half_standard_height"
+        android:height="@dimen/half_standard_height"
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
diff --git a/app/src/main/res/drawable/ic_list_white_24dp.xml b/app/src/main/res/drawable/ic_list_white_24dp.xml
index 7f5d99c3b..0bba4193d 100644
--- a/app/src/main/res/drawable/ic_list_white_24dp.xml
+++ b/app/src/main/res/drawable/ic_list_white_24dp.xml
@@ -1,6 +1,6 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
+        android:width="@dimen/half_standard_height"
+        android:height="@dimen/half_standard_height"
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
diff --git a/app/src/main/res/drawable/ic_location_white_24dp.xml b/app/src/main/res/drawable/ic_location_white_24dp.xml
index aea56cb5a..067b7fcb2 100644
--- a/app/src/main/res/drawable/ic_location_white_24dp.xml
+++ b/app/src/main/res/drawable/ic_location_white_24dp.xml
@@ -1,5 +1,5 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
+<vector android:height="@dimen/half_standard_height" android:tint="#FFFFFF"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    android:width="@dimen/half_standard_height" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#FF000000" android:pathData="M12,2C8.13,2 5,5.13 5,9c0,5.25 7,13 7,13s7,-7.75 7,-13c0,-3.87 -3.13,-7 -7,-7zM12,11.5c-1.38,0 -2.5,-1.12 -2.5,-2.5s1.12,-2.5 2.5,-2.5 2.5,1.12 2.5,2.5 -1.12,2.5 -2.5,2.5z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_map_white_24dp.xml b/app/src/main/res/drawable/ic_map_white_24dp.xml
index 4cb341e6e..cbe78954b 100644
--- a/app/src/main/res/drawable/ic_map_white_24dp.xml
+++ b/app/src/main/res/drawable/ic_map_white_24dp.xml
@@ -1,6 +1,6 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
+        android:width="@dimen/half_standard_height"
+        android:height="@dimen/half_standard_height"
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
diff --git a/app/src/main/res/drawable/ic_message_black_24dp.xml b/app/src/main/res/drawable/ic_message_black_24dp.xml
index d2876bfad..a68dd064f 100644
--- a/app/src/main/res/drawable/ic_message_black_24dp.xml
+++ b/app/src/main/res/drawable/ic_message_black_24dp.xml
@@ -1,6 +1,6 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
+        android:width="@dimen/half_standard_height"
+        android:height="@dimen/half_standard_height"
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
diff --git a/app/src/main/res/drawable/ic_more_vert_white_24dp.xml b/app/src/main/res/drawable/ic_more_vert_white_24dp.xml
index d73c8d86c..b788bfaa8 100644
--- a/app/src/main/res/drawable/ic_more_vert_white_24dp.xml
+++ b/app/src/main/res/drawable/ic_more_vert_white_24dp.xml
@@ -1,6 +1,6 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
+    android:width="@dimen/half_standard_height"
+    android:height="@dimen/half_standard_height"
     android:viewportWidth="24.0"
     android:viewportHeight="24.0">
     <path
diff --git a/app/src/main/res/drawable/ic_my_location_black_24dp.xml b/app/src/main/res/drawable/ic_my_location_black_24dp.xml
index 07d6e4694..708ec0444 100644
--- a/app/src/main/res/drawable/ic_my_location_black_24dp.xml
+++ b/app/src/main/res/drawable/ic_my_location_black_24dp.xml
@@ -1,6 +1,6 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
+        android:width="@dimen/half_standard_height"
+        android:height="@dimen/half_standard_height"
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
diff --git a/app/src/main/res/drawable/ic_notifications_off_black_24dp.xml b/app/src/main/res/drawable/ic_notifications_off_black_24dp.xml
index f7aa3891d..6dbf2714f 100644
--- a/app/src/main/res/drawable/ic_notifications_off_black_24dp.xml
+++ b/app/src/main/res/drawable/ic_notifications_off_black_24dp.xml
@@ -1,5 +1,5 @@
-<vector android:height="24dp" android:tint="#959594"
+<vector android:height="@dimen/half_standard_height" android:tint="#959594"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    android:width="@dimen/half_standard_height" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#FF000000" android:pathData="M20,18.69L7.84,6.14 5.27,3.49 4,4.76l2.8,2.8v0.01c-0.52,0.99 -0.8,2.16 -0.8,3.42v5l-2,2v1h13.73l2,2L21,19.72l-1,-1.03zM12,22c1.11,0 2,-0.89 2,-2h-4c0,1.11 0.89,2 2,2zM18,14.68L18,11c0,-3.08 -1.64,-5.64 -4.5,-6.32L13.5,4c0,-0.83 -0.67,-1.5 -1.5,-1.5s-1.5,0.67 -1.5,1.5v0.68c-0.15,0.03 -0.29,0.08 -0.42,0.12 -0.1,0.03 -0.2,0.07 -0.3,0.11h-0.01c-0.01,0 -0.01,0 -0.02,0.01 -0.23,0.09 -0.46,0.2 -0.68,0.31 0,0 -0.01,0 -0.01,0.01L18,14.68z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_notifications_white_24dp.xml b/app/src/main/res/drawable/ic_notifications_white_24dp.xml
index 120895c4f..48ea46fc1 100644
--- a/app/src/main/res/drawable/ic_notifications_white_24dp.xml
+++ b/app/src/main/res/drawable/ic_notifications_white_24dp.xml
@@ -1,6 +1,6 @@
-<vector android:height="24dp" android:tint="#FFFFFF"
+<vector android:height="@dimen/half_standard_height" android:tint="#FFFFFF"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    android:width="@dimen/half_standard_height" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#FF000000" android:pathData="M12,22c1.1,0 2,-0.9 2,-2h-4c0,1.1 0.89,2 2,2zM18,16v-5c0,-3.07 -1.64,-5.64 -4.5,-6.32L13.5,4c0,-0.83 -0.67,-1.5 -1.5,-1.5s-1.5,0.67 -1.5,1.5v0.68C7.63,5.36 6,7.92 6,11v5l-2,2v1h16v-1l-2,-2z"/>
 
 </vector>
diff --git a/app/src/main/res/drawable/ic_overflow.xml b/app/src/main/res/drawable/ic_overflow.xml
index c3f27d467..e97372a90 100644
--- a/app/src/main/res/drawable/ic_overflow.xml
+++ b/app/src/main/res/drawable/ic_overflow.xml
@@ -1,6 +1,6 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
+    android:width="@dimen/half_standard_height"
+    android:height="@dimen/half_standard_height"
     android:viewportWidth="24.0"
     android:viewportHeight="24.0"
     android:tint="@color/status_bar_blue">
diff --git a/app/src/main/res/drawable/ic_photo_camera_white_24dp.xml b/app/src/main/res/drawable/ic_photo_camera_white_24dp.xml
index 4fa7158a0..0882cd5b1 100644
--- a/app/src/main/res/drawable/ic_photo_camera_white_24dp.xml
+++ b/app/src/main/res/drawable/ic_photo_camera_white_24dp.xml
@@ -1,6 +1,6 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
+        android:width="@dimen/half_standard_height"
+        android:height="@dimen/half_standard_height"
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
diff --git a/app/src/main/res/drawable/ic_photo_white_24dp.xml b/app/src/main/res/drawable/ic_photo_white_24dp.xml
index 0b56f71ae..c0eb627d4 100644
--- a/app/src/main/res/drawable/ic_photo_white_24dp.xml
+++ b/app/src/main/res/drawable/ic_photo_white_24dp.xml
@@ -1,6 +1,6 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
+        android:width="@dimen/half_standard_height"
+        android:height="@dimen/half_standard_height"
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
diff --git a/app/src/main/res/drawable/ic_refresh_white_24dp.xml b/app/src/main/res/drawable/ic_refresh_white_24dp.xml
index d69022192..08e2e5d7b 100644
--- a/app/src/main/res/drawable/ic_refresh_white_24dp.xml
+++ b/app/src/main/res/drawable/ic_refresh_white_24dp.xml
@@ -1,6 +1,6 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
+    android:width="@dimen/half_standard_height"
+    android:height="@dimen/half_standard_height"
     android:viewportHeight="24.0"
     android:viewportWidth="24.0">
 
diff --git a/app/src/main/res/drawable/ic_round_star_border_24px.xml b/app/src/main/res/drawable/ic_round_star_border_24px.xml
index d01dfa7fa..234b1dc7f 100644
--- a/app/src/main/res/drawable/ic_round_star_border_24px.xml
+++ b/app/src/main/res/drawable/ic_round_star_border_24px.xml
@@ -1,6 +1,6 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
+    android:width="@dimen/half_standard_height"
+    android:height="@dimen/half_standard_height"
     android:viewportWidth="24"
     android:viewportHeight="24">
   <path
diff --git a/app/src/main/res/drawable/ic_round_star_filled_24px.xml b/app/src/main/res/drawable/ic_round_star_filled_24px.xml
index f9a701c2d..85d52b363 100644
--- a/app/src/main/res/drawable/ic_round_star_filled_24px.xml
+++ b/app/src/main/res/drawable/ic_round_star_filled_24px.xml
@@ -1,6 +1,6 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
+    android:width="@dimen/half_standard_height"
+    android:height="@dimen/half_standard_height"
     android:viewportWidth="24"
     android:viewportHeight="24">
   <path
diff --git a/app/src/main/res/drawable/ic_save_white_24dp.xml b/app/src/main/res/drawable/ic_save_white_24dp.xml
index a7a81a25d..64c018924 100644
--- a/app/src/main/res/drawable/ic_save_white_24dp.xml
+++ b/app/src/main/res/drawable/ic_save_white_24dp.xml
@@ -1,6 +1,6 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
+        android:width="@dimen/half_standard_height"
+        android:height="@dimen/half_standard_height"
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
diff --git a/app/src/main/res/drawable/ic_send_white_24dp.xml b/app/src/main/res/drawable/ic_send_white_24dp.xml
index 78a666de5..c34ef6424 100644
--- a/app/src/main/res/drawable/ic_send_white_24dp.xml
+++ b/app/src/main/res/drawable/ic_send_white_24dp.xml
@@ -1,6 +1,6 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
+        android:width="@dimen/half_standard_height"
+        android:height="@dimen/half_standard_height"
         android:autoMirrored="true"
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
diff --git a/app/src/main/res/drawable/ic_settings_black_24dp.xml b/app/src/main/res/drawable/ic_settings_black_24dp.xml
index ace746c40..d19715e50 100644
--- a/app/src/main/res/drawable/ic_settings_black_24dp.xml
+++ b/app/src/main/res/drawable/ic_settings_black_24dp.xml
@@ -1,6 +1,6 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
+        android:width="@dimen/half_standard_height"
+        android:height="@dimen/half_standard_height"
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
diff --git a/app/src/main/res/drawable/ic_share_black_24dp.xml b/app/src/main/res/drawable/ic_share_black_24dp.xml
index 203b1d84c..1f0bb4af3 100644
--- a/app/src/main/res/drawable/ic_share_black_24dp.xml
+++ b/app/src/main/res/drawable/ic_share_black_24dp.xml
@@ -1,5 +1,5 @@
-<vector android:alpha="0.84" android:height="24dp"
+<vector android:alpha="0.84" android:height="@dimen/half_standard_height"
     android:viewportHeight="24.0" android:viewportWidth="24.0"
-    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    android:width="@dimen/half_standard_height" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#ffffffff" android:pathData="M18,16.08c-0.76,0 -1.44,0.3 -1.96,0.77L8.91,12.7c0.05,-0.23 0.09,-0.46 0.09,-0.7s-0.04,-0.47 -0.09,-0.7l7.05,-4.11c0.54,0.5 1.25,0.81 2.04,0.81 1.66,0 3,-1.34 3,-3s-1.34,-3 -3,-3 -3,1.34 -3,3c0,0.24 0.04,0.47 0.09,0.7L8.04,9.81C7.5,9.31 6.79,9 6,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3c0.79,0 1.5,-0.31 2.04,-0.81l7.12,4.16c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.61 1.31,2.92 2.92,2.92 1.61,0 2.92,-1.31 2.92,-2.92s-1.31,-2.92 -2.92,-2.92z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_thanks.xml b/app/src/main/res/drawable/ic_thanks.xml
index 480b45c1b..1ddaa940e 100644
--- a/app/src/main/res/drawable/ic_thanks.xml
+++ b/app/src/main/res/drawable/ic_thanks.xml
@@ -1,4 +1,4 @@
-<vector android:height="24dp" android:viewportHeight="96"
-    android:viewportWidth="96" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+<vector android:height="@dimen/half_standard_height" android:viewportHeight="96"
+    android:viewportWidth="96" android:width="@dimen/half_standard_height" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#00AF89" android:pathData="M17.36,17.959v46.007L5.56,77.188c24.029,0 72.417,0 77.54,0c7.133,0 7.471,-7.096 7.482,-7.449V17.959H17.36zM63.443,29.27c2.354,0 4.258,1.907 4.258,4.256s-1.904,4.253 -4.258,4.253c-2.348,0 -4.256,-1.904 -4.256,-4.253S61.096,29.27 63.443,29.27zM45.82,29.27c2.348,0 4.252,1.907 4.252,4.256s-1.904,4.253 -4.252,4.253c-2.351,0 -4.258,-1.904 -4.258,-4.253S43.47,29.27 45.82,29.27zM54.631,65.881c-12.434,0 -22.515,-10.082 -22.515,-22.518c0,0 11.276,4.866 22.996,4.866c11.986,0 22.035,-4.866 22.035,-4.866C77.146,55.799 67.066,65.881 54.631,65.881z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_wikidata_logo_24dp.xml b/app/src/main/res/drawable/ic_wikidata_logo_24dp.xml
index f92da86c3..a3e73d8b1 100644
--- a/app/src/main/res/drawable/ic_wikidata_logo_24dp.xml
+++ b/app/src/main/res/drawable/ic_wikidata_logo_24dp.xml
@@ -1,7 +1,7 @@
-<vector android:height="24dp"
+<vector android:height="@dimen/half_standard_height"
     android:viewportHeight="93.46232"
     android:viewportWidth="102.1415"
-    android:width="24dp"
+    android:width="@dimen/half_standard_height"
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:tint="@color/button_color_selector"
     >
diff --git a/app/src/main/res/drawable/ic_wikipedia_logo_24dp.xml b/app/src/main/res/drawable/ic_wikipedia_logo_24dp.xml
index 9056d87fa..2d081a667 100644
--- a/app/src/main/res/drawable/ic_wikipedia_logo_24dp.xml
+++ b/app/src/main/res/drawable/ic_wikipedia_logo_24dp.xml
@@ -1,7 +1,7 @@
-<vector android:height="24dp"
+<vector android:height="@dimen/half_standard_height"
     android:viewportHeight="141.092"
     android:viewportWidth="141.092"
-    android:width="24dp"
+    android:width="@dimen/half_standard_height"
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:tint="@color/button_color_selector"
     >
diff --git a/app/src/main/res/drawable/notification_badge.xml b/app/src/main/res/drawable/notification_badge.xml
index babec7015..74233e848 100644
--- a/app/src/main/res/drawable/notification_badge.xml
+++ b/app/src/main/res/drawable/notification_badge.xml
@@ -5,6 +5,6 @@
     <solid android:color="#F00" />
 
     <size
-        android:width="12dp"
-        android:height="12dp" />
+        android:width="@dimen/medium_width"
+        android:height="@dimen/medium_height" />
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/round_icon_airport.xml b/app/src/main/res/drawable/round_icon_airport.xml
index 4a24f240b..4e58305b3 100644
--- a/app/src/main/res/drawable/round_icon_airport.xml
+++ b/app/src/main/res/drawable/round_icon_airport.xml
@@ -1,5 +1,5 @@
-<vector android:height="24dp" android:viewportHeight="235.0"
-    android:viewportWidth="235.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+<vector android:height="@dimen/half_standard_height" android:viewportHeight="235.0"
+    android:viewportWidth="235.0" android:width="@dimen/half_standard_height" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#E3E3E3" android:pathData="M117.5,18.5c-54.68,0 -99,44.32 -99,99c0,54.67 44.32,99 99,99c54.67,0 99,-44.32 99,-99C216.5,62.83 172.18,18.5 117.5,18.5zM117.5,202.98c-47.21,0 -85.48,-38.27 -85.48,-85.48c0,-47.21 38.27,-85.48 85.48,-85.48c47.21,0 85.48,38.27 85.48,85.48C202.98,164.71 164.71,202.98 117.5,202.98z"/>
     <path android:fillColor="#EDA33F" android:pathData="M197.23,117.5c0,44.03 -35.69,79.72 -79.73,79.72c-44.03,0 -79.73,-35.69 -79.73,-79.72c0,-44.03 35.69,-79.73 79.73,-79.73C161.53,37.77 197.23,73.47 197.23,117.5z"/>
     <path android:fillColor="#352200" android:pathData="M116.97,97.32c-38.84,0 -71.25,11.73 -78.86,27.34c0.63,7.06 2.16,13.86 4.51,20.28c12.15,12.41 40.86,21.13 74.35,21.13c35.18,0 65.08,-9.63 76.06,-23.04c1.76,-5.21 3,-10.67 3.65,-16.3C191.03,110.1 157.5,97.32 116.97,97.32z"/>
diff --git a/app/src/main/res/drawable/round_icon_bridge.xml b/app/src/main/res/drawable/round_icon_bridge.xml
index efe428b80..660f3cda1 100644
--- a/app/src/main/res/drawable/round_icon_bridge.xml
+++ b/app/src/main/res/drawable/round_icon_bridge.xml
@@ -1,5 +1,5 @@
-<vector android:height="24dp" android:viewportHeight="235.0"
-    android:viewportWidth="235.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+<vector android:height="@dimen/half_standard_height" android:viewportHeight="235.0"
+    android:viewportWidth="235.0" android:width="@dimen/half_standard_height" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#E3E3E3" android:pathData="M117.5,18.5c-54.68,0 -99,44.32 -99,99c0,54.67 44.32,99 99,99c54.67,0 99,-44.32 99,-99C216.5,62.83 172.18,18.5 117.5,18.5zM117.5,202.98c-47.21,0 -85.48,-38.27 -85.48,-85.48c0,-47.21 38.27,-85.48 85.48,-85.48c47.21,0 85.48,38.27 85.48,85.48C202.98,164.71 164.71,202.98 117.5,202.98z"/>
     <path android:fillColor="#EDA33F" android:pathData="M197.23,117.5c0,44.03 -35.69,79.72 -79.73,79.72c-44.03,0 -79.73,-35.69 -79.73,-79.72c0,-44.03 35.69,-79.73 79.73,-79.73C161.53,37.77 197.23,73.47 197.23,117.5z"/>
     <path android:fillColor="#007F9F" android:pathData="M177.13,170.39c2.87,-3.23 5.47,-6.69 7.79,-10.36c-8.9,-5.09 -35.72,-8.79 -67.42,-8.79s-58.52,3.7 -67.42,8.79c2.32,3.66 4.92,7.13 7.79,10.36c12.51,3.49 34.53,5.81 59.63,5.81C142.6,176.2 164.63,173.88 177.13,170.39z"/>
diff --git a/app/src/main/res/drawable/round_icon_church.xml b/app/src/main/res/drawable/round_icon_church.xml
index c27a52669..fbbe9d147 100644
--- a/app/src/main/res/drawable/round_icon_church.xml
+++ b/app/src/main/res/drawable/round_icon_church.xml
@@ -1,5 +1,5 @@
-<vector android:height="24dp" android:viewportHeight="235.0"
-    android:viewportWidth="235.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+<vector android:height="@dimen/half_standard_height" android:viewportHeight="235.0"
+    android:viewportWidth="235.0" android:width="@dimen/half_standard_height" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#E3E3E3" android:pathData="M117.5,18.5c-54.68,0 -99,44.32 -99,99c0,54.67 44.32,99 99,99c54.67,0 99,-44.32 99,-99C216.5,62.83 172.18,18.5 117.5,18.5zM117.5,202.98c-47.21,0 -85.48,-38.27 -85.48,-85.48c0,-47.21 38.27,-85.48 85.48,-85.48c47.21,0 85.48,38.27 85.48,85.48C202.98,164.71 164.71,202.98 117.5,202.98z"/>
     <path android:fillColor="#EDA33F" android:pathData="M197.23,117.5c0,44.03 -35.69,79.72 -79.73,79.72c-44.03,0 -79.73,-35.69 -79.73,-79.72c0,-44.03 35.69,-79.73 79.73,-79.73C161.53,37.77 197.23,73.47 197.23,117.5z"/>
     <path android:fillColor="#FF000000" android:pathData="M66.97,166.68a50.53,7.7 0,1 0,101.06 0a50.53,7.7 0,1 0,-101.06 0z"/>
diff --git a/app/src/main/res/drawable/round_icon_city.xml b/app/src/main/res/drawable/round_icon_city.xml
index ce4cc5c44..26ab9fd1a 100644
--- a/app/src/main/res/drawable/round_icon_city.xml
+++ b/app/src/main/res/drawable/round_icon_city.xml
@@ -1,5 +1,5 @@
-<vector android:height="24dp" android:viewportHeight="235.0"
-    android:viewportWidth="235.001" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+<vector android:height="@dimen/half_standard_height" android:viewportHeight="235.0"
+    android:viewportWidth="235.001" android:width="@dimen/half_standard_height" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#E3E3E3" android:pathData="M117.5,18.5c-54.67,0 -99,44.32 -99,99c0,54.67 44.32,99 99,99c54.67,0 99,-44.32 99,-99C216.5,62.83 172.18,18.5 117.5,18.5zM117.5,202.98c-47.21,0 -85.48,-38.27 -85.48,-85.48c0,-47.21 38.27,-85.48 85.48,-85.48s85.48,38.27 85.48,85.48C202.98,164.71 164.71,202.98 117.5,202.98z"/>
     <path android:fillColor="#EDA33F" android:pathData="M117.5,117.5m-79.73,0a79.73,79.73 0,1 1,159.45 0a79.73,79.73 0,1 1,-159.45 0"/>
     <path android:fillColor="#FF000000" android:pathData="M49.31,154.69a68.19,8.86 0,1 0,136.39 0a68.19,8.86 0,1 0,-136.39 0z"/>
diff --git a/app/src/main/res/drawable/round_icon_forest.xml b/app/src/main/res/drawable/round_icon_forest.xml
index c04d643ab..96511ccde 100644
--- a/app/src/main/res/drawable/round_icon_forest.xml
+++ b/app/src/main/res/drawable/round_icon_forest.xml
@@ -1,5 +1,5 @@
-<vector android:height="24dp" android:viewportHeight="112.8"
-    android:viewportWidth="112.8" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+<vector android:height="@dimen/half_standard_height" android:viewportHeight="112.8"
+    android:viewportWidth="112.8" android:width="@dimen/half_standard_height" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#E3E3E3" android:pathData="M56.4,8.88c-26.24,0 -47.52,21.28 -47.52,47.52c0,26.24 21.27,47.52 47.52,47.52c26.25,0 47.52,-21.28 47.52,-47.52C103.92,30.16 82.64,8.88 56.4,8.88zM56.4,97.43c-22.66,0 -41.03,-18.37 -41.03,-41.03c0,-22.66 18.37,-41.03 41.03,-41.03c22.66,0 41.03,18.37 41.03,41.03C97.43,79.06 79.06,97.43 56.4,97.43z"/>
     <path android:fillColor="#54B948" android:pathData="M56.4,56.73m-38.27,0a38.27,38.27 0,1 1,76.54 0a38.27,38.27 0,1 1,-76.54 0"/>
     <path android:fillColor="#352200" android:pathData="M28.6,69.79a27.8,10.31 0,1 0,55.6 0a27.8,10.31 0,1 0,-55.6 0z"/>
diff --git a/app/src/main/res/drawable/round_icon_gatehouse.xml b/app/src/main/res/drawable/round_icon_gatehouse.xml
index 7d04491fa..fb3e4bee2 100644
--- a/app/src/main/res/drawable/round_icon_gatehouse.xml
+++ b/app/src/main/res/drawable/round_icon_gatehouse.xml
@@ -1,5 +1,5 @@
-<vector android:height="24dp" android:viewportHeight="235.0"
-    android:viewportWidth="235.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+<vector android:height="@dimen/half_standard_height" android:viewportHeight="235.0"
+    android:viewportWidth="235.0" android:width="@dimen/half_standard_height" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#E3E3E3" android:pathData="M117.5,18.5c-54.68,0 -99,44.32 -99,99c0,54.67 44.32,99 99,99c54.67,0 99,-44.32 99,-99C216.5,62.83 172.18,18.5 117.5,18.5zM117.5,202.98c-47.21,0 -85.48,-38.27 -85.48,-85.48c0,-47.21 38.27,-85.48 85.48,-85.48c47.21,0 85.48,38.27 85.48,85.48C202.98,164.71 164.71,202.98 117.5,202.98z"/>
     <path android:fillColor="#EDA33F" android:pathData="M197.23,117.5c0,44.03 -35.69,79.72 -79.73,79.72c-44.03,0 -79.73,-35.69 -79.73,-79.72c0,-44.03 35.69,-79.73 79.73,-79.73C161.53,37.77 197.23,73.47 197.23,117.5z"/>
     <path android:fillColor="#FF000000" android:pathData="M56.94,153.5a60.56,8.91 0,1 0,121.12 0a60.56,8.91 0,1 0,-121.12 0z"/>
diff --git a/app/src/main/res/drawable/round_icon_generic_building.xml b/app/src/main/res/drawable/round_icon_generic_building.xml
index 9e8f13593..44345e6e0 100644
--- a/app/src/main/res/drawable/round_icon_generic_building.xml
+++ b/app/src/main/res/drawable/round_icon_generic_building.xml
@@ -1,5 +1,5 @@
-<vector android:height="24dp" android:viewportHeight="235.0"
-    android:viewportWidth="235.001" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+<vector android:height="@dimen/half_standard_height" android:viewportHeight="235.0"
+    android:viewportWidth="235.001" android:width="@dimen/half_standard_height" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#E3E3E3" android:pathData="M117.5,18.5c-54.67,0 -99,44.32 -99,99c0,54.67 44.32,99 99,99c54.67,0 99,-44.32 99,-99C216.5,62.83 172.18,18.5 117.5,18.5zM117.5,202.98c-47.21,0 -85.48,-38.27 -85.48,-85.48c0,-47.21 38.27,-85.48 85.48,-85.48s85.48,38.27 85.48,85.48C202.98,164.71 164.71,202.98 117.5,202.98z"/>
     <path android:fillColor="#EDA33F" android:pathData="M117.5,117.5m-79.73,0a79.73,79.73 0,1 1,159.45 0a79.73,79.73 0,1 1,-159.45 0"/>
     <path android:fillColor="#FF000000" android:pathData="M73.44,165.32a44.06,7.71 0,1 0,88.13 0a44.06,7.71 0,1 0,-88.13 0z"/>
diff --git a/app/src/main/res/drawable/round_icon_house.xml b/app/src/main/res/drawable/round_icon_house.xml
index e69e05eba..d210e89df 100644
--- a/app/src/main/res/drawable/round_icon_house.xml
+++ b/app/src/main/res/drawable/round_icon_house.xml
@@ -1,5 +1,5 @@
-<vector android:height="24dp" android:viewportHeight="235.0"
-    android:viewportWidth="235.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+<vector android:height="@dimen/half_standard_height" android:viewportHeight="235.0"
+    android:viewportWidth="235.0" android:width="@dimen/half_standard_height" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#E3E3E3" android:pathData="M117.5,18.5c-54.68,0 -99,44.32 -99,99c0,54.67 44.32,99 99,99c54.67,0 99,-44.32 99,-99C216.5,62.83 172.18,18.5 117.5,18.5zM117.5,202.98c-47.21,0 -85.48,-38.27 -85.48,-85.48c0,-47.21 38.27,-85.48 85.48,-85.48c47.21,0 85.48,38.27 85.48,85.48C202.98,164.71 164.71,202.98 117.5,202.98z"/>
     <path android:fillColor="#EDA33F" android:pathData="M197.23,117.5c0,44.03 -35.69,79.72 -79.73,79.72c-44.03,0 -79.73,-35.69 -79.73,-79.72c0,-44.03 35.69,-79.73 79.73,-79.73C161.53,37.77 197.23,73.47 197.23,117.5z"/>
     <path android:fillColor="#FF000000" android:pathData="M64.19,148.92a53.31,8.12 0,1 0,106.62 0a53.31,8.12 0,1 0,-106.62 0z"/>
diff --git a/app/src/main/res/drawable/round_icon_island.xml b/app/src/main/res/drawable/round_icon_island.xml
index 940ccd9d4..4157b163c 100644
--- a/app/src/main/res/drawable/round_icon_island.xml
+++ b/app/src/main/res/drawable/round_icon_island.xml
@@ -1,5 +1,5 @@
-<vector android:height="24dp" android:viewportHeight="112.801"
-    android:viewportWidth="112.8" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+<vector android:height="@dimen/half_standard_height" android:viewportHeight="112.801"
+    android:viewportWidth="112.8" android:width="@dimen/half_standard_height" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#E3E3E3" android:pathData="M56.4,8.88c-26.24,0 -47.52,21.28 -47.52,47.52s21.27,47.52 47.52,47.52c26.25,0 47.52,-21.28 47.52,-47.52S82.64,8.88 56.4,8.88zM56.4,97.43c-22.66,0 -41.03,-18.37 -41.03,-41.03c0,-22.66 18.37,-41.03 41.03,-41.03c22.66,0 41.03,18.37 41.03,41.03C97.43,79.06 79.06,97.43 56.4,97.43z"/>
     <path android:fillColor="#54B948" android:pathData="M56.4,56.73m-38.27,0a38.27,38.27 0,1 1,76.54 0a38.27,38.27 0,1 1,-76.54 0"/>
     <path android:fillColor="#007F9F" android:pathData="M18.13,56.73c0,21.13 17.13,38.27 38.27,38.27c21.14,0 38.27,-17.13 38.27,-38.27c0,-4.1 -0.65,-8.03 -1.84,-11.73H19.97C18.78,48.7 18.13,52.64 18.13,56.73z"/>
diff --git a/app/src/main/res/drawable/round_icon_milestone.xml b/app/src/main/res/drawable/round_icon_milestone.xml
index 23eb5142b..23923c0f3 100644
--- a/app/src/main/res/drawable/round_icon_milestone.xml
+++ b/app/src/main/res/drawable/round_icon_milestone.xml
@@ -1,5 +1,5 @@
-<vector android:height="24dp" android:viewportHeight="235.0"
-    android:viewportWidth="235.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+<vector android:height="@dimen/half_standard_height" android:viewportHeight="235.0"
+    android:viewportWidth="235.0" android:width="@dimen/half_standard_height" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#E3E3E3" android:pathData="M117.5,18.5c-54.68,0 -99,44.32 -99,99c0,54.67 44.32,99 99,99c54.67,0 99,-44.32 99,-99C216.5,62.83 172.18,18.5 117.5,18.5zM117.5,202.98c-47.21,0 -85.48,-38.27 -85.48,-85.48c0,-47.21 38.27,-85.48 85.48,-85.48s85.48,38.27 85.48,85.48S164.71,202.98 117.5,202.98z"/>
     <path android:fillColor="#EDA33F" android:pathData="M197.23,117.5c0,44.03 -35.69,79.72 -79.73,79.72c-44.03,0 -79.73,-35.69 -79.73,-79.72c0,-44.03 35.69,-79.73 79.73,-79.73C161.53,37.77 197.23,73.47 197.23,117.5z"/>
     <path android:fillColor="#FF000000" android:pathData="M73.27,163.84a44.23,6.61 0,1 0,88.46 0a44.23,6.61 0,1 0,-88.46 0z"/>
diff --git a/app/src/main/res/drawable/round_icon_mountain.xml b/app/src/main/res/drawable/round_icon_mountain.xml
index 46c9999a0..911c2f53a 100644
--- a/app/src/main/res/drawable/round_icon_mountain.xml
+++ b/app/src/main/res/drawable/round_icon_mountain.xml
@@ -1,5 +1,5 @@
-<vector android:height="24dp" android:viewportHeight="235.0"
-    android:viewportWidth="235.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+<vector android:height="@dimen/half_standard_height" android:viewportHeight="235.0"
+    android:viewportWidth="235.0" android:width="@dimen/half_standard_height" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#E3E3E3" android:pathData="M117.5,18.5c-54.67,0 -99,44.32 -99,99c0,54.67 44.32,99 99,99c54.68,0 99,-44.33 99,-99C216.5,62.83 172.18,18.5 117.5,18.5zM117.5,202.98c-47.21,0 -85.48,-38.27 -85.48,-85.48c0,-47.21 38.27,-85.48 85.48,-85.48c47.21,0 85.48,38.27 85.48,85.48C202.98,164.71 164.71,202.98 117.5,202.98z"/>
     <path android:fillColor="#54B948" android:pathData="M117.5,118.19m-79.73,0a79.73,79.73 0,1 1,159.45 0a79.73,79.73 0,1 1,-159.45 0"/>
     <path android:fillColor="#FF000000" android:pathData="M54.44,151.1a62.06,8.91 0,1 0,124.12 0a62.06,8.91 0,1 0,-124.12 0z"/>
diff --git a/app/src/main/res/drawable/round_icon_ocean.xml b/app/src/main/res/drawable/round_icon_ocean.xml
index 7f62065aa..78df5f170 100644
--- a/app/src/main/res/drawable/round_icon_ocean.xml
+++ b/app/src/main/res/drawable/round_icon_ocean.xml
@@ -1,5 +1,5 @@
-<vector android:height="24dp" android:viewportHeight="112.8"
-    android:viewportWidth="112.8" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+<vector android:height="@dimen/half_standard_height" android:viewportHeight="112.8"
+    android:viewportWidth="112.8" android:width="@dimen/half_standard_height" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#E3E3E3" android:pathData="M56.4,8.88c-26.24,0 -47.52,21.27 -47.52,47.52c0,26.24 21.27,47.52 47.52,47.52c26.25,0 47.52,-21.28 47.52,-47.52C103.92,30.16 82.64,8.88 56.4,8.88zM56.4,97.43c-22.66,0 -41.03,-18.37 -41.03,-41.03s18.37,-41.03 41.03,-41.03c22.66,0 41.03,18.37 41.03,41.03S79.06,97.43 56.4,97.43z"/>
     <path android:fillColor="#54B948" android:pathData="M56.4,56.73m-38.27,0a38.27,38.27 0,1 1,76.54 0a38.27,38.27 0,1 1,-76.54 0"/>
     <path android:fillColor="#007F9F" android:pathData="M18.13,56.73c0,21.14 17.13,38.27 38.27,38.27c21.14,0 38.27,-17.13 38.27,-38.27c0,-4.09 -0.65,-8.03 -1.84,-11.73H19.97C18.78,48.7 18.13,52.64 18.13,56.73z"/>
diff --git a/app/src/main/res/drawable/round_icon_park.xml b/app/src/main/res/drawable/round_icon_park.xml
index ed19fe8de..7e0cb01e7 100644
--- a/app/src/main/res/drawable/round_icon_park.xml
+++ b/app/src/main/res/drawable/round_icon_park.xml
@@ -1,5 +1,5 @@
-<vector android:height="24dp" android:viewportHeight="235.0"
-    android:viewportWidth="235.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+<vector android:height="@dimen/half_standard_height" android:viewportHeight="235.0"
+    android:viewportWidth="235.0" android:width="@dimen/half_standard_height" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#E3E3E3" android:pathData="M117.5,18.5c-54.68,0 -99,44.32 -99,99c0,54.67 44.32,99 99,99c54.67,0 99,-44.32 99,-99C216.5,62.83 172.18,18.5 117.5,18.5zM117.5,202.98c-47.21,0 -85.48,-38.27 -85.48,-85.48c0,-47.21 38.27,-85.48 85.48,-85.48c47.21,0 85.48,38.27 85.48,85.48C202.98,164.71 164.71,202.98 117.5,202.98z"/>
     <path android:fillColor="#EDA33F" android:pathData="M197.23,117.5c0,44.03 -35.69,79.72 -79.73,79.72c-44.03,0 -79.73,-35.69 -79.73,-79.72c0,-44.03 35.69,-79.73 79.73,-79.73C161.53,37.77 197.23,73.47 197.23,117.5z"/>
     <path android:fillColor="#54B948" android:pathData="M50.99,153.38a65.64,7.45 0,1 0,131.28 0a65.64,7.45 0,1 0,-131.28 0z"/>
diff --git a/app/src/main/res/drawable/round_icon_railway_station.xml b/app/src/main/res/drawable/round_icon_railway_station.xml
index 5a0520432..8732e27ef 100644
--- a/app/src/main/res/drawable/round_icon_railway_station.xml
+++ b/app/src/main/res/drawable/round_icon_railway_station.xml
@@ -1,5 +1,5 @@
-<vector android:height="24dp" android:viewportHeight="235.0"
-    android:viewportWidth="235.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+<vector android:height="@dimen/half_standard_height" android:viewportHeight="235.0"
+    android:viewportWidth="235.0" android:width="@dimen/half_standard_height" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#E3E3E3" android:pathData="M117.5,18.5c-54.68,0 -99,44.32 -99,99c0,54.67 44.32,99 99,99c54.67,0 99,-44.32 99,-99C216.5,62.83 172.18,18.5 117.5,18.5zM117.5,202.98c-47.21,0 -85.48,-38.27 -85.48,-85.48c0,-47.21 38.27,-85.48 85.48,-85.48c47.21,0 85.48,38.27 85.48,85.48C202.98,164.71 164.71,202.98 117.5,202.98z"/>
     <path android:fillColor="#EDA33F" android:pathData="M197.23,117.5c0,44.03 -35.69,79.72 -79.73,79.72c-44.03,0 -79.73,-35.69 -79.73,-79.72c0,-44.03 35.69,-79.73 79.73,-79.73C161.53,37.77 197.23,73.47 197.23,117.5z"/>
     <path android:fillColor="#352200" android:pathData="M48.69,144.99a69.93,13.72 0,1 0,139.86 0a69.93,13.72 0,1 0,-139.86 0z"/>
diff --git a/app/src/main/res/drawable/round_icon_river.xml b/app/src/main/res/drawable/round_icon_river.xml
index 27dbaab62..dae050dfa 100644
--- a/app/src/main/res/drawable/round_icon_river.xml
+++ b/app/src/main/res/drawable/round_icon_river.xml
@@ -1,5 +1,5 @@
-<vector android:height="24dp" android:viewportHeight="112.801"
-    android:viewportWidth="112.801" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+<vector android:height="@dimen/half_standard_height" android:viewportHeight="112.801"
+    android:viewportWidth="112.801" android:width="@dimen/half_standard_height" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#E3E3E3" android:pathData="M56.4,8.88c-26.24,0 -47.52,21.27 -47.52,47.52c0,26.24 21.27,47.52 47.52,47.52c26.25,0 47.52,-21.27 47.52,-47.52C103.92,30.16 82.64,8.88 56.4,8.88zM56.4,97.43c-22.66,0 -41.03,-18.37 -41.03,-41.03c0,-22.66 18.37,-41.03 41.03,-41.03c22.66,0 41.03,18.37 41.03,41.03C97.43,79.06 79.06,97.43 56.4,97.43z"/>
     <path android:fillColor="#54B948" android:pathData="M56.4,56.4m-38.27,0a38.27,38.27 0,1 1,76.54 0a38.27,38.27 0,1 1,-76.54 0"/>
     <path android:fillColor="#352200" android:pathData="M19.31,61.45a36.97,17.44 0,1 0,73.93 0a36.97,17.44 0,1 0,-73.93 0z"/>
diff --git a/app/src/main/res/drawable/round_icon_road.xml b/app/src/main/res/drawable/round_icon_road.xml
index 4c5cb98ef..e65158d2b 100644
--- a/app/src/main/res/drawable/round_icon_road.xml
+++ b/app/src/main/res/drawable/round_icon_road.xml
@@ -1,5 +1,5 @@
-<vector android:height="24dp" android:viewportHeight="234.999"
-    android:viewportWidth="235.001" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+<vector android:height="@dimen/half_standard_height" android:viewportHeight="234.999"
+    android:viewportWidth="235.001" android:width="@dimen/half_standard_height" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#E3E3E3" android:pathData="M117.5,18.5c-54.67,0 -99,44.32 -99,99c0,54.67 44.32,99 99,99c54.67,0 99,-44.32 99,-99C216.5,62.83 172.18,18.5 117.5,18.5zM117.5,202.98c-47.21,0 -85.48,-38.27 -85.48,-85.48c0,-47.21 38.27,-85.48 85.48,-85.48s85.48,38.27 85.48,85.48C202.98,164.71 164.71,202.98 117.5,202.98z"/>
     <path android:fillColor="#EDA33F" android:pathData="M197.23,117.5c0,44.03 -35.69,79.72 -79.73,79.72c-44.03,0 -79.73,-35.69 -79.73,-79.72c0,-44.03 35.69,-79.73 79.73,-79.73C161.53,37.77 197.23,73.47 197.23,117.5z"/>
     <path android:fillColor="#352200" android:pathData="M195.22,99.74c-4.62,-1.5 -10.24,-2.97 -14.99,-3.58l-37.11,-5.24c-42.73,-5.28 -76.6,-2.88 -101.46,1.97c-2.52,7.75 -3.89,16.02 -3.89,24.61c0,44.03 35.69,79.72 79.73,79.72c44.03,0 79.73,-35.69 79.73,-79.72C197.23,111.39 196.52,105.46 195.22,99.74z"/>
diff --git a/app/src/main/res/drawable/round_icon_school.xml b/app/src/main/res/drawable/round_icon_school.xml
index 303610416..a4f9f1339 100644
--- a/app/src/main/res/drawable/round_icon_school.xml
+++ b/app/src/main/res/drawable/round_icon_school.xml
@@ -1,5 +1,5 @@
-<vector android:height="24dp" android:viewportHeight="235.0"
-    android:viewportWidth="235.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+<vector android:height="@dimen/half_standard_height" android:viewportHeight="235.0"
+    android:viewportWidth="235.0" android:width="@dimen/half_standard_height" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#E3E3E3" android:pathData="M117.5,18.5c-54.68,0 -99,44.32 -99,99c0,54.67 44.32,99 99,99c54.67,0 99,-44.32 99,-99C216.5,62.83 172.18,18.5 117.5,18.5zM117.5,202.98c-47.21,0 -85.48,-38.27 -85.48,-85.48c0,-47.21 38.27,-85.48 85.48,-85.48c47.21,0 85.48,38.27 85.48,85.48C202.98,164.71 164.71,202.98 117.5,202.98z"/>
     <path android:fillColor="#EDA33F" android:pathData="M197.23,117.5c0,44.03 -35.69,79.72 -79.73,79.72c-44.03,0 -79.73,-35.69 -79.73,-79.72c0,-44.03 35.69,-79.73 79.73,-79.73C161.53,37.77 197.23,73.47 197.23,117.5z"/>
     <path android:fillColor="#FF000000" android:pathData="M51.77,153.81a65.73,6.07 0,1 0,131.47 0a65.73,6.07 0,1 0,-131.47 0z"/>
diff --git a/app/src/main/res/drawable/round_icon_unknown.xml b/app/src/main/res/drawable/round_icon_unknown.xml
index 33905d93b..774403976 100644
--- a/app/src/main/res/drawable/round_icon_unknown.xml
+++ b/app/src/main/res/drawable/round_icon_unknown.xml
@@ -1,5 +1,5 @@
-<vector android:height="24dp" android:viewportHeight="32.0"
-    android:viewportWidth="32.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+<vector android:height="@dimen/half_standard_height" android:viewportHeight="32.0"
+    android:viewportWidth="32.0" android:width="@dimen/half_standard_height" xmlns:android="http://schemas.android.com/apk/res/android">
     <path android:fillColor="#006598" android:pathData="m15.87,3.79c-0.52,0.03 -0.91,0.06 -1.34,0.17 -1.55,0.38 -2.92,1.35 -3.81,2.69 -0.71,1.06 -1.08,2.29 -1.08,3.57 0,0.37 0.02,0.6 0.02,0.88l1.86,0c-0.07,-0.31 -0.12,-0.63 -0.12,-0.95 0,-2.6 2.12,-4.69 4.72,-4.69 2.6,0 4.69,2.1 4.69,4.69 0,2.33 -1.59,4.27 -3.81,4.82 -0.38,0.21 -0.73,0.24 -1,0.51 -0.24,0.24 -0.42,0.44 -0.59,0.73 -0.19,0.33 -0.36,0.76 -0.46,1.17 -0.03,0.12 -0.01,0.12 -0.02,0.12 -0.01,0 -0.16,-0.05 -0.42,-0.15 -0.54,-0.21 -0.68,-0.24 -0.76,-0.24 -0.05,-0 -0.06,0.01 -0.05,0.05 0.01,0.04 0.06,0.1 0.15,0.2 0.32,0.37 0.59,0.88 0.9,1.61 0.26,0.62 0.56,1.43 0.78,2.2 0.03,0.09 0.05,0.19 0.05,0.2 0,0 0.48,-0.79 0.81,-1.34 0.96,-1.63 1.46,-2.62 1.39,-2.71 -0.01,-0.01 -0.01,0.01 -0.05,0.02 -0.02,0.01 -0.07,0.04 -0.15,0.12 -0.07,0.07 -0.16,0.15 -0.2,0.17 -0.11,0.08 -0.27,0.16 -0.42,0.2 -0.13,0.03 -0.26,0.04 -0.27,0.02 -0.01,-0.01 0.03,-0.15 0.07,-0.27 0.17,-0.5 0.38,-0.82 0.76,-1.08 0.22,-0.15 0.44,-0.24 1.05,-0.49 0.48,-0.2 0.61,-0.27 0.86,-0.39 0.52,-0.26 0.92,-0.54 1.3,-0.93 0.54,-0.56 0.97,-1.22 1.27,-1.93 0.34,-0.8 0.51,-1.67 0.51,-2.54 0,-1.27 -0.37,-2.51 -1.08,-3.57 -0.35,-0.52 -0.76,-0.99 -1.25,-1.39 -0.88,-0.73 -1.93,-1.21 -3.06,-1.39 -0.23,-0.04 -0.43,-0.05 -0.68,-0.07 -0.1,-0.01 -0.5,-0 -0.59,0z"/>
     <path android:fillColor="#980000" android:pathData="m15.61,25.72c-0.51,-0.04 -0.97,-0.29 -1.29,-0.68 -0.18,-0.23 -0.31,-0.49 -0.37,-0.78 -0.03,-0.15 -0.03,-0.19 -0.03,-0.38 0,-0.16 0,-0.19 0.01,-0.26 0.05,-0.34 0.18,-0.63 0.39,-0.89 0.06,-0.08 0.2,-0.22 0.28,-0.28 0.35,-0.28 0.78,-0.42 1.21,-0.41 0.41,0.01 0.77,0.14 1.09,0.4 0.08,0.06 0.23,0.21 0.29,0.28 0.18,0.22 0.29,0.45 0.36,0.71 0.04,0.15 0.05,0.28 0.05,0.45 0,0.12 -0.01,0.2 -0.02,0.3 -0.1,0.6 -0.48,1.1 -1.03,1.36 -0.29,0.14 -0.62,0.2 -0.94,0.17z"/>
 </vector>
diff --git a/app/src/main/res/drawable/round_icon_waterfall.xml b/app/src/main/res/drawable/round_icon_waterfall.xml
index a02541583..ade5598d0 100644
--- a/app/src/main/res/drawable/round_icon_waterfall.xml
+++ b/app/src/main/res/drawable/round_icon_waterfall.xml
@@ -1,5 +1,5 @@
-<vector android:height="24dp" android:viewportHeight="235.0"
-android:viewportWidth="235.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+<vector android:height="@dimen/half_standard_height" android:viewportHeight="235.0"
+android:viewportWidth="235.0" android:width="@dimen/half_standard_height" xmlns:android="http://schemas.android.com/apk/res/android">
 <path android:fillColor="#E3E3E3" android:pathData="M117.5,18.5c-54.67,0 -99,44.32 -99,99c0,54.67 44.32,99 99,99c54.68,0 99,-44.33 99,-99C216.5,62.83 172.18,18.5 117.5,18.5zM117.5,202.98c-47.21,0 -85.48,-38.27 -85.48,-85.48c0,-47.21 38.27,-85.48 85.48,-85.48c47.21,0 85.48,38.27 85.48,85.48C202.98,164.71 164.71,202.98 117.5,202.98z"/>
 <path android:fillColor="#54B948" android:pathData="M117.5,118.19m-79.73,0a79.73,79.73 0,1 1,159.45 0a79.73,79.73 0,1 1,-159.45 0"/>
 <path android:fillColor="#58595B" android:pathData="M117.5,197.91c44.03,0 79.73,-35.69 79.73,-79.72c0,-7.58 -1.08,-14.9 -3.06,-21.85c-27.77,-4.05 -53.39,-3.37 -55.11,0.61H91.73c-3.07,-5.81 -25.77,-5.67 -49.91,-3.83c-2.61,7.89 -4.04,16.31 -4.04,25.07C37.77,162.22 73.47,197.91 117.5,197.91z"/>
diff --git a/app/src/main/res/drawable/thumbnail_selected.xml b/app/src/main/res/drawable/thumbnail_selected.xml
index ac6ec9335..19ab17e54 100644
--- a/app/src/main/res/drawable/thumbnail_selected.xml
+++ b/app/src/main/res/drawable/thumbnail_selected.xml
@@ -1,11 +1,11 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
   <stroke
     android:color="@color/primaryDarkColor"
-    android:width="2dp"/>
+    android:width="@dimen/miniscule_margin"/>
   <solid android:color="#F8F7F5"/>
   <padding
-    android:bottom="2dp"
-    android:left="2dp"
-    android:right="2dp"
-    android:top="2dp"/>
+    android:bottom="@dimen/miniscule_margin"
+    android:left="@dimen/miniscule_margin"
+    android:right="@dimen/miniscule_margin"
+    android:top="@dimen/miniscule_margin"/>
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout-land/activity_login.xml b/app/src/main/res/layout-land/activity_login.xml
index f322e4ce4..de281c1f5 100644
--- a/app/src/main/res/layout-land/activity_login.xml
+++ b/app/src/main/res/layout-land/activity_login.xml
@@ -9,7 +9,7 @@
       android:layout_height="match_parent"
       android:orientation="vertical">
     <FrameLayout
-        android:layout_width="400sp"
+        android:layout_width="@dimen/landscape_width"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
         android:layout_marginTop="@dimen/small_gap">
@@ -23,8 +23,8 @@
             android:layout_marginRight="@dimen/standard_gap"
             android:layout_marginStart="@dimen/standard_gap"
             android:layout_marginTop="@dimen/large_gap"
-            app:cardCornerRadius="4dp"
-            app:cardElevation="4dp">
+            app:cardCornerRadius="@dimen/tiny_margin"
+            app:cardElevation="@dimen/tiny_margin">
 
             <RelativeLayout
                 android:layout_width="match_parent"
@@ -170,7 +170,7 @@
                     <Button
                         android:id="@+id/sign_up_button"
                         style="@style/Widget.AppCompat.Button.Borderless.Colored"
-                        android:layout_width="0dp"
+                        android:layout_width="@dimen/dimen_0"
                         android:layout_height="wrap_content"
                         android:layout_gravity="center_horizontal"
                         android:layout_marginEnd="@dimen/small_gap"
@@ -181,7 +181,7 @@
                     <Button
                         android:id="@+id/login_button"
                         style="@style/Widget.AppCompat.Button.Colored"
-                        android:layout_width="0dp"
+                        android:layout_width="@dimen/dimen_0"
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="@dimen/small_gap"
                         android:layout_marginStart="@dimen/small_gap"
@@ -216,19 +216,19 @@
         </androidx.cardview.widget.CardView>
 
         <androidx.appcompat.widget.AppCompatImageView
-            android:layout_width="64dp"
-            android:layout_height="64dp"
+            android:layout_width="@dimen/gigantic_gap"
+            android:layout_height="@dimen/gigantic_gap"
             android:layout_gravity="center_horizontal"
-            android:elevation="8dp"
+            android:elevation="@dimen/activity_margin_horizontal"
             app:srcCompat="@drawable/blue_rinse_circle"
             tools:ignore="UnusedAttribute" />
 
         <androidx.appcompat.widget.AppCompatImageView
-            android:layout_width="42dp"
-            android:layout_height="42dp"
+            android:layout_width="@dimen/dimen_42"
+            android:layout_height="@dimen/dimen_42"
             android:layout_gravity="center_horizontal"
-            android:layout_marginTop="8dp"
-            android:elevation="8dp"
+            android:layout_marginTop="@dimen/activity_margin_horizontal"
+            android:elevation="@dimen/activity_margin_horizontal"
             app:srcCompat="@drawable/commons_logo"
             tools:ignore="UnusedAttribute" />
 
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 0ec9bc8b3..ede0396df 100644
--- a/app/src/main/res/layout-land/welcome_do_upload.xml
+++ b/app/src/main/res/layout-land/welcome_do_upload.xml
@@ -8,7 +8,7 @@
     android:paddingRight="@dimen/huge_gap">
 
     <ImageView
-        android:layout_width="0dp"
+        android:layout_width="@dimen/dimen_0"
         android:layout_height="wrap_content"
         android:layout_marginRight="@dimen/large_gap"
         android:layout_weight="0.5"
@@ -17,7 +17,7 @@
         android:src="@drawable/welcome_do_upload" />
 
     <LinearLayout
-        android:layout_width="0dp"
+        android:layout_width="@dimen/dimen_0"
         android:layout_height="wrap_content"
         android:layout_weight="0.5"
         android:orientation="vertical">
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 037950491..5d6053833 100644
--- a/app/src/main/res/layout-land/welcome_dont_upload.xml
+++ b/app/src/main/res/layout-land/welcome_dont_upload.xml
@@ -8,7 +8,7 @@
     android:paddingRight="@dimen/huge_gap">
 
     <ImageView
-        android:layout_width="0dp"
+        android:layout_width="@dimen/dimen_0"
         android:layout_height="wrap_content"
         android:layout_marginRight="@dimen/large_gap"
         android:layout_weight="0.5"
@@ -17,7 +17,7 @@
         android:src="@drawable/welcome_dont_upload" />
 
     <LinearLayout
-        android:layout_width="0dp"
+        android:layout_width="@dimen/dimen_0"
         android:layout_height="wrap_content"
         android:layout_weight="0.5"
         android:orientation="vertical">
diff --git a/app/src/main/res/layout-land/welcome_image_example.xml b/app/src/main/res/layout-land/welcome_image_example.xml
index 82a8ae29c..9662588d1 100644
--- a/app/src/main/res/layout-land/welcome_image_example.xml
+++ b/app/src/main/res/layout-land/welcome_image_example.xml
@@ -8,7 +8,7 @@
     android:paddingRight="@dimen/huge_gap">
 
     <ImageView
-        android:layout_width="0dp"
+        android:layout_width="@dimen/dimen_0"
         android:layout_height="wrap_content"
         android:layout_marginRight="@dimen/large_gap"
         android:layout_weight="0.5"
@@ -17,7 +17,7 @@
         android:src="@drawable/welcome_image_example" />
 
     <LinearLayout
-        android:layout_width="0dp"
+        android:layout_width="@dimen/dimen_0"
         android:layout_height="wrap_content"
         android:layout_weight="0.5"
         android:orientation="vertical">
diff --git a/app/src/main/res/layout-land/welcome_wikipedia.xml b/app/src/main/res/layout-land/welcome_wikipedia.xml
index 6104bb6e3..b6d64473e 100644
--- a/app/src/main/res/layout-land/welcome_wikipedia.xml
+++ b/app/src/main/res/layout-land/welcome_wikipedia.xml
@@ -8,7 +8,7 @@
     android:paddingRight="@dimen/huge_gap">
 
     <ImageView
-        android:layout_width="0dp"
+        android:layout_width="@dimen/dimen_0"
         android:layout_height="wrap_content"
         android:layout_marginRight="@dimen/large_gap"
         android:layout_weight="0.5"
@@ -17,7 +17,7 @@
         android:src="@drawable/welcome_wikipedia" />
 
     <LinearLayout
-        android:layout_width="0dp"
+        android:layout_width="@dimen/dimen_0"
         android:layout_height="wrap_content"
         android:layout_weight="0.5"
         android:orientation="vertical">
diff --git a/app/src/main/res/layout-v21/drawer_view.xml b/app/src/main/res/layout-v21/drawer_view.xml
index 1850f9a8e..952408da5 100644
--- a/app/src/main/res/layout-v21/drawer_view.xml
+++ b/app/src/main/res/layout-v21/drawer_view.xml
@@ -5,6 +5,6 @@
     android:layout_width="wrap_content"
     android:layout_height="match_parent"
     android:layout_gravity="start"
-    android:elevation="2dp"
+    android:elevation="@dimen/miniscule_margin"
     app:headerLayout="@layout/drawer_header"
     app:menu="@menu/drawer" />
\ No newline at end of file
diff --git a/app/src/main/res/layout-xlarge/activity_login.xml b/app/src/main/res/layout-xlarge/activity_login.xml
index 0a445c80e..b491de5c2 100644
--- a/app/src/main/res/layout-xlarge/activity_login.xml
+++ b/app/src/main/res/layout-xlarge/activity_login.xml
@@ -10,7 +10,7 @@
         android:orientation="vertical">
 
         <FrameLayout
-            android:layout_width="400sp"
+            android:layout_width="@dimen/landscape_width"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
             android:layout_marginTop="@dimen/small_gap">
@@ -24,8 +24,8 @@
                 android:layout_marginRight="@dimen/standard_gap"
                 android:layout_marginStart="@dimen/standard_gap"
                 android:layout_marginTop="@dimen/large_gap"
-                app:cardCornerRadius="4dp"
-                app:cardElevation="4dp">
+                app:cardCornerRadius="@dimen/tiny_margin"
+                app:cardElevation="@dimen/tiny_margin">
 
                 <RelativeLayout
                     android:layout_width="match_parent"
@@ -171,7 +171,7 @@
                         <Button
                             android:id="@+id/sign_up_button"
                             style="@style/Widget.AppCompat.Button.Borderless.Colored"
-                            android:layout_width="0dp"
+                            android:layout_width="@dimen/dimen_0"
                             android:layout_height="wrap_content"
                             android:layout_gravity="center_horizontal"
                             android:layout_marginEnd="@dimen/small_gap"
@@ -182,7 +182,7 @@
                         <Button
                             android:id="@+id/login_button"
                             style="@style/Widget.AppCompat.Button.Colored"
-                            android:layout_width="0dp"
+                            android:layout_width="@dimen/dimen_0"
                             android:layout_height="wrap_content"
                             android:layout_marginLeft="@dimen/small_gap"
                             android:layout_marginStart="@dimen/small_gap"
@@ -217,19 +217,19 @@
             </androidx.cardview.widget.CardView>
 
             <androidx.appcompat.widget.AppCompatImageView
-                android:layout_width="64dp"
-                android:layout_height="64dp"
+                android:layout_width="@dimen/gigantic_gap"
+                android:layout_height="@dimen/gigantic_gap"
                 android:layout_gravity="center_horizontal"
-                android:elevation="8dp"
+                android:elevation="@dimen/activity_margin_horizontal"
                 app:srcCompat="@drawable/blue_rinse_circle"
                 tools:ignore="UnusedAttribute" />
 
             <androidx.appcompat.widget.AppCompatImageView
-                android:layout_width="42dp"
-                android:layout_height="42dp"
+                android:layout_width="@dimen/dimen_42"
+                android:layout_height="@dimen/dimen_42"
                 android:layout_gravity="center_horizontal"
-                android:layout_marginTop="8dp"
-                android:elevation="8dp"
+                android:layout_marginTop="@dimen/activity_margin_horizontal"
+                android:elevation="@dimen/activity_margin_horizontal"
                 app:srcCompat="@drawable/commons_logo"
                 tools:ignore="UnusedAttribute" />
 
diff --git a/app/src/main/res/layout/activity_achievements.xml b/app/src/main/res/layout/activity_achievements.xml
index b81831e96..01bc98bbd 100644
--- a/app/src/main/res/layout/activity_achievements.xml
+++ b/app/src/main/res/layout/activity_achievements.xml
@@ -110,32 +110,32 @@
                             android:text="@string/images_uploaded" />
 
                         <ImageView
-                            android:layout_width="12dp"
-                            android:layout_height="12dp"
+                            android:layout_width="@dimen/quarter_standard_height"
+                            android:layout_height="@dimen/quarter_standard_height"
                             android:id="@+id/images_upload_info"
-                            android:layout_marginTop="8dp"
+                            android:layout_marginTop="@dimen/activity_margin_horizontal"
                             android:layout_marginRight="@dimen/activity_margin_horizontal"
                             android:layout_marginEnd="@dimen/activity_margin_horizontal"
                             android:layout_toRightOf="@+id/images_upload_text_param"
                             android:layout_toEndOf="@+id/images_upload_text_param"
                             app:srcCompat="@drawable/ic_info_outline_24dp"
                             android:tint="@color/primaryDarkColor"
-                            android:layout_marginLeft="8dp"
-                            android:layout_marginStart="8dp"/>
+                            android:layout_marginLeft="@dimen/activity_margin_horizontal"
+                            android:layout_marginStart="@dimen/activity_margin_horizontal"/>
 
                         <com.dinuscxj.progressbar.CircleProgressBar
-                            android:layout_width="40dp"
-                            android:layout_height="40dp"
+                            android:layout_width="@dimen/dimen_40"
+                            android:layout_height="@dimen/dimen_40"
                             android:layout_alignParentRight="true"
                             android:layout_alignParentEnd="true"
-                            android:layout_marginEnd="32dp"
-                            android:layout_marginRight="32dp"
+                            android:layout_marginEnd="@dimen/large_gap"
+                            android:layout_marginRight="@dimen/large_gap"
                             android:id="@+id/images_uploaded_progressbar"
                             android:progress="50"
-                            app:progress_text_size="9dp"
+                            app:progress_text_size="@dimen/progressbar_text"
                             app:progress_end_color="#8C8B98"
                             app:progress_start_color="#3A3381"
-                            app:progress_stroke_width="3dp"
+                            app:progress_stroke_width="@dimen/progressbar_stroke"
                             app:progress_text_format_pattern="573/110"
                             app:progress_text_color="@color/secondaryColor"
                             app:style="solid_line" />
@@ -146,7 +146,7 @@
                         android:id="@+id/layout_image_reverts"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_marginTop="4dp"
+                        android:layout_marginTop="@dimen/tiny_margin"
                         android:layout_below="@+id/layout_image_uploaded"
                         android:layout_marginEnd="@dimen/activity_margin_horizontal"
                         android:layout_marginLeft="@dimen/activity_margin_horizontal"
@@ -163,9 +163,9 @@
                             android:text="@string/image_reverts" />
 
                         <ImageView
-                            android:layout_width="12dp"
-                            android:layout_height="12dp"
-                            android:layout_marginTop="8dp"
+                            android:layout_width="@dimen/medium_width"
+                            android:layout_height="@dimen/medium_height"
+                            android:layout_marginTop="@dimen/activity_margin_horizontal"
                             android:layout_marginRight="@dimen/activity_margin_horizontal"
                             android:layout_marginEnd="@dimen/activity_margin_horizontal"
                             android:id="@+id/images_reverted_info"
@@ -173,32 +173,32 @@
                             android:layout_toEndOf="@+id/images_reverted_text"
                             app:srcCompat="@drawable/ic_info_outline_24dp"
                             android:tint="@color/primaryDarkColor"
-                            android:layout_marginLeft="8dp"
-                            android:layout_marginStart="8dp"/>
+                            android:layout_marginLeft="@dimen/activity_margin_horizontal"
+                            android:layout_marginStart="@dimen/activity_margin_horizontal"/>
 
                         <TextView
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:text="@string/achievements_revert_limit_message"
-                            android:textSize="10sp"
+                            android:textSize="@dimen/small_text"
                             android:id="@+id/images_revert_limit_text"
                             android:layout_marginLeft="@dimen/activity_margin_horizontal"
                             android:layout_marginStart="@dimen/activity_margin_horizontal"
                             android:layout_below="@+id/images_reverted_text"/>
 
                         <com.dinuscxj.progressbar.CircleProgressBar
-                            android:layout_width="40dp"
-                            android:layout_height="40dp"
+                            android:layout_width="@dimen/dimen_40"
+                            android:layout_height="@dimen/dimen_40"
                             android:layout_alignParentRight="true"
                             android:layout_alignParentEnd="true"
-                            android:layout_marginRight="32dp"
-                            android:layout_marginEnd="32dp"
+                            android:layout_marginRight="@dimen/large_gap"
+                            android:layout_marginEnd="@dimen/large_gap"
                             android:progress="50"
                             android:id="@+id/image_reverts_progressbar"
                             app:progress_end_color="#8C8B98"
                             app:progress_start_color="#3A3381"
-                            app:progress_text_size="9dp"
-                            app:progress_stroke_width="3dp"
+                            app:progress_text_size="@dimen/progressbar_text"
+                            app:progress_stroke_width="@dimen/progressbar_stroke"
                             app:progress_text_format_pattern="92%%"
                             app:progress_text_color="@color/secondaryColor"
                             app:style="solid_line" />
@@ -209,7 +209,7 @@
                         android:id="@+id/layout_image_used_by_wiki"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_marginTop="4dp"
+                        android:layout_marginTop="@dimen/tiny_margin"
                         android:layout_below="@+id/layout_image_reverts"
                         android:layout_marginBottom="@dimen/activity_margin_vertical"
                         android:layout_marginEnd="@dimen/activity_margin_horizontal"
@@ -228,28 +228,28 @@
                             android:text="@string/images_used_by_wiki" />
 
                         <ImageView
-                            android:layout_width="12dp"
-                            android:layout_height="12dp"
+                            android:layout_width="@dimen/medium_width"
+                            android:layout_height="@dimen/medium_height"
                             android:id="@+id/images_used_by_wiki_info"
-                            android:layout_marginTop="8dp"
+                            android:layout_marginTop="@dimen/activity_margin_horizontal"
                             android:layout_marginRight="@dimen/activity_margin_horizontal"
                             android:layout_marginEnd="@dimen/activity_margin_horizontal"
                             android:layout_toRightOf="@+id/images_used_by_wiki_text"
                             android:layout_toEndOf="@+id/images_used_by_wiki_text"
                             app:srcCompat="@drawable/ic_info_outline_24dp"
                             android:tint="@color/primaryDarkColor"
-                            android:layout_marginLeft="8dp"
-                            android:layout_marginStart="8dp"/>
+                            android:layout_marginLeft="@dimen/activity_margin_horizontal"
+                            android:layout_marginStart="@dimen/activity_margin_horizontal"/>
 
                         <com.dinuscxj.progressbar.CircleProgressBar
-                            android:layout_width="40dp"
-                            android:layout_height="40dp"
+                            android:layout_width="@dimen/dimen_40"
+                            android:layout_height="@dimen/dimen_40"
                             android:layout_alignParentRight="true"
                             android:layout_alignParentEnd="true"
-                            android:layout_marginRight="32dp"
-                            android:layout_marginEnd="32dp"
+                            android:layout_marginRight="@dimen/large_gap"
+                            android:layout_marginEnd="@dimen/large_gap"
                             android:progress="50"
-                            app:progress_text_size="9dp"
+                            app:progress_text_size="@dimen/progressbar_text"
                             android:id="@+id/images_used_by_wiki_progress_bar"
                             app:progress_end_color="#8C8B98"
                             app:progress_start_color="#3A3381"
@@ -321,10 +321,10 @@
                                 android:text="@string/statistics_wikidata_edits"  />
 
                             <ImageView
-                                android:layout_width="12dp"
-                                android:layout_height="12dp"
+                                android:layout_width="@dimen/medium_width"
+                                android:layout_height="@dimen/medium_height"
                                 android:id="@+id/images_nearby_info"
-                                android:layout_marginTop="8dp"
+                                android:layout_marginTop="@dimen/activity_margin_horizontal"
                                 android:layout_marginRight="@dimen/activity_margin_horizontal"
                                 android:layout_marginEnd="@dimen/activity_margin_horizontal"
                                 android:layout_gravity="top"
@@ -341,13 +341,13 @@
                             android:layout_alignParentRight="true"
                             android:layout_alignParentEnd="true"
                             android:layout_marginLeft="@dimen/activity_margin_horizontal"
-                            android:layout_marginEnd="24dp"
+                            android:layout_marginEnd="@dimen/half_standard_height"
                             android:layout_marginTop="@dimen/activity_margin_horizontal"
                             android:layout_marginStart="@dimen/activity_margin_horizontal"
                             android:layout_centerVertical="true"
                             tools:text="2"
                             android:id="@+id/wikidata_edits"
-                            android:layout_marginRight="24dp" />
+                            android:layout_marginRight="@dimen/half_standard_height" />
 
                     </RelativeLayout>
 
@@ -389,10 +389,10 @@
                                 android:text="@string/statistics_featured"  />
 
                             <ImageView
-                                android:layout_width="12dp"
-                                android:layout_height="12dp"
+                                android:layout_width="@dimen/medium_width"
+                                android:layout_height="@dimen/medium_height"
                                 android:id="@+id/images_featured_info"
-                                android:layout_marginTop="8dp"
+                                android:layout_marginTop="@dimen/activity_margin_horizontal"
                                 android:layout_marginRight="@dimen/activity_margin_horizontal"
                                 android:layout_marginEnd="@dimen/activity_margin_horizontal"
                                 android:layout_gravity="top"
@@ -413,8 +413,8 @@
                             tools:text="2"
                             android:id="@+id/image_featured"
                             android:layout_marginLeft="@dimen/activity_margin_horizontal"
-                            android:layout_marginEnd="24dp"
-                            android:layout_marginRight="24dp" />
+                            android:layout_marginEnd="@dimen/half_standard_height"
+                            android:layout_marginRight="@dimen/half_standard_height" />
 
                     </RelativeLayout>
 
@@ -456,10 +456,10 @@
                                 android:text="@string/statistics_thanks"  />
 
                             <ImageView
-                                android:layout_width="12dp"
-                                android:layout_height="12dp"
+                                android:layout_width="@dimen/medium_width"
+                                android:layout_height="@dimen/medium_height"
                                 android:id="@+id/thanks_received_info"
-                                android:layout_marginTop="8dp"
+                                android:layout_marginTop="@dimen/activity_margin_horizontal"
                                 android:layout_marginRight="@dimen/activity_margin_horizontal"
                                 android:layout_marginEnd="@dimen/activity_margin_horizontal"
                                 android:layout_gravity="top"
@@ -480,8 +480,8 @@
                             android:layout_centerVertical="true"
                             tools:text="2"
                             android:id="@+id/thanks_received"
-                            android:layout_marginEnd="24dp"
-                            android:layout_marginRight="24dp" />
+                            android:layout_marginEnd="@dimen/half_standard_height"
+                            android:layout_marginRight="@dimen/half_standard_height" />
 
                     </RelativeLayout>
 
diff --git a/app/src/main/res/layout/activity_bookmarks.xml b/app/src/main/res/layout/activity_bookmarks.xml
index 028c43c91..a52af68e1 100644
--- a/app/src/main/res/layout/activity_bookmarks.xml
+++ b/app/src/main/res/layout/activity_bookmarks.xml
@@ -24,8 +24,8 @@
 
         <androidx.viewpager.widget.ViewPager
             android:id="@+id/viewPagerBookmarks"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
+            android:layout_width="@dimen/dimen_0"
+            android:layout_height="@dimen/dimen_0"
             app:layout_behavior="@string/appbar_scrolling_view_behavior"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
@@ -34,8 +34,8 @@
 
         <FrameLayout
             android:id="@+id/fragmentContainer"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
+            android:layout_width="@dimen/dimen_0"
+            android:layout_height="@dimen/dimen_0"
             android:orientation="horizontal"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index 642f60641..772d3e742 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -25,8 +25,8 @@
             android:layout_marginStart="@dimen/standard_gap"
             android:layout_marginTop="@dimen/large_gap"
             android:focusableInTouchMode="true"
-            app:cardCornerRadius="4dp"
-            app:cardElevation="4dp">
+            app:cardCornerRadius="@dimen/tiny_margin"
+            app:cardElevation="@dimen/tiny_margin">
 
             <RelativeLayout
                 android:layout_width="match_parent"
@@ -174,7 +174,7 @@
                     <Button
                         android:id="@+id/sign_up_button"
                         style="@style/Widget.AppCompat.Button.Borderless.Colored"
-                        android:layout_width="0dp"
+                        android:layout_width="@dimen/dimen_0"
                         android:layout_height="wrap_content"
                         android:layout_gravity="center_horizontal"
                         android:layout_marginEnd="@dimen/small_gap"
@@ -185,7 +185,7 @@
                     <Button
                         android:id="@+id/login_button"
                         style="@style/Widget.AppCompat.Button.Colored"
-                        android:layout_width="0dp"
+                        android:layout_width="@dimen/dimen_0"
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="@dimen/small_gap"
                         android:layout_marginStart="@dimen/small_gap"
@@ -220,19 +220,19 @@
         </androidx.cardview.widget.CardView>
 
         <androidx.appcompat.widget.AppCompatImageView
-            android:layout_width="64dp"
-            android:layout_height="64dp"
+            android:layout_width="@dimen/gigantic_gap"
+            android:layout_height="@dimen/gigantic_gap"
             android:layout_gravity="center_horizontal"
-            android:elevation="8dp"
+            android:elevation="@dimen/activity_margin_horizontal"
             app:srcCompat="@drawable/blue_rinse_circle"
             tools:ignore="UnusedAttribute" />
 
         <androidx.appcompat.widget.AppCompatImageView
-            android:layout_width="42dp"
-            android:layout_height="42dp"
+            android:layout_width="@dimen/dimen_42"
+            android:layout_height="@dimen/dimen_42"
             android:layout_gravity="center_horizontal"
-            android:layout_marginTop="8dp"
-            android:elevation="8dp"
+            android:layout_marginTop="@dimen/activity_margin_horizontal"
+            android:elevation="@dimen/activity_margin_horizontal"
             app:srcCompat="@drawable/commons_logo"
             tools:ignore="UnusedAttribute" />
     </FrameLayout>
diff --git a/app/src/main/res/layout/activity_notification.xml b/app/src/main/res/layout/activity_notification.xml
index e6c07f8de..ccde97f83 100644
--- a/app/src/main/res/layout/activity_notification.xml
+++ b/app/src/main/res/layout/activity_notification.xml
@@ -41,8 +41,8 @@
 
             <ImageView
                 android:id="@+id/imageView"
-                android:layout_width="110dp"
-                android:layout_height="160dp"
+                android:layout_width="@dimen/notification_width"
+                android:layout_height="@dimen/notification_height"
                 app:layout_constraintLeft_toLeftOf="parent"
                 app:layout_constraintRight_toRightOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
@@ -58,7 +58,7 @@
                 app:layout_constraintRight_toRightOf="parent"
                 android:gravity="center"
                 android:text="@string/no_notification"
-                android:textSize="20sp" />
+                android:textSize="@dimen/subheading_text_size" />
         </androidx.constraintlayout.widget.ConstraintLayout>
 
     </RelativeLayout>
diff --git a/app/src/main/res/layout/activity_quiz.xml b/app/src/main/res/layout/activity_quiz.xml
index eeda3bf66..e27fcdc71 100644
--- a/app/src/main/res/layout/activity_quiz.xml
+++ b/app/src/main/res/layout/activity_quiz.xml
@@ -16,11 +16,11 @@
             <androidx.cardview.widget.CardView
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                app:cardCornerRadius="8dp"
-                android:layout_marginBottom="8dp"
-                android:layout_marginLeft="8dp"
-                android:layout_marginRight="8dp"
-                android:layout_marginTop="8dp"
+                app:cardCornerRadius="@dimen/activity_margin_horizontal"
+                android:layout_marginBottom="@dimen/activity_margin_horizontal"
+                android:layout_marginLeft="@dimen/activity_margin_horizontal"
+                android:layout_marginRight="@dimen/activity_margin_horizontal"
+                android:layout_marginTop="@dimen/activity_margin_horizontal"
                 app:cardUseCompatPadding="true">
 
                 <ScrollView
diff --git a/app/src/main/res/layout/activity_quiz_result.xml b/app/src/main/res/layout/activity_quiz_result.xml
index 5cfb4f4f9..416869bae 100644
--- a/app/src/main/res/layout/activity_quiz_result.xml
+++ b/app/src/main/res/layout/activity_quiz_result.xml
@@ -10,7 +10,7 @@
     <androidx.cardview.widget.CardView
         android:layout_height="match_parent"
         android:layout_width="match_parent"
-        app:cardCornerRadius="8dp"
+        app:cardCornerRadius="@dimen/activity_margin_horizontal"
         android:layout_marginBottom="@dimen/activity_margin_vertical"
         android:layout_marginLeft="@dimen/activity_margin_horizontal"
         android:layout_marginRight="@dimen/activity_margin_horizontal"
@@ -45,15 +45,15 @@
 
                     <com.dinuscxj.progressbar.CircleProgressBar
                         android:layout_width="match_parent"
-                        android:layout_height="250dp"
+                        android:layout_height="@dimen/dimen_250"
                         android:layout_marginRight="@dimen/activity_margin_horizontal"
                         android:layout_marginLeft="@dimen/activity_margin_horizontal"
                         android:layout_marginTop="@dimen/activity_margin_vertical"
                         android:progress="50"
                         app:progress_end_color="#8C8B98"
                         app:progress_start_color="#3A3381"
-                        app:progress_stroke_width="15dp"
-                        app:progress_text_size="32dp"
+                        app:progress_stroke_width="@dimen/first_fab"
+                        app:progress_text_size="@dimen/large_gap"
                         app:progress_text_format_pattern="4/5"
                         app:style="solid_line"
                         android:id="@+id/result_progress_bar"/>
@@ -73,7 +73,7 @@
                 </LinearLayout>
 
                 <Button
-                    android:layout_width="150dp"
+                    android:layout_width="@dimen/dimen_150"
                     android:layout_alignParentBottom="true"
                     android:layout_alignParentRight="true"
                     android:layout_marginRight="@dimen/activity_margin_horizontal"
diff --git a/app/src/main/res/layout/activity_review.xml b/app/src/main/res/layout/activity_review.xml
index 4a1652493..b2e10c49f 100644
--- a/app/src/main/res/layout/activity_review.xml
+++ b/app/src/main/res/layout/activity_review.xml
@@ -23,10 +23,10 @@
               android:layout_width="wrap_content"
               android:layout_height="wrap_content"
               android:layout_gravity="center_horizontal"
-              android:paddingLeft="12dp"
-              android:paddingRight="12dp"
+              android:paddingLeft="@dimen/medium_height"
+              android:paddingRight="@dimen/medium_height"
               android:drawableEnd="@drawable/ic_info_outline_24dp"
-              android:drawablePadding="12dp"
+              android:drawablePadding="@dimen/medium_height"
               android:drawableTint="@color/button_blue_dark"
               android:text="@string/skip_image"
               android:textColor="@color/button_blue_dark"
@@ -45,9 +45,9 @@
 
                     <RelativeLayout
                       android:layout_width="match_parent"
-                      android:layout_height="0dp"
+                      android:layout_height="@dimen/dimen_0"
                       android:layout_weight="1"
-                      android:layout_marginTop="5dp"
+                      android:layout_marginTop="@dimen/tiny_padding"
                       >
 
                     <com.facebook.drawee.view.SimpleDraweeView
@@ -55,7 +55,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="match_parent"
                         android:layout_alignParentTop="true"
-                        android:layout_marginTop="0dp"
+                        android:layout_marginTop="@dimen/dimen_0"
                         app:srcCompat="@drawable/commons_logo" />
 
                     <RelativeLayout
@@ -90,7 +90,7 @@
                     <fr.free.nrw.commons.review.ReviewViewPager
                       android:id="@+id/view_pager_review"
                       android:layout_width="match_parent"
-                      android:layout_height="0dp"
+                      android:layout_height="@dimen/dimen_0"
                       android:layout_weight="1"
                       android:fadingEdge="none"/>
 
@@ -100,10 +100,10 @@
                   android:id="@+id/rl_container_bottom_view"
                   android:layout_width="match_parent"
                   android:layout_height="wrap_content"
-                  android:padding="12dp"
+                  android:padding="@dimen/medium_height"
                   android:layout_alignParentBottom="true"
                   android:background="?attr/colorPrimaryDark"
-                  android:elevation="2dp">
+                  android:elevation="@dimen/miniscule_margin">
                     <com.viewpagerindicator.CirclePageIndicator
                       android:id="@+id/pager_indicator_review"
                       android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_upload.xml b/app/src/main/res/layout/activity_upload.xml
index 7822ce593..2d3a332bc 100644
--- a/app/src/main/res/layout/activity_upload.xml
+++ b/app/src/main/res/layout/activity_upload.xml
@@ -16,12 +16,12 @@
       android:id="@+id/cv_container_top_card"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
-      android:layout_marginBottom="8dp"
-      android:layout_marginEnd="8dp"
-      android:layout_marginLeft="8dp"
-      android:layout_marginRight="8dp"
-      android:layout_marginStart="8dp"
-      android:layout_marginTop="16dp"
+      android:layout_marginBottom="@dimen/activity_margin_horizontal"
+      android:layout_marginEnd="@dimen/activity_margin_horizontal"
+      android:layout_marginLeft="@dimen/activity_margin_horizontal"
+      android:layout_marginRight="@dimen/activity_margin_horizontal"
+      android:layout_marginStart="@dimen/activity_margin_horizontal"
+      android:layout_marginTop="@dimen/standard_gap"
       android:elevation="@dimen/cardview_default_elevation"
       >
     <LinearLayout
@@ -40,7 +40,7 @@
         <TextView
             android:id="@+id/tv_top_card_title"
             android:layout_width="wrap_content"
-            android:layout_height="24dp"
+            android:layout_height="@dimen/half_standard_height"
             android:layout_alignParentLeft="true"
             android:layout_alignParentStart="true"
             android:layout_centerVertical="true"
@@ -51,8 +51,8 @@
             />
         <androidx.appcompat.widget.AppCompatImageButton
             android:id="@+id/ib_toggle_top_card"
-            android:layout_width="24dp"
-            android:layout_height="24dp"
+            android:layout_width="@dimen/half_standard_height"
+            android:layout_height="@dimen/half_standard_height"
             android:layout_alignParentEnd="true"
             android:layout_alignParentRight="true"
             android:layout_centerVertical="true"
diff --git a/app/src/main/res/layout/activity_welcome.xml b/app/src/main/res/layout/activity_welcome.xml
index 2e23a8901..4cce03da6 100644
--- a/app/src/main/res/layout/activity_welcome.xml
+++ b/app/src/main/res/layout/activity_welcome.xml
@@ -27,6 +27,6 @@
         android:layout_width="match_parent"
         android:layout_height="@dimen/half_standard_height"
         android:layout_gravity="bottom"
-        android:padding="5dp" />
+        android:padding="@dimen/tiny_padding" />
 
 </FrameLayout>
diff --git a/app/src/main/res/layout/bottom_sheet_details.xml b/app/src/main/res/layout/bottom_sheet_details.xml
index 2a95ded81..a8889aafa 100644
--- a/app/src/main/res/layout/bottom_sheet_details.xml
+++ b/app/src/main/res/layout/bottom_sheet_details.xml
@@ -6,7 +6,7 @@
     android:orientation="vertical"
     android:background="?attr/mainBackground"
     app:layout_behavior="@string/bottom_sheet_behavior"
-    app:behavior_peekHeight="72dp"
+    app:behavior_peekHeight="@dimen/large_height"
     app:behavior_hideable="true"
     android:visibility="visible"
 
@@ -14,24 +14,24 @@
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="72dp"
-        android:layout_marginVertical="8dp"
+        android:layout_height="@dimen/large_height"
+        android:layout_marginVertical="@dimen/activity_margin_horizontal"
         android:gravity="center_vertical"
         >
 
         <ImageView
             android:id="@+id/icon"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
-            android:layout_marginLeft="16dp">
+            android:layout_width="@dimen/dimen_40"
+            android:layout_height="@dimen/dimen_40"
+            android:layout_marginLeft="@dimen/standard_gap">
         </ImageView>
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical"
-            android:layout_marginLeft="16dp"
-            android:layout_marginRight="16dp">
+            android:layout_marginLeft="@dimen/standard_gap"
+            android:layout_marginRight="@dimen/standard_gap">
 
             <TextView
                 android:id="@+id/title"
@@ -51,9 +51,9 @@
     </LinearLayout>
     <View
         android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:layout_marginTop="7dp"
-        android:layout_marginBottom="8dp"
+        android:layout_height="@dimen/tiny_height"
+        android:layout_marginTop="@dimen/small_height"
+        android:layout_marginBottom="@dimen/activity_margin_horizontal"
         android:background="@android:color/darker_gray"/>
     <LinearLayout
         android:layout_width="match_parent"
@@ -63,10 +63,10 @@
 
         <LinearLayout
             android:id="@+id/bookmarkButton"
-            android:layout_width="0dp"
+            android:layout_width="@dimen/dimen_0"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:padding="16dp"
+            android:padding="@dimen/standard_gap"
             android:clickable="true"
             android:orientation="vertical"
             android:background="@drawable/button_background_selector"
@@ -82,7 +82,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:id="@+id/bookmarkButtonText"
-                android:paddingTop="8dp"
+                android:paddingTop="@dimen/activity_margin_horizontal"
                 android:layout_gravity="center_horizontal"
                 android:text="CAMERA"
                 android:visibility="gone"
@@ -91,10 +91,10 @@
 
         <LinearLayout
             android:id="@+id/directionsButton"
-            android:layout_width="0dp"
+            android:layout_width="@dimen/dimen_0"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:padding="16dp"
+            android:padding="@dimen/standard_gap"
             android:clickable="true"
             android:background="@drawable/button_background_selector"
             android:orientation="vertical"
@@ -111,7 +111,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:id="@+id/directionsButtonText"
-                android:paddingTop="8dp"
+                android:paddingTop="@dimen/activity_margin_horizontal"
                 android:duplicateParentState="true"
                 android:textColor="@color/text_color_selector"
                 android:layout_gravity="center_horizontal"
@@ -121,10 +121,10 @@
         </LinearLayout>
         <LinearLayout
             android:id="@+id/wikidataButton"
-            android:layout_width="0dp"
+            android:layout_width="@dimen/dimen_0"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:padding="16dp"
+            android:padding="@dimen/standard_gap"
             android:clickable="true"
             android:background="@drawable/button_background_selector"
             android:orientation="vertical"
@@ -140,7 +140,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:id="@+id/wikidataButtonText"
-                android:paddingTop="8dp"
+                android:paddingTop="@dimen/activity_margin_horizontal"
                 android:duplicateParentState="true"
                 android:textColor="@color/text_color_selector"
                 android:layout_gravity="center_horizontal"
@@ -151,10 +151,10 @@
 
         <LinearLayout
             android:id="@+id/wikipediaButton"
-            android:layout_width="0dp"
+            android:layout_width="@dimen/dimen_0"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:padding="16dp"
+            android:padding="@dimen/standard_gap"
             android:clickable="true"
             android:background="@drawable/button_background_selector"
             android:orientation="vertical"
@@ -171,7 +171,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:id="@+id/wikipediaButtonText"
-                android:paddingTop="8dp"
+                android:paddingTop="@dimen/activity_margin_horizontal"
                 android:duplicateParentState="true"
                 android:textColor="@color/text_color_selector"
                 android:layout_gravity="center_horizontal"
@@ -182,10 +182,10 @@
 
         <LinearLayout
             android:id="@+id/commonsButton"
-            android:layout_width="0dp"
+            android:layout_width="@dimen/dimen_0"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:padding="16dp"
+            android:padding="@dimen/standard_gap"
             android:clickable="true"
             android:background="@drawable/button_background_selector"
             android:orientation="vertical"
@@ -201,7 +201,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:id="@+id/commonsButtonText"
-                android:paddingTop="8dp"
+                android:paddingTop="@dimen/activity_margin_horizontal"
                 android:duplicateParentState="true"
                 android:textColor="@color/text_color_selector"
                 android:layout_gravity="center_horizontal"
@@ -212,17 +212,17 @@
     </LinearLayout>
     <View
         android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:layout_marginTop="7dp"
-        android:layout_marginBottom="8dp"
+        android:layout_height="@dimen/tiny_height"
+        android:layout_marginTop="@dimen/small_height"
+        android:layout_marginBottom="@dimen/activity_margin_horizontal"
         android:background="@android:color/darker_gray"/>
     <TextView
         android:id="@+id/description"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="72dp"
-        android:layout_marginRight="16dp"
-        android:layout_marginBottom="16dp"
+        android:layout_marginLeft="@dimen/large_height"
+        android:layout_marginRight="@dimen/standard_gap"
+        android:layout_marginBottom="@dimen/standard_gap"
         android:textSize="16sp" />
 
 
diff --git a/app/src/main/res/layout/custom_nearby_tab_layout.xml b/app/src/main/res/layout/custom_nearby_tab_layout.xml
index 07d11f403..b63d15cc4 100644
--- a/app/src/main/res/layout/custom_nearby_tab_layout.xml
+++ b/app/src/main/res/layout/custom_nearby_tab_layout.xml
@@ -15,11 +15,11 @@
         android:textAllCaps="true"
         android:gravity="center"/>
     <ImageView
-        android:layout_width="18dp"
-        android:layout_height="18dp"
+        android:layout_width="@dimen/normal_height"
+        android:layout_height="@dimen/normal_height"
         android:id="@+id/nearby_info_image"
-        android:layout_marginStart="16dp"
-        android:layout_marginLeft="16dp"
+        android:layout_marginStart="@dimen/standard_gap"
+        android:layout_marginLeft="@dimen/standard_gap"
         app:srcCompat="@drawable/ic_info_outline_24dp"
         />
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/drawer_header.xml b/app/src/main/res/layout/drawer_header.xml
index 63e32911f..7ec93dc60 100644
--- a/app/src/main/res/layout/drawer_header.xml
+++ b/app/src/main/res/layout/drawer_header.xml
@@ -29,10 +29,10 @@
             android:id="@+id/username"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="4dp"
-            android:layout_marginTop="8dp"
-            android:layout_marginEnd="4dp"
-            android:layout_marginBottom="8dp"
+            android:layout_marginStart="@dimen/tiny_margin"
+            android:layout_marginTop="@dimen/activity_margin_horizontal"
+            android:layout_marginEnd="@dimen/tiny_margin"
+            android:layout_marginBottom="@dimen/activity_margin_horizontal"
             android:paddingBottom="@dimen/small_gap"
             android:textColor="@color/item_white_background"
             android:textSize="@dimen/subheading_text_size"
@@ -42,10 +42,10 @@
             android:id="@+id/user_icon"
             android:layout_width="25dp"
             android:layout_height="25dp"
-            android:layout_marginStart="4dp"
-            android:layout_marginTop="8dp"
-            android:layout_marginEnd="4dp"
-            android:layout_marginBottom="8dp"
+            android:layout_marginStart="@dimen/tiny_margin"
+            android:layout_marginTop="@dimen/activity_margin_horizontal"
+            android:layout_marginEnd="@dimen/tiny_margin"
+            android:layout_marginBottom="@dimen/activity_margin_horizontal"
             android:textColor="@color/item_white_background"
             android:textSize="@dimen/subheading_text_size"
             app:srcCompat="@drawable/ic_person_black_24dp" />
diff --git a/app/src/main/res/layout/drawer_view.xml b/app/src/main/res/layout/drawer_view.xml
index 1850f9a8e..952408da5 100644
--- a/app/src/main/res/layout/drawer_view.xml
+++ b/app/src/main/res/layout/drawer_view.xml
@@ -5,6 +5,6 @@
     android:layout_width="wrap_content"
     android:layout_height="match_parent"
     android:layout_gravity="start"
-    android:elevation="2dp"
+    android:elevation="@dimen/miniscule_margin"
     app:headerLayout="@layout/drawer_header"
     app:menu="@menu/drawer" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/filter_chip_view.xml b/app/src/main/res/layout/filter_chip_view.xml
index 6da5ad545..205f811aa 100644
--- a/app/src/main/res/layout/filter_chip_view.xml
+++ b/app/src/main/res/layout/filter_chip_view.xml
@@ -9,7 +9,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
-        android:paddingStart="15dp"
+        android:paddingStart="@dimen/filter_padding"
         android:text="@string/place_state"
         android:textColor="@color/white"/>
 
@@ -17,7 +17,7 @@
         android:id="@+id/choice_chip_group"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginStart="15dp"
+        android:layout_marginStart="@dimen/filter_padding"
         android:theme="@style/Theme.MaterialComponents.Light"
         app:singleSelection="false">
 
diff --git a/app/src/main/res/layout/filter_search_view_layout.xml b/app/src/main/res/layout/filter_search_view_layout.xml
index 7d5dc31b6..b99d69bca 100644
--- a/app/src/main/res/layout/filter_search_view_layout.xml
+++ b/app/src/main/res/layout/filter_search_view_layout.xml
@@ -1,7 +1,7 @@
 <LinearLayout android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:id="@+id/search_view_layout"
-    android:paddingVertical="15dp"
+    android:paddingVertical="@dimen/filter_padding"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:android="http://schemas.android.com/apk/res/android">
 
@@ -9,7 +9,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
-        android:paddingStart="15dp"
+        android:paddingStart="@dimen/filter_padding"
         android:text="@string/place_type"
         android:textColor="@color/white"/>
 
diff --git a/app/src/main/res/layout/fragment_bookmarks_pictures.xml b/app/src/main/res/layout/fragment_bookmarks_pictures.xml
index 45c8ea460..c353f0a69 100644
--- a/app/src/main/res/layout/fragment_bookmarks_pictures.xml
+++ b/app/src/main/res/layout/fragment_bookmarks_pictures.xml
@@ -27,7 +27,7 @@
         android:id="@+id/bookmarkedPicturesList"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:columnWidth="240dp"
+        android:columnWidth="@dimen/very_large_height"
         android:fadingEdge="none"
         android:fastScrollEnabled="true"
         android:listSelector="@null"
diff --git a/app/src/main/res/layout/fragment_browse_image.xml b/app/src/main/res/layout/fragment_browse_image.xml
index 52841b6b0..8a199034e 100644
--- a/app/src/main/res/layout/fragment_browse_image.xml
+++ b/app/src/main/res/layout/fragment_browse_image.xml
@@ -22,8 +22,8 @@
         android:layout_height="wrap_content"
         android:layout_centerHorizontal="true"
         android:layout_alignParentBottom="true"
-        android:paddingTop="5dp"
-        android:paddingBottom="5dp"
+        android:paddingTop="@dimen/tiny_padding"
+        android:paddingBottom="@dimen/tiny_padding"
         android:visibility="gone"
          />
     <ProgressBar
diff --git a/app/src/main/res/layout/fragment_category_images.xml b/app/src/main/res/layout/fragment_category_images.xml
index f317b2f23..e58e985ee 100644
--- a/app/src/main/res/layout/fragment_category_images.xml
+++ b/app/src/main/res/layout/fragment_category_images.xml
@@ -32,7 +32,7 @@
         android:layout_height="match_parent"
         android:layout_width="match_parent"
         android:stretchMode="columnWidth"
-        android:columnWidth="240dp"
+        android:columnWidth="@dimen/very_large_height"
         android:numColumns="auto_fit"
         android:listSelector="@null"
         android:fadingEdge="none"
diff --git a/app/src/main/res/layout/fragment_contributions.xml b/app/src/main/res/layout/fragment_contributions.xml
index fbbf48d62..780369919 100644
--- a/app/src/main/res/layout/fragment_contributions.xml
+++ b/app/src/main/res/layout/fragment_contributions.xml
@@ -16,14 +16,14 @@
       android:id="@+id/campaigns_view"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
-      android:layout_marginTop="2dp"
+      android:layout_marginTop="@dimen/miniscule_margin"
       app:cardBackgroundColor="?attr/mainCardBackground" />
 
   <FrameLayout
       android:id="@+id/root_frame"
       android:layout_width="match_parent"
       android:layout_height="match_parent"
-      android:layout_marginTop="2dp"
+      android:layout_marginTop="@dimen/miniscule_margin"
       android:background="#000"
       >
   </FrameLayout>
diff --git a/app/src/main/res/layout/fragment_contributions_list.xml b/app/src/main/res/layout/fragment_contributions_list.xml
index 82b9d69e6..49e4e60c7 100644
--- a/app/src/main/res/layout/fragment_contributions_list.xml
+++ b/app/src/main/res/layout/fragment_contributions_list.xml
@@ -39,8 +39,8 @@
         android:layout_alignParentBottom="true"
         android:layout_alignParentEnd="true"
         android:layout_alignParentRight="true"
-        android:layout_marginRight="12dp"
-        android:layout_marginBottom="8dp"
+        android:layout_marginRight="@dimen/medium_height"
+        android:layout_marginBottom="@dimen/activity_margin_horizontal"
         android:orientation="vertical"
         android:gravity="center"
         >
@@ -53,7 +53,7 @@
             android:visibility="gone"
             app:backgroundTint="@color/main_background_light"
             app:useCompatPadding="true"
-            app:elevation="4dp"
+            app:elevation="@dimen/tiny_margin"
             app:fabSize="mini"
             app:srcCompat="@drawable/ic_photo_camera_white_24dp" />
 
@@ -65,7 +65,7 @@
             android:visibility="gone"
             app:backgroundTint="@color/main_background_light"
             app:useCompatPadding="true"
-            app:elevation="4dp"
+            app:elevation="@dimen/tiny_margin"
             app:fabSize="mini"
             app:srcCompat="@drawable/ic_photo_white_24dp" />
 
@@ -77,7 +77,7 @@
             android:visibility="visible"
             app:backgroundTint="@color/status_bar_blue"
             app:useCompatPadding="true"
-            app:elevation="4dp"
+            app:elevation="@dimen/tiny_margin"
             app:srcCompat="@drawable/ic_add_white_24dp" />
 
     </LinearLayout>
diff --git a/app/src/main/res/layout/fragment_media_license.xml b/app/src/main/res/layout/fragment_media_license.xml
index 4b46ebb6f..c6f59ef17 100644
--- a/app/src/main/res/layout/fragment_media_license.xml
+++ b/app/src/main/res/layout/fragment_media_license.xml
@@ -3,7 +3,7 @@
   xmlns:tools="http://schemas.android.com/tools"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
-  android:layout_marginBottom="8dp"
+  android:layout_marginBottom="@dimen/activity_margin_horizontal"
   android:padding="@dimen/standard_gap"
   >
   <LinearLayout
@@ -16,7 +16,7 @@
       android:id="@+id/tv_title"
       android:textStyle="bold"
       android:layout_width="wrap_content"
-      android:layout_height="24dp"
+      android:layout_height="@dimen/half_standard_height"
       android:layout_marginEnd="@dimen/standard_gap"
       android:layout_marginRight="@dimen/standard_gap"
       android:gravity="center_vertical"
@@ -26,7 +26,7 @@
     <TextView
       android:id="@+id/tv_subtitle"
       android:layout_width="wrap_content"
-      android:layout_height="24dp"
+      android:layout_height="@dimen/half_standard_height"
       android:layout_marginTop="@dimen/tiny_gap"
       android:gravity="center_vertical"
       android:text="@string/upload_flow_all_images_in_set"
@@ -38,7 +38,7 @@
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
       android:layout_marginTop="@dimen/standard_gap"
-      android:padding="0dp"
+      android:padding="@dimen/dimen_0"
       tools:visibility="visible"/>
 
     <TextView
@@ -68,14 +68,14 @@
     <View
       android:id="@+id/button_divider"
       android:layout_width="match_parent"
-      android:layout_height="1dp"
-      android:layout_marginTop="16dp"
+      android:layout_height="@dimen/tiny_height"
+      android:layout_marginTop="@dimen/standard_gap"
       android:background="@color/divider_grey"/>
 
     <LinearLayout
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
-      android:padding="16dp"
+      android:padding="@dimen/standard_gap"
       android:orientation="horizontal"
       >
       <androidx.appcompat.widget.AppCompatButton
diff --git a/app/src/main/res/layout/fragment_nearby_parent.xml b/app/src/main/res/layout/fragment_nearby_parent.xml
index 9ad4791cd..7f0388857 100644
--- a/app/src/main/res/layout/fragment_nearby_parent.xml
+++ b/app/src/main/res/layout/fragment_nearby_parent.xml
@@ -18,8 +18,8 @@
         <include layout="@layout/nearby_filter_list"
             android:id="@+id/nearby_filter_list"
             android:layout_below="@id/nearby_filter"
-            android:layout_height="160dp"
-            android:layout_width="160dp"
+            android:layout_height="@dimen/giant_height"
+            android:layout_width="@dimen/giant_height"
             android:layout_alignParentEnd="true"/>
 
 
@@ -49,14 +49,14 @@
             android:layout_height="wrap_content"
             android:layout_centerHorizontal="true"
             android:layout_gravity="center_horizontal"
-            android:layout_margin="8dp"
+            android:layout_margin="@dimen/activity_margin_horizontal"
             android:background="@color/white"
-            android:padding="8dp"
+            android:padding="@dimen/activity_margin_horizontal"
             android:singleLine="true"
             android:text="@string/search_this_area"
             android:textColor="@color/status_bar_blue"
             android:visibility="gone"
-            app:elevation="6dp"
+            app:elevation="@dimen/dimen_6"
             android:layout_below="@id/nearby_filter"/>
 
         <View
@@ -66,7 +66,7 @@
             android:layout_alignParentLeft="true"
             android:background="#aa969696"
             android:visibility="gone"
-            android:elevation="6dp">
+            android:elevation="@dimen/dimen_6">
 
         </View>
 
@@ -80,7 +80,7 @@
             android:clickable="true"
             android:visibility="visible"
             app:backgroundTint="@color/main_background_light"
-            app:elevation="6dp"
+            app:elevation="@dimen/dimen_6"
             app:fabSize="normal"
             app:layout_anchorGravity="top|right|end"
             app:srcCompat="@drawable/ic_my_location_black_24dp"
@@ -99,7 +99,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
-        app:elevation="6dp"
+        app:elevation="@dimen/dimen_6"
         android:visibility="gone" />
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
@@ -109,16 +109,16 @@
         android:layout_alignParentEnd="true"
         android:layout_alignParentRight="true"
         android:layout_alignParentBottom="true"
-        android:layout_marginEnd="12dp"
-        android:layout_marginRight="12dp"
+        android:layout_marginEnd="@dimen/medium_height"
+        android:layout_marginRight="@dimen/medium_height"
         android:clickable="true"
         android:visibility="invisible"
         app:backgroundTint="@color/button_blue"
-        app:elevation="8dp"
+        app:elevation="@dimen/activity_margin_horizontal"
         app:fabSize="normal"
         app:layout_anchor="@id/bottom_sheet_details"
         app:layout_anchorGravity="top|right|end"
-        app:pressedTranslationZ="12dp"
+        app:pressedTranslationZ="@dimen/medium_height"
         app:srcCompat="@drawable/ic_add_white_24dp"
         app:useCompatPadding="true" />
 
@@ -146,11 +146,11 @@
         android:tint="@color/button_blue"
         android:visibility="invisible"
         app:backgroundTint="@color/main_background_light"
-        app:elevation="6dp"
+        app:elevation="@dimen/dimen_6"
         app:fabSize="mini"
         app:layout_anchor="@id/empty_view1"
         app:layout_anchorGravity="center_horizontal"
-        app:pressedTranslationZ="12dp"
+        app:pressedTranslationZ="@dimen/medium_height"
         app:srcCompat="@drawable/ic_photo_camera_white_24dp" />
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
@@ -161,11 +161,11 @@
         android:tint="@color/button_blue"
         android:visibility="invisible"
         app:backgroundTint="@color/main_background_light"
-        app:elevation="6dp"
+        app:elevation="@dimen/dimen_6"
         app:fabSize="mini"
         app:layout_anchor="@id/empty_view"
         app:layout_anchorGravity="center_horizontal"
-        app:pressedTranslationZ="12dp"
+        app:pressedTranslationZ="@dimen/medium_height"
         app:srcCompat="@drawable/ic_photo_white_24dp" />
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_review_image.xml b/app/src/main/res/layout/fragment_review_image.xml
index 5972ac76f..8572ca938 100644
--- a/app/src/main/res/layout/fragment_review_image.xml
+++ b/app/src/main/res/layout/fragment_review_image.xml
@@ -3,7 +3,7 @@
   android:layout_width="match_parent"
   android:layout_height="match_parent"
   xmlns:tools="http://schemas.android.com/tools"
-  android:paddingBottom="10dp"
+  android:paddingBottom="@dimen/dimen_10"
   android:orientation="vertical"
   >
 
@@ -15,7 +15,7 @@
     <LinearLayout
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
-      android:paddingTop="6dp"
+      android:paddingTop="@dimen/dimen_6"
       android:orientation="vertical">
 
       <TextView
@@ -32,7 +32,7 @@
         android:id="@+id/tv_review_question_context"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="15dp"
+        android:layout_marginBottom="@dimen/filter_padding"
         android:gravity="center_vertical"
         tools:text="testing2"
         android:textAlignment="center"
@@ -47,13 +47,13 @@
     android:layout_height="70dp"
     android:layout_alignParentBottom="true"
     android:orientation="horizontal"
-    android:padding="2dp"
+    android:padding="@dimen/miniscule_margin"
     android:weightSum="2">
 
     <Button
       android:id="@+id/button_yes"
-      android:layout_width="0dp"
-      android:layout_height="48dp"
+      android:layout_width="@dimen/dimen_0"
+      android:layout_height="@dimen/fragment_height"
       android:layout_weight="1"
       android:layout_margin="@dimen/activity_margin_horizontal"
       android:background="@android:color/transparent"
@@ -67,8 +67,8 @@
     <Button
       android:textAllCaps="true"
       android:id="@+id/button_no"
-      android:layout_width="0dp"
-      android:layout_height="48dp"
+      android:layout_width="@dimen/dimen_0"
+      android:layout_height="@dimen/fragment_height"
       android:layout_weight="1"
       android:enabled="false"
       android:alpha="0.5"
diff --git a/app/src/main/res/layout/fragment_search_history.xml b/app/src/main/res/layout/fragment_search_history.xml
index 2ac2752b4..1e6e95bf8 100644
--- a/app/src/main/res/layout/fragment_search_history.xml
+++ b/app/src/main/res/layout/fragment_search_history.xml
@@ -19,19 +19,19 @@
             <TextView
                 android:id="@+id/recent_searches_text_view"
                 android:layout_width="wrap_content"
-                android:layout_height="48dp"
+                android:layout_height="@dimen/fragment_height"
                 android:layout_gravity="start"
                 android:gravity="center_vertical"
-                android:paddingLeft="16dp"
-                android:paddingRight="16dp"
+                android:paddingLeft="@dimen/standard_gap"
+                android:paddingRight="@dimen/standard_gap"
                 android:text="@string/search_recent_header"
                 android:textAppearance="?android:attr/textAppearanceMedium"
                 android:textStyle="bold" />
 
             <ImageView
                 android:id="@+id/recent_searches_delete_button"
-                android:layout_width="48dp"
-                android:layout_height="48dp"
+                android:layout_width="@dimen/fragment_height"
+                android:layout_height="@dimen/fragment_height"
                 android:layout_gravity="end"
                 android:background="?attr/actionBarItemBackground"
                 android:clickable="true"
diff --git a/app/src/main/res/layout/fragment_similar_image_dialog.xml b/app/src/main/res/layout/fragment_similar_image_dialog.xml
index 469ee6b5e..f2aab44da 100644
--- a/app/src/main/res/layout/fragment_similar_image_dialog.xml
+++ b/app/src/main/res/layout/fragment_similar_image_dialog.xml
@@ -10,21 +10,21 @@
         android:orientation="horizontal">
         <com.facebook.drawee.view.SimpleDraweeView
             android:id="@+id/orginalImage"
-            android:layout_width="160dp"
-            android:layout_height="240dp"
-            android:layout_margin="3dp"
+            android:layout_width="@dimen/giant_height"
+            android:layout_height="@dimen/very_large_height"
+            android:layout_margin="@dimen/progressbar_stroke"
             app:actualImageScaleType="fitCenter" />
         <com.facebook.drawee.view.SimpleDraweeView
             android:id="@+id/possibleImage"
-            android:layout_width="160dp"
-            android:layout_height="240dp"
-            android:layout_margin="3dp"
+            android:layout_width="@dimen/giant_height"
+            android:layout_height="@dimen/very_large_height"
+            android:layout_margin="@dimen/progressbar_stroke"
             app:actualImageScaleType="fitCenter" />
     </LinearLayout>
     <TextView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_margin="6dp"
+        android:layout_margin="@dimen/dimen_6"
         android:layout_gravity="center"
         android:textAlignment="center"
         android:text="Did you shoot these two pictures at the same place? Do you want to use the latitude/longitude of the picture on the right?"/>
@@ -33,15 +33,15 @@
         android:orientation="horizontal"
         android:layout_height="match_parent">
         <View
-            android:layout_width="0dp"
-            android:layout_height="0dp"
+            android:layout_width="@dimen/dimen_0"
+            android:layout_height="@dimen/dimen_0"
             android:layout_weight="1"/>
         <Button
             style="@style/Widget.AppCompat.Button.Borderless"
             android:layout_width="wrap_content"
             android:layout_gravity="right"
             android:id="@+id/negative_button"
-            android:layout_marginRight="3dp"
+            android:layout_marginRight="@dimen/progressbar_stroke"
             android:layout_height="wrap_content"
             android:text="No" />
 
@@ -51,7 +51,7 @@
             android:layout_height="wrap_content"
             android:id="@+id/postive_button"
             android:layout_gravity="right"
-            android:layout_marginLeft="3dp"
+            android:layout_marginLeft="@dimen/progressbar_stroke"
             android:text="Yes" />
     </LinearLayout>
 </LinearLayout>
diff --git a/app/src/main/res/layout/fragment_upload_media_detail_fragment.xml b/app/src/main/res/layout/fragment_upload_media_detail_fragment.xml
index 84003afa6..d3495d760 100644
--- a/app/src/main/res/layout/fragment_upload_media_detail_fragment.xml
+++ b/app/src/main/res/layout/fragment_upload_media_detail_fragment.xml
@@ -16,7 +16,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
-        android:layout_margin="10dp"
+        android:layout_margin="@dimen/dimen_10"
         android:elevation="@dimen/cardview_default_elevation">
 
         <androidx.core.widget.NestedScrollView
@@ -27,7 +27,7 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:layout_margin="10dp"
+                android:layout_margin="@dimen/dimen_10"
                 android:orientation="vertical">
 
                 <RelativeLayout
@@ -38,7 +38,7 @@
                     <TextView
                         android:id="@+id/tv_title"
                         android:layout_width="wrap_content"
-                        android:layout_height="24dp"
+                        android:layout_height="@dimen/half_standard_height"
                         android:layout_marginEnd="@dimen/standard_gap"
                         android:layout_marginRight="@dimen/standard_gap"
                         android:gravity="center_vertical"
@@ -51,8 +51,8 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_centerVertical="true"
-                        android:layout_marginEnd="16dp"
-                        android:layout_marginRight="16dp"
+                        android:layout_marginEnd="@dimen/standard_gap"
+                        android:layout_marginRight="@dimen/standard_gap"
                         android:layout_toLeftOf="@id/ib_expand_collapse"
                         android:visibility="gone"
                         app:srcCompat="@drawable/ic_map_white_24dp"
@@ -61,8 +61,8 @@
                     <androidx.appcompat.widget.AppCompatImageButton
                         android:id="@+id/ib_expand_collapse"
                         style="@style/Widget.AppCompat.Button.Borderless"
-                        android:layout_width="24dp"
-                        android:layout_height="24dp"
+                        android:layout_width="@dimen/half_standard_height"
+                        android:layout_height="@dimen/half_standard_height"
                         android:layout_alignParentTop="true"
                         android:layout_alignParentEnd="true"
                         android:layout_alignParentRight="true"
@@ -71,7 +71,7 @@
                         android:layout_marginBottom="@dimen/small_gap"
                         android:clickable="false"
                         android:focusable="false"
-                        android:padding="12dp"
+                        android:padding="@dimen/medium_height"
                         app:srcCompat="@drawable/ic_expand_less_black_24dp" />
                 </RelativeLayout>
 
@@ -102,8 +102,8 @@
                         android:id="@+id/rv_descriptions"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_marginTop="8dp"
-                        android:layout_marginBottom="8dp"
+                        android:layout_marginTop="@dimen/activity_margin_horizontal"
+                        android:layout_marginBottom="@dimen/activity_margin_horizontal"
                         tools:visibility="visible" />
 
 
@@ -113,7 +113,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:text="@string/previous_image_title_description"
-                        android:padding="2dp"
+                        android:padding="@dimen/miniscule_margin"
                         android:textAlignment="textEnd"
                         android:textColor="@color/button_blue"
                         android:visibility="gone"
@@ -128,7 +128,7 @@
                             style="@style/Widget.AppCompat.Button.Borderless"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:minWidth="48dp"
+                            android:minWidth="@dimen/fragment_height"
                             android:text="+" />
 
                         <androidx.appcompat.widget.AppCompatButton
diff --git a/app/src/main/res/layout/image_alert_layout.xml b/app/src/main/res/layout/image_alert_layout.xml
index 266d771ea..191e76d9e 100644
--- a/app/src/main/res/layout/image_alert_layout.xml
+++ b/app/src/main/res/layout/image_alert_layout.xml
@@ -7,8 +7,8 @@
 
     <ImageView
         android:layout_margin="@dimen/activity_margin_horizontal"
-        android:layout_width="140dp"
-        android:layout_height="200dp"
+        android:layout_width="@dimen/dimen_140"
+        android:layout_height="@dimen/dimen_200"
         android:id="@+id/alert_image" />
 
     <TextView
diff --git a/app/src/main/res/layout/item_notification.xml b/app/src/main/res/layout/item_notification.xml
index 55c16eef1..d2728a6f9 100644
--- a/app/src/main/res/layout/item_notification.xml
+++ b/app/src/main/res/layout/item_notification.xml
@@ -5,15 +5,15 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/notification_view"
     android:foreground="?selectableItemBackground"
-    android:minHeight="72dp">
+    android:minHeight="@dimen/large_height">
 
     <androidx.appcompat.widget.AppCompatImageView
         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_width="@dimen/dimen_40"
+        android:layout_height="@dimen/dimen_40"
+        android:layout_marginLeft="@dimen/standard_gap"
+        android:layout_marginStart="@dimen/standard_gap"
+        android:layout_marginTop="@dimen/standard_gap"
         android:scaleType="centerCrop"
         app:srcCompat="@drawable/ic_message_black_24dp"
         app:tint="@color/primaryDarkColor"
@@ -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"
         />
 
@@ -36,8 +36,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_alignTop="@id/time"
-        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/time"
         android:layout_toRightOf="@id/icon"
@@ -45,6 +45,6 @@
         android:ellipsize="end"
         android:layout_alignParentTop="true"
         android:textAppearance="@style/TextAppearance.AppCompat.Body2"
-        android:padding="12dp"
+        android:padding="@dimen/medium_height"
         />
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_place.xml b/app/src/main/res/layout/item_place.xml
index e9521fef3..c67a55828 100644
--- a/app/src/main/res/layout/item_place.xml
+++ b/app/src/main/res/layout/item_place.xml
@@ -4,12 +4,12 @@
     android:layout_height="wrap_content"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:focusableInTouchMode="true"
-    android:minHeight="72dp">
+    android:minHeight="@dimen/large_height">
 
     <com.facebook.drawee.view.SimpleDraweeView
         android:id="@+id/icon"
-        android:layout_width="40dp"
-        android:layout_height="40dp"
+        android:layout_width="@dimen/dimen_40"
+        android:layout_height="@dimen/dimen_40"
         android:layout_marginLeft="@dimen/standard_gap"
         android:layout_marginStart="@dimen/standard_gap"
         android:layout_marginTop="@dimen/standard_gap"
@@ -36,8 +36,8 @@
         android:layout_height="wrap_content"
         android:layout_alignParentEnd="true"
         android:layout_alignParentRight="true"
-        android:layout_marginRight="16dp"
-        android:layout_marginTop="32dp"
+        android:layout_marginRight="@dimen/standard_gap"
+        android:layout_marginTop="@dimen/large_gap"
 
         />
 
diff --git a/app/src/main/res/layout/item_upload_thumbnail.xml b/app/src/main/res/layout/item_upload_thumbnail.xml
index 9b8e8ee74..6e7a1f8e1 100644
--- a/app/src/main/res/layout/item_upload_thumbnail.xml
+++ b/app/src/main/res/layout/item_upload_thumbnail.xml
@@ -3,22 +3,22 @@
   xmlns:app="http://schemas.android.com/apk/res-auto"
   xmlns:fresco="http://schemas.android.com/apk/res-auto"
   xmlns:tools="http://schemas.android.com/tools"
-  android:layout_width="90dp"
-  android:layout_height="90dp"
+  android:layout_width="@dimen/big_height"
+  android:layout_height="@dimen/big_height"
   android:id="@+id/rl_container"
   android:background="@drawable/thumbnail_not_selected"
   android:orientation="horizontal">
 
   <com.facebook.drawee.view.SimpleDraweeView
     android:id="@+id/iv_thumbnail"
-    android:layout_width="90dp"
-    android:layout_height="90dp"
+    android:layout_width="@dimen/big_height"
+    android:layout_height="@dimen/big_height"
     fresco:actualImageScaleType="fitCenter"/>
 
   <ImageView
     android:id="@+id/iv_error"
-    android:layout_width="24dp"
-    android:layout_height="24dp"
+    android:layout_width="@dimen/half_standard_height"
+    android:layout_height="@dimen/half_standard_height"
     android:layout_alignParentBottom="true"
     android:layout_alignParentRight="true"
     android:layout_gravity="end"
diff --git a/app/src/main/res/layout/layout_campagin.xml b/app/src/main/res/layout/layout_campagin.xml
index 57c21df67..4dd823f5f 100644
--- a/app/src/main/res/layout/layout_campagin.xml
+++ b/app/src/main/res/layout/layout_campagin.xml
@@ -6,7 +6,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_centerVertical="true"
-    android:minHeight="72dp"
+    android:minHeight="@dimen/large_height"
     >
   <LinearLayout
       android:layout_width="match_parent"
@@ -15,10 +15,10 @@
 
   <ImageView
       android:id="@+id/iv_campaign"
-      android:layout_width="40dp"
-      android:layout_height="40dp"
-      android:layout_marginLeft="16dp"
-      android:layout_marginStart="16dp"
+      android:layout_width="@dimen/dimen_40"
+      android:layout_height="@dimen/dimen_40"
+      android:layout_marginLeft="@dimen/standard_gap"
+      android:layout_marginStart="@dimen/standard_gap"
       android:scaleType="centerCrop"
       app:srcCompat="@drawable/ic_campaign"
       />
@@ -34,15 +34,15 @@
   <androidx.constraintlayout.widget.ConstraintLayout
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
-      android:layout_marginLeft="16dp"
-      android:layout_marginRight="4dp"
+      android:layout_marginLeft="@dimen/standard_gap"
+      android:layout_marginRight="@dimen/tiny_margin"
       android:layout_centerInParent="true"
       >
     <TextView
         android:id="@+id/tv_title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="16dp"
+        android:layout_marginLeft="@dimen/standard_gap"
         android:textColor="@android:color/white"
         android:textStyle="bold"
         tools:text="Campaign Title"
@@ -52,9 +52,9 @@
         android:id="@+id/tv_description"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="16dp"
+        android:layout_marginLeft="@dimen/standard_gap"
         android:gravity="start"
-        android:paddingTop="2dp"
+        android:paddingTop="@dimen/miniscule_margin"
         android:textAlignment="textStart"
         android:textColor="@android:color/white"
         android:visibility="gone"
@@ -64,11 +64,11 @@
 
     <TextView
         android:id="@+id/tv_dates"
-        android:layout_width="0dp"
+        android:layout_width="@dimen/dimen_0"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="16dp"
+        android:layout_marginLeft="@dimen/standard_gap"
         android:layout_weight="1"
-        android:paddingTop="2dp"
+        android:paddingTop="@dimen/miniscule_margin"
         android:text="@string/ends_on"
         android:textColor="@android:color/white"
         app:layout_constraintTop_toBottomOf="@id/tv_description"
diff --git a/app/src/main/res/layout/layout_category_images.xml b/app/src/main/res/layout/layout_category_images.xml
index 98bc962ff..3ee1ad80a 100644
--- a/app/src/main/res/layout/layout_category_images.xml
+++ b/app/src/main/res/layout/layout_category_images.xml
@@ -4,8 +4,8 @@
     android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:padding="2dp"
-    android:paddingBottom="0dp"
+    android:padding="@dimen/miniscule_margin"
+    android:paddingBottom="@dimen/dimen_0"
     >
 
     <TextView
@@ -21,7 +21,7 @@
     <com.facebook.drawee.view.SimpleDraweeView
         android:id="@+id/categoryImageView"
         android:layout_width="match_parent"
-        android:layout_height="240dp"
+        android:layout_height="@dimen/very_large_height"
         app:actualImageScaleType="centerCrop"
         />
 
diff --git a/app/src/main/res/layout/layout_contribution.xml b/app/src/main/res/layout/layout_contribution.xml
index a91653aa8..49d1cb8e5 100644
--- a/app/src/main/res/layout/layout_contribution.xml
+++ b/app/src/main/res/layout/layout_contribution.xml
@@ -5,8 +5,8 @@
     android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:padding="2dp"
-    android:paddingBottom="0dp">
+    android:padding="@dimen/miniscule_margin"
+    android:paddingBottom="@dimen/dimen_0">
 
     <TextView
         android:id="@+id/contributionSequenceNumber"
@@ -21,7 +21,7 @@
     <com.facebook.drawee.view.SimpleDraweeView
         android:id="@+id/contributionImage"
         android:layout_width="match_parent"
-        android:layout_height="240dp"
+        android:layout_height="@dimen/very_large_height"
         app:actualImageScaleType="centerCrop"
         fresco:placeholderImage="@drawable/ic_image_black_24dp"
         />
@@ -35,7 +35,7 @@
         >
 
         <LinearLayout
-            android:layout_width="0dp"
+            android:layout_width="@dimen/dimen_0"
             android:layout_height="wrap_content"
             android:layout_gravity="center|bottom"
             android:orientation="vertical"
@@ -75,7 +75,7 @@
 
         <LinearLayout
             android:id="@+id/failed_image_options"
-            android:layout_width="0dp"
+            android:layout_width="@dimen/dimen_0"
             android:layout_height="wrap_content"
             android:orientation="horizontal"
             android:layout_weight="2"
@@ -90,8 +90,8 @@
                 android:src="@drawable/ic_cancel_white"
                 android:text="@string/menu_cancel_upload"
                 android:background="@android:color/transparent"
-                android:padding="8dp"
-                android:layout_marginRight="5dp"
+                android:padding="@dimen/activity_margin_horizontal"
+                android:layout_marginRight="@dimen/tiny_padding"
                 />
 
             <ImageButton
@@ -101,7 +101,7 @@
                 android:src="@drawable/ic_retry_white"
                 android:text="@string/menu_retry_upload"
                 android:background="@android:color/transparent"
-                android:padding="8dp"
+                android:padding="@dimen/activity_margin_horizontal"
                 />
 
         </LinearLayout>
diff --git a/app/src/main/res/layout/nearby_card_view.xml b/app/src/main/res/layout/nearby_card_view.xml
index c779b7fe9..f9a3269ea 100644
--- a/app/src/main/res/layout/nearby_card_view.xml
+++ b/app/src/main/res/layout/nearby_card_view.xml
@@ -5,7 +5,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:background="?attr/mainCardBackground"
     android:layout_centerVertical="true"
-    android:minHeight="72dp">
+    android:minHeight="@dimen/large_height">
 
     <Button
         android:layout_width="wrap_content"
@@ -13,10 +13,10 @@
         android:id="@+id/permission_request_button"
         android:text="@string/display_nearby_notification_summary"
         android:layout_centerInParent="true"
-        android:layout_marginLeft="8dp"
-        android:layout_marginRight="8dp"
-        android:layout_marginTop="8dp"
-        android:minWidth="48dp"
+        android:layout_marginLeft="@dimen/activity_margin_horizontal"
+        android:layout_marginRight="@dimen/activity_margin_horizontal"
+        android:layout_marginTop="@dimen/activity_margin_horizontal"
+        android:minWidth="@dimen/fragment_height"
         android:textColor="@android:color/white"
         android:singleLine="true"
         android:theme="?attr/mainScreenNearbyPermissionbutton"
@@ -39,10 +39,10 @@
 
         <ImageView
             android:id="@+id/nearby_icon"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
-            android:layout_marginLeft="16dp"
-            android:layout_marginStart="16dp"
+            android:layout_width="@dimen/dimen_40"
+            android:layout_height="@dimen/dimen_40"
+            android:layout_marginLeft="@dimen/standard_gap"
+            android:layout_marginStart="@dimen/standard_gap"
             android:scaleType="centerCrop"
             app:srcCompat="@drawable/ic_location_white_24dp"/>
 
@@ -59,12 +59,12 @@
 
             <TextView
                 android:id="@+id/nearby_title"
-                android:layout_width="0dp"
+                android:layout_width="@dimen/dimen_0"
                 android:layout_height="wrap_content"
                 android:layout_weight="3"
                 android:layout_centerInParent="true"
-                android:layout_marginLeft="16dp"
-                android:layout_marginRight="16dp"
+                android:layout_marginLeft="@dimen/standard_gap"
+                android:layout_marginRight="@dimen/standard_gap"
                 tools:text="test distance"
                 android:textColor="@android:color/white"
                 android:singleLine="true"
@@ -73,12 +73,12 @@
 
             <TextView
                 android:id="@+id/nearby_distance"
-                android:layout_width="0dp"
+                android:layout_width="@dimen/dimen_0"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:layout_marginLeft="16dp"
-                android:layout_marginRight="16dp"
-                android:minWidth="48dp"
+                android:layout_marginLeft="@dimen/standard_gap"
+                android:layout_marginRight="@dimen/standard_gap"
+                android:minWidth="@dimen/fragment_height"
                 android:textAppearance="@style/TextAppearance.AppCompat.Caption"
                 tools:text="test distance"
                 android:textColor="@android:color/white"
diff --git a/app/src/main/res/layout/nearby_filter_list.xml b/app/src/main/res/layout/nearby_filter_list.xml
index 6fd9040ba..2152087c6 100644
--- a/app/src/main/res/layout/nearby_filter_list.xml
+++ b/app/src/main/res/layout/nearby_filter_list.xml
@@ -5,27 +5,27 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_alignParentRight="true"
-    android:elevation="8dp"
+    android:elevation="@dimen/activity_margin_horizontal"
     android:background="@color/white">
 
     <fr.free.nrw.commons.nearby.CheckBoxTriStates
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:id="@+id/checkbox_tri_states"
-        android:layout_margin="10dp"
+        android:layout_margin="@dimen/dimen_10"
         android:text="All"
         />
 
     <View
         android:layout_width="match_parent"
-        android:layout_height="1dp"
+        android:layout_height="@dimen/tiny_height"
         android:background="@android:color/darker_gray"/>
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/search_list_view"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginVertical="10dp"
+        android:layout_marginVertical="@dimen/dimen_10"
         />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/nearby_permission_dialog.xml b/app/src/main/res/layout/nearby_permission_dialog.xml
index a477373a1..df62f3a9f 100644
--- a/app/src/main/res/layout/nearby_permission_dialog.xml
+++ b/app/src/main/res/layout/nearby_permission_dialog.xml
@@ -8,9 +8,9 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/never_ask_again"
-        android:layout_marginTop="5dp"
-        android:layout_marginBottom="5dp"
-        android:layout_marginEnd="20dp"
-        android:layout_marginStart="20dp"/>
+        android:layout_marginTop="@dimen/tiny_padding"
+        android:layout_marginBottom="@dimen/tiny_padding"
+        android:layout_marginEnd="@dimen/dimen_20"
+        android:layout_marginStart="@dimen/dimen_20"/>
 
 </FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/nearby_row_button.xml b/app/src/main/res/layout/nearby_row_button.xml
index 508d33470..6976e6b2c 100644
--- a/app/src/main/res/layout/nearby_row_button.xml
+++ b/app/src/main/res/layout/nearby_row_button.xml
@@ -5,17 +5,17 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:orientation="horizontal"
     android:visibility="gone"
-    android:layout_marginTop="16dp"
+    android:layout_marginTop="@dimen/standard_gap"
     android:layout_below="@+id/icon"
     xmlns:android="http://schemas.android.com/apk/res/android"
     >
 
     <LinearLayout
         android:id="@+id/bookmarkRowButton"
-        android:layout_width="0dp"
+        android:layout_width="@dimen/dimen_0"
         android:layout_height="wrap_content"
         android:layout_weight="1"
-        android:padding="16dp"
+        android:padding="@dimen/standard_gap"
         android:clickable="true"
         android:orientation="vertical"
         android:background="@drawable/button_background_selector"
@@ -31,7 +31,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:id="@+id/bookmarkButtonText"
-            android:paddingTop="8dp"
+            android:paddingTop="@dimen/activity_margin_horizontal"
             android:layout_gravity="center_horizontal"
             android:text="CAMERA"
             android:visibility="gone"
@@ -40,10 +40,10 @@
 
     <LinearLayout
         android:id="@+id/cameraButton"
-        android:layout_width="0dp"
+        android:layout_width="@dimen/dimen_0"
         android:layout_height="wrap_content"
         android:layout_weight="1"
-        android:padding="16dp"
+        android:padding="@dimen/standard_gap"
         android:clickable="true"
         android:orientation="vertical"
         android:background="@drawable/button_background_selector"
@@ -58,7 +58,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:id="@+id/cameraButtonText"
-            android:paddingTop="8dp"
+            android:paddingTop="@dimen/activity_margin_horizontal"
             android:layout_gravity="center_horizontal"
             android:text="CAMERA"
             android:visibility="gone"
@@ -66,10 +66,10 @@
     </LinearLayout>
     <LinearLayout
         android:id="@+id/galleryButton"
-        android:layout_width="0dp"
+        android:layout_width="@dimen/dimen_0"
         android:layout_height="wrap_content"
         android:layout_weight="1"
-        android:padding="16dp"
+        android:padding="@dimen/standard_gap"
         android:clickable="true"
         android:orientation="vertical"
         android:background="@drawable/button_background_selector"
@@ -85,7 +85,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:id="@+id/galleryButtonText"
-            android:paddingTop="8dp"
+            android:paddingTop="@dimen/activity_margin_horizontal"
             android:layout_gravity="center_horizontal"
             android:text="GALLERY"
             android:duplicateParentState="true"
@@ -95,10 +95,10 @@
 
     <LinearLayout
         android:id="@+id/directionsButton"
-        android:layout_width="0dp"
+        android:layout_width="@dimen/dimen_0"
         android:layout_height="wrap_content"
         android:layout_weight="1"
-        android:padding="16dp"
+        android:padding="@dimen/standard_gap"
         android:clickable="true"
         android:orientation="vertical"
         android:background="@drawable/button_background_selector"
@@ -114,7 +114,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:id="@+id/directionsButtonText"
-            android:paddingTop="8dp"
+            android:paddingTop="@dimen/activity_margin_horizontal"
             android:layout_gravity="center_horizontal"
             android:text="DIRECTIONS"
             android:duplicateParentState="true"
@@ -124,10 +124,10 @@
 
     <LinearLayout
         android:id="@+id/iconOverflow"
-        android:layout_width="0dp"
+        android:layout_width="@dimen/dimen_0"
         android:layout_height="wrap_content"
         android:layout_weight="1"
-        android:padding="16dp"
+        android:padding="@dimen/standard_gap"
         android:clickable="true"
         android:orientation="vertical"
         >
@@ -142,7 +142,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:id="@+id/iconOverflowText"
-            android:paddingTop="8dp"
+            android:paddingTop="@dimen/activity_margin_horizontal"
             android:layout_gravity="center_horizontal"
             android:text="MORE"
             android:duplicateParentState="true"
diff --git a/app/src/main/res/layout/nearby_search_list_item.xml b/app/src/main/res/layout/nearby_search_list_item.xml
index 62a79c185..b6261e80b 100644
--- a/app/src/main/res/layout/nearby_search_list_item.xml
+++ b/app/src/main/res/layout/nearby_search_list_item.xml
@@ -4,7 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="horizontal"
-    android:padding="4dp">
+    android:padding="@dimen/tiny_margin">
 
     <ImageView
         android:id="@+id/place_icon"
diff --git a/app/src/main/res/layout/nearby_search_list_item_dark.xml b/app/src/main/res/layout/nearby_search_list_item_dark.xml
index e89074b7c..fd87641f3 100644
--- a/app/src/main/res/layout/nearby_search_list_item_dark.xml
+++ b/app/src/main/res/layout/nearby_search_list_item_dark.xml
@@ -3,7 +3,7 @@
     android:id="@+id/search_list_item"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:padding="4dp"
+    android:padding="@dimen/tiny_margin"
     android:orientation="horizontal">
 
     <ImageView
diff --git a/app/src/main/res/layout/notification_icon.xml b/app/src/main/res/layout/notification_icon.xml
index 5a41d5f80..c38ca829e 100644
--- a/app/src/main/res/layout/notification_icon.xml
+++ b/app/src/main/res/layout/notification_icon.xml
@@ -14,9 +14,9 @@
         android:id="@+id/cart_icon_image_view"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="8dp"
+        android:layout_marginEnd="@dimen/activity_margin_horizontal"
         android:gravity="center"
-        android:layout_marginRight="8dp"
+        android:layout_marginRight="@dimen/activity_margin_horizontal"
         app:srcCompat="@drawable/ic_notifications_white_24dp" />
 
     <TextView xmlns:android="http://schemas.android.com/apk/res/android"
@@ -28,7 +28,7 @@
         android:layout_alignRight="@id/cart_icon_image_view"
         android:background="@drawable/notification_badge"
         android:gravity="center"
-        android:padding="2dp"
+        android:padding="@dimen/miniscule_margin"
         android:textColor="#ffffffff"
         android:textSize="7sp"
         android:textStyle="bold"
diff --git a/app/src/main/res/layout/pic_of_day_app_widget.xml b/app/src/main/res/layout/pic_of_day_app_widget.xml
index 2af07ad04..bf222644a 100644
--- a/app/src/main/res/layout/pic_of_day_app_widget.xml
+++ b/app/src/main/res/layout/pic_of_day_app_widget.xml
@@ -14,17 +14,17 @@
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
+            android:layout_marginTop="@dimen/dimen_10"
             android:text="@string/app_widget_heading"
             android:textColor="@color/white"
             android:layout_centerHorizontal="true"
-            android:textSize="20sp" />
+            android:textSize="@dimen/subheading_text_size" />
 
         <ImageView
             android:id="@+id/camera_button"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:padding="20dp"
+            android:padding="@dimen/dimen_20"
             android:layout_alignParentEnd="true"
             android:src="@drawable/ic_photo_camera_white_24dp" />
 
@@ -37,13 +37,13 @@
         android:textAlignment="center"
         android:layout_gravity="bottom"
         android:textColor="@color/white"
-        android:layout_marginTop="15dp"
-        android:layout_marginStart="5dp"
-        android:layout_marginEnd="5dp"
-        android:textSize="12sp"/>
+        android:layout_marginTop="@dimen/filter_padding"
+        android:layout_marginStart="@dimen/tiny_padding"
+        android:layout_marginEnd="@dimen/tiny_padding"
+        android:textSize="@dimen/subtitle_text"/>
 
     <ImageView
-        android:padding="15dp"
+        android:padding="@dimen/filter_padding"
         android:id="@+id/appwidget_image"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/question_layout.xml b/app/src/main/res/layout/question_layout.xml
index 17180360c..71abb38b5 100644
--- a/app/src/main/res/layout/question_layout.xml
+++ b/app/src/main/res/layout/question_layout.xml
@@ -6,8 +6,8 @@
     android:gravity="center_horizontal">
 
     <com.facebook.drawee.view.SimpleDraweeView
-        android:layout_width="320dp"
-        android:layout_height="252dp"
+        android:layout_width="@dimen/question_width"
+        android:layout_height="@dimen/question_height"
         android:scaleType="fitXY"
         android:id="@+id/question_image"
         android:layout_marginHorizontal="@dimen/activity_margin_horizontal"
diff --git a/app/src/main/res/layout/row_item_description.xml b/app/src/main/res/layout/row_item_description.xml
index 32136b29d..650e3daca 100644
--- a/app/src/main/res/layout/row_item_description.xml
+++ b/app/src/main/res/layout/row_item_description.xml
@@ -10,8 +10,8 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_weight="0"
-        android:minWidth="1dp"
-        android:padding="0dp"
+        android:minWidth="@dimen/tiny_height"
+        android:padding="@dimen/dimen_0"
         android:spinnerMode="dialog" />
 
     <com.google.android.material.textfield.TextInputLayout
diff --git a/app/src/main/res/layout/row_item_languages_spinner.xml b/app/src/main/res/layout/row_item_languages_spinner.xml
index 754b5e4a8..2d60e21c8 100644
--- a/app/src/main/res/layout/row_item_languages_spinner.xml
+++ b/app/src/main/res/layout/row_item_languages_spinner.xml
@@ -11,10 +11,10 @@
     style="@style/Base.TextAppearance.AppCompat.Widget.TextView.SpinnerItem"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:paddingTop="10dp"
-    android:paddingBottom="10dp"
-    android:paddingLeft="4dp"
-    android:paddingRight="4dp"
+    android:paddingTop="@dimen/dimen_10"
+    android:paddingBottom="@dimen/dimen_10"
+    android:paddingLeft="@dimen/tiny_margin"
+    android:paddingRight="@dimen/tiny_margin"
     android:imeOptions="flagNoExtractUi"
     android:maxLines="1"
     android:singleLine="true"
@@ -25,6 +25,6 @@
   <View
       android:id="@+id/view"
       android:layout_width="match_parent"
-      android:layout_height="1dp"
+      android:layout_height="@dimen/tiny_height"
       android:background="@color/item_white_background" />
 </LinearLayout>
diff --git a/app/src/main/res/layout/upload_categories_fragment.xml b/app/src/main/res/layout/upload_categories_fragment.xml
index a4d55884d..b46a36a86 100644
--- a/app/src/main/res/layout/upload_categories_fragment.xml
+++ b/app/src/main/res/layout/upload_categories_fragment.xml
@@ -4,7 +4,7 @@
   android:id="@+id/rl_container_categories"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
-  android:padding="16dp"
+  android:padding="@dimen/standard_gap"
   >
   <LinearLayout
     android:layout_width="match_parent"
@@ -15,7 +15,7 @@
       android:id="@+id/tv_title"
       android:textStyle="bold"
       android:layout_width="wrap_content"
-      android:layout_height="24dp"
+      android:layout_height="@dimen/half_standard_height"
       android:layout_marginEnd="@dimen/standard_gap"
       android:layout_marginRight="@dimen/standard_gap"
       android:gravity="center_vertical"
@@ -25,7 +25,7 @@
     <TextView
       android:id="@+id/tv_subtitle"
       android:layout_width="wrap_content"
-      android:layout_height="24dp"
+      android:layout_height="@dimen/half_standard_height"
       android:layout_marginTop="@dimen/tiny_gap"
       android:gravity="center_vertical"
       android:text="@string/upload_flow_all_images_in_set"
@@ -80,7 +80,7 @@
   <View
     android:id="@+id/button_divider"
     android:layout_width="match_parent"
-    android:layout_height="1dp"
+    android:layout_height="@dimen/tiny_height"
     android:layout_above="@+id/ll_container_buttons"
     android:background="@color/divider_grey"/>
 
@@ -89,7 +89,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_alignParentBottom="true"
-    android:padding="16dp"
+    android:padding="@dimen/standard_gap"
     android:orientation="horizontal"
     >
     <androidx.appcompat.widget.AppCompatButton
diff --git a/app/src/main/res/layout/welcome_bullet.xml b/app/src/main/res/layout/welcome_bullet.xml
index 0baea2af6..6e2102206 100644
--- a/app/src/main/res/layout/welcome_bullet.xml
+++ b/app/src/main/res/layout/welcome_bullet.xml
@@ -7,7 +7,7 @@
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:paddingRight="4dp"
+        android:paddingRight="@dimen/tiny_margin"
         android:text="@string/bullet"
         android:textColor="@android:color/white"
         android:textSize="@dimen/normal_text" />
diff --git a/app/src/main/res/layout/welcome_final.xml b/app/src/main/res/layout/welcome_final.xml
index 0152f2580..7072f74f1 100644
--- a/app/src/main/res/layout/welcome_final.xml
+++ b/app/src/main/res/layout/welcome_final.xml
@@ -28,7 +28,7 @@
 
         <ImageView
             android:src="@drawable/welcome_copyright"
-            android:layout_width="160dp"
+            android:layout_width="@dimen/giant_height"
             android:layout_height="120dp"
             android:layout_gravity="center"
             android:layout_marginLeft="@dimen/standard_gap"
@@ -41,7 +41,7 @@
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:maxWidth="240dp"
+        android:maxWidth="@dimen/very_large_height"
         android:text="@string/welcome_final_text"
         android:layout_gravity="center"
         android:textStyle="bold"
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index ef9ab3458..d9c38dc53 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -5,29 +5,65 @@
     <dimen name="activity_margin_horizontal">8dp</dimen>
     <dimen name="activity_margin_vertical">8dp</dimen>
     <dimen name="achievements_activity_margin_vertical">8dp</dimen>
+    <dimen name="medium_height">12dp</dimen>
+    <dimen name="medium_width">12dp</dimen>
 
     <!-- Standard margins / padding -->
+    <dimen name="tiny_height">1dp</dimen>
+    <dimen name="miniscule_margin">2dp</dimen>
+    <dimen name="tiny_margin">4dp</dimen>
+    <dimen name="tiny_padding">5dp</dimen>
+    <dimen name="normal_height">18dp</dimen>
     <dimen name="huge_gap">48dp</dimen>
     <dimen name="large_gap">32dp</dimen>
+    <dimen name="gigantic_gap">64dp</dimen>
     <dimen name="standard_gap">16dp</dimen>
     <dimen name="small_gap">8dp</dimen>
+    <dimen name="small_height">7dp</dimen>
     <dimen name="tiny_gap">4dp</dimen>
+    <dimen name="landscape_width">400sp</dimen>
+    <dimen name="large_height">72dp</dimen>
+    <dimen name="question_height">252dp</dimen>
+    <dimen name="question_width">320dp</dimen>
+    <dimen name="big_height">90dp</dimen>
+    <dimen name="giant_height">160dp</dimen>
+    <dimen name="very_large_height">240dp</dimen>
+    <dimen name="fragment_height">48dp</dimen>
+    <dimen name="filter_padding">15dp</dimen>
 
     <!-- Component sizes -->
     <dimen name="overflow_icon_dimen">56dp</dimen>
     <dimen name="overflow_button_dimen">48dp</dimen>
     <dimen name="half_standard_height">24dp</dimen>
     <dimen name="quarter_standard_height">12dp</dimen>
+    <dimen name="progressbar_stroke">3dp</dimen>
+    <dimen name="notification_width">110dp</dimen>
+    <dimen name="notification_height">160dp</dimen>
 
     <!-- Text sizes -->
     <dimen name="heading_text_size">24sp</dimen>
     <dimen name="subheading_text_size">20sp</dimen>
+    <dimen name="small_text">10sp</dimen>
     <dimen name="normal_text">16sp</dimen>
     <dimen name="description_text_size">14sp</dimen>
     <dimen name="first_fab">15dp</dimen>
     <dimen name="second_fab">25dp</dimen>
     <dimen name="subtitle_text">12sp</dimen>
+    <dimen name="progressbar_text">9dp</dimen>
 
     <!-- App widget margin -->
     <dimen name="widget_margin">0dp</dimen>
+
+    <!-- Commonly used dimensions -->
+    <dimen name="dimen_0">0dp</dimen>
+    <dimen name="dimen_6">6dp</dimen>
+    <dimen name="dimen_10">10dp</dimen>
+    <dimen name="dimen_20">20dp</dimen>
+    <dimen name="dimen_40">40dp</dimen>
+    <dimen name="dimen_42">42dp</dimen>
+    <dimen name="dimen_250">250dp</dimen>
+    <dimen name="dimen_150">150dp</dimen>
+    <dimen name="dimen_72">72dp</dimen>
+    <dimen name="dimen_140">140dp</dimen>
+    <dimen name="dimen_200">200dp</dimen>
 </resources>