From 159494f08392d17805c4716368f3f08c368895f1 Mon Sep 17 00:00:00 2001
From: pixel <pixelu@tutanota.com>
Date: Mon, 27 Sep 2021 05:21:48 -0400
Subject: [PATCH]  I extracted dimension values into resource files #1151. 
 (https://github.com/lbryio/lbry-android/issues/1151)

 Because a lot of dimensions get reused, when I moved the dimensions file I used names like "large_1", "small_1", and "normal_1" for dimension values.

 I tried this to allow to cut down on repetitive values in the dimens file.

 "small" values range between 0dp and 15dp
 "normal" values range between 16dp to 119dp
 "large" values are anything over 120dp (the largest is 480dp)
---
 .../main/res/layout/activity_first_run.xml    |  22 +-
 .../main/res/layout/activity_verification.xml |  16 +-
 app/src/main/res/layout/app_bar_main.xml      |  54 +--
 .../main/res/layout/card_invites_by_email.xml |  22 +-
 .../main/res/layout/card_invites_by_link.xml  |  42 +-
 .../main/res/layout/card_invites_history.xml  |  14 +-
 .../main/res/layout/card_reward_driver.xml    |  16 +-
 .../main/res/layout/card_wallet_balance.xml   |  70 ++--
 .../layout/card_wallet_receive_credits.xml    |  38 +-
 .../card_wallet_recent_transactions.xml       |  32 +-
 .../res/layout/card_wallet_send_credits.xml   |  48 +--
 app/src/main/res/layout/card_wallet_sync.xml  |  58 +--
 .../res/layout/container_comment_form.xml     |  68 ++--
 .../layout/container_inline_channel_form.xml  |  40 +-
 .../res/layout/container_inline_tag_form.xml  |  26 +-
 .../layout/container_nothing_at_location.xml  |  14 +-
 .../res/layout/container_sdk_initializing.xml |  10 +-
 app/src/main/res/layout/content_main.xml      |  64 ++--
 .../main/res/layout/dialog_content_from.xml   |  36 +-
 .../main/res/layout/dialog_content_scope.xml  |  40 +-
 .../main/res/layout/dialog_content_sort.xml   |  46 +--
 .../main/res/layout/dialog_create_support.xml |  60 +--
 .../main/res/layout/dialog_customize_tags.xml |  68 ++--
 app/src/main/res/layout/dialog_discover.xml   |  16 +-
 .../main/res/layout/dialog_repost_claim.xml   |  64 ++--
 .../res/layout/exo_playback_control_view.xml  |  76 ++--
 .../res/layout/floating_wallet_balance.xml    |  50 +--
 app/src/main/res/layout/fragment_about.xml    | 136 +++----
 .../main/res/layout/fragment_all_content.xml  |  74 ++--
 app/src/main/res/layout/fragment_channel.xml  | 134 +++----
 .../res/layout/fragment_channel_about.xml     |  26 +-
 .../res/layout/fragment_channel_comments.xml  |  42 +-
 .../res/layout/fragment_channel_content.xml   |  44 +--
 .../main/res/layout/fragment_channel_form.xml | 130 +++----
 .../res/layout/fragment_channel_manager.xml   |  28 +-
 .../res/layout/fragment_editors_choice.xml    |   8 +-
 .../main/res/layout/fragment_file_view.xml    | 360 +++++++++---------
 .../main/res/layout/fragment_following.xml    |  76 ++--
 app/src/main/res/layout/fragment_gallery.xml  |   8 +-
 app/src/main/res/layout/fragment_home.xml     |   8 +-
 app/src/main/res/layout/fragment_invites.xml  |  16 +-
 app/src/main/res/layout/fragment_library.xml  | 108 +++---
 app/src/main/res/layout/fragment_publish.xml  |  52 +--
 .../main/res/layout/fragment_publish_form.xml | 202 +++++-----
 .../main/res/layout/fragment_publishes.xml    |  28 +-
 app/src/main/res/layout/fragment_rewards.xml  |  42 +-
 app/src/main/res/layout/fragment_search.xml   |  14 +-
 app/src/main/res/layout/fragment_shuffle.xml  |  28 +-
 .../layout/fragment_transaction_history.xml   |  12 +-
 .../layout/fragment_verification_email.xml    |  44 +--
 .../layout/fragment_verification_manual.xml   |  62 +--
 .../layout/fragment_verification_phone.xml    |  40 +-
 .../layout/fragment_verification_wallet.xml   |  28 +-
 app/src/main/res/layout/fragment_wallet.xml   |  16 +-
 .../res/layout/list_item_boosting_balance.xml |  26 +-
 app/src/main/res/layout/list_item_channel.xml |  76 ++--
 .../res/layout/list_item_channel_filter.xml   |  16 +-
 app/src/main/res/layout/list_item_comment.xml |  36 +-
 .../res/layout/list_item_editors_choice.xml   |  28 +-
 .../list_item_featured_search_result.xml      |  76 ++--
 app/src/main/res/layout/list_item_gallery.xml |  10 +-
 app/src/main/res/layout/list_item_invitee.xml |  12 +-
 .../res/layout/list_item_nav_menu_group.xml   |  10 +-
 .../res/layout/list_item_nav_menu_item.xml    |  18 +-
 .../res/layout/list_item_notification.xml     |  42 +-
 app/src/main/res/layout/list_item_reward.xml  |  46 +--
 .../res/layout/list_item_startupstage.xml     |   8 +-
 app/src/main/res/layout/list_item_stream.xml  |  96 ++---
 .../layout/list_item_suggested_channel.xml    |  32 +-
 app/src/main/res/layout/list_item_tag.xml     |  22 +-
 .../main/res/layout/list_item_transaction.xml |  30 +-
 .../res/layout/list_item_url_suggestion.xml   |  20 +-
 app/src/main/res/layout/nav_header_main.xml   |  14 +-
 app/src/main/res/layout/popup_webview.xml     |   4 +-
 .../main/res/layout/spinner_item_channel.xml  |   4 +-
 .../main/res/layout/spinner_item_generic.xml  |   4 +-
 app/src/main/res/values/dimens.xml            | 172 +++++++++
 77 files changed, 1925 insertions(+), 1753 deletions(-)

diff --git a/app/src/main/res/layout/activity_first_run.xml b/app/src/main/res/layout/activity_first_run.xml
index 3c4e7a41..78fa3131 100644
--- a/app/src/main/res/layout/activity_first_run.xml
+++ b/app/src/main/res/layout/activity_first_run.xml
@@ -14,7 +14,7 @@
             android:id="@+id/welcome_wait_container"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:padding="24dp"
+            android:padding="@dimen/normal_03"
             android:visibility="gone">
             <LinearLayout
                 android:layout_width="wrap_content"
@@ -22,9 +22,9 @@
                 android:layout_centerInParent="true">
                 <ProgressBar
                     android:id="@+id/welcome_progress_bar"
-                    android:layout_width="24dp"
-                    android:layout_height="24dp"
-                    android:layout_marginEnd="8dp"
+                    android:layout_width="@dimen/normal_03"
+                    android:layout_height="@dimen/normal_03"
+                    android:layout_marginEnd="@dimen/small_08"
                     android:layout_gravity="center_vertical"/>
                 <TextView
                     android:id="@+id/welcome_wait_text"
@@ -43,7 +43,7 @@
             android:id="@+id/welcome_link_use_lbry"
             android:background="?attr/selectableItemBackground"
             android:clickable="true"
-            android:padding="16dp"
+            android:padding="@dimen/normal_01"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:visibility="gone"
@@ -68,34 +68,34 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_centerInParent="true"
-                android:padding="24dp">
+                android:padding="@dimen/normal_03">
                 <TextView
                     android:fontFamily="@font/inter"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/welcome_to_lbry"
                     android:textColor="@color/white"
-                    android:textSize="32sp" />
+                    android:textSize="@dimen/text_size_14" />
                 <TextView
                     android:fontFamily="@font/inter"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/welcome_paragraph"
                     android:textColor="@color/white"
-                    android:layout_marginTop="16dp"
+                    android:layout_marginTop="@dimen/normal_01"
                     android:textFontWeight="300"
-                    android:textSize="16sp" />
+                    android:textSize="@dimen/text_size_06" />
                 <TextView
                     android:id="@+id/welcome_text_view_tos"
                     android:fontFamily="@font/inter"
-                    android:layout_marginTop="48dp"
+                    android:layout_marginTop="@dimen/normal_09"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:linksClickable="true"
                     android:text="@string/welcome_tos"
                     android:textColor="@color/white"
                     android:textFontWeight="300"
-                    android:textSize="12sp" />
+                    android:textSize="@dimen/text_size_02" />
             </LinearLayout>
         </RelativeLayout>
     </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/activity_verification.xml b/app/src/main/res/layout/activity_verification.xml
index c5017c9e..8877269c 100644
--- a/app/src/main/res/layout/activity_verification.xml
+++ b/app/src/main/res/layout/activity_verification.xml
@@ -19,17 +19,17 @@
         <RelativeLayout
             android:id="@+id/verification_close_button"
             android:visibility="gone"
-            android:layout_width="36dp"
-            android:layout_height="36dp"
-            android:layout_marginEnd="8dp"
-            android:layout_marginTop="8dp"
+            android:layout_width="@dimen/normal_06"
+            android:layout_height="@dimen/normal_06"
+            android:layout_marginEnd="@dimen/small_08"
+            android:layout_marginTop="@dimen/small_08"
             android:background="?attr/selectableItemBackground"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintRight_toRightOf="parent">
             <ImageView
                 android:layout_centerInParent="true"
-                android:layout_width="24dp"
-                android:layout_height="24dp"
+                android:layout_width="@dimen/normal_03"
+                android:layout_height="@dimen/normal_03"
                 android:src="@drawable/ic_close"
                 app:tint="@color/white" />
         </RelativeLayout>
@@ -37,8 +37,8 @@
         <ProgressBar
             android:id="@+id/verification_loading_progress"
             android:visibility="gone"
-            android:layout_width="36dp"
-            android:layout_height="36dp"
+            android:layout_width="@dimen/normal_06"
+            android:layout_height="@dimen/normal_06"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintRight_toRightOf="parent"
             app:layout_constraintLeft_toLeftOf="parent"
diff --git a/app/src/main/res/layout/app_bar_main.xml b/app/src/main/res/layout/app_bar_main.xml
index 3b46df68..bf157df1 100644
--- a/app/src/main/res/layout/app_bar_main.xml
+++ b/app/src/main/res/layout/app_bar_main.xml
@@ -34,33 +34,33 @@
                     android:background="@android:color/transparent"
                     android:layout_centerVertical="true"
                     android:drawableStart="@drawable/ic_search"
-                    android:drawablePadding="8dp"
+                    android:drawablePadding="@dimen/small_08"
                     android:drawableTint="@color/actionBarForeground"
                     android:fontFamily="@font/inter"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginEnd="24dp"
+                    android:layout_marginEnd="@dimen/normal_03"
                     android:hint="@string/uri_placeholder"
                     android:imeOptions="actionGo"
                     android:inputType="textNoSuggestions"
-                    android:paddingEnd="36dp"
+                    android:paddingEnd="@dimen/normal_06"
                     android:selectAllOnFocus="true"
                     android:singleLine="true"
                     android:textFontWeight="300"
-                    android:textSize="14sp" />
+                    android:textSize="@dimen/text_size_04" />
                 <LinearLayout
                     android:id="@+id/wunderbar_close"
                     android:clickable="true"
                     android:background="?attr/selectableItemBackground"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginEnd="24dp"
+                    android:layout_marginEnd="@dimen/normal_03"
                     android:layout_alignParentEnd="true"
                     android:layout_centerVertical="true"
                     android:visibility="gone">
                     <ImageView
-                        android:layout_width="24dp"
-                        android:layout_height="24dp"
+                        android:layout_width="@dimen/normal_03"
+                        android:layout_height="@dimen/normal_03"
                         android:src="@drawable/ic_close"
                         app:tint="@color/actionBarForeground" />
                 </LinearLayout>
@@ -69,14 +69,14 @@
                     android:id="@+id/wunderbar_notifications"
                     android:clickable="true"
                     android:background="?attr/selectableItemBackground"
-                    android:layout_width="48dp"
+                    android:layout_width="@dimen/normal_09"
                     android:layout_height="match_parent"
                     android:layout_alignParentEnd="true"
                     android:layout_centerVertical="true">
                     <ImageView
                         android:id="@+id/notifications_toggle_icon"
-                        android:layout_width="24dp"
-                        android:layout_height="24dp"
+                        android:layout_width="@dimen/normal_03"
+                        android:layout_height="@dimen/normal_03"
                         android:layout_centerInParent="true"
                         android:src="@drawable/ic_notifications"
                         app:tint="@color/actionBarForeground" />
@@ -87,13 +87,13 @@
                         android:background="@drawable/bg_notification_badge"
                         android:fontFamily="@font/inter"
                         android:gravity="center_horizontal"
-                        android:minWidth="12dp"
-                        android:paddingStart="2dp"
-                        android:paddingEnd="2dp"
-                        android:layout_marginTop="12dp"
-                        android:layout_marginStart="24dp"
+                        android:minWidth="@dimen/small_12"
+                        android:paddingStart="@dimen/small_02"
+                        android:paddingEnd="@dimen/small_02"
+                        android:layout_marginTop="@dimen/small_12"
+                        android:layout_marginStart="@dimen/normal_03"
                         android:textColor="@color/white"
-                        android:textSize="10sp"
+                        android:textSize="@dimen/text_size_00"
                         android:visibility="invisible"
                         />
                 </RelativeLayout>
@@ -124,13 +124,13 @@
                 android:layout_height="wrap_content"
                 android:text="@string/app_name"
                 android:fontFamily="@font/inter"
-                android:textSize="56sp"
+                android:textSize="@dimen/text_size_16"
                 android:textStyle="bold" />
             <ProgressBar
                 android:layout_gravity="center_horizontal"
-                android:layout_width="24dp"
-                android:layout_height="24dp"
-                android:layout_marginTop="48dp" />
+                android:layout_width="@dimen/normal_03"
+                android:layout_height="@dimen/normal_03"
+                android:layout_marginTop="@dimen/normal_09" />
         </LinearLayout>
         <LinearLayout
             android:id="@+id/splash_view_error_container"
@@ -139,30 +139,30 @@
             android:layout_centerVertical="true"
             android:orientation="vertical"
             android:visibility="gone"
-            android:padding="24dp">
+            android:padding="@dimen/normal_03">
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:fontFamily="@font/inter"
                 android:text="@string/oops_something_went_wrong"
-                android:textSize="20sp"
+                android:textSize="@dimen/text_size_10"
                 android:textColor="@color/white" />
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:fontFamily="@font/inter"
-                android:layout_marginTop="8dp"
+                android:layout_marginTop="@dimen/small_08"
                 android:text="@string/startup_failed"
                 android:textColor="@color/white"
                 android:textFontWeight="300"
-                android:textSize="14sp" />
+                android:textSize="@dimen/text_size_04" />
             <ListView
                 android:id="@+id/startup_stage_error_listview"
                 android:layout_width="wrap_content"
-                android:layout_height="0dp"
-                android:layout_marginTop="12dp"
+                android:layout_height="@dimen/small_00"
+                android:layout_marginTop="@dimen/small_12"
                 android:divider="@android:color/transparent"
-                android:dividerHeight="8dp"
+                android:dividerHeight="@dimen/small_08"
                 android:scrollbars="none"
                 tools:listitem="@layout/list_item_startupstage">
 
diff --git a/app/src/main/res/layout/card_invites_by_email.xml b/app/src/main/res/layout/card_invites_by_email.xml
index ff3dcd84..e59e245f 100644
--- a/app/src/main/res/layout/card_invites_by_email.xml
+++ b/app/src/main/res/layout/card_invites_by_email.xml
@@ -2,52 +2,52 @@
 <androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginBottom="16dp">
+    android:layout_marginBottom="@dimen/normal_01">
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
-        android:padding="16dp">
+        android:padding="@dimen/normal_01">
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="12dp"
+            android:layout_marginBottom="@dimen/small_12"
             android:fontFamily="@font/inter"
             android:textStyle="bold"
             android:text="@string/invite_by_email"
-            android:textSize="20sp"/>
+            android:textSize="@dimen/text_size_10"/>
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:fontFamily="@font/inter"
             android:text="@string/invite_someone"
-            android:textSize="14sp"
+            android:textSize="@dimen/text_size_04"
             android:textFontWeight="300" />
         <com.google.android.material.textfield.TextInputLayout
             android:id="@+id/invites_email_input_layout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="16dp">
+            android:layout_marginTop="@dimen/normal_01">
             <com.google.android.material.textfield.TextInputEditText
                 android:id="@+id/invites_email_input"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:fontFamily="@font/inter"
                 android:hint="@string/invite_email_placeholder"
-                android:textSize="14sp"
+                android:textSize="@dimen/text_size_04"
                 android:textFontWeight="300" />
         </com.google.android.material.textfield.TextInputLayout>
 
         <RelativeLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="16dp">
+            android:layout_marginTop="@dimen/normal_01">
             <ProgressBar
                 android:id="@+id/invites_loading_invite_by_email_progress"
-                android:layout_width="20dp"
-                android:layout_height="20dp"
+                android:layout_width="@dimen/normal_02"
+                android:layout_height="@dimen/normal_02"
                 android:layout_centerVertical="true"
-                android:layout_marginEnd="24dp"
+                android:layout_marginEnd="@dimen/normal_03"
                 android:layout_toStartOf="@id/invites_email_button"
                 android:visibility="gone" />
             <com.google.android.material.button.MaterialButton
diff --git a/app/src/main/res/layout/card_invites_by_link.xml b/app/src/main/res/layout/card_invites_by_link.xml
index a02d92ba..8c95bbb8 100644
--- a/app/src/main/res/layout/card_invites_by_link.xml
+++ b/app/src/main/res/layout/card_invites_by_link.xml
@@ -2,16 +2,16 @@
 <androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginBottom="16dp">
+    android:layout_marginBottom="@dimen/normal_01">
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
-        android:padding="16dp">
+        android:padding="@dimen/normal_01">
         <RelativeLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="12dp">
+            android:layout_marginBottom="@dimen/small_12">
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -19,11 +19,11 @@
                 android:fontFamily="@font/inter"
                 android:textStyle="bold"
                 android:text="@string/invite_link"
-                android:textSize="20sp"/>
+                android:textSize="@dimen/text_size_10"/>
             <ProgressBar
                 android:id="@+id/invites_loading_channels_progress"
-                android:layout_width="20dp"
-                android:layout_height="20dp"
+                android:layout_width="@dimen/normal_02"
+                android:layout_height="@dimen/normal_02"
                 android:layout_alignParentEnd="true"
                 android:layout_centerVertical="true"
                 android:visibility="gone" />
@@ -33,21 +33,21 @@
             android:layout_height="wrap_content"
             android:fontFamily="@font/inter"
             android:text="@string/share_this_link"
-            android:textSize="14sp"
+            android:textSize="@dimen/text_size_04"
             android:textFontWeight="300" />
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="12dp"
+            android:layout_marginTop="@dimen/small_12"
             android:fontFamily="@font/inter"
             android:text="@string/your_invite_link"
-            android:textSize="14sp"
+            android:textSize="@dimen/text_size_04"
             android:textFontWeight="300" />
 
         <RelativeLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="8dp"
+            android:layout_marginTop="@dimen/small_08"
             android:orientation="horizontal">
             <LinearLayout
                 android:background="@drawable/bg_copyable_text"
@@ -55,26 +55,26 @@
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
                 android:layout_toStartOf="@id/invites_copy_invite_link"
-                android:paddingTop="8dp"
-                android:paddingBottom="8dp"
-                android:paddingStart="12dp"
-                android:paddingEnd="12dp">
+                android:paddingTop="@dimen/small_08"
+                android:paddingBottom="@dimen/small_08"
+                android:paddingStart="@dimen/small_12"
+                android:paddingEnd="@dimen/small_12">
                 <TextView
                     android:id="@+id/invites_invite_link"
                     android:clickable="true"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:fontFamily="@font/inter"
-                    android:textSize="14sp"
+                    android:textSize="@dimen/text_size_04"
                     android:letterSpacing="0.05"
                     android:singleLine="true"
                     android:ellipsize="middle" />
             </LinearLayout>
             <ImageButton
                 android:id="@+id/invites_copy_invite_link"
-                android:layout_marginStart="8dp"
-                android:layout_width="24dp"
-                android:layout_height="24dp"
+                android:layout_marginStart="@dimen/small_08"
+                android:layout_width="@dimen/normal_03"
+                android:layout_height="@dimen/normal_03"
                 android:layout_centerVertical="true"
                 android:background="@null"
                 android:src="@drawable/ic_copy"
@@ -85,16 +85,16 @@
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="12dp"
+            android:layout_marginTop="@dimen/small_12"
             android:fontFamily="@font/inter"
             android:text="@string/customize_invite_link"
-            android:textSize="14sp"
+            android:textSize="@dimen/text_size_04"
             android:textFontWeight="300" />
         <androidx.appcompat.widget.AppCompatSpinner
             android:id="@+id/invites_channel_spinner"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="4dp" />
+            android:layout_marginTop="@dimen/small_04" />
 
         <include layout="@layout/container_inline_channel_form" />
     </LinearLayout>
diff --git a/app/src/main/res/layout/card_invites_history.xml b/app/src/main/res/layout/card_invites_history.xml
index e8bd189d..cadd70e4 100644
--- a/app/src/main/res/layout/card_invites_history.xml
+++ b/app/src/main/res/layout/card_invites_history.xml
@@ -6,11 +6,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
-        android:padding="16dp">
+        android:padding="@dimen/normal_01">
         <RelativeLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="12dp">
+            android:layout_marginBottom="@dimen/small_12">
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -18,11 +18,11 @@
                 android:fontFamily="@font/inter"
                 android:textStyle="bold"
                 android:text="@string/invite_history"
-                android:textSize="20sp"/>
+                android:textSize="@dimen/text_size_10"/>
             <ProgressBar
                 android:id="@+id/invites_loading_status_progress"
-                android:layout_width="20dp"
-                android:layout_height="20dp"
+                android:layout_width="@dimen/normal_02"
+                android:layout_height="@dimen/normal_02"
                 android:layout_alignParentEnd="true"
                 android:layout_centerVertical="true"
                 android:visibility="gone" />
@@ -32,14 +32,14 @@
             android:layout_height="wrap_content"
             android:fontFamily="@font/inter"
             android:text="@string/earn_credits_for_inviting"
-            android:textSize="14sp"
+            android:textSize="@dimen/text_size_04"
             android:textFontWeight="300" />
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/invite_history_list"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="16dp"
+            android:layout_marginTop="@dimen/normal_01"
             android:visibility="gone"/>
     </LinearLayout>
 </androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/card_reward_driver.xml b/app/src/main/res/layout/card_reward_driver.xml
index 08f427d9..037887b3 100644
--- a/app/src/main/res/layout/card_reward_driver.xml
+++ b/app/src/main/res/layout/card_reward_driver.xml
@@ -7,18 +7,18 @@
     android:foreground="?attr/selectableItemBackground"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:elevation="4dp"
-    app:cardCornerRadius="0dp">
+    android:elevation="@dimen/small_04"
+    app:cardCornerRadius="@dimen/small_00">
     <RelativeLayout
         android:background="@color/rewardDriverBlue"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:padding="12dp">
+        android:padding="@dimen/small_12">
         <io.lbry.browser.ui.controls.SolidIconView
             android:id="@+id/reward_driver_icon"
-            android:layout_width="20dp"
-            android:layout_height="20dp"
-            android:textSize="16dp"
+            android:layout_width="@dimen/normal_02"
+            android:layout_height="@dimen/normal_02"
+            android:textSize="@dimen/normal_01"
             android:layout_centerVertical="true"
             android:text="@string/fa_award"
             android:textColor="@color/white" />
@@ -27,12 +27,12 @@
             android:layout_centerVertical="true"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="8dp"
+            android:layout_marginStart="@dimen/small_08"
             android:layout_toEndOf="@id/reward_driver_icon"
             android:fontFamily="@font/inter"
             android:lineSpacingMultiplier="1.2"
             android:textColor="@color/white"
             android:textFontWeight="300"
-            android:textSize="14sp" />
+            android:textSize="@dimen/text_size_04" />
     </RelativeLayout>
 </androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/card_wallet_balance.xml b/app/src/main/res/layout/card_wallet_balance.xml
index 8e5e8118..b1d33ca1 100644
--- a/app/src/main/res/layout/card_wallet_balance.xml
+++ b/app/src/main/res/layout/card_wallet_balance.xml
@@ -4,7 +4,7 @@
     xmlns:lbry="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:elevation="4dp">
+    android:elevation="@dimen/small_04">
     <LinearLayout
         android:orientation="vertical"
         android:layout_width="match_parent"
@@ -13,7 +13,7 @@
             android:background="@drawable/stripe_2x"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:padding="16dp"
+            android:padding="@dimen/normal_01"
             android:orientation="vertical">
 
             <io.lbry.browser.views.CreditsBalanceView
@@ -21,7 +21,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 lbry:textSize="@dimen/wallet_total_balance_font_size"
-                lbry:iconSize="24dp"
+                lbry:iconSize="@dimen/normal_03"
                 android:textColor="@color/white"
                 android:textFontWeight="300" />
 
@@ -31,14 +31,14 @@
                 android:layout_height="wrap_content"
                 android:fontFamily="@font/inter"
                 android:textColor="@color/white"
-                android:textSize="16sp"
+                android:textSize="@dimen/text_size_06"
                 android:textFontWeight="300" />
 
             <TextView
                 android:id="@+id/total_balance_desc"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="8dp"
+                android:layout_marginTop="@dimen/small_08"
                 android:fontFamily="@font/inter"
                 android:textColor="@color/white"
                 android:textFontWeight="300"
@@ -46,9 +46,9 @@
 
             <View
                 android:layout_width="match_parent"
-                android:layout_height="0.5dp"
-                android:layout_marginTop="16dp"
-                android:layout_marginBottom="16dp"
+                android:layout_height="@dimen/small_00.5"
+                android:layout_marginTop="@dimen/normal_01"
+                android:layout_marginBottom="@dimen/normal_01"
                 android:background="@color/lightDivider" />
 
 
@@ -61,7 +61,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     lbry:textSize="@dimen/wallet_detail_balance_font_size"
-                    lbry:iconSize="14dp"
+                    lbry:iconSize="@dimen/small_14"
                     android:textColor="@color/white"
                     android:textFontWeight="300" />
 
@@ -70,7 +70,7 @@
                     android:layout_height="wrap_content"
                     android:gravity="bottom"
                     android:fontFamily="@font/inter"
-                    android:paddingStart="8dp"
+                    android:paddingStart="@dimen/small_08"
                     android:text="@string/immediately_spendable"
                     android:textColor="@color/white"
                     android:textFontWeight="300"
@@ -80,14 +80,14 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="12dp"
+                android:layout_marginTop="@dimen/small_12"
                 android:orientation="horizontal">
                 <io.lbry.browser.views.CreditsBalanceView
                     android:id="@+id/wallet_supporting_balance"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     lbry:textSize="@dimen/wallet_detail_balance_font_size"
-                    lbry:iconSize="14dp"
+                    lbry:iconSize="@dimen/small_14"
                     android:textColor="@color/white"
                     android:textFontWeight="300" />
 
@@ -95,7 +95,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:fontFamily="@font/inter"
-                    android:paddingStart="8dp"
+                    android:paddingStart="@dimen/small_08"
                     android:text="@string/boosting_content"
                     android:textColor="@color/white"
                     android:textFontWeight="300"
@@ -105,7 +105,7 @@
                     android:id="@+id/view_more_button"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="18dp"
+                    android:layout_marginStart="@dimen/normal_01_02"
                     android:drawableEnd="@drawable/ic_arrow_dropdown"
                     android:gravity="end"
                     android:text="@string/view_more"
@@ -116,8 +116,8 @@
             <ListView
                 android:id="@+id/balance_detail_listview"
                 android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:layout_marginTop="8dp"
+                android:layout_height="@dimen/small_00"
+                android:layout_marginTop="@dimen/small_08"
                 android:visibility="gone">
 
             </ListView>
@@ -132,40 +132,40 @@
             android:layout_height="wrap_content"
             android:fontFamily="@font/inter"
             android:text="@string/buy_lbc"
-            android:layout_marginTop="8dp"
-            android:layout_marginStart="12dp"
-            android:layout_marginEnd="12dp"
-            android:textSize="16sp" />
+            android:layout_marginTop="@dimen/small_08"
+            android:layout_marginStart="@dimen/small_12"
+            android:layout_marginEnd="@dimen/small_12"
+            android:textSize="@dimen/text_size_06" />
 
         <TextView
             android:id="@+id/wallet_hint_convert_credits"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="6dp"
-            android:layout_marginStart="16dp"
-            android:layout_marginEnd="16dp"
+            android:layout_marginTop="@dimen/small_06"
+            android:layout_marginStart="@dimen/normal_01"
+            android:layout_marginEnd="@dimen/normal_01"
             android:fontFamily="@font/inter"
             android:text="@string/convert_credits"
             android:textColorLink="@color/lbryGreen"
-            android:textSize="12sp" />
+            android:textSize="@dimen/text_size_02" />
 
         <TextView
             android:id="@+id/wallet_hint_convert_credits_bittrex"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="8dp"
-            android:layout_marginStart="16dp"
+            android:layout_marginTop="@dimen/small_08"
+            android:layout_marginStart="@dimen/normal_01"
             android:visibility="gone"
             android:fontFamily="@font/inter"
             android:text="@string/convert_credits_bittrex"
             android:textColorLink="@color/lbryGreen"
-            android:textSize="16sp" />
+            android:textSize="@dimen/text_size_06" />
 
         <View
             android:layout_width="match_parent"
-            android:layout_height="0.5dp"
-            android:layout_marginTop="16dp"
-            android:layout_marginBottom="16dp"
+            android:layout_height="@dimen/small_00.5"
+            android:layout_marginTop="@dimen/normal_01"
+            android:layout_marginBottom="@dimen/normal_01"
             android:background="@color/lightDivider" />
 
 
@@ -173,9 +173,9 @@
             android:background="@color/lbryGreen"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="16dp"
+            android:layout_marginTop="@dimen/normal_01"
             android:orientation="vertical"
-            android:padding="16dp">
+            android:padding="@dimen/normal_01">
             <TextView
                 android:id="@+id/wallet_hint_sync_status"
                 android:layout_width="wrap_content"
@@ -183,16 +183,16 @@
                 android:fontFamily="@font/inter"
                 android:text="@string/backup_notsynced"
                 android:textColor="@color/white"
-                android:textSize="14sp" />
+                android:textSize="@dimen/text_size_04" />
             <TextView
                 android:id="@+id/wallet_hint_what_sync_means"
                 android:layout_width="wrap_content"
-                android:layout_marginTop="8dp"
+                android:layout_marginTop="@dimen/small_08"
                 android:layout_height="wrap_content"
                 android:fontFamily="@font/inter"
                 android:text="@string/backup_what_does_this_mean"
                 android:textColor="@color/white"
-                android:textSize="12sp" />
+                android:textSize="@dimen/text_size_02" />
         </LinearLayout>
     </LinearLayout>
 </androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/card_wallet_receive_credits.xml b/app/src/main/res/layout/card_wallet_receive_credits.xml
index d1664aae..deeeb030 100644
--- a/app/src/main/res/layout/card_wallet_receive_credits.xml
+++ b/app/src/main/res/layout/card_wallet_receive_credits.xml
@@ -1,36 +1,36 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.cardview.widget.CardView
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:elevation="4dp"
+    android:elevation="@dimen/small_04"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginTop="16dp">
+    android:layout_marginTop="@dimen/normal_01">
     <LinearLayout
         android:orientation="vertical"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:padding="16dp">
+        android:padding="@dimen/normal_01">
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="16dp"
+            android:layout_marginBottom="@dimen/normal_01"
             android:fontFamily="@font/inter"
             android:textStyle="bold"
             android:text="@string/receive_credits"
-            android:textSize="20sp"/>
+            android:textSize="@dimen/text_size_10"/>
 
         <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:fontFamily="@font/inter"
             android:text="@string/use_this_address_hint"
-            android:textSize="14sp"
+            android:textSize="@dimen/text_size_04"
             android:textFontWeight="300" />
 
         <RelativeLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="8dp"
+            android:layout_marginTop="@dimen/small_08"
             android:orientation="horizontal">
             <TextView
                 android:id="@+id/wallet_receive_address"
@@ -41,20 +41,20 @@
                 android:layout_height="wrap_content"
                 android:fontFamily="@font/inter"
                 android:background="@drawable/bg_copyable_text"
-                android:textSize="14sp"
+                android:textSize="@dimen/text_size_04"
                 android:letterSpacing="0.05"
-                android:paddingTop="8dp"
-                android:paddingBottom="8dp"
-                android:paddingStart="8dp"
-                android:paddingEnd="8dp"
+                android:paddingTop="@dimen/small_08"
+                android:paddingBottom="@dimen/small_08"
+                android:paddingStart="@dimen/small_08"
+                android:paddingEnd="@dimen/small_08"
                 android:singleLine="true"
                 android:textAlignment="center"
                 android:ellipsize="middle" />
             <ImageButton
                 android:id="@+id/wallet_copy_receive_address"
-                android:layout_marginStart="8dp"
-                android:layout_width="24dp"
-                android:layout_height="24dp"
+                android:layout_marginStart="@dimen/small_08"
+                android:layout_width="@dimen/normal_03"
+                android:layout_height="@dimen/normal_03"
                 android:layout_centerVertical="true"
                 android:background="@null"
                 android:src="@drawable/ic_copy"
@@ -66,17 +66,17 @@
             android:id="@+id/wallet_get_new_address"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="8dp"
+            android:layout_marginTop="@dimen/small_08"
             android:text="@string/get_new_address"
             android:fontFamily="@font/inter"
-            android:textSize="14sp" />
+            android:textSize="@dimen/text_size_04" />
         <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="16dp"
+            android:layout_marginTop="@dimen/normal_01"
             android:fontFamily="@font/inter"
             android:text="@string/generate_address_hint"
-            android:textSize="12sp"
+            android:textSize="@dimen/text_size_02"
             android:textFontWeight="300" />
     </LinearLayout>
 </androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/card_wallet_recent_transactions.xml b/app/src/main/res/layout/card_wallet_recent_transactions.xml
index 9fe093b2..2b3d03e9 100644
--- a/app/src/main/res/layout/card_wallet_recent_transactions.xml
+++ b/app/src/main/res/layout/card_wallet_recent_transactions.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.cardview.widget.CardView
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:elevation="4dp"
+    android:elevation="@dimen/small_04"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginTop="16dp">
+    android:layout_marginTop="@dimen/normal_01">
     <LinearLayout
         android:orientation="vertical"
         android:layout_width="match_parent"
@@ -12,16 +12,16 @@
         <RelativeLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
-            android:layout_marginEnd="16dp"
-            android:layout_marginTop="16dp">
+            android:layout_marginStart="@dimen/normal_01"
+            android:layout_marginEnd="@dimen/normal_01"
+            android:layout_marginTop="@dimen/normal_01">
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:fontFamily="@font/inter"
                 android:textStyle="bold"
                 android:text="@string/recent_transactions"
-                android:textSize="20sp"/>
+                android:textSize="@dimen/text_size_10"/>
 
             <TextView
                 android:id="@+id/wallet_link_view_all"
@@ -34,21 +34,21 @@
                 android:fontFamily="@font/inter"
                 android:text="@string/view_all"
                 android:textColor="@color/lbryGreen"
-                android:textSize="14sp"
+                android:textSize="@dimen/text_size_04"
                 android:textFontWeight="300"/>
         </RelativeLayout>
 
         <View
             android:background="@color/lightDivider"
             android:layout_width="match_parent"
-            android:layout_height="0.5dp"
-            android:layout_marginTop="16dp" />
+            android:layout_height="@dimen/small_00.5"
+            android:layout_marginTop="@dimen/normal_01" />
         
         <RelativeLayout
             android:id="@+id/wallet_loading_recent_container"
             android:visibility="gone"
             android:orientation="horizontal"
-            android:padding="16dp"
+            android:padding="@dimen/normal_01"
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
             <LinearLayout
@@ -57,16 +57,16 @@
                 android:layout_height="wrap_content">
                 <ProgressBar
                     android:id="@+id/wallet_loading_recent_progress"
-                    android:layout_width="20dp"
-                    android:layout_height="20dp"
+                    android:layout_width="@dimen/normal_02"
+                    android:layout_height="@dimen/normal_02"
                     />
                 <TextView
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="8dp"
+                    android:layout_marginStart="@dimen/small_08"
                     android:text="@string/loading_transactions"
                     android:fontFamily="@font/inter"
-                    android:textSize="14sp"
+                    android:textSize="@dimen/text_size_04"
                     android:textFontWeight="300" />
             </LinearLayout>
         </RelativeLayout>
@@ -76,10 +76,10 @@
             android:id="@+id/wallet_no_recent_transactions"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_margin="16dp"
+            android:layout_margin="@dimen/normal_01"
             android:text="@string/no_recent_transactions"
             android:fontFamily="@font/inter"
-            android:textSize="14sp"
+            android:textSize="@dimen/text_size_04"
             android:textAlignment="center"
             android:textFontWeight="300" />
 
diff --git a/app/src/main/res/layout/card_wallet_send_credits.xml b/app/src/main/res/layout/card_wallet_send_credits.xml
index 82210fed..14982744 100644
--- a/app/src/main/res/layout/card_wallet_send_credits.xml
+++ b/app/src/main/res/layout/card_wallet_send_credits.xml
@@ -1,28 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.cardview.widget.CardView
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:elevation="4dp"
+    android:elevation="@dimen/small_04"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginTop="16dp">
+    android:layout_marginTop="@dimen/normal_01">
     <LinearLayout
         android:orientation="vertical"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:padding="16dp">
+        android:padding="@dimen/normal_01">
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="16dp"
+            android:layout_marginBottom="@dimen/normal_01"
             android:fontFamily="@font/inter"
             android:textStyle="bold"
             android:text="@string/send_credits"
-            android:textSize="20sp"/>
+            android:textSize="@dimen/text_size_10"/>
 
         <RelativeLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_marginTop="8dp"
+            android:layout_marginTop="@dimen/small_08"
             android:orientation="horizontal">
 
             <com.google.android.material.textfield.TextInputLayout
@@ -39,35 +39,35 @@
                     android:layout_height="wrap_content"
                     android:fontFamily="@font/inter"
                     android:imeOptions="actionNext"
-                    android:textSize="14sp" />
+                    android:textSize="@dimen/text_size_04" />
 
             </com.google.android.material.textfield.TextInputLayout>
 
             <ImageButton
                 android:id="@+id/wallet_qr_scan_address"
-                android:layout_width="48dp"
-                android:layout_height="48dp"
+                android:layout_width="@dimen/normal_09"
+                android:layout_height="@dimen/normal_09"
                 android:layout_alignParentEnd="true"
                 android:layout_centerVertical="true"
-                android:layout_marginStart="8dp"
+                android:layout_marginStart="@dimen/small_08"
                 android:background="@null"
                 android:src="@drawable/ic_qr_scanner"
                 android:tint="@color/lbryGreen" />
         </RelativeLayout>
 
         <RelativeLayout
-            android:layout_marginTop="16dp"
+            android:layout_marginTop="@dimen/normal_01"
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
             <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/wallet_input_layout_amount"
-                android:layout_width="80dp"
+                android:layout_width="@dimen/normal_17"
                 android:layout_height="wrap_content"
                 android:hint="@string/amount">
                 <com.google.android.material.textfield.TextInputEditText
                     android:id="@+id/wallet_input_amount"
                     android:fontFamily="@font/inter"
-                    android:textSize="14sp"
+                    android:textSize="@dimen/text_size_04"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:inputType="numberDecimal" />
@@ -78,26 +78,26 @@
                 android:layout_toEndOf="@id/wallet_input_layout_amount"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="8dp"
-                android:layout_marginTop="30dp"
+                android:layout_marginStart="@dimen/small_08"
+                android:layout_marginTop="@dimen/normal_04_02"
                 android:fontFamily="@font/inter"
                 android:text="@string/lbc"
                 android:textAllCaps="true"
-                android:textSize="10sp"
+                android:textSize="@dimen/text_size_00"
                 android:textFontWeight="300" />
 
             <LinearLayout
                 android:id="@+id/wallet_inline_balance_container"
                 android:layout_toEndOf="@id/wallet_input_currency"
-                android:layout_marginStart="24dp"
-                android:layout_marginTop="28dp"
+                android:layout_marginStart="@dimen/normal_03"
+                android:layout_marginTop="@dimen/normal_04"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:orientation="horizontal"
                 android:visibility="invisible">
                 <ImageView
-                    android:layout_width="12dp"
-                    android:layout_height="12dp"
+                    android:layout_width="@dimen/small_12"
+                    android:layout_height="@dimen/small_12"
                     android:layout_gravity="center_vertical"
                     android:src="@drawable/ic_credits" />
                 <TextView
@@ -106,16 +106,16 @@
                     android:layout_height="wrap_content"
                     android:fontFamily="@font/inter"
                     android:textFontWeight="300"
-                    android:layout_marginStart="2dp" />
+                    android:layout_marginStart="@dimen/small_02" />
             </LinearLayout>
 
             <ProgressBar
                 android:id="@+id/wallet_send_progress"
-                android:layout_width="20dp"
-                android:layout_height="20dp"
+                android:layout_width="@dimen/normal_02"
+                android:layout_height="@dimen/normal_02"
                 android:layout_toStartOf="@id/wallet_send"
                 android:layout_centerVertical="true"
-                android:layout_marginEnd="8dp"
+                android:layout_marginEnd="@dimen/small_08"
                 android:visibility="gone" />
 
             <com.google.android.material.button.MaterialButton
diff --git a/app/src/main/res/layout/card_wallet_sync.xml b/app/src/main/res/layout/card_wallet_sync.xml
index 9700c80c..caed6c5e 100644
--- a/app/src/main/res/layout/card_wallet_sync.xml
+++ b/app/src/main/res/layout/card_wallet_sync.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.cardview.widget.CardView
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:elevation="4dp"
+    android:elevation="@dimen/small_04"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginTop="16dp">
+    android:layout_marginTop="@dimen/normal_01">
     <LinearLayout
         android:orientation="vertical"
         android:layout_width="match_parent"
@@ -12,29 +12,29 @@
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
-            android:layout_marginTop="16dp"
+            android:layout_marginStart="@dimen/normal_01"
+            android:layout_marginTop="@dimen/normal_01"
             android:fontFamily="@font/inter"
             android:textStyle="bold"
             android:text="@string/wallet_sync"
-            android:textSize="20sp"/>
+            android:textSize="@dimen/text_size_10"/>
 
         <View
             android:background="@color/lightDivider"
             android:layout_width="match_parent"
-            android:layout_height="0.5dp"
-            android:layout_marginTop="16dp" />
+            android:layout_height="@dimen/small_00.5"
+            android:layout_marginTop="@dimen/normal_01" />
 
         <LinearLayout
             android:orientation="horizontal"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
-            android:layout_marginEnd="16dp"
+            android:layout_marginStart="@dimen/normal_01"
+            android:layout_marginEnd="@dimen/normal_01"
             android:weightSum="10">
             <TextView
                 android:layout_weight="4"
-                android:layout_width="0dp"
+                android:layout_width="@dimen/small_00"
                 android:layout_height="wrap_content"
                 android:singleLine="true"
                 android:ellipsize="end"
@@ -42,36 +42,36 @@
                 android:layout_gravity="center_vertical"
                 android:text="@string/sync_status"
                 android:textFontWeight="600"
-                android:textSize="16sp" />
+                android:textSize="@dimen/text_size_06" />
 
             <com.google.android.material.switchmaterial.SwitchMaterial
                 android:id="@+id/wallet_switch_sync_status"
                 android:fontFamily="@font/inter"
                 android:layout_weight="6"
-                android:layout_width="0dp"
+                android:layout_width="@dimen/small_00"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:text="@string/off"
                 android:textFontWeight="300"
-                android:textSize="16sp" />
+                android:textSize="@dimen/text_size_06" />
         </LinearLayout>
 
         <View
             android:background="@color/lightDivider"
             android:layout_width="match_parent"
-            android:layout_height="0.5dp"
-            android:layout_marginBottom="14dp" />
+            android:layout_height="@dimen/small_00.5"
+            android:layout_marginBottom="@dimen/small_14" />
 
         <LinearLayout
             android:orientation="horizontal"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
-            android:layout_marginEnd="16dp"
+            android:layout_marginStart="@dimen/normal_01"
+            android:layout_marginEnd="@dimen/normal_01"
             android:weightSum="10">
             <TextView
                 android:layout_weight="4"
-                android:layout_width="0dp"
+                android:layout_width="@dimen/small_00"
                 android:layout_height="wrap_content"
                 android:singleLine="true"
                 android:ellipsize="end"
@@ -79,12 +79,12 @@
                 android:layout_gravity="center_vertical"
                 android:text="@string/email"
                 android:textFontWeight="600"
-                android:textSize="16sp" />
+                android:textSize="@dimen/text_size_06" />
 
             <TextView
                 android:id="@+id/wallet_connected_email"
                 android:layout_weight="6"
-                android:layout_width="0dp"
+                android:layout_width="@dimen/small_00"
                 android:layout_height="wrap_content"
                 android:singleLine="true"
                 android:ellipsize="end"
@@ -92,35 +92,35 @@
                 android:layout_gravity="center_vertical"
                 android:text="@string/no_connected_email"
                 android:textFontWeight="300"
-                android:textSize="16sp" />
+                android:textSize="@dimen/text_size_06" />
         </LinearLayout>
 
         <View
             android:background="@color/lightDivider"
             android:layout_width="match_parent"
-            android:layout_height="0.5dp"
-            android:layout_marginTop="14dp"
-            android:layout_marginBottom="12dp" />
+            android:layout_height="@dimen/small_00.5"
+            android:layout_marginTop="@dimen/small_14"
+            android:layout_marginBottom="@dimen/small_12" />
 
         <LinearLayout
             android:orientation="horizontal"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
-            android:layout_marginEnd="16dp"
-            android:layout_marginBottom="12dp"
+            android:layout_marginStart="@dimen/normal_01"
+            android:layout_marginEnd="@dimen/normal_01"
+            android:layout_marginBottom="@dimen/small_12"
             android:weightSum="2">
             <TextView
                 android:id="@+id/wallet_link_manual_backup"
                 android:layout_weight="1"
-                android:layout_width="0dp"
+                android:layout_width="@dimen/small_00"
                 android:layout_height="wrap_content"
                 android:text="@string/manual_backup"
                 android:textColorLink="@color/lbryGreen" />
             <TextView
                 android:id="@+id/wallet_link_sync_faq"
                 android:layout_weight="1"
-                android:layout_width="0dp"
+                android:layout_width="@dimen/small_00"
                 android:layout_height="wrap_content"
                 android:gravity="right"
                 android:text="@string/sync_faq"
diff --git a/app/src/main/res/layout/container_comment_form.xml b/app/src/main/res/layout/container_comment_form.xml
index 0e2a4f26..8d7888db 100644
--- a/app/src/main/res/layout/container_comment_form.xml
+++ b/app/src/main/res/layout/container_comment_form.xml
@@ -6,12 +6,12 @@
     android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_margin="16dp">
+    android:layout_margin="@dimen/normal_01">
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
-        android:padding="16dp">
+        android:padding="@dimen/normal_01">
         <RelativeLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
@@ -21,14 +21,14 @@
                 android:layout_centerVertical="true"
                 android:text="@string/comment_as"
                 android:fontFamily="@font/inter"
-                android:textSize="14sp"
+                android:textSize="@dimen/text_size_04"
                 android:textFontWeight="300" />
             <ProgressBar
                 android:id="@+id/comment_form_channels_loading"
                 android:layout_alignParentEnd="true"
                 android:layout_centerVertical="true"
-                android:layout_width="20dp"
-                android:layout_height="20dp"
+                android:layout_width="@dimen/normal_02"
+                android:layout_height="@dimen/normal_02"
                 android:visibility="gone" />
         </RelativeLayout>
 
@@ -36,7 +36,7 @@
             android:id="@+id/comment_form_channel_spinner"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="4dp" />
+            android:layout_marginTop="@dimen/small_04" />
 
         <include layout="@layout/container_inline_channel_form" />
 
@@ -44,14 +44,14 @@
             android:id="@+id/comment_form_reply_to_container"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="8dp"
-            android:layout_marginBottom="8dp"
+            android:layout_marginTop="@dimen/small_08"
+            android:layout_marginBottom="@dimen/small_08"
             android:orientation="horizontal"
             android:visibility="gone">
 
             <View
                 android:id="@+id/comment_form_reply_to_vertical_bar"
-                android:layout_width="3dp"
+                android:layout_width="@dimen/small_03"
                 android:layout_height="match_parent"
                 android:background="@color/nextLbryGreen"
                 android:orientation="vertical" />
@@ -59,12 +59,12 @@
             <RelativeLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="8dp">
+                android:layout_marginStart="@dimen/small_08">
 
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginEnd="40dp"
+                    android:layout_marginEnd="@dimen/normal_07"
                     android:orientation="vertical">
 
                     <TextView
@@ -74,30 +74,30 @@
                         android:fontFamily="@font/inter"
                         android:text="@string/replying_to"
                         android:textColor="@color/lightGrey"
-                        android:textSize="12sp" />
+                        android:textSize="@dimen/text_size_02" />
 
                     <TextView
                         android:id="@+id/comment_form_reply_to_body"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginTop="2dp"
+                        android:layout_marginTop="@dimen/small_02"
                         android:fontFamily="@font/inter"
                         android:lineSpacingMultiplier="1.05"
                         android:textFontWeight="300"
-                        android:textSize="14sp" />
+                        android:textSize="@dimen/text_size_04" />
                 </LinearLayout>
 
                 <RelativeLayout
                     android:id="@+id/comment_form_clear_reply_to"
-                    android:layout_width="36dp"
-                    android:layout_height="36dp"
+                    android:layout_width="@dimen/normal_06"
+                    android:layout_height="@dimen/normal_06"
                     android:layout_alignParentEnd="true"
                     android:background="?attr/selectableItemBackground"
                     android:clickable="true">
 
                     <ImageView
-                        android:layout_width="24dp"
-                        android:layout_height="24dp"
+                        android:layout_width="@dimen/normal_03"
+                        android:layout_height="@dimen/normal_03"
                         android:layout_centerInParent="true"
                         android:src="@drawable/ic_close"
                         app:tint="@color/foreground" />
@@ -108,17 +108,17 @@
         <RelativeLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="8dp">
+            android:layout_marginTop="@dimen/small_08">
             <RelativeLayout
                 android:id="@+id/comment_form_avatar_container"
-                android:layout_width="40dp"
-                android:layout_height="40dp">
+                android:layout_width="@dimen/normal_07"
+                android:layout_height="@dimen/normal_07">
                 <RelativeLayout
                     android:layout_centerHorizontal="true"
                     android:background="@drawable/bg_channel_icon"
                     android:id="@+id/comment_form_no_thumbnail"
-                    android:layout_width="40dp"
-                    android:layout_height="40dp"
+                    android:layout_width="@dimen/normal_07"
+                    android:layout_height="@dimen/normal_07"
                     android:visibility="invisible">
                     <TextView
                         android:id="@+id/comment_form_thumbnail_alpha"
@@ -127,22 +127,22 @@
                         android:layout_height="wrap_content"
                         android:fontFamily="@font/inter"
                         android:textAllCaps="true"
-                        android:textSize="24sp"
+                        android:textSize="@dimen/text_size_11"
                         android:textColor="@color/white"
                         android:textFontWeight="300" />
                 </RelativeLayout>
                 <ImageView
                     android:layout_centerInParent="true"
                     android:id="@+id/comment_form_thumbnail"
-                    android:layout_width="40dp"
-                    android:layout_height="40dp" />
+                    android:layout_width="@dimen/normal_07"
+                    android:layout_height="@dimen/normal_07" />
             </RelativeLayout>
 
             <com.google.android.material.textfield.TextInputLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_toEndOf="@id/comment_form_avatar_container"
-                android:layout_marginStart="16dp">
+                android:layout_marginStart="@dimen/normal_01">
                 <com.google.android.material.textfield.TextInputEditText
                     android:id="@+id/comment_form_body"
                     android:hint="@string/comment"
@@ -154,7 +154,7 @@
                     android:maxLength="2000"
                     android:singleLine="false"
                     android:scrollbars="vertical"
-                    android:textSize="14sp" />
+                    android:textSize="@dimen/text_size_04" />
             </com.google.android.material.textfield.TextInputLayout>
         </RelativeLayout>
 
@@ -163,16 +163,16 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="right"
-            android:layout_marginTop="2dp"
+            android:layout_marginTop="@dimen/small_02"
             android:fontFamily="@font/inter"
             android:textColor="@color/lightGrey"
             android:textFontWeight="300"
-            android:textSize="12sp" />
+            android:textSize="@dimen/text_size_02" />
 
         <RelativeLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="8dp">
+            android:layout_marginTop="@dimen/small_08">
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/comment_form_post"
@@ -183,11 +183,11 @@
                 android:text="@string/comment_form_post" />
             <ProgressBar
                 android:id="@+id/comment_form_post_progress"
-                android:layout_width="20dp"
-                android:layout_height="20dp"
+                android:layout_width="@dimen/normal_02"
+                android:layout_height="@dimen/normal_02"
                 android:layout_centerVertical="true"
                 android:layout_toEndOf="@id/comment_form_post"
-                android:layout_marginStart="24dp"
+                android:layout_marginStart="@dimen/normal_03"
                 android:visibility="gone" />
         </RelativeLayout>
     </LinearLayout>
diff --git a/app/src/main/res/layout/container_inline_channel_form.xml b/app/src/main/res/layout/container_inline_channel_form.xml
index 38b11bf0..f7db5f20 100644
--- a/app/src/main/res/layout/container_inline_channel_form.xml
+++ b/app/src/main/res/layout/container_inline_channel_form.xml
@@ -2,7 +2,7 @@
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/container_inline_channel_form_create"
-    android:layout_marginTop="16dp"
+    android:layout_marginTop="@dimen/normal_01"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
@@ -17,16 +17,16 @@
             android:fontFamily="@font/inter"
             android:hint="@string/channel_name"
             android:textFontWeight="300"
-            android:textSize="14sp" />
+            android:textSize="@dimen/text_size_04" />
     </com.google.android.material.textfield.TextInputLayout>
 
     <RelativeLayout
-        android:layout_marginTop="16dp"
+        android:layout_marginTop="@dimen/normal_01"
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
         <com.google.android.material.textfield.TextInputLayout
             android:id="@+id/inline_channel_form_layout_deposit"
-            android:layout_width="100dp"
+            android:layout_width="@dimen/normal_22"
             android:layout_height="wrap_content"
             android:hint="@string/deposit">
             <com.google.android.material.textfield.TextInputEditText
@@ -35,7 +35,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:singleLine="true"
-                android:textSize="14sp"
+                android:textSize="@dimen/text_size_04"
                 android:text="@string/min_deposit"
                 android:inputType="numberDecimal" />
         </com.google.android.material.textfield.TextInputLayout>
@@ -45,26 +45,26 @@
             android:layout_toEndOf="@id/inline_channel_form_layout_deposit"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="8dp"
-            android:layout_marginTop="30dp"
+            android:layout_marginStart="@dimen/small_08"
+            android:layout_marginTop="@dimen/normal_04_02"
             android:fontFamily="@font/inter"
             android:text="@string/lbc"
             android:textAllCaps="true"
-            android:textSize="10sp"
+            android:textSize="@dimen/text_size_00"
             android:textFontWeight="300" />
 
         <LinearLayout
             android:id="@+id/inline_channel_form_inline_balance_container"
             android:layout_toEndOf="@id/inline_channel_form_inline_currency"
-            android:layout_marginStart="24dp"
-            android:layout_marginTop="28dp"
+            android:layout_marginStart="@dimen/normal_03"
+            android:layout_marginTop="@dimen/normal_04"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:orientation="horizontal"
             android:visibility="invisible">
             <ImageView
-                android:layout_width="12dp"
-                android:layout_height="12dp"
+                android:layout_width="@dimen/small_12"
+                android:layout_height="@dimen/small_12"
                 android:layout_gravity="center_vertical"
                 android:src="@drawable/ic_credits" />
             <TextView
@@ -73,23 +73,23 @@
                 android:layout_height="wrap_content"
                 android:fontFamily="@font/inter"
                 android:textFontWeight="300"
-                android:layout_marginStart="2dp" />
+                android:layout_marginStart="@dimen/small_02" />
         </LinearLayout>
     </RelativeLayout>
 
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="4dp"
+        android:layout_marginTop="@dimen/small_04"
         android:fontFamily="@font/inter"
         android:text="@string/deposit_remains_yours"
         android:textFontWeight="300"
-        android:textSize="12sp" />
+        android:textSize="@dimen/text_size_02" />
 
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="16dp">
+        android:layout_marginTop="@dimen/normal_01">
         <TextView
             android:id="@+id/inline_channel_form_cancel_link"
             android:background="?attr/selectableItemBackground"
@@ -98,15 +98,15 @@
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
             android:fontFamily="@font/inter"
-            android:textSize="12sp"
+            android:textSize="@dimen/text_size_02"
             android:text="@string/cancel" />
 
         <ProgressBar
             android:id="@+id/inline_channel_form_create_progress"
-            android:layout_width="20dp"
-            android:layout_height="20dp"
+            android:layout_width="@dimen/normal_02"
+            android:layout_height="@dimen/normal_02"
             android:layout_centerVertical="true"
-            android:layout_marginEnd="24dp"
+            android:layout_marginEnd="@dimen/normal_03"
             android:layout_toStartOf="@id/inline_channel_form_create_button"
             android:visibility="gone" />
 
diff --git a/app/src/main/res/layout/container_inline_tag_form.xml b/app/src/main/res/layout/container_inline_tag_form.xml
index bdd32a3c..4c386b5a 100644
--- a/app/src/main/res/layout/container_inline_tag_form.xml
+++ b/app/src/main/res/layout/container_inline_tag_form.xml
@@ -10,19 +10,19 @@
         android:id="@+id/form_no_added_tags"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="6dp"
+        android:layout_marginBottom="@dimen/small_06"
         android:fontFamily="@font/inter"
         android:text="@string/no_added_tags"
-        android:textSize="14sp"
+        android:textSize="@dimen/text_size_04"
         android:textFontWeight="300"
         android:visibility="gone" />
 
     <View
         android:layout_width="match_parent"
-        android:layout_height="0.5dp"
+        android:layout_height="@dimen/small_00.5"
         android:background="@color/divider"
-        android:layout_marginTop="10dp"
-        android:layout_marginBottom="16dp"/>
+        android:layout_marginTop="@dimen/small_10"
+        android:layout_marginBottom="@dimen/normal_01"/>
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/form_suggested_tags"
@@ -33,7 +33,7 @@
         android:id="@+id/form_mature_tags_container"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="8dp"
+        android:layout_marginTop="@dimen/small_08"
         android:orientation="vertical"
         android:visibility="gone">
         <TextView
@@ -41,38 +41,38 @@
             android:layout_height="wrap_content"
             android:fontFamily="@font/inter"
             android:text="@string/mature_tags"
-            android:textSize="14sp"
+            android:textSize="@dimen/text_size_04"
             android:textFontWeight="300" />
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/form_mature_tags"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="4dp" />
+            android:layout_marginTop="@dimen/small_04" />
     </LinearLayout>
 
     <TextView
         android:id="@+id/form_no_tag_results"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="6dp"
+        android:layout_marginBottom="@dimen/small_06"
         android:fontFamily="@font/inter"
         android:text="@string/form_no_tag_results"
-        android:textSize="14sp"
+        android:textSize="@dimen/text_size_04"
         android:textFontWeight="300"
         android:visibility="gone" />
 
     <com.google.android.material.textfield.TextInputLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="10dp"
-        android:layout_marginBottom="16dp">
+        android:layout_marginTop="@dimen/small_10"
+        android:layout_marginBottom="@dimen/normal_01">
         <com.google.android.material.textfield.TextInputEditText
             android:id="@+id/form_tag_filter_input"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:hint="@string/search_for_more_tags"
             android:fontFamily="@font/inter"
-            android:textSize="14sp"
+            android:textSize="@dimen/text_size_04"
             android:textFontWeight="300" />
     </com.google.android.material.textfield.TextInputLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/container_nothing_at_location.xml b/app/src/main/res/layout/container_nothing_at_location.xml
index be868d07..6cce816e 100644
--- a/app/src/main/res/layout/container_nothing_at_location.xml
+++ b/app/src/main/res/layout/container_nothing_at_location.xml
@@ -10,11 +10,11 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_centerInParent="true"
-        android:padding="36dp">
+        android:padding="@dimen/normal_06">
         <ImageView
             android:layout_gravity="center_horizontal"
-            android:layout_width="160dp"
-            android:layout_height="300dp"
+            android:layout_width="@dimen/large_11"
+            android:layout_height="@dimen/large_47"
             android:adjustViewBounds="true"
             android:src="@drawable/gerbil_happy" />
         <TextView
@@ -22,19 +22,19 @@
             android:text="@string/nothing_at_this_location"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="24dp"
+            android:layout_marginTop="@dimen/normal_03"
             android:layout_gravity="center_horizontal"
             android:fontFamily="@font/inter"
-            android:textSize="16sp"
+            android:textSize="@dimen/text_size_06"
             android:textAlignment="center" />
         <com.google.android.material.button.MaterialButton
             android:id="@+id/nothing_at_location_publish_button"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
-            android:layout_marginTop="24dp"
+            android:layout_marginTop="@dimen/normal_03"
             android:fontFamily="@font/inter"
-            android:textSize="14sp"
+            android:textSize="@dimen/text_size_04"
             android:text="@string/publish_something_here"
             android:textFontWeight="300"
             android:visibility="gone" />
diff --git a/app/src/main/res/layout/container_sdk_initializing.xml b/app/src/main/res/layout/container_sdk_initializing.xml
index 63f32959..9794069a 100644
--- a/app/src/main/res/layout/container_sdk_initializing.xml
+++ b/app/src/main/res/layout/container_sdk_initializing.xml
@@ -11,21 +11,21 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_centerInParent="true"
-        android:padding="36dp">
+        android:padding="@dimen/normal_06">
         <ImageView
             android:layout_gravity="center_horizontal"
-            android:layout_width="160dp"
-            android:layout_height="300dp"
+            android:layout_width="@dimen/large_11"
+            android:layout_height="@dimen/large_47"
             android:adjustViewBounds="true"
             android:src="@drawable/gerbil_happy" />
         <TextView
             android:text="@string/sdk_still_initializing"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="24dp"
+            android:layout_marginTop="@dimen/normal_03"
             android:layout_gravity="center_horizontal"
             android:fontFamily="@font/inter"
-            android:textSize="16sp"
+            android:textSize="@dimen/text_size_06"
             android:textAlignment="center" />
     </LinearLayout>
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/content_main.xml b/app/src/main/res/layout/content_main.xml
index 06bfa62f..a64c4208 100644
--- a/app/src/main/res/layout/content_main.xml
+++ b/app/src/main/res/layout/content_main.xml
@@ -14,7 +14,7 @@
         android:fitsSystemWindows="true"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_margin="0dp"
+        android:layout_margin="@dimen/small_00"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
@@ -22,7 +22,7 @@
     <RelativeLayout
         android:id="@+id/url_suggestions_container"
         android:background="@color/pageBackground"
-        android:elevation="6dp"
+        android:elevation="@dimen/small_06"
         android:fitsSystemWindows="true"
         android:visibility="gone"
         android:layout_width="match_parent"
@@ -36,7 +36,7 @@
     <RelativeLayout
         android:id="@+id/notifications_container"
         android:background="@color/pageBackground"
-        android:elevation="6dp"
+        android:elevation="@dimen/small_06"
         android:fitsSystemWindows="true"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -44,8 +44,8 @@
         <ProgressBar
             android:id="@+id/notifications_progress"
             android:layout_centerInParent="true"
-            android:layout_width="24dp"
-            android:layout_height="24dp"
+            android:layout_width="@dimen/normal_03"
+            android:layout_height="@dimen/normal_03"
             android:visibility="gone" />
         <LinearLayout
             android:id="@+id/notification_list_empty_container"
@@ -53,22 +53,22 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_centerInParent="true"
-            android:padding="36dp"
+            android:padding="@dimen/normal_06"
             android:visibility="gone">
             <ImageView
                 android:layout_gravity="center_horizontal"
-                android:layout_width="160dp"
-                android:layout_height="300dp"
+                android:layout_width="@dimen/large_11"
+                android:layout_height="@dimen/large_47"
                 android:adjustViewBounds="true"
                 android:src="@drawable/gerbil_happy" />
             <TextView
                 android:text="@string/no_notifications"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="24dp"
+                android:layout_marginTop="@dimen/normal_03"
                 android:layout_gravity="center_horizontal"
                 android:fontFamily="@font/inter"
-                android:textSize="16sp"
+                android:textSize="@dimen/text_size_06"
                 android:textAlignment="center" />
         </LinearLayout>
         <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
@@ -79,7 +79,7 @@
                 android:id="@+id/notifications_list"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:paddingTop="8dp"
+                android:paddingTop="@dimen/small_08"
                 android:clipToPadding="false"
                 />
         </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
@@ -92,8 +92,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="@color/lbryGreen"
-        android:elevation="12dp"
-        android:padding="8dp"
+        android:elevation="@dimen/small_12"
+        android:padding="@dimen/small_08"
         android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="parent">
         <LinearLayout
@@ -102,17 +102,17 @@
             android:layout_centerHorizontal="true"
             android:orientation="horizontal">
             <ProgressBar
-                android:layout_width="16dp"
-                android:layout_height="16dp"
+                android:layout_width="@dimen/normal_01"
+                android:layout_height="@dimen/normal_01"
                 android:layout_gravity="center_vertical" />
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
-                android:layout_marginStart="8dp"
+                android:layout_marginStart="@dimen/small_08"
                 android:fontFamily="@font/inter"
                 android:text="@string/sdk_initializing"
-                android:textSize="14sp"
+                android:textSize="@dimen/text_size_04"
                 android:textColor="@color/white"
                 android:textFontWeight="300" />
         </LinearLayout>
@@ -123,24 +123,24 @@
         android:clickable="true"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginStart="4dp"
-        android:layout_marginEnd="4dp"
-        android:layout_marginBottom="4dp"
+        android:layout_marginStart="@dimen/small_04"
+        android:layout_marginEnd="@dimen/small_04"
+        android:layout_marginBottom="@dimen/small_04"
         android:visibility="gone"
-        app:cardElevation="8dp"
+        app:cardElevation="@dimen/small_08"
         app:layout_constraintBottom_toTopOf="@id/global_sdk_initializing_status">
         <RelativeLayout
             android:orientation="horizontal"
             android:layout_width="match_parent"
-            android:layout_height="90dp">
+            android:layout_height="@dimen/normal_19_02">
             <com.google.android.exoplayer2.ui.PlayerView
                 android:id="@+id/global_now_playing_player_view"
-                android:layout_width="160dp"
-                android:layout_height="90dp" />
+                android:layout_width="@dimen/large_11"
+                android:layout_height="@dimen/normal_19_02" />
             <LinearLayout
                 android:layout_toEndOf="@id/global_now_playing_player_view"
                 android:layout_toStartOf="@id/global_now_playing_close"
-                android:layout_marginStart="8dp"
+                android:layout_marginStart="@dimen/small_08"
                 android:layout_centerVertical="true"
                 android:orientation="vertical"
                 android:layout_width="match_parent"
@@ -152,28 +152,28 @@
                     android:layout_height="wrap_content"
                     android:maxLines="2"
                     android:ellipsize="end"
-                    android:textSize="12sp"  />
+                    android:textSize="@dimen/text_size_02"  />
                 <TextView
                     android:id="@+id/global_now_playing_channel_title"
                     android:fontFamily="@font/inter"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="8dp"
+                    android:layout_marginTop="@dimen/small_08"
                     android:ellipsize="end"
                     android:singleLine="true"
-                    android:textSize="10sp" />
+                    android:textSize="@dimen/text_size_00" />
             </LinearLayout>
             <RelativeLayout
                 android:id="@+id/global_now_playing_close"
                 android:background="?attr/selectableItemBackground"
                 android:layout_height="match_parent"
-                android:layout_width="36dp"
+                android:layout_width="@dimen/normal_06"
                 android:layout_alignParentEnd="true"
                 android:clickable="true"
-                android:layout_marginStart="8dp">
+                android:layout_marginStart="@dimen/small_08">
                 <ImageView
-                    android:layout_width="24dp"
-                    android:layout_height="24dp"
+                    android:layout_width="@dimen/normal_03"
+                    android:layout_height="@dimen/normal_03"
                     android:src="@drawable/ic_close"
                     android:layout_centerInParent="true"
                     app:tint="@color/foreground" />
diff --git a/app/src/main/res/layout/dialog_content_from.xml b/app/src/main/res/layout/dialog_content_from.xml
index 7bdc4161..e2e2dd7e 100644
--- a/app/src/main/res/layout/dialog_content_from.xml
+++ b/app/src/main/res/layout/dialog_content_from.xml
@@ -5,23 +5,23 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
     <TextView
-        android:layout_marginStart="10dp"
-        android:layout_marginEnd="10dp"
-        android:layout_marginTop="8dp"
+        android:layout_marginStart="@dimen/small_10"
+        android:layout_marginEnd="@dimen/small_10"
+        android:layout_marginTop="@dimen/small_08"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:fontFamily="@font/inter"
         android:text="@string/content_from"
-        android:textSize="12sp"
+        android:textSize="@dimen/text_size_02"
         android:textAllCaps="true"
         android:textStyle="bold" />
     <View
         android:layout_width="match_parent"
-        android:layout_height="0.5dp"
+        android:layout_height="@dimen/small_00.5"
         android:background="@color/divider"
-        android:layout_marginTop="8dp"
-        android:layout_marginStart="8dp"
-        android:layout_marginEnd="8dp" />
+        android:layout_marginTop="@dimen/small_08"
+        android:layout_marginStart="@dimen/small_08"
+        android:layout_marginEnd="@dimen/small_08" />
 
     <RelativeLayout
         android:id="@+id/content_from_past_24_hours_item"
@@ -29,14 +29,14 @@
         android:clickable="true"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:padding="12dp">
+        android:padding="@dimen/small_12">
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
             android:fontFamily="@font/inter"
             android:text="@string/past_24_hours"
-            android:textSize="14sp"
+            android:textSize="@dimen/text_size_04"
             android:textFontWeight="300" />
         <ImageView
             android:id="@+id/content_from_past_24_hours_item_selected"
@@ -55,14 +55,14 @@
         android:clickable="true"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:padding="12dp">
+        android:padding="@dimen/small_12">
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
             android:fontFamily="@font/inter"
             android:text="@string/past_week"
-            android:textSize="14sp"
+            android:textSize="@dimen/text_size_04"
             android:textFontWeight="300" />
         <ImageView
             android:id="@+id/content_from_past_week_item_selected"
@@ -81,14 +81,14 @@
         android:clickable="true"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:padding="12dp">
+        android:padding="@dimen/small_12">
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
             android:fontFamily="@font/inter"
             android:text="@string/past_month"
-            android:textSize="14sp"
+            android:textSize="@dimen/text_size_04"
             android:textFontWeight="300" />
         <ImageView
             android:id="@+id/content_from_past_month_item_selected"
@@ -107,14 +107,14 @@
         android:clickable="true"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:padding="12dp">
+        android:padding="@dimen/small_12">
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
             android:fontFamily="@font/inter"
             android:text="@string/past_year"
-            android:textSize="14sp"
+            android:textSize="@dimen/text_size_04"
             android:textFontWeight="300" />
         <ImageView
             android:id="@+id/content_from_past_year_item_selected"
@@ -133,14 +133,14 @@
         android:clickable="true"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:padding="12dp">
+        android:padding="@dimen/small_12">
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
             android:fontFamily="@font/inter"
             android:text="@string/all_time"
-            android:textSize="14sp"
+            android:textSize="@dimen/text_size_04"
             android:textFontWeight="300" />
         <ImageView
             android:id="@+id/content_from_all_time_item_selected"
diff --git a/app/src/main/res/layout/dialog_content_scope.xml b/app/src/main/res/layout/dialog_content_scope.xml
index b8b9211d..e7ee68c3 100644
--- a/app/src/main/res/layout/dialog_content_scope.xml
+++ b/app/src/main/res/layout/dialog_content_scope.xml
@@ -5,23 +5,23 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
     <TextView
-        android:layout_marginStart="10dp"
-        android:layout_marginEnd="10dp"
-        android:layout_marginTop="8dp"
+        android:layout_marginStart="@dimen/small_10"
+        android:layout_marginEnd="@dimen/small_10"
+        android:layout_marginTop="@dimen/small_08"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:fontFamily="@font/inter"
         android:text="@string/filter_for"
-        android:textSize="12sp"
+        android:textSize="@dimen/text_size_02"
         android:textAllCaps="true"
         android:textStyle="bold" />
     <View
         android:layout_width="match_parent"
-        android:layout_height="0.5dp"
+        android:layout_height="@dimen/small_00.5"
         android:background="@color/divider"
-        android:layout_marginTop="8dp"
-        android:layout_marginStart="8dp"
-        android:layout_marginEnd="8dp" />
+        android:layout_marginTop="@dimen/small_08"
+        android:layout_marginStart="@dimen/small_08"
+        android:layout_marginEnd="@dimen/small_08" />
 
     <RelativeLayout
         android:id="@+id/content_scope_everyone_item"
@@ -29,23 +29,23 @@
         android:clickable="true"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:padding="12dp">
+        android:padding="@dimen/small_12">
         <io.lbry.browser.ui.controls.SolidIconView
             android:id="@+id/content_scope_everyone_item_icon"
-            android:layout_width="18dp"
-            android:layout_height="18dp"
-            android:textSize="16dp"
+            android:layout_width="@dimen/normal_01_02"
+            android:layout_height="@dimen/normal_01_02"
+            android:textSize="@dimen/normal_01"
             android:layout_centerVertical="true"
             android:text="@string/fa_globe_americas" />
         <TextView
             android:layout_toEndOf="@+id/content_scope_everyone_item_icon"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
+            android:layout_marginStart="@dimen/normal_01"
             android:layout_centerVertical="true"
             android:fontFamily="@font/inter"
             android:text="@string/everyone"
-            android:textSize="14sp"
+            android:textSize="@dimen/text_size_04"
             android:textFontWeight="300" />
         <ImageView
             android:id="@+id/content_scope_everyone_item_selected"
@@ -64,23 +64,23 @@
         android:clickable="true"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:padding="12dp">
+        android:padding="@dimen/small_12">
         <io.lbry.browser.ui.controls.SolidIconView
             android:id="@+id/content_scope_tags_item_icon"
-            android:layout_width="18dp"
-            android:layout_height="18dp"
-            android:textSize="16dp"
+            android:layout_width="@dimen/normal_01_02"
+            android:layout_height="@dimen/normal_01_02"
+            android:textSize="@dimen/normal_01"
             android:layout_centerVertical="true"
             android:text="@string/fa_hashtag" />
         <TextView
             android:layout_toEndOf="@+id/content_scope_tags_item_icon"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
+            android:layout_marginStart="@dimen/normal_01"
             android:layout_centerVertical="true"
             android:fontFamily="@font/inter"
             android:text="@string/tags_you_follow"
-            android:textSize="14sp"
+            android:textSize="@dimen/text_size_04"
             android:textFontWeight="300" />
         <ImageView
             android:id="@+id/content_scope_tags_item_selected"
diff --git a/app/src/main/res/layout/dialog_content_sort.xml b/app/src/main/res/layout/dialog_content_sort.xml
index 82e012d5..0e0536f6 100644
--- a/app/src/main/res/layout/dialog_content_sort.xml
+++ b/app/src/main/res/layout/dialog_content_sort.xml
@@ -5,23 +5,23 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
     <TextView
-        android:layout_marginStart="10dp"
-        android:layout_marginEnd="10dp"
-        android:layout_marginTop="8dp"
+        android:layout_marginStart="@dimen/small_10"
+        android:layout_marginEnd="@dimen/small_10"
+        android:layout_marginTop="@dimen/small_08"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:fontFamily="@font/inter"
         android:text="@string/sort_content_by"
-        android:textSize="12sp"
+        android:textSize="@dimen/text_size_02"
         android:textAllCaps="true"
         android:textStyle="bold" />
     <View
         android:layout_width="match_parent"
-        android:layout_height="0.5dp"
+        android:layout_height="@dimen/small_00.5"
         android:background="@color/divider"
-        android:layout_marginTop="8dp"
-        android:layout_marginStart="8dp"
-        android:layout_marginEnd="8dp" />
+        android:layout_marginTop="@dimen/small_08"
+        android:layout_marginStart="@dimen/small_08"
+        android:layout_marginEnd="@dimen/small_08" />
 
     <RelativeLayout
         android:id="@+id/sort_by_trending_item"
@@ -29,11 +29,11 @@
         android:clickable="true"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:padding="12dp">
+        android:padding="@dimen/small_12">
         <ImageView
             android:id="@+id/sort_by_trending_item_icon"
-            android:layout_width="18dp"
-            android:layout_height="18dp"
+            android:layout_width="@dimen/normal_01_02"
+            android:layout_height="@dimen/normal_01_02"
             android:layout_centerVertical="true"
             android:src="@drawable/ic_trending"
             app:tint="@color/foreground" />
@@ -41,11 +41,11 @@
             android:layout_toEndOf="@+id/sort_by_trending_item_icon"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
+            android:layout_marginStart="@dimen/normal_01"
             android:layout_centerVertical="true"
             android:fontFamily="@font/inter"
             android:text="@string/trending_content"
-            android:textSize="14sp"
+            android:textSize="@dimen/text_size_04"
             android:textFontWeight="300" />
         <ImageView
             android:id="@+id/sort_by_trending_item_selected"
@@ -64,11 +64,11 @@
         android:clickable="true"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:padding="12dp">
+        android:padding="@dimen/small_12">
         <ImageView
             android:id="@+id/sort_by_new_item_icon"
-            android:layout_width="18dp"
-            android:layout_height="18dp"
+            android:layout_width="@dimen/normal_01_02"
+            android:layout_height="@dimen/normal_01_02"
             android:layout_centerVertical="true"
             android:src="@drawable/ic_new"
             app:tint="@color/foreground" />
@@ -76,11 +76,11 @@
             android:layout_toEndOf="@+id/sort_by_new_item_icon"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
+            android:layout_marginStart="@dimen/normal_01"
             android:layout_centerVertical="true"
             android:fontFamily="@font/inter"
             android:text="@string/new_content"
-            android:textSize="14sp"
+            android:textSize="@dimen/text_size_04"
             android:textFontWeight="300" />
         <ImageView
             android:id="@+id/sort_by_new_item_selected"
@@ -99,11 +99,11 @@
         android:clickable="true"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:padding="12dp">
+        android:padding="@dimen/small_12">
         <ImageView
             android:id="@+id/sort_by_top_item_icon"
-            android:layout_width="18dp"
-            android:layout_height="18dp"
+            android:layout_width="@dimen/normal_01_02"
+            android:layout_height="@dimen/normal_01_02"
             android:layout_centerVertical="true"
             android:src="@drawable/ic_top"
             app:tint="@color/foreground" />
@@ -111,11 +111,11 @@
             android:layout_toEndOf="@+id/sort_by_top_item_icon"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
+            android:layout_marginStart="@dimen/normal_01"
             android:layout_centerVertical="true"
             android:fontFamily="@font/inter"
             android:text="@string/top_content"
-            android:textSize="14sp"
+            android:textSize="@dimen/text_size_04"
             android:textFontWeight="300" />
         <ImageView
             android:id="@+id/sort_by_top_item_selected"
diff --git a/app/src/main/res/layout/dialog_create_support.xml b/app/src/main/res/layout/dialog_create_support.xml
index 4e36db0f..1b3ce1db 100644
--- a/app/src/main/res/layout/dialog_create_support.xml
+++ b/app/src/main/res/layout/dialog_create_support.xml
@@ -7,7 +7,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical"
-        android:padding="16dp">
+        android:padding="@dimen/normal_01">
         <TextView
             android:id="@+id/create_support_title"
             android:layout_width="wrap_content"
@@ -16,13 +16,13 @@
             android:fontFamily="@font/inter"
             android:singleLine="true"
             android:text="@string/send_a_tip"
-            android:textSize="20sp" />
+            android:textSize="@dimen/text_size_10" />
         <View
             android:layout_width="match_parent"
-            android:layout_height="0.5dp"
+            android:layout_height="@dimen/small_00.5"
             android:background="@color/divider"
-            android:layout_marginTop="8dp"
-            android:layout_marginBottom="12dp" />
+            android:layout_marginTop="@dimen/small_08"
+            android:layout_marginBottom="@dimen/small_12" />
 
         <TextView
             android:id="@+id/create_support_info"
@@ -31,14 +31,14 @@
             android:fontFamily="@font/inter"
             android:text="@string/send_tip_info_content"
             android:textFontWeight="300"
-            android:textSize="14sp" />
+            android:textSize="@dimen/text_size_04" />
 
         <View
             android:layout_width="match_parent"
-            android:layout_height="0.5dp"
+            android:layout_height="@dimen/small_00.5"
             android:background="@color/lightDivider"
-            android:layout_marginTop="12dp"
-            android:layout_marginBottom="12dp" />
+            android:layout_marginTop="@dimen/small_12"
+            android:layout_marginBottom="@dimen/small_12" />
 
         <RelativeLayout
             android:layout_width="match_parent"
@@ -52,8 +52,8 @@
                 android:id="@+id/create_support_channel_progress"
                 android:layout_alignParentEnd="true"
                 android:layout_centerVertical="true"
-                android:layout_width="20dp"
-                android:layout_height="20dp"
+                android:layout_width="@dimen/normal_02"
+                android:layout_height="@dimen/normal_02"
                 android:visibility="gone" />
         </RelativeLayout>
 
@@ -61,21 +61,21 @@
             android:id="@+id/create_support_channel_spinner"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="4dp" />
+            android:layout_marginTop="@dimen/small_04" />
 
         <RelativeLayout
-            android:layout_marginTop="16dp"
+            android:layout_marginTop="@dimen/normal_01"
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
             <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/create_support_input_layout_amount"
-                android:layout_width="100dp"
+                android:layout_width="@dimen/normal_22"
                 android:layout_height="wrap_content"
                 android:hint="@string/amount">
                 <com.google.android.material.textfield.TextInputEditText
                     android:id="@+id/create_support_input_amount"
                     android:fontFamily="@font/inter"
-                    android:textSize="14sp"
+                    android:textSize="@dimen/text_size_04"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:inputType="numberDecimal" />
@@ -86,26 +86,26 @@
                 android:layout_toEndOf="@id/create_support_input_layout_amount"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="8dp"
-                android:layout_marginTop="30dp"
+                android:layout_marginStart="@dimen/small_08"
+                android:layout_marginTop="@dimen/normal_04_02"
                 android:fontFamily="@font/inter"
                 android:text="@string/lbc"
                 android:textAllCaps="true"
-                android:textSize="10sp"
+                android:textSize="@dimen/text_size_00"
                 android:textFontWeight="300" />
 
             <LinearLayout
                 android:id="@+id/create_support_inline_balance_container"
                 android:layout_toEndOf="@id/create_support_input_currency"
-                android:layout_marginStart="24dp"
-                android:layout_marginTop="28dp"
+                android:layout_marginStart="@dimen/normal_03"
+                android:layout_marginTop="@dimen/normal_04"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:orientation="horizontal"
                 android:visibility="invisible">
                 <ImageView
-                    android:layout_width="12dp"
-                    android:layout_height="12dp"
+                    android:layout_width="@dimen/small_12"
+                    android:layout_height="@dimen/small_12"
                     android:layout_gravity="center_vertical"
                     android:src="@drawable/ic_credits" />
                 <TextView
@@ -114,7 +114,7 @@
                     android:layout_height="wrap_content"
                     android:fontFamily="@font/inter"
                     android:textFontWeight="300"
-                    android:layout_marginStart="2dp" />
+                    android:layout_marginStart="@dimen/small_02" />
             </LinearLayout>
         </RelativeLayout>
 
@@ -123,12 +123,12 @@
             android:checked="true"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="8dp"
-            android:layout_marginBottom="8dp"
+            android:layout_marginTop="@dimen/small_08"
+            android:layout_marginBottom="@dimen/small_08"
             android:text="@string/make_this_a_tip"
             android:fontFamily="@font/inter"
             android:textFontWeight="300"
-            android:textSize="14sp" />
+            android:textSize="@dimen/text_size_04" />
 
         <RelativeLayout
             android:layout_width="match_parent"
@@ -143,15 +143,15 @@
                 android:fontFamily="@font/inter"
                 android:text="@string/cancel"
                 android:textFontWeight="300"
-                android:textSize="14sp" />
+                android:textSize="@dimen/text_size_04" />
 
             <ProgressBar
                 android:id="@+id/create_support_progress"
-                android:layout_width="20dp"
-                android:layout_height="20dp"
+                android:layout_width="@dimen/normal_02"
+                android:layout_height="@dimen/normal_02"
                 android:layout_toStartOf="@id/create_support_send"
                 android:layout_centerVertical="true"
-                android:layout_marginEnd="8dp"
+                android:layout_marginEnd="@dimen/small_08"
                 android:visibility="gone" />
 
             <com.google.android.material.button.MaterialButton
diff --git a/app/src/main/res/layout/dialog_customize_tags.xml b/app/src/main/res/layout/dialog_customize_tags.xml
index 2efca530..2b540a3d 100644
--- a/app/src/main/res/layout/dialog_customize_tags.xml
+++ b/app/src/main/res/layout/dialog_customize_tags.xml
@@ -8,87 +8,87 @@
         android:layout_height="match_parent"
         android:orientation="vertical">
         <TextView
-            android:layout_marginStart="10dp"
-            android:layout_marginEnd="10dp"
-            android:layout_marginTop="8dp"
+            android:layout_marginStart="@dimen/small_10"
+            android:layout_marginEnd="@dimen/small_10"
+            android:layout_marginTop="@dimen/small_08"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:fontFamily="@font/inter"
             android:text="@string/customize_your_tags"
-            android:textSize="12sp"
+            android:textSize="@dimen/text_size_02"
             android:textAllCaps="true"
             android:textStyle="bold" />
         <View
             android:layout_width="match_parent"
-            android:layout_height="0.5dp"
+            android:layout_height="@dimen/small_00.5"
             android:background="@color/divider"
-            android:layout_marginTop="8dp"
-            android:layout_marginStart="8dp"
-            android:layout_marginEnd="8dp"
-            android:layout_marginBottom="16dp"/>
+            android:layout_marginTop="@dimen/small_08"
+            android:layout_marginStart="@dimen/small_08"
+            android:layout_marginEnd="@dimen/small_08"
+            android:layout_marginBottom="@dimen/normal_01"/>
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/customize_tags_followed_list"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
-            android:layout_marginEnd="16dp" />
+            android:layout_marginStart="@dimen/normal_01"
+            android:layout_marginEnd="@dimen/normal_01" />
         <TextView
             android:id="@+id/customize_no_followed_tags"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
-            android:layout_marginEnd="16dp"
-            android:layout_marginBottom="6dp"
+            android:layout_marginStart="@dimen/normal_01"
+            android:layout_marginEnd="@dimen/normal_01"
+            android:layout_marginBottom="@dimen/small_06"
             android:fontFamily="@font/inter"
             android:text="@string/no_followed_tags"
-            android:textSize="14sp"
+            android:textSize="@dimen/text_size_04"
             android:textFontWeight="300"
             android:visibility="gone" />
 
         <View
             android:layout_width="match_parent"
-            android:layout_height="0.5dp"
+            android:layout_height="@dimen/small_00.5"
             android:background="@color/divider"
-            android:layout_marginTop="10dp"
-            android:layout_marginStart="8dp"
-            android:layout_marginEnd="8dp"
-            android:layout_marginBottom="16dp"/>
+            android:layout_marginTop="@dimen/small_10"
+            android:layout_marginStart="@dimen/small_08"
+            android:layout_marginEnd="@dimen/small_08"
+            android:layout_marginBottom="@dimen/normal_01"/>
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/customize_tags_suggested_list"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
-            android:layout_marginEnd="16dp" />
+            android:layout_marginStart="@dimen/normal_01"
+            android:layout_marginEnd="@dimen/normal_01" />
 
         <TextView
             android:id="@+id/customize_no_tag_results"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
-            android:layout_marginEnd="16dp"
-            android:layout_marginBottom="6dp"
+            android:layout_marginStart="@dimen/normal_01"
+            android:layout_marginEnd="@dimen/normal_01"
+            android:layout_marginBottom="@dimen/small_06"
             android:fontFamily="@font/inter"
             android:text="@string/no_tag_results"
-            android:textSize="14sp"
+            android:textSize="@dimen/text_size_04"
             android:textFontWeight="300"
             android:visibility="gone" />
 
         <com.google.android.material.textfield.TextInputLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
-            android:layout_marginStart="16dp"
-            android:layout_marginEnd="16dp"
-            android:layout_marginBottom="16dp">
+            android:layout_marginTop="@dimen/small_10"
+            android:layout_marginStart="@dimen/normal_01"
+            android:layout_marginEnd="@dimen/normal_01"
+            android:layout_marginBottom="@dimen/normal_01">
             <com.google.android.material.textfield.TextInputEditText
                 android:id="@+id/customize_tag_filter_input"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:hint="@string/search_for_more_tags"
                 android:fontFamily="@font/inter"
-                android:textSize="14sp"
+                android:textSize="@dimen/text_size_04"
                 android:textFontWeight="300" />
         </com.google.android.material.textfield.TextInputLayout>
 
@@ -97,9 +97,9 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_alignParentBottom="true"
-            android:layout_marginStart="16dp"
-            android:layout_marginEnd="16dp"
-            android:layout_marginBottom="16dp"
+            android:layout_marginStart="@dimen/normal_01"
+            android:layout_marginEnd="@dimen/normal_01"
+            android:layout_marginBottom="@dimen/normal_01"
             android:fontFamily="@font/inter"
             android:text="@string/done" />
     </LinearLayout>
diff --git a/app/src/main/res/layout/dialog_discover.xml b/app/src/main/res/layout/dialog_discover.xml
index 77386803..89e4815d 100644
--- a/app/src/main/res/layout/dialog_discover.xml
+++ b/app/src/main/res/layout/dialog_discover.xml
@@ -8,7 +8,7 @@
         android:id="@+id/discover_title_container"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_margin="16dp">
+        android:layout_margin="@dimen/normal_01">
         <TextView
             android:id="@+id/discover_title"
             android:layout_width="match_parent"
@@ -16,12 +16,12 @@
             android:layout_centerVertical="true"
             android:fontFamily="@font/inter"
             android:text="@string/discover_channels"
-            android:textSize="20sp"
+            android:textSize="@dimen/text_size_10"
             android:textFontWeight="300" />
         <ProgressBar
             android:id="@+id/discover_loading"
-            android:layout_width="20dp"
-            android:layout_height="20dp"
+            android:layout_width="@dimen/normal_02"
+            android:layout_height="@dimen/normal_02"
             android:layout_alignParentEnd="true"
             android:layout_centerVertical="true"
             android:visibility="gone" />
@@ -29,8 +29,8 @@
 
     <ProgressBar
         android:id="@+id/discover_main_loading"
-        android:layout_width="36dp"
-        android:layout_height="36dp"
+        android:layout_width="@dimen/normal_06"
+        android:layout_height="@dimen/normal_06"
         android:layout_centerInParent="true"
         android:visibility="gone" />
 
@@ -46,8 +46,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
-        android:layout_marginStart="16dp"
-        android:layout_marginEnd="16dp"
+        android:layout_marginStart="@dimen/normal_01"
+        android:layout_marginEnd="@dimen/normal_01"
         android:fontFamily="@font/inter"
         android:text="@string/done" />
 
diff --git a/app/src/main/res/layout/dialog_repost_claim.xml b/app/src/main/res/layout/dialog_repost_claim.xml
index 8c9cbad2..449f077c 100644
--- a/app/src/main/res/layout/dialog_repost_claim.xml
+++ b/app/src/main/res/layout/dialog_repost_claim.xml
@@ -7,7 +7,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical"
-        android:padding="16dp">
+        android:padding="@dimen/normal_01">
         <TextView
             android:id="@+id/repost_title"
             android:layout_width="wrap_content"
@@ -16,13 +16,13 @@
             android:fontFamily="@font/inter"
             android:singleLine="true"
             android:text="@string/repost"
-            android:textSize="20sp" />
+            android:textSize="@dimen/text_size_10" />
         <View
             android:layout_width="match_parent"
-            android:layout_height="0.5dp"
+            android:layout_height="@dimen/small_00.5"
             android:background="@color/divider"
-            android:layout_marginTop="8dp"
-            android:layout_marginBottom="8dp" />
+            android:layout_marginTop="@dimen/small_08"
+            android:layout_marginBottom="@dimen/small_08" />
 
         <TextView
             android:layout_width="wrap_content"
@@ -30,34 +30,34 @@
             android:fontFamily="@font/inter"
             android:text="@string/repost_your_favorite"
             android:textFontWeight="300"
-            android:textSize="14sp" />
+            android:textSize="@dimen/text_size_04" />
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="24dp"
+            android:layout_marginTop="@dimen/normal_03"
             android:fontFamily="@font/inter"
             android:text="@string/channel_to_post_on"
             android:textFontWeight="300"
-            android:textSize="14sp" />
+            android:textSize="@dimen/text_size_04" />
         <androidx.appcompat.widget.AppCompatSpinner
             android:id="@+id/repost_channel_spinner"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="4dp" />
+            android:layout_marginTop="@dimen/small_04" />
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="24dp"
+            android:layout_marginTop="@dimen/normal_03"
             android:fontFamily="@font/inter"
             android:text="@string/name"
             android:textFontWeight="300"
-            android:textSize="14sp" />
+            android:textSize="@dimen/text_size_04" />
         <RelativeLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="4dp">
+            android:layout_marginTop="@dimen/small_04">
             <TextView
                 android:id="@+id/repost_name_prefix"
                 android:layout_width="wrap_content"
@@ -66,7 +66,7 @@
                 android:fontFamily="@font/inter"
                 android:singleLine="true"
                 android:textColor="@color/lightGrey"
-                android:textSize="14sp"
+                android:textSize="@dimen/text_size_04"
                 android:textFontWeight="300" />
             <EditText
                 android:id="@+id/repost_name_input"
@@ -77,7 +77,7 @@
                 android:layout_toEndOf="@id/repost_name_prefix"
                 android:fontFamily="@font/inter"
                 android:singleLine="true"
-                android:textSize="14sp"
+                android:textSize="@dimen/text_size_04"
                 android:textFontWeight="300" />
         </RelativeLayout>
 
@@ -85,7 +85,7 @@
             android:id="@+id/repost_advanced_container"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="24dp"
+            android:layout_marginTop="@dimen/normal_03"
             android:orientation="vertical"
             android:visibility="gone">
             <RelativeLayout
@@ -93,13 +93,13 @@
                 android:layout_height="wrap_content">
                 <com.google.android.material.textfield.TextInputLayout
                     android:id="@+id/repost_input_layout_amount"
-                    android:layout_width="100dp"
+                    android:layout_width="@dimen/normal_22"
                     android:layout_height="wrap_content"
                     android:hint="@string/deposit">
                     <com.google.android.material.textfield.TextInputEditText
                         android:id="@+id/repost_input_deposit"
                         android:fontFamily="@font/inter"
-                        android:textSize="14sp"
+                        android:textSize="@dimen/text_size_04"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:inputType="numberDecimal" />
@@ -110,26 +110,26 @@
                     android:layout_toEndOf="@id/repost_input_layout_amount"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="8dp"
-                    android:layout_marginTop="30dp"
+                    android:layout_marginStart="@dimen/small_08"
+                    android:layout_marginTop="@dimen/normal_04_02"
                     android:fontFamily="@font/inter"
                     android:text="@string/lbc"
                     android:textAllCaps="true"
-                    android:textSize="10sp"
+                    android:textSize="@dimen/text_size_00"
                     android:textFontWeight="300" />
 
                 <LinearLayout
                     android:id="@+id/repost_inline_balance_container"
                     android:layout_toEndOf="@id/repost_input_currency"
-                    android:layout_marginStart="24dp"
-                    android:layout_marginTop="28dp"
+                    android:layout_marginStart="@dimen/normal_03"
+                    android:layout_marginTop="@dimen/normal_04"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:orientation="horizontal"
                     android:visibility="invisible">
                     <ImageView
-                        android:layout_width="12dp"
-                        android:layout_height="12dp"
+                        android:layout_width="@dimen/small_12"
+                        android:layout_height="@dimen/small_12"
                         android:layout_gravity="center_vertical"
                         android:src="@drawable/ic_credits" />
                     <TextView
@@ -138,7 +138,7 @@
                         android:layout_height="wrap_content"
                         android:fontFamily="@font/inter"
                         android:textFontWeight="300"
-                        android:layout_marginStart="2dp" />
+                        android:layout_marginStart="@dimen/small_02" />
                 </LinearLayout>
             </RelativeLayout>
         </LinearLayout>
@@ -146,7 +146,7 @@
         <RelativeLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="24dp">
+            android:layout_marginTop="@dimen/normal_03">
             <TextView
                 android:id="@+id/repost_cancel_link"
                 android:background="?attr/selectableItemBackground"
@@ -157,7 +157,7 @@
                 android:fontFamily="@font/inter"
                 android:text="@string/cancel"
                 android:textFontWeight="300"
-                android:textSize="14sp" />
+                android:textSize="@dimen/text_size_04" />
 
             <TextView
                 android:id="@+id/repost_toggle_advanced"
@@ -166,18 +166,18 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
-                android:layout_marginEnd="24dp"
+                android:layout_marginEnd="@dimen/normal_03"
                 android:layout_toStartOf="@id/repost_button"
                 android:fontFamily="@font/inter"
-                android:textSize="14sp"
+                android:textSize="@dimen/text_size_04"
                 android:text="@string/show_advanced" />
             <ProgressBar
                 android:id="@+id/repost_progress"
-                android:layout_width="20dp"
-                android:layout_height="20dp"
+                android:layout_width="@dimen/normal_02"
+                android:layout_height="@dimen/normal_02"
                 android:layout_toStartOf="@id/repost_button"
                 android:layout_centerVertical="true"
-                android:layout_marginEnd="8dp"
+                android:layout_marginEnd="@dimen/small_08"
                 android:visibility="gone" />
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/repost_button"
diff --git a/app/src/main/res/layout/exo_playback_control_view.xml b/app/src/main/res/layout/exo_playback_control_view.xml
index 19d8310c..6465d0b1 100644
--- a/app/src/main/res/layout/exo_playback_control_view.xml
+++ b/app/src/main/res/layout/exo_playback_control_view.xml
@@ -12,23 +12,23 @@
         android:clickable="true"
         android:focusable="true"
         android:layout_centerVertical="true"
-        android:layout_width="72dp"
-        android:layout_height="72dp"
+        android:layout_width="@dimen/normal_15"
+        android:layout_height="@dimen/normal_15"
         android:layout_toStartOf="@id/player_play_pause">
         <ImageView
-            android:layout_width="36dp"
-            android:layout_height="36dp"
+            android:layout_width="@dimen/normal_06"
+            android:layout_height="@dimen/normal_06"
             android:layout_centerHorizontal="true"
             android:layout_alignParentBottom="true"
-            android:layout_marginBottom="16dp"
+            android:layout_marginBottom="@dimen/normal_01"
             android:src="@drawable/ic_replay_10"
             app:tint="@color/white" />
     </RelativeLayout>
 
     <RelativeLayout
         android:id="@+id/player_play_pause"
-        android:layout_width="96dp"
-        android:layout_height="96dp"
+        android:layout_width="@dimen/normal_21"
+        android:layout_height="@dimen/normal_21"
         android:layout_centerInParent="true">
         <RelativeLayout
             android:id="@id/exo_play"
@@ -38,8 +38,8 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent">
             <ImageView
-                android:layout_width="72dp"
-                android:layout_height="72dp"
+                android:layout_width="@dimen/normal_15"
+                android:layout_height="@dimen/normal_15"
                 android:layout_centerInParent="true"
                 android:src="@drawable/ic_play" />
         </RelativeLayout>
@@ -52,8 +52,8 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent">
             <ImageView
-                android:layout_width="64dp"
-                android:layout_height="64dp"
+                android:layout_width="@dimen/normal_13"
+                android:layout_height="@dimen/normal_13"
                 android:layout_centerInParent="true"
                 android:src="@drawable/ic_pause" />
         </RelativeLayout>
@@ -64,15 +64,15 @@
         android:clickable="true"
         android:focusable="true"
         android:layout_centerVertical="true"
-        android:layout_width="72dp"
-        android:layout_height="72dp"
+        android:layout_width="@dimen/normal_15"
+        android:layout_height="@dimen/normal_15"
         android:layout_toEndOf="@id/player_play_pause">
         <ImageView
-            android:layout_width="36dp"
-            android:layout_height="36dp"
+            android:layout_width="@dimen/normal_06"
+            android:layout_height="@dimen/normal_06"
             android:layout_centerHorizontal="true"
             android:layout_alignParentBottom="true"
-            android:layout_marginBottom="16dp"
+            android:layout_marginBottom="@dimen/normal_01"
             android:src="@drawable/ic_forward_10"
             app:tint="@color/white" />
     </RelativeLayout>
@@ -81,15 +81,15 @@
         android:id="@+id/player_toggle_cast"
         android:clickable="true"
         android:background="?attr/selectableItemBackground"
-        android:layout_width="48dp"
-        android:layout_height="48dp"
+        android:layout_width="@dimen/normal_09"
+        android:layout_height="@dimen/normal_09"
         android:layout_alignParentTop="true"
         android:layout_alignParentEnd="true"
         android:visibility="gone">
         <ImageView
             android:id="@+id/player_image_cast_toggle"
-            android:layout_width="24dp"
-            android:layout_height="24dp"
+            android:layout_width="@dimen/normal_03"
+            android:layout_height="@dimen/normal_03"
             android:layout_centerInParent="true"
             android:src="@drawable/ic_cast"
             app:tint="@color/white" />
@@ -101,8 +101,8 @@
         android:clickable="true"
         android:focusable="true"
         android:layout_alignParentBottom="true"
-        android:layout_width="56dp"
-        android:layout_height="48dp"
+        android:layout_width="@dimen/normal_11"
+        android:layout_height="@dimen/normal_09"
         android:layout_toStartOf="@id/player_toggle_fullscreen">
         <TextView
             android:id="@+id/player_playback_speed_label"
@@ -110,12 +110,12 @@
             android:layout_centerVertical="true"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginEnd="8dp"
+            android:layout_marginEnd="@dimen/small_08"
             android:fontFamily="@font/inter"
             android:letterSpacing="0.05"
             android:singleLine="true"
             android:textColor="@color/white"
-            android:textSize="11sp" />
+            android:textSize="@dimen/text_size_01" />
     </RelativeLayout>
 
     <RelativeLayout
@@ -123,14 +123,14 @@
         android:clickable="true"
         android:focusable="true"
         android:background="?attr/selectableItemBackground"
-        android:layout_width="48dp"
-        android:layout_height="48dp"
+        android:layout_width="@dimen/normal_09"
+        android:layout_height="@dimen/normal_09"
         android:layout_alignParentBottom="true"
         android:layout_alignParentEnd="true">
         <ImageView
             android:id="@+id/player_image_full_screen_toggle"
-            android:layout_width="24dp"
-            android:layout_height="24dp"
+            android:layout_width="@dimen/normal_03"
+            android:layout_height="@dimen/normal_03"
             android:layout_centerInParent="true"
             android:src="@drawable/ic_fullscreen"
             app:tint="@color/white" />
@@ -138,36 +138,36 @@
 
     <RelativeLayout
         android:layout_width="match_parent"
-        android:layout_height="48dp"
+        android:layout_height="@dimen/normal_09"
         android:layout_alignParentBottom="true"
         android:layout_toStartOf="@id/player_playback_speed"
-        android:paddingStart="16dp"
-        android:paddingEnd="4dp">
+        android:paddingStart="@dimen/normal_01"
+        android:paddingEnd="@dimen/small_04">
         <TextView
             android:id="@+id/player_duration_elapsed"
-            android:layout_width="64dp"
+            android:layout_width="@dimen/normal_13"
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
             android:fontFamily="@font/inter"
             android:singleLine="true"
             android:text="@string/zero_duration"
             android:textColor="@color/white"
-            android:textSize="14sp" />
+            android:textSize="@dimen/text_size_04" />
         <com.google.android.exoplayer2.ui.DefaultTimeBar
             android:id="@id/exo_progress"
             android:layout_toStartOf="@id/player_duration_total"
             android:layout_toEndOf="@id/player_duration_elapsed"
             android:layout_width="match_parent"
-            android:layout_height="24dp"
-            android:layout_marginStart="4dp"
-            android:layout_marginEnd="4dp"
+            android:layout_height="@dimen/normal_03"
+            android:layout_marginStart="@dimen/small_04"
+            android:layout_marginEnd="@dimen/small_04"
             android:layout_centerVertical="true"
             app:scrubber_color="@color/scrubberColor"
             app:played_color="@color/playedColor"
             app:buffered_color="@color/bufferedColor" />
         <TextView
             android:id="@+id/player_duration_total"
-            android:layout_width="64dp"
+            android:layout_width="@dimen/normal_13"
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
             android:layout_alignParentEnd="true"
@@ -176,6 +176,6 @@
             android:singleLine="true"
             android:text="@string/zero_duration"
             android:textColor="@color/white"
-            android:textSize="14sp" />
+            android:textSize="@dimen/text_size_04" />
     </RelativeLayout>
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/floating_wallet_balance.xml b/app/src/main/res/layout/floating_wallet_balance.xml
index 5e6111f3..88eaeb66 100644
--- a/app/src/main/res/layout/floating_wallet_balance.xml
+++ b/app/src/main/res/layout/floating_wallet_balance.xml
@@ -5,9 +5,9 @@
     android:background="@android:color/transparent"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:layout_marginBottom="8dp"
-    android:layout_marginEnd="8dp"
-    android:elevation="4dp"
+    android:layout_marginBottom="@dimen/small_08"
+    android:layout_marginEnd="@dimen/small_08"
+    android:elevation="@dimen/small_04"
     app:layout_constraintEnd_toEndOf="parent"
     app:layout_constraintBottom_toBottomOf="parent">
     <LinearLayout
@@ -17,15 +17,15 @@
         android:foreground="?attr/selectableItemBackground"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:paddingTop="8dp"
-        android:paddingBottom="8dp"
-        android:paddingStart="8dp"
-        android:paddingEnd="44dp"
+        android:paddingTop="@dimen/small_08"
+        android:paddingBottom="@dimen/small_08"
+        android:paddingStart="@dimen/small_08"
+        android:paddingEnd="@dimen/normal_08"
         android:visibility="invisible">
         <io.lbry.browser.ui.controls.SolidIconView
-            android:layout_width="16dp"
-            android:layout_height="16dp"
-            android:textSize="10dp"
+            android:layout_width="@dimen/normal_01"
+            android:layout_height="@dimen/normal_01"
+            android:textSize="@dimen/small_10"
             android:layout_gravity="center_vertical"
             android:textColor="@color/white"
             android:text="@string/fa_award" />
@@ -33,12 +33,12 @@
             android:id="@+id/floating_reward_value"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="2dp"
+            android:layout_marginStart="@dimen/small_02"
             android:layout_gravity="center_vertical"
             android:fontFamily="@font/inter"
             android:textColor="@color/white"
             android:text="@string/zero"
-            android:textSize="14sp"
+            android:textSize="@dimen/text_size_04"
             android:textStyle="bold"
             android:textFontWeight="300"  />
     </LinearLayout>
@@ -51,14 +51,14 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_toEndOf="@id/floating_reward_container"
-        android:layout_marginStart="-36dp"
-        android:paddingTop="8dp"
-        android:paddingBottom="8dp"
-        android:paddingStart="12dp"
-        android:paddingEnd="16dp">
+        android:layout_marginStart="@dimen/negative_normal_06"
+        android:paddingTop="@dimen/small_08"
+        android:paddingBottom="@dimen/small_08"
+        android:paddingStart="@dimen/small_12"
+        android:paddingEnd="@dimen/normal_01">
         <ImageView
-            android:layout_width="12dp"
-            android:layout_height="12dp"
+            android:layout_width="@dimen/small_12"
+            android:layout_height="@dimen/small_12"
             android:layout_gravity="center_vertical"
             android:src="@drawable/ic_credits" />
         <TextView
@@ -66,26 +66,26 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:fontFamily="@font/inter"
-            android:textSize="14sp" />
+            android:textSize="@dimen/text_size_04" />
         <TextView
             android:id="@+id/floating_balance_value"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="2dp"
+            android:layout_marginStart="@dimen/small_02"
             android:layout_gravity="center_vertical"
             android:fontFamily="@font/inter"
             android:textColor="@color/white"
             android:text="@string/zero"
-            android:textSize="14sp"
+            android:textSize="@dimen/text_size_04"
             android:textStyle="bold"
             android:textFontWeight="300"
             android:visibility="gone" />
         <ProgressBar
             android:id="@+id/floating_balance_loading"
             android:layout_gravity="center_vertical"
-            android:layout_width="16dp"
-            android:layout_height="16dp"
-            android:layout_marginStart="2dp"  />
+            android:layout_width="@dimen/normal_01"
+            android:layout_height="@dimen/normal_01"
+            android:layout_marginStart="@dimen/small_02"  />
     </LinearLayout>
 
 
diff --git a/app/src/main/res/layout/fragment_about.xml b/app/src/main/res/layout/fragment_about.xml
index 5f5e3fb9..b103cc4c 100644
--- a/app/src/main/res/layout/fragment_about.xml
+++ b/app/src/main/res/layout/fragment_about.xml
@@ -9,144 +9,144 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
-        android:padding="16dp">
+        android:padding="@dimen/normal_01">
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:fontFamily="@font/inter"
             android:text="@string/content_freedom"
             android:textColor="@color/lbryGreen"
-            android:textSize="24sp" />
+            android:textSize="@dimen/text_size_11" />
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="8dp"
+            android:layout_marginTop="@dimen/small_08"
             android:fontFamily="@font/inter"
             android:text="@string/about_paragraph"
-            android:textSize="14sp"
+            android:textSize="@dimen/text_size_04"
             android:textFontWeight="300" />
 
         <TextView
             android:id="@+id/about_link_what_is_lbry"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="8dp"
+            android:layout_marginTop="@dimen/small_08"
             android:fontFamily="@font/inter"
             android:text="@string/about_link_what_is_lbry"
             android:textColorLink="@color/lbryGreen"
-            android:textSize="14sp"
+            android:textSize="@dimen/text_size_04"
             android:textFontWeight="300" />
         <TextView
             android:id="@+id/about_link_android_basics"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="8dp"
+            android:layout_marginTop="@dimen/small_08"
             android:fontFamily="@font/inter"
             android:text="@string/about_link_android_basics"
             android:textColorLink="@color/lbryGreen"
-            android:textSize="14sp"
+            android:textSize="@dimen/text_size_04"
             android:textFontWeight="300" />
         <TextView
             android:id="@+id/about_link_faq"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="8dp"
+            android:layout_marginTop="@dimen/small_08"
             android:fontFamily="@font/inter"
             android:text="@string/about_link_faq"
             android:textColorLink="@color/lbryGreen"
-            android:textSize="14sp"
+            android:textSize="@dimen/text_size_04"
             android:textFontWeight="300" />
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="36dp"
+            android:layout_marginTop="@dimen/normal_06"
             android:fontFamily="@font/inter"
             android:text="@string/get_social"
             android:textColor="@color/lbryGreen"
-            android:textSize="18sp" />
+            android:textSize="@dimen/text_size_08" />
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="8dp"
+            android:layout_marginTop="@dimen/small_08"
             android:fontFamily="@font/inter"
             android:text="@string/social_paragraph"
-            android:textSize="14sp"
+            android:textSize="@dimen/text_size_04"
             android:textFontWeight="300" />
         <TextView
             android:id="@+id/about_link_discord"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="8dp"
+            android:layout_marginTop="@dimen/small_08"
             android:fontFamily="@font/inter"
             android:text="@string/about_link_discord"
             android:textColorLink="@color/lbryGreen"
-            android:textSize="14sp"
+            android:textSize="@dimen/text_size_04"
             android:textFontWeight="300" />
         <TextView
             android:id="@+id/about_link_facebook"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="8dp"
+            android:layout_marginTop="@dimen/small_08"
             android:fontFamily="@font/inter"
             android:text="@string/about_link_facebook"
             android:textColorLink="@color/lbryGreen"
-            android:textSize="14sp"
+            android:textSize="@dimen/text_size_04"
             android:textFontWeight="300" />
         <TextView
             android:id="@+id/about_link_instagram"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="8dp"
+            android:layout_marginTop="@dimen/small_08"
             android:fontFamily="@font/inter"
             android:text="@string/about_link_instagram"
             android:textColorLink="@color/lbryGreen"
-            android:textSize="14sp"
+            android:textSize="@dimen/text_size_04"
             android:textFontWeight="300" />
         <TextView
             android:id="@+id/about_link_reddit"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="8dp"
+            android:layout_marginTop="@dimen/small_08"
             android:fontFamily="@font/inter"
             android:text="@string/about_link_reddit"
             android:textColorLink="@color/lbryGreen"
-            android:textSize="14sp"
+            android:textSize="@dimen/text_size_04"
             android:textFontWeight="300" />
         <TextView
             android:id="@+id/about_link_telegram"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="8dp"
+            android:layout_marginTop="@dimen/small_08"
             android:fontFamily="@font/inter"
             android:text="@string/about_link_telegram"
             android:textColorLink="@color/lbryGreen"
-            android:textSize="14sp"
+            android:textSize="@dimen/text_size_04"
             android:textFontWeight="300" />
         <TextView
             android:id="@+id/about_link_twitter"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="8dp"
+            android:layout_marginTop="@dimen/small_08"
             android:fontFamily="@font/inter"
             android:text="@string/about_link_twitter"
             android:textColorLink="@color/lbryGreen"
-            android:textSize="14sp"
+            android:textSize="@dimen/text_size_04"
             android:textFontWeight="300" />
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="36dp"
+            android:layout_marginTop="@dimen/normal_06"
             android:fontFamily="@font/inter"
             android:text="@string/app_info"
             android:textColor="@color/lbryGreen"
-            android:textSize="18sp" />
+            android:textSize="@dimen/text_size_08" />
         <androidx.cardview.widget.CardView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="8dp">
+            android:layout_marginTop="@dimen/small_08">
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -156,20 +156,20 @@
                     android:layout_height="wrap_content"
                     android:orientation="horizontal"
                     android:layout_weight="10"
-                    android:padding="12dp">
+                    android:padding="@dimen/small_12">
                     <TextView
                         android:layout_weight="4"
-                        android:layout_width="0dp"
+                        android:layout_width="@dimen/small_00"
                         android:layout_height="wrap_content"
                         android:ellipsize="end"
                         android:fontFamily="@font/inter"
                         android:singleLine="true"
                         android:text="@string/connected_email"
-                        android:textSize="14sp"
+                        android:textSize="@dimen/text_size_04"
                         android:textStyle="bold" />
                     <LinearLayout
                         android:layout_weight="6"
-                        android:layout_width="0dp"
+                        android:layout_width="@dimen/small_00"
                         android:layout_height="wrap_content"
                         android:orientation="vertical">
                         <TextView
@@ -181,7 +181,7 @@
                             android:text="@string/no_connected_email"
                             android:textFontWeight="300"
                             android:textIsSelectable="true"
-                            android:textSize="14sp"
+                            android:textSize="@dimen/text_size_04"
                             android:textStyle="italic" />
                         <TextView
                             android:id="@+id/about_update_mailing_preferences"
@@ -189,75 +189,75 @@
                             android:clickable="true"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:layout_marginTop="2dp"
+                            android:layout_marginTop="@dimen/small_02"
                             android:fontFamily="@font/inter"
                             android:singleLine="true"
                             android:text="@string/update_mailing_preferences"
                             android:textColor="@color/lbryGreen"
                             android:textFontWeight="300"
-                            android:textSize="14sp" />
+                            android:textSize="@dimen/text_size_04" />
                     </LinearLayout>
                 </LinearLayout>
 
                 <View
                     android:background="@color/divider"
                     android:layout_width="match_parent"
-                    android:layout_height="0.5dp" />
+                    android:layout_height="@dimen/small_00.5" />
 
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:orientation="horizontal"
                     android:layout_weight="10"
-                    android:padding="12dp">
+                    android:padding="@dimen/small_12">
                     <TextView
                         android:layout_weight="4"
-                        android:layout_width="0dp"
+                        android:layout_width="@dimen/small_00"
                         android:layout_height="wrap_content"
                         android:ellipsize="end"
                         android:fontFamily="@font/inter"
                         android:singleLine="true"
                         android:text="@string/app_version"
-                        android:textSize="14sp"
+                        android:textSize="@dimen/text_size_04"
                         android:textStyle="bold" />
                     <TextView
                         android:id="@+id/about_app_version"
                         android:layout_weight="6"
-                        android:layout_width="0dp"
+                        android:layout_width="@dimen/small_00"
                         android:layout_height="wrap_content"
                         android:ellipsize="end"
                         android:fontFamily="@font/inter"
                         android:singleLine="true"
                         android:textFontWeight="300"
                         android:textIsSelectable="true"
-                        android:textSize="14sp" />
+                        android:textSize="@dimen/text_size_04" />
                 </LinearLayout>
 
                 <View
                     android:background="@color/divider"
                     android:layout_width="match_parent"
-                    android:layout_height="0.5dp" />
+                    android:layout_height="@dimen/small_00.5" />
 
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:orientation="horizontal"
                     android:layout_weight="10"
-                    android:padding="12dp">
+                    android:padding="@dimen/small_12">
                     <TextView
                         android:layout_weight="4"
-                        android:layout_width="0dp"
+                        android:layout_width="@dimen/small_00"
                         android:layout_height="wrap_content"
                         android:ellipsize="end"
                         android:fontFamily="@font/inter"
                         android:singleLine="true"
                         android:text="@string/lbry_sdk"
-                        android:textSize="14sp"
+                        android:textSize="@dimen/text_size_04"
                         android:textStyle="bold" />
                     <TextView
                         android:id="@+id/about_lbry_sdk"
                         android:layout_weight="6"
-                        android:layout_width="0dp"
+                        android:layout_width="@dimen/small_00"
                         android:layout_height="wrap_content"
                         android:ellipsize="end"
                         android:fontFamily="@font/inter"
@@ -265,34 +265,34 @@
                         android:text="@string/loading"
                         android:textFontWeight="300"
                         android:textIsSelectable="true"
-                        android:textSize="14sp"  />
+                        android:textSize="@dimen/text_size_04"  />
                 </LinearLayout>
 
                 <View
                     android:background="@color/divider"
                     android:layout_width="match_parent"
-                    android:layout_height="0.5dp" />
+                    android:layout_height="@dimen/small_00.5" />
 
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:orientation="horizontal"
                     android:layout_weight="10"
-                    android:padding="12dp">
+                    android:padding="@dimen/small_12">
                     <TextView
                         android:layout_weight="4"
-                        android:layout_width="0dp"
+                        android:layout_width="@dimen/small_00"
                         android:layout_height="wrap_content"
                         android:ellipsize="end"
                         android:fontFamily="@font/inter"
                         android:singleLine="true"
                         android:text="@string/platform"
-                        android:textSize="14sp"
+                        android:textSize="@dimen/text_size_04"
                         android:textStyle="bold" />
                     <TextView
                         android:id="@+id/about_platform"
                         android:layout_weight="6"
-                        android:layout_width="0dp"
+                        android:layout_width="@dimen/small_00"
                         android:layout_height="wrap_content"
                         android:ellipsize="end"
                         android:fontFamily="@font/inter"
@@ -300,20 +300,20 @@
                         android:text="@string/loading"
                         android:textFontWeight="300"
                         android:textIsSelectable="true"
-                        android:textSize="14sp" />
+                        android:textSize="@dimen/text_size_04" />
                 </LinearLayout>
 
                 <View
                     android:background="@color/divider"
                     android:layout_width="match_parent"
-                    android:layout_height="0.5dp" />
+                    android:layout_height="@dimen/small_00.5" />
 
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:orientation="vertical"
                     android:layout_weight="10"
-                    android:padding="12dp">
+                    android:padding="@dimen/small_12">
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
@@ -321,7 +321,7 @@
                         android:fontFamily="@font/inter"
                         android:singleLine="true"
                         android:text="@string/installation_id"
-                        android:textSize="14sp"
+                        android:textSize="@dimen/text_size_04"
                         android:textStyle="bold" />
                     <TextView
                         android:id="@+id/about_installation_id"
@@ -332,20 +332,20 @@
                         android:text="@string/loading"
                         android:textFontWeight="300"
                         android:textIsSelectable="true"
-                        android:textSize="14sp" />
+                        android:textSize="@dimen/text_size_04" />
                 </LinearLayout>
 
                 <View
                     android:background="@color/divider"
                     android:layout_width="match_parent"
-                    android:layout_height="0.5dp" />
+                    android:layout_height="@dimen/small_00.5" />
 
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:orientation="vertical"
                     android:layout_weight="10"
-                    android:padding="12dp">
+                    android:padding="@dimen/small_12">
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
@@ -353,7 +353,7 @@
                         android:fontFamily="@font/inter"
                         android:singleLine="true"
                         android:text="@string/firebase_token"
-                        android:textSize="14sp"
+                        android:textSize="@dimen/text_size_04"
                         android:textStyle="bold" />
                     <TextView
                         android:id="@+id/about_firebase_token"
@@ -363,36 +363,36 @@
                         android:fontFamily="@font/inter"
                         android:textFontWeight="300"
                         android:textIsSelectable="true"
-                        android:textSize="14sp" />
+                        android:textSize="@dimen/text_size_04" />
                 </LinearLayout>
 
                 <View
                     android:background="@color/divider"
                     android:layout_width="match_parent"
-                    android:layout_height="0.5dp" />
+                    android:layout_height="@dimen/small_00.5" />
 
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:orientation="horizontal"
                     android:layout_weight="10"
-                    android:padding="12dp">
+                    android:padding="@dimen/small_12">
                     <TextView
                         android:layout_weight="4"
-                        android:layout_width="0dp"
+                        android:layout_width="@dimen/small_00"
                         android:layout_height="wrap_content"
                         android:ellipsize="end"
                         android:fontFamily="@font/inter"
                         android:singleLine="true"
                         android:text="@string/logs"
-                        android:textSize="14sp"
+                        android:textSize="@dimen/text_size_04"
                         android:textStyle="bold" />
                     <TextView
                         android:id="@+id/about_send_log"
                         android:background="?attr/selectableItemBackground"
                         android:clickable="true"
                         android:layout_weight="6"
-                        android:layout_width="0dp"
+                        android:layout_width="@dimen/small_00"
                         android:layout_height="wrap_content"
                         android:ellipsize="end"
                         android:fontFamily="@font/inter"
@@ -400,7 +400,7 @@
                         android:text="@string/send_log"
                         android:textColor="@color/lbryGreen"
                         android:textFontWeight="300"
-                        android:textSize="14sp" />
+                        android:textSize="@dimen/text_size_04" />
                 </LinearLayout>
             </LinearLayout>
         </androidx.cardview.widget.CardView>
diff --git a/app/src/main/res/layout/fragment_all_content.xml b/app/src/main/res/layout/fragment_all_content.xml
index 68477ace..d7ebfe07 100644
--- a/app/src/main/res/layout/fragment_all_content.xml
+++ b/app/src/main/res/layout/fragment_all_content.xml
@@ -8,8 +8,8 @@
 
     <ProgressBar
         android:id="@+id/all_content_main_progress"
-        android:layout_width="36dp"
-        android:layout_height="36dp"
+        android:layout_width="@dimen/normal_06"
+        android:layout_height="@dimen/normal_06"
         android:visibility="gone"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
@@ -20,13 +20,13 @@
         android:orientation="vertical"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:paddingTop="16dp">
+        android:paddingTop="@dimen/normal_01">
         <RelativeLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="8dp"
-            android:layout_marginStart="16dp"
-            android:layout_marginEnd="16dp">
+            android:layout_marginBottom="@dimen/small_08"
+            android:layout_marginStart="@dimen/normal_01"
+            android:layout_marginEnd="@dimen/normal_01">
             <TextView
                 android:id="@+id/all_content_page_title"
                 android:layout_width="wrap_content"
@@ -34,12 +34,12 @@
                 android:layout_centerVertical="true"
                 android:fontFamily="@font/inter"
                 android:text="@string/all_content"
-                android:textSize="20sp"  />
+                android:textSize="@dimen/text_size_10"  />
             <ProgressBar
                 android:id="@+id/all_content_load_progress"
                 android:visibility="gone"
-                android:layout_width="16dp"
-                android:layout_height="16dp"
+                android:layout_width="@dimen/normal_01"
+                android:layout_height="@dimen/normal_01"
                 android:layout_centerVertical="true"
                 android:layout_alignParentEnd="true" />
         </RelativeLayout>
@@ -48,10 +48,10 @@
             android:id="@+id/all_content_filter_container"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="2dp"
-            android:layout_marginBottom="8dp"
-            android:layout_marginStart="16dp"
-            android:layout_marginEnd="16dp"
+            android:layout_marginTop="@dimen/small_02"
+            android:layout_marginBottom="@dimen/small_08"
+            android:layout_marginStart="@dimen/normal_01"
+            android:layout_marginEnd="@dimen/normal_01"
             android:visibility="visible">
             <LinearLayout
                 android:layout_width="wrap_content"
@@ -71,12 +71,12 @@
                         android:layout_gravity="center_vertical"
                         android:fontFamily="@font/inter"
                         android:textFontWeight="300"
-                        android:textSize="12sp"
+                        android:textSize="@dimen/text_size_02"
                         android:text="@string/trending" />
                     <ImageView
-                        android:layout_width="16dp"
-                        android:layout_height="16dp"
-                        android:layout_marginStart="2dp"
+                        android:layout_width="@dimen/normal_01"
+                        android:layout_height="@dimen/normal_01"
+                        android:layout_marginStart="@dimen/small_02"
                         android:layout_gravity="center_vertical"
                         android:src="@drawable/ic_arrow_dropdown"
                         app:tint="@color/foreground" />
@@ -88,10 +88,10 @@
                     android:layout_toEndOf="@id/all_content_sort_link"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="2dp"
+                    android:layout_marginStart="@dimen/small_02"
                     android:fontFamily="@font/inter"
                     android:textFontWeight="300"
-                    android:textSize="12sp"
+                    android:textSize="@dimen/text_size_02"
                     android:text="@string/for_text"
                     android:visibility="gone" />
                 <LinearLayout
@@ -101,7 +101,7 @@
                     android:clickable="true"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="2dp"
+                    android:layout_marginStart="@dimen/small_02"
                     android:layout_centerVertical="true"
                     android:visibility="gone">
                     <TextView
@@ -109,15 +109,15 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_gravity="center_vertical"
-                        android:layout_marginStart="4dp"
+                        android:layout_marginStart="@dimen/small_04"
                         android:fontFamily="@font/inter"
                         android:textFontWeight="300"
-                        android:textSize="12sp"
+                        android:textSize="@dimen/text_size_02"
                         android:text="@string/everyone" />
                     <ImageView
-                        android:layout_width="16dp"
-                        android:layout_height="16dp"
-                        android:layout_marginStart="2dp"
+                        android:layout_width="@dimen/normal_01"
+                        android:layout_height="@dimen/normal_01"
+                        android:layout_marginStart="@dimen/small_02"
                         android:layout_gravity="center_vertical"
                         android:src="@drawable/ic_arrow_dropdown"
                         app:tint="@color/foreground" />
@@ -129,10 +129,10 @@
                     android:layout_toEndOf="@id/all_content_sort_link"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="2dp"
+                    android:layout_marginStart="@dimen/small_02"
                     android:fontFamily="@font/inter"
                     android:textFontWeight="300"
-                    android:textSize="12sp"
+                    android:textSize="@dimen/text_size_02"
                     android:text="@string/from"
                     android:visibility="gone" />
                 <LinearLayout
@@ -142,7 +142,7 @@
                     android:clickable="true"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="2dp"
+                    android:layout_marginStart="@dimen/small_02"
                     android:layout_toEndOf="@id/all_content_sort_link"
                     android:visibility="gone">
                     <TextView
@@ -150,15 +150,15 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_gravity="center_vertical"
-                        android:layout_marginStart="4dp"
+                        android:layout_marginStart="@dimen/small_04"
                         android:fontFamily="@font/inter"
                         android:textFontWeight="300"
-                        android:textSize="12sp"
+                        android:textSize="@dimen/text_size_02"
                         android:text="@string/past_week" />
                     <ImageView
-                        android:layout_width="16dp"
-                        android:layout_height="16dp"
-                        android:layout_marginStart="2dp"
+                        android:layout_width="@dimen/normal_01"
+                        android:layout_height="@dimen/normal_01"
+                        android:layout_marginStart="@dimen/small_02"
                         android:layout_gravity="center_vertical"
                         android:src="@drawable/ic_arrow_dropdown"
                         app:tint="@color/foreground" />
@@ -175,7 +175,7 @@
                 android:clickable="true"
                 android:fontFamily="@font/inter"
                 android:textFontWeight="300"
-                android:textSize="12sp"
+                android:textSize="@dimen/text_size_02"
                 android:text="@string/customize"
                 android:visibility="gone" />
         </RelativeLayout>
@@ -184,17 +184,17 @@
             android:id="@+id/all_content_no_claim_search_content"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_margin="16dp"
+            android:layout_margin="@dimen/normal_01"
             android:fontFamily="@font/inter"
             android:text="@string/no_claim_search_content"
-            android:textSize="14sp"
+            android:textSize="@dimen/text_size_04"
             android:textFontWeight="300"
             android:visibility="gone" />
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/all_content_list"
             android:clipToPadding="false"
-            android:layout_marginTop="2dp"
+            android:layout_marginTop="@dimen/small_02"
             android:layout_width="match_parent"
             android:layout_height="match_parent"  />
     </LinearLayout>
diff --git a/app/src/main/res/layout/fragment_channel.xml b/app/src/main/res/layout/fragment_channel.xml
index 058dcbfe..d13932fd 100644
--- a/app/src/main/res/layout/fragment_channel.xml
+++ b/app/src/main/res/layout/fragment_channel.xml
@@ -17,9 +17,9 @@
             android:layout_height="wrap_content"
             android:layout_centerInParent="true">
             <ProgressBar
-                android:layout_width="16dp"
-                android:layout_height="16dp"
-                android:layout_marginEnd="8dp"
+                android:layout_width="@dimen/normal_01"
+                android:layout_height="@dimen/normal_01"
+                android:layout_marginEnd="@dimen/small_08"
                 android:layout_gravity="center_vertical" />
             <TextView
                 android:layout_width="wrap_content"
@@ -27,7 +27,7 @@
                 android:layout_gravity="center_vertical"
                 android:fontFamily="@font/inter"
                 android:text="@string/loading_decentralized_data"
-                android:textSize="16sp"
+                android:textSize="@dimen/text_size_06"
                 android:textFontWeight="300" />
         </LinearLayout>
 
@@ -42,7 +42,7 @@
         android:layout_height="match_parent">
         <RelativeLayout
             android:layout_width="match_parent"
-            android:layout_height="220dp">
+            android:layout_height="@dimen/large_26">
             <ImageView
                 android:id="@+id/channel_view_cover_image"
                 android:layout_width="match_parent"
@@ -53,8 +53,8 @@
             <LinearLayout
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="12dp"
-                android:layout_marginEnd="12dp"
+                android:layout_marginStart="@dimen/small_12"
+                android:layout_marginEnd="@dimen/small_12"
                 android:layout_above="@+id/channel_view_tabs"
                 android:layout_toEndOf="@id/channel_view_icon_container"
                 android:orientation="vertical">
@@ -63,14 +63,14 @@
                     android:background="@color/channelCoverBackground"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:paddingStart="4dp"
-                    android:paddingEnd="4dp"
-                    android:paddingTop="2dp"
-                    android:paddingBottom="2dp"
+                    android:paddingStart="@dimen/small_04"
+                    android:paddingEnd="@dimen/small_04"
+                    android:paddingTop="@dimen/small_02"
+                    android:paddingBottom="@dimen/small_02"
                     android:ellipsize="end"
                     android:fontFamily="@font/inter"
                     android:maxLines="2"
-                    android:textSize="20sp"
+                    android:textSize="@dimen/text_size_10"
                     android:textColor="@color/white" />
                 <TextView
                     android:id="@+id/channel_view_follower_count"
@@ -78,14 +78,14 @@
                     android:visibility="invisible"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="2dp"
-                    android:layout_marginBottom="2dp"
-                    android:paddingStart="4dp"
-                    android:paddingEnd="4dp"
-                    android:paddingTop="2dp"
-                    android:paddingBottom="2dp"
+                    android:layout_marginTop="@dimen/small_02"
+                    android:layout_marginBottom="@dimen/small_02"
+                    android:paddingStart="@dimen/small_04"
+                    android:paddingEnd="@dimen/small_04"
+                    android:paddingTop="@dimen/small_02"
+                    android:paddingBottom="@dimen/small_02"
                     android:fontFamily="@font/inter"
-                    android:textSize="14sp"
+                    android:textSize="@dimen/text_size_04"
                     android:textColor="@color/white"
                     android:textFontWeight="300"/>
             </LinearLayout>
@@ -95,22 +95,22 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_alignParentBottom="true"
-                android:paddingStart="110dp"
+                android:paddingStart="@dimen/normal_24_02"
                 app:tabGravity="fill"
                 app:tabMode="scrollable"/>
             <RelativeLayout
                 android:id="@+id/channel_view_icon_container"
-                android:layout_width="80dp"
-                android:layout_height="80dp"
+                android:layout_width="@dimen/normal_17"
+                android:layout_height="@dimen/normal_17"
                 android:layout_alignParentBottom="true"
-                android:layout_marginStart="12dp"
-                android:layout_marginBottom="12dp">
+                android:layout_marginStart="@dimen/small_12"
+                android:layout_marginBottom="@dimen/small_12">
                 <RelativeLayout
                     android:layout_centerHorizontal="true"
                     android:background="@drawable/bg_channel_icon"
                     android:id="@+id/channel_view_no_thumbnail"
-                    android:layout_width="90dp"
-                    android:layout_height="90dp">
+                    android:layout_width="@dimen/normal_19_02"
+                    android:layout_height="@dimen/normal_19_02">
                     <TextView
                         android:id="@+id/channel_view_icon_alpha"
                         android:layout_centerInParent="true"
@@ -118,7 +118,7 @@
                         android:layout_height="wrap_content"
                         android:fontFamily="@font/inter"
                         android:textAllCaps="true"
-                        android:textSize="48sp"
+                        android:textSize="@dimen/text_size_15"
                         android:textColor="@color/white"
                         android:textFontWeight="300" />
                 </RelativeLayout>
@@ -140,23 +140,23 @@
                 android:layout_height="match_parent" />
 
             <LinearLayout
-                android:elevation="4dp"
+                android:elevation="@dimen/small_04"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignParentEnd="true"
-                android:padding="8dp">
+                android:padding="@dimen/small_08">
                 <RelativeLayout
                     android:id="@+id/channel_view_edit"
                     android:clickable="true"
                     android:background="?attr/selectableItemBackground"
-                    android:layout_width="36dp"
-                    android:layout_height="36dp"
-                    android:layout_marginEnd="8dp"
+                    android:layout_width="@dimen/normal_06"
+                    android:layout_height="@dimen/normal_06"
+                    android:layout_marginEnd="@dimen/small_08"
                     android:visibility="gone">
                     <ImageView
                         android:layout_centerInParent="true"
-                        android:layout_width="24dp"
-                        android:layout_height="24dp"
+                        android:layout_width="@dimen/normal_03"
+                        android:layout_height="@dimen/normal_03"
                         android:src="@drawable/ic_edit"
                         app:tint="@color/foreground" />
                 </RelativeLayout>
@@ -164,14 +164,14 @@
                     android:id="@+id/channel_view_delete"
                     android:clickable="true"
                     android:background="?attr/selectableItemBackground"
-                    android:layout_width="36dp"
-                    android:layout_height="36dp"
-                    android:layout_marginEnd="8dp"
+                    android:layout_width="@dimen/normal_06"
+                    android:layout_height="@dimen/normal_06"
+                    android:layout_marginEnd="@dimen/small_08"
                     android:visibility="gone">
                     <ImageView
                         android:layout_centerInParent="true"
-                        android:layout_width="24dp"
-                        android:layout_height="24dp"
+                        android:layout_width="@dimen/normal_03"
+                        android:layout_height="@dimen/normal_03"
                         android:src="@drawable/ic_delete"
                         app:tint="@color/foreground" />
                 </RelativeLayout>
@@ -179,13 +179,13 @@
                     android:id="@+id/channel_view_share"
                     android:clickable="true"
                     android:background="?attr/selectableItemBackground"
-                    android:layout_width="36dp"
-                    android:layout_height="36dp"
-                    android:layout_marginEnd="8dp">
+                    android:layout_width="@dimen/normal_06"
+                    android:layout_height="@dimen/normal_06"
+                    android:layout_marginEnd="@dimen/small_08">
                     <ImageView
                         android:layout_centerInParent="true"
-                        android:layout_width="22dp"
-                        android:layout_height="22dp"
+                        android:layout_width="@dimen/normal_02_02"
+                        android:layout_height="@dimen/normal_02_02"
                         android:src="@drawable/ic_share"
                         app:tint="@color/foreground" />
                 </RelativeLayout>
@@ -193,71 +193,71 @@
                     android:id="@+id/channel_view_tip"
                     android:background="?attr/selectableItemBackground"
                     android:clickable="true"
-                    android:layout_width="36dp"
-                    android:layout_height="36dp"
-                    android:layout_marginEnd="8dp">
+                    android:layout_width="@dimen/normal_06"
+                    android:layout_height="@dimen/normal_06"
+                    android:layout_marginEnd="@dimen/small_08">
                     <io.lbry.browser.ui.controls.SolidIconView
                         android:layout_centerInParent="true"
-                        android:layout_width="24dp"
-                        android:layout_height="24dp"
+                        android:layout_width="@dimen/normal_03"
+                        android:layout_height="@dimen/normal_03"
                         android:text="@string/fa_gift"
                         android:textColor="@color/foreground"
-                        android:textSize="20dp" />
+                        android:textSize="@dimen/normal_02" />
                 </RelativeLayout>
                 <RelativeLayout
                     android:id="@+id/channel_view_follow_unfollow"
                     android:background="?attr/selectableItemBackground"
                     android:clickable="true"
                     android:layout_width="wrap_content"
-                    android:layout_height="36dp">
+                    android:layout_height="@dimen/normal_06">
                     <TextView
                         android:id="@+id/channel_view_text_follow"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_centerVertical="true"
-                        android:layout_marginStart="6dp"
-                        android:layout_marginEnd="6dp"
+                        android:layout_marginStart="@dimen/small_06"
+                        android:layout_marginEnd="@dimen/small_06"
                         android:fontFamily="@font/inter"
                         android:text="@string/follow"
-                        android:textSize="12sp"
+                        android:textSize="@dimen/text_size_02"
                         android:textStyle="bold"
                         android:textAllCaps="true" />
                     <io.lbry.browser.ui.controls.OutlineIconView
                         android:id="@+id/channel_view_icon_follow"
                         android:layout_toRightOf="@id/channel_view_text_follow"
                         android:layout_centerVertical="true"
-                        android:layout_width="24dp"
-                        android:layout_height="24dp"
-                        android:layout_marginEnd="6dp"
+                        android:layout_width="@dimen/normal_03"
+                        android:layout_height="@dimen/normal_03"
+                        android:layout_marginEnd="@dimen/small_06"
                         android:text="@string/fa_heart"
                         android:textColor="@color/red"
-                        android:textSize="20dp" />
+                        android:textSize="@dimen/normal_02" />
                     <io.lbry.browser.ui.controls.SolidIconView
                         android:id="@+id/channel_view_icon_unfollow"
                         android:layout_centerInParent="true"
-                        android:layout_width="24dp"
-                        android:layout_height="24dp"
+                        android:layout_width="@dimen/normal_03"
+                        android:layout_height="@dimen/normal_03"
                         android:text="@string/fa_heart_broken"
                         android:textColor="@color/foreground"
-                        android:textSize="20dp"
+                        android:textSize="@dimen/normal_02"
                         android:visibility="invisible"/>
                 </RelativeLayout>
                 <RelativeLayout
                     android:id="@+id/channel_view_subscribe_notify"
                     android:background="?attr/selectableItemBackground"
                     android:clickable="true"
-                    android:layout_width="36dp"
-                    android:layout_height="36dp"
-                    android:layout_marginStart="8dp"
+                    android:layout_width="@dimen/normal_06"
+                    android:layout_height="@dimen/normal_06"
+                    android:layout_marginStart="@dimen/small_08"
                     android:visibility="gone">
                     <io.lbry.browser.ui.controls.SolidIconView
                         android:id="@+id/channel_view_icon_bell"
                         android:layout_centerInParent="true"
-                        android:layout_width="24dp"
-                        android:layout_height="24dp"
+                        android:layout_width="@dimen/normal_03"
+                        android:layout_height="@dimen/normal_03"
                         android:text="@string/fa_bell_slash"
                         android:textColor="@color/foreground"
-                        android:textSize="20dp"/>
+                        android:textSize="@dimen/normal_02"/>
                 </RelativeLayout>
             </LinearLayout>
         </RelativeLayout>
diff --git a/app/src/main/res/layout/fragment_channel_about.xml b/app/src/main/res/layout/fragment_channel_about.xml
index a572155e..6be4371c 100644
--- a/app/src/main/res/layout/fragment_channel_about.xml
+++ b/app/src/main/res/layout/fragment_channel_about.xml
@@ -12,8 +12,8 @@
         android:orientation="vertical">
         <ImageView
             android:layout_gravity="center_horizontal"
-            android:layout_width="120dp"
-            android:layout_height="200dp"
+            android:layout_width="@dimen/large_01"
+            android:layout_height="@dimen/large_21"
             android:adjustViewBounds="true"
             android:src="@drawable/gerbil_happy" />
 
@@ -21,48 +21,48 @@
             android:id="@+id/channel_about_no_info"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="12dp"
+            android:layout_marginTop="@dimen/small_12"
             android:fontFamily="@font/inter"
             android:textAlignment="center"
             android:text="@string/no_channel_info"
             android:textFontWeight="300"
-            android:textSize="16sp" />
+            android:textSize="@dimen/text_size_06" />
     </LinearLayout>
 
     <androidx.core.widget.NestedScrollView
         android:id="@+id/channel_about_info_area"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginTop="48dp">
+        android:layout_marginTop="@dimen/normal_09">
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical"
-            android:padding="16dp">
+            android:padding="@dimen/normal_01">
             <LinearLayout
                 android:id="@+id/channel_about_website_container"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginBottom="16dp"
+                android:layout_marginBottom="@dimen/normal_01"
                 android:orientation="vertical">
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:fontFamily="@font/inter"
                     android:text="@string/website"
-                    android:textSize="14sp"
+                    android:textSize="@dimen/text_size_04"
                     android:textStyle="bold" />
                 <TextView
                     android:id="@+id/channel_about_website"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:fontFamily="@font/inter"
-                    android:textSize="14sp"
+                    android:textSize="@dimen/text_size_04"
                     android:textFontWeight="300" />
             </LinearLayout>
 
             <LinearLayout
-                android:layout_marginBottom="16dp"
+                android:layout_marginBottom="@dimen/normal_01"
                 android:id="@+id/channel_about_email_container"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -72,14 +72,14 @@
                     android:layout_height="wrap_content"
                     android:fontFamily="@font/inter"
                     android:text="@string/email"
-                    android:textSize="14sp"
+                    android:textSize="@dimen/text_size_04"
                     android:textStyle="bold" />
                 <TextView
                     android:id="@+id/channel_about_email"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:fontFamily="@font/inter"
-                    android:textSize="14sp"
+                    android:textSize="@dimen/text_size_04"
                     android:textFontWeight="300" />
             </LinearLayout>
 
@@ -89,7 +89,7 @@
                 android:layout_height="wrap_content"
                 android:autoLink="web"
                 android:fontFamily="@font/inter"
-                android:textSize="14sp"
+                android:textSize="@dimen/text_size_04"
                 android:textFontWeight="300" />
 
         </LinearLayout>
diff --git a/app/src/main/res/layout/fragment_channel_comments.xml b/app/src/main/res/layout/fragment_channel_comments.xml
index 75834a08..1c8a3243 100644
--- a/app/src/main/res/layout/fragment_channel_comments.xml
+++ b/app/src/main/res/layout/fragment_channel_comments.xml
@@ -7,13 +7,13 @@
 
     <RelativeLayout
         android:layout_width="match_parent"
-        android:layout_height="48dp"
-        android:layout_marginStart="16dp"
-        android:layout_marginEnd="16dp">
+        android:layout_height="@dimen/normal_09"
+        android:layout_marginStart="@dimen/normal_01"
+        android:layout_marginEnd="@dimen/normal_01">
         <ProgressBar
             android:id="@+id/channel_comments_progress"
-            android:layout_width="20dp"
-            android:layout_height="20dp"
+            android:layout_width="@dimen/normal_02"
+            android:layout_height="@dimen/normal_02"
             android:layout_centerVertical="true"
             android:visibility="gone" />
     </RelativeLayout>
@@ -31,49 +31,49 @@
                 android:id="@+id/container_comment_form"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="0dp"
-                android:layout_marginStart="16dp"
-                android:layout_marginEnd="16dp"
-                android:layout_marginBottom="16dp"
+                android:layout_marginTop="@dimen/small_00"
+                android:layout_marginStart="@dimen/normal_01"
+                android:layout_marginEnd="@dimen/normal_01"
+                android:layout_marginBottom="@dimen/normal_01"
                 android:visibility="gone" />
 
             <TextView
                 android:id="@+id/channel_disabled_comments"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="16dp"
-                android:layout_marginEnd="16dp"
-                android:layout_marginTop="8dp"
+                android:layout_marginStart="@dimen/normal_01"
+                android:layout_marginEnd="@dimen/normal_01"
+                android:layout_marginTop="@dimen/small_08"
                 android:fontFamily="@font/inter"
                 android:text="@string/channel_disabled_comments"
                 android:textFontWeight="300"
-                android:textSize="14sp"
+                android:textSize="@dimen/text_size_04"
                 android:visibility="gone" />
 
             <TextView
                 android:id="@+id/channel_no_comments"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="16dp"
-                android:layout_marginEnd="16dp"
-                android:layout_marginTop="8dp"
+                android:layout_marginStart="@dimen/normal_01"
+                android:layout_marginEnd="@dimen/normal_01"
+                android:layout_marginTop="@dimen/small_08"
                 android:fontFamily="@font/inter"
                 android:text="@string/no_comments"
                 android:textFontWeight="300"
-                android:textSize="14sp"
+                android:textSize="@dimen/text_size_04"
                 android:visibility="gone" />
 
             <TextView
                 android:id="@+id/channel_comments_sdk_initializing"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="16dp"
-                android:layout_marginEnd="16dp"
-                android:layout_marginTop="8dp"
+                android:layout_marginStart="@dimen/normal_01"
+                android:layout_marginEnd="@dimen/normal_01"
+                android:layout_marginTop="@dimen/small_08"
                 android:fontFamily="@font/inter"
                 android:text="@string/sdk_initializing_comments"
                 android:textFontWeight="300"
-                android:textSize="14sp"
+                android:textSize="@dimen/text_size_04"
                 android:visibility="gone" />
 
             <androidx.recyclerview.widget.RecyclerView
diff --git a/app/src/main/res/layout/fragment_channel_content.xml b/app/src/main/res/layout/fragment_channel_content.xml
index 701ed17c..c60e31d5 100644
--- a/app/src/main/res/layout/fragment_channel_content.xml
+++ b/app/src/main/res/layout/fragment_channel_content.xml
@@ -8,8 +8,8 @@
 
     <ProgressBar
         android:id="@+id/channel_content_main_progress"
-        android:layout_width="36dp"
-        android:layout_height="36dp"
+        android:layout_width="@dimen/normal_06"
+        android:layout_height="@dimen/normal_06"
         android:visibility="gone"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
@@ -20,15 +20,15 @@
         android:orientation="vertical"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:paddingTop="16dp">
+        android:paddingTop="@dimen/normal_01">
         <RelativeLayout
             android:id="@+id/channel_content_filter_container"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="2dp"
-            android:layout_marginBottom="8dp"
-            android:layout_marginStart="16dp"
-            android:layout_marginEnd="16dp"
+            android:layout_marginTop="@dimen/small_02"
+            android:layout_marginBottom="@dimen/small_08"
+            android:layout_marginStart="@dimen/normal_01"
+            android:layout_marginEnd="@dimen/normal_01"
             android:visibility="visible">
             <LinearLayout
                 android:layout_width="wrap_content"
@@ -48,12 +48,12 @@
                         android:layout_gravity="center_vertical"
                         android:fontFamily="@font/inter"
                         android:textFontWeight="300"
-                        android:textSize="12sp"
+                        android:textSize="@dimen/text_size_02"
                         android:text="@string/new_text" />
                     <ImageView
-                        android:layout_width="16dp"
-                        android:layout_height="16dp"
-                        android:layout_marginStart="2dp"
+                        android:layout_width="@dimen/normal_01"
+                        android:layout_height="@dimen/normal_01"
+                        android:layout_marginStart="@dimen/small_02"
                         android:layout_gravity="center_vertical"
                         android:src="@drawable/ic_arrow_dropdown"
                         app:tint="@color/foreground" />
@@ -66,7 +66,7 @@
                     android:clickable="true"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="24dp"
+                    android:layout_marginStart="@dimen/normal_03"
                     android:layout_toEndOf="@id/channel_content_sort_link"
                     android:visibility="gone">
                     <TextView
@@ -74,15 +74,15 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_gravity="center_vertical"
-                        android:layout_marginStart="4dp"
+                        android:layout_marginStart="@dimen/small_04"
                         android:fontFamily="@font/inter"
                         android:textFontWeight="300"
-                        android:textSize="12sp"
+                        android:textSize="@dimen/text_size_02"
                         android:text="@string/past_week" />
                     <ImageView
-                        android:layout_width="16dp"
-                        android:layout_height="16dp"
-                        android:layout_marginStart="2dp"
+                        android:layout_width="@dimen/normal_01"
+                        android:layout_height="@dimen/normal_01"
+                        android:layout_marginStart="@dimen/small_02"
                         android:layout_gravity="center_vertical"
                         android:src="@drawable/ic_arrow_dropdown"
                         app:tint="@color/foreground" />
@@ -92,8 +92,8 @@
             <ProgressBar
                 android:id="@+id/channel_content_load_progress"
                 android:visibility="gone"
-                android:layout_width="16dp"
-                android:layout_height="16dp"
+                android:layout_width="@dimen/normal_01"
+                android:layout_height="@dimen/normal_01"
                 android:layout_centerVertical="true"
                 android:layout_centerHorizontal="true" />
         </RelativeLayout>
@@ -102,17 +102,17 @@
             android:id="@+id/channel_content_no_claim_search_content"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_margin="16dp"
+            android:layout_margin="@dimen/normal_01"
             android:fontFamily="@font/inter"
             android:text="@string/no_claim_search_content"
-            android:textSize="14sp"
+            android:textSize="@dimen/text_size_04"
             android:textFontWeight="300"
             android:visibility="gone" />
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/channel_content_list"
             android:clipToPadding="false"
-            android:layout_marginTop="2dp"
+            android:layout_marginTop="@dimen/small_02"
             android:layout_width="match_parent"
             android:layout_height="match_parent"  />
     </LinearLayout>
diff --git a/app/src/main/res/layout/fragment_channel_form.xml b/app/src/main/res/layout/fragment_channel_form.xml
index bdce4273..8ffcf5e6 100644
--- a/app/src/main/res/layout/fragment_channel_form.xml
+++ b/app/src/main/res/layout/fragment_channel_form.xml
@@ -8,7 +8,7 @@
     <LinearLayout
         android:id="@+id/channel_form_display_area"
         android:clipChildren="false"
-        android:elevation="4dp"
+        android:elevation="@dimen/small_04"
         android:orientation="vertical"
         android:layout_weight="10"
         android:layout_width="match_parent"
@@ -18,7 +18,7 @@
             android:clickable="true"
             android:foreground="?attr/selectableItemBackground"
             android:layout_width="match_parent"
-            android:layout_height="220dp">
+            android:layout_height="@dimen/large_26">
             <ImageView
                 android:id="@+id/channel_form_cover_image"
                 android:layout_width="match_parent"
@@ -27,15 +27,15 @@
                 android:scaleType="centerCrop" />
             <RelativeLayout
                 android:background="@drawable/bg_small_icon"
-                android:layout_width="24dp"
-                android:layout_height="24dp"
-                android:layout_marginStart="16dp"
-                android:layout_marginBottom="16dp"
+                android:layout_width="@dimen/normal_03"
+                android:layout_height="@dimen/normal_03"
+                android:layout_marginStart="@dimen/normal_01"
+                android:layout_marginBottom="@dimen/normal_01"
                 android:layout_alignParentBottom="true">
                 <ImageView
                     android:id="@+id/channel_form_cover_edit_icon"
-                    android:layout_width="16dp"
-                    android:layout_height="16dp"
+                    android:layout_width="@dimen/normal_01"
+                    android:layout_height="@dimen/normal_01"
                     android:layout_centerInParent="true"
                     android:src="@drawable/ic_edit"
                     app:tint="@color/white" />
@@ -48,42 +48,42 @@
                 android:layout_alignParentEnd="true"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="4dp"
-                android:layout_marginTop="4dp"
+                android:layout_marginStart="@dimen/small_04"
+                android:layout_marginTop="@dimen/small_04"
                 android:orientation="horizontal"
-                android:paddingTop="2dp"
-                android:paddingBottom="2dp"
-                android:paddingStart="8dp"
-                android:paddingEnd="8dp"
+                android:paddingTop="@dimen/small_02"
+                android:paddingBottom="@dimen/small_02"
+                android:paddingStart="@dimen/small_08"
+                android:paddingEnd="@dimen/small_08"
                 android:visibility="gone">
                 <ProgressBar
-                    android:layout_width="16dp"
-                    android:layout_height="16dp" />
+                    android:layout_width="@dimen/normal_01"
+                    android:layout_height="@dimen/normal_01" />
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="4dp"
+                    android:layout_marginStart="@dimen/small_04"
                     android:fontFamily="@font/inter"
                     android:text="@string/uploading"
                     android:textColor="@color/white"
                     android:textFontWeight="300"
-                    android:textSize="12sp" />
+                    android:textSize="@dimen/text_size_02" />
             </LinearLayout>
             <RelativeLayout
                 android:id="@+id/channel_form_icon_container"
                 android:foreground=" ?attr/selectableItemBackground"
                 android:clickable="true"
-                android:layout_width="80dp"
-                android:layout_height="80dp"
+                android:layout_width="@dimen/normal_17"
+                android:layout_height="@dimen/normal_17"
                 android:layout_alignParentBottom="true"
-                android:layout_marginBottom="16dp"
+                android:layout_marginBottom="@dimen/normal_01"
                 android:layout_centerHorizontal="true">
                 <RelativeLayout
                     android:layout_centerHorizontal="true"
                     android:background="@drawable/bg_channel_icon"
                     android:id="@+id/channel_form_no_thumbnail"
-                    android:layout_width="90dp"
-                    android:layout_height="90dp">
+                    android:layout_width="@dimen/normal_19_02"
+                    android:layout_height="@dimen/normal_19_02">
                     <TextView
                         android:id="@+id/channel_form_icon_alpha"
                         android:layout_centerInParent="true"
@@ -91,7 +91,7 @@
                         android:layout_height="wrap_content"
                         android:fontFamily="@font/inter"
                         android:textAllCaps="true"
-                        android:textSize="48sp"
+                        android:textSize="@dimen/text_size_15"
                         android:textColor="@color/white"
                         android:textFontWeight="300" />
                 </RelativeLayout>
@@ -101,15 +101,15 @@
                     android:layout_height="match_parent" />
                 <RelativeLayout
                     android:background="@drawable/bg_small_icon"
-                    android:layout_width="24dp"
-                    android:layout_height="24dp"
-                    android:layout_marginStart="16dp"
-                    android:layout_marginBottom="16dp"
+                    android:layout_width="@dimen/normal_03"
+                    android:layout_height="@dimen/normal_03"
+                    android:layout_marginStart="@dimen/normal_01"
+                    android:layout_marginBottom="@dimen/normal_01"
                     android:layout_alignParentBottom="true"
                     android:layout_centerHorizontal="true">
                     <ImageView
-                        android:layout_width="16dp"
-                        android:layout_height="16dp"
+                        android:layout_width="@dimen/normal_01"
+                        android:layout_height="@dimen/normal_01"
                         android:layout_centerInParent="true"
                         android:src="@drawable/ic_edit"
                         app:tint="@color/white" />
@@ -134,7 +134,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:orientation="vertical"
-                    android:padding="16dp">
+                    android:padding="@dimen/normal_01">
                     <com.google.android.material.textfield.TextInputLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
@@ -145,13 +145,13 @@
                             android:layout_height="wrap_content"
                             android:fontFamily="@font/inter"
                             android:singleLine="true"
-                            android:textSize="14sp" />
+                            android:textSize="@dimen/text_size_04" />
                     </com.google.android.material.textfield.TextInputLayout>
 
                     <RelativeLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_marginTop="16dp">
+                        android:layout_marginTop="@dimen/normal_01">
                         <com.google.android.material.textfield.TextInputLayout
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content">
@@ -162,32 +162,32 @@
                                 android:fontFamily="@font/inter"
                                 android:hint="@string/channel_name"
                                 android:singleLine="true"
-                                android:textSize="14sp" />
+                                android:textSize="@dimen/text_size_04" />
                         </com.google.android.material.textfield.TextInputLayout>
                         <TextView
                             android:id="@+id/channel_form_at_prefix"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:layout_marginTop="28dp"
-                            android:layout_marginStart="12dp"
+                            android:layout_marginTop="@dimen/normal_04"
+                            android:layout_marginStart="@dimen/small_12"
                             android:text="@string/at"
                             android:visibility="gone" />
                     </RelativeLayout>
 
                     <RelativeLayout
-                        android:layout_marginTop="16dp"
+                        android:layout_marginTop="@dimen/normal_01"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content">
                         <com.google.android.material.textfield.TextInputLayout
                             android:id="@+id/channel_form_input_layout_deposit"
-                            android:layout_width="100dp"
+                            android:layout_width="@dimen/normal_22"
                             android:layout_height="wrap_content"
                             android:hint="@string/deposit">
                             <com.google.android.material.textfield.TextInputEditText
                                 android:id="@+id/channel_form_input_deposit"
                                 android:fontFamily="@font/inter"
                                 android:singleLine="true"
-                                android:textSize="14sp"
+                                android:textSize="@dimen/text_size_04"
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
                                 android:inputType="numberDecimal" />
@@ -198,26 +198,26 @@
                             android:layout_toEndOf="@id/channel_form_input_layout_deposit"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:layout_marginStart="8dp"
-                            android:layout_marginTop="30dp"
+                            android:layout_marginStart="@dimen/small_08"
+                            android:layout_marginTop="@dimen/normal_04_02"
                             android:fontFamily="@font/inter"
                             android:text="@string/lbc"
                             android:textAllCaps="true"
-                            android:textSize="10sp"
+                            android:textSize="@dimen/text_size_00"
                             android:textFontWeight="300" />
 
                         <LinearLayout
                             android:id="@+id/channel_form_inline_balance_container"
                             android:layout_toEndOf="@id/channel_form_input_currency"
-                            android:layout_marginStart="24dp"
-                            android:layout_marginTop="28dp"
+                            android:layout_marginStart="@dimen/normal_03"
+                            android:layout_marginTop="@dimen/normal_04"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:orientation="horizontal"
                             android:visibility="invisible">
                             <ImageView
-                                android:layout_width="12dp"
-                                android:layout_height="12dp"
+                                android:layout_width="@dimen/small_12"
+                                android:layout_height="@dimen/small_12"
                                 android:layout_gravity="center_vertical"
                                 android:src="@drawable/ic_credits" />
                             <TextView
@@ -226,24 +226,24 @@
                                 android:layout_height="wrap_content"
                                 android:fontFamily="@font/inter"
                                 android:textFontWeight="300"
-                                android:layout_marginStart="2dp" />
+                                android:layout_marginStart="@dimen/small_02" />
                         </LinearLayout>
                     </RelativeLayout>
 
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginTop="4dp"
+                        android:layout_marginTop="@dimen/small_04"
                         android:fontFamily="@font/inter"
                         android:text="@string/deposit_remains_yours"
                         android:textFontWeight="300"
-                        android:textSize="12sp" />
+                        android:textSize="@dimen/text_size_02" />
 
                     <LinearLayout
                         android:id="@+id/channel_form_optional_fields_container"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_marginTop="16dp"
+                        android:layout_marginTop="@dimen/normal_01"
                         android:orientation="vertical"
                         android:visibility="gone">
 
@@ -259,13 +259,13 @@
                                 android:inputType="textMultiLine"
                                 android:singleLine="false"
                                 android:scrollbars="vertical"
-                                android:textSize="14sp" />
+                                android:textSize="@dimen/text_size_04" />
                         </com.google.android.material.textfield.TextInputLayout>
 
                         <com.google.android.material.textfield.TextInputLayout
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:layout_marginTop="16dp"
+                            android:layout_marginTop="@dimen/normal_01"
                             android:hint="@string/website">
                             <com.google.android.material.textfield.TextInputEditText
                                 android:id="@+id/channel_form_input_website"
@@ -273,13 +273,13 @@
                                 android:layout_height="wrap_content"
                                 android:fontFamily="@font/inter"
                                 android:singleLine="true"
-                                android:textSize="14sp" />
+                                android:textSize="@dimen/text_size_04" />
                         </com.google.android.material.textfield.TextInputLayout>
 
                         <com.google.android.material.textfield.TextInputLayout
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:layout_marginTop="16dp"
+                            android:layout_marginTop="@dimen/normal_01"
                             android:hint="@string/email">
                             <com.google.android.material.textfield.TextInputEditText
                                 android:id="@+id/channel_form_input_email"
@@ -287,25 +287,25 @@
                                 android:layout_height="wrap_content"
                                 android:fontFamily="@font/inter"
                                 android:singleLine="true"
-                                android:textSize="14sp" />
+                                android:textSize="@dimen/text_size_04" />
                         </com.google.android.material.textfield.TextInputLayout>
 
                         <TextView
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:layout_marginTop="16dp"
-                            android:layout_marginBottom="8dp"
+                            android:layout_marginTop="@dimen/normal_01"
+                            android:layout_marginBottom="@dimen/small_08"
                             android:fontFamily="@font/inter"
                             android:text="@string/tags"
                             android:textFontWeight="600"
-                            android:textSize="14sp" />
+                            android:textSize="@dimen/text_size_04" />
                         <include layout="@layout/container_inline_tag_form" />
                     </LinearLayout>
 
                     <RelativeLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_marginTop="24dp">
+                        android:layout_marginTop="@dimen/normal_03">
                         <TextView
                             android:id="@+id/channel_form_cancel_link"
                             android:background="?attr/selectableItemBackground"
@@ -314,7 +314,7 @@
                             android:layout_height="wrap_content"
                             android:layout_centerVertical="true"
                             android:fontFamily="@font/inter"
-                            android:textSize="14sp"
+                            android:textSize="@dimen/text_size_04"
                             android:text="@string/cancel" />
 
                         <TextView
@@ -324,17 +324,17 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_centerVertical="true"
-                            android:layout_marginEnd="24dp"
+                            android:layout_marginEnd="@dimen/normal_03"
                             android:layout_toStartOf="@id/channel_form_save_button"
                             android:fontFamily="@font/inter"
-                            android:textSize="14sp"
+                            android:textSize="@dimen/text_size_04"
                             android:text="@string/show_optional_fields" />
                         <ProgressBar
                             android:id="@+id/channel_form_save_progress"
-                            android:layout_width="20dp"
-                            android:layout_height="20dp"
+                            android:layout_width="@dimen/normal_02"
+                            android:layout_height="@dimen/normal_02"
                             android:layout_centerVertical="true"
-                            android:layout_marginEnd="24dp"
+                            android:layout_marginEnd="@dimen/normal_03"
                             android:layout_toStartOf="@+id/channel_form_save_button"
                             android:visibility="gone" />
                         <com.google.android.material.button.MaterialButton
diff --git a/app/src/main/res/layout/fragment_channel_manager.xml b/app/src/main/res/layout/fragment_channel_manager.xml
index 7cd6a948..a1e7d43e 100644
--- a/app/src/main/res/layout/fragment_channel_manager.xml
+++ b/app/src/main/res/layout/fragment_channel_manager.xml
@@ -7,17 +7,17 @@
     android:focusedByDefault="true">
     <ProgressBar
         android:id="@+id/channel_manager_list_big_loading"
-        android:layout_width="36dp"
-        android:layout_height="36dp"
+        android:layout_width="@dimen/normal_06"
+        android:layout_height="@dimen/normal_06"
         android:layout_centerInParent="true"
         android:visibility="gone" />
     <ProgressBar
         android:id="@+id/channel_manager_list_loading"
-        android:layout_width="20dp"
-        android:layout_height="20dp"
+        android:layout_width="@dimen/normal_02"
+        android:layout_height="@dimen/normal_02"
         android:layout_alignParentEnd="true"
-        android:layout_marginTop="16dp"
-        android:layout_marginEnd="16dp"
+        android:layout_marginTop="@dimen/normal_01"
+        android:layout_marginEnd="@dimen/normal_01"
         android:visibility="gone" />
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/channel_manager_list"
@@ -35,28 +35,28 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_centerInParent="true"
-            android:padding="36dp">
+            android:padding="@dimen/normal_06">
             <ImageView
                 android:layout_gravity="center_horizontal"
-                android:layout_width="160dp"
-                android:layout_height="300dp"
+                android:layout_width="@dimen/large_11"
+                android:layout_height="@dimen/large_47"
                 android:adjustViewBounds="true"
                 android:src="@drawable/gerbil_happy" />
             <TextView
                 android:text="@string/no_channel_created"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="24dp"
+                android:layout_marginTop="@dimen/normal_03"
                 android:layout_gravity="center_horizontal"
                 android:fontFamily="@font/inter"
                 android:textAlignment="center"
-                android:textSize="16sp"
+                android:textSize="@dimen/text_size_06"
                 android:textFontWeight="300"/>
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/channel_manager_create_button"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="24dp"
+                android:layout_marginTop="@dimen/normal_03"
                 android:fontFamily="@font/inter"
                 android:text="@string/create_a_channel"  />
         </LinearLayout>
@@ -68,8 +68,8 @@
         android:layout_height="wrap_content"
         android:layout_alignParentEnd="true"
         android:layout_alignParentBottom="true"
-        android:layout_marginEnd="16dp"
-        android:layout_marginBottom="16dp"
+        android:layout_marginEnd="@dimen/normal_01"
+        android:layout_marginBottom="@dimen/normal_01"
         android:src="@drawable/ic_add"
         android:visibility="gone" />
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_editors_choice.xml b/app/src/main/res/layout/fragment_editors_choice.xml
index 42e03e9a..53f00957 100644
--- a/app/src/main/res/layout/fragment_editors_choice.xml
+++ b/app/src/main/res/layout/fragment_editors_choice.xml
@@ -6,8 +6,8 @@
     android:orientation="vertical">
     <ProgressBar
         android:id="@+id/editors_choice_loading"
-        android:layout_width="36dp"
-        android:layout_height="36dp"
+        android:layout_width="@dimen/normal_06"
+        android:layout_height="@dimen/normal_06"
         android:layout_centerInParent="true"
         android:visibility="gone" />
     <androidx.recyclerview.widget.RecyclerView
@@ -15,6 +15,6 @@
         android:clipToPadding="false"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:paddingTop="16dp"
-        android:paddingBottom="16dp" />
+        android:paddingTop="@dimen/normal_01"
+        android:paddingBottom="@dimen/normal_01" />
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_file_view.xml b/app/src/main/res/layout/fragment_file_view.xml
index 9fa4ed64..b2d2e475 100644
--- a/app/src/main/res/layout/fragment_file_view.xml
+++ b/app/src/main/res/layout/fragment_file_view.xml
@@ -18,9 +18,9 @@
             android:layout_height="wrap_content"
             android:layout_centerInParent="true">
             <ProgressBar
-                android:layout_width="16dp"
-                android:layout_height="16dp"
-                android:layout_marginEnd="8dp"
+                android:layout_width="@dimen/normal_01"
+                android:layout_height="@dimen/normal_01"
+                android:layout_marginEnd="@dimen/small_08"
                 android:layout_gravity="center_vertical" />
             <TextView
                 android:layout_width="wrap_content"
@@ -28,7 +28,7 @@
                 android:layout_gravity="center_vertical"
                 android:fontFamily="@font/inter"
                 android:text="@string/loading_decentralized_data"
-                android:textSize="16sp"
+                android:textSize="@dimen/text_size_06"
                 android:textFontWeight="300" />
         </LinearLayout>
 
@@ -45,7 +45,7 @@
         <RelativeLayout
             android:id="@+id/file_view_media_container"
             android:layout_width="match_parent"
-            android:layout_height="246dp"
+            android:layout_height="@dimen/large_32_02"
             android:background="@color/mediaContainerBackground">
 
             <RelativeLayout
@@ -62,8 +62,8 @@
 
                 <ProgressBar
                     android:id="@+id/file_view_main_action_loading"
-                    android:layout_width="36dp"
-                    android:layout_height="36dp"
+                    android:layout_width="@dimen/normal_06"
+                    android:layout_height="@dimen/normal_06"
                     android:layout_centerInParent="true" />
 
                 <com.google.android.material.button.MaterialButton
@@ -73,7 +73,7 @@
                     android:layout_centerInParent="true"
                     android:fontFamily="@font/inter"
                     android:text="@string/play"
-                    android:textSize="14sp"
+                    android:textSize="@dimen/text_size_04"
                     android:visibility="invisible" />
 
                 <LinearLayout
@@ -81,19 +81,19 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_alignParentEnd="true"
-                    android:layout_marginTop="4dp"
-                    android:layout_marginEnd="4dp"
+                    android:layout_marginTop="@dimen/small_04"
+                    android:layout_marginEnd="@dimen/small_04"
                     android:background="@drawable/bg_stream_cost"
                     android:orientation="horizontal"
-                    android:paddingStart="6dp"
-                    android:paddingTop="2dp"
-                    android:paddingEnd="7dp"
-                    android:paddingBottom="2dp"
+                    android:paddingStart="@dimen/small_06"
+                    android:paddingTop="@dimen/small_02"
+                    android:paddingEnd="@dimen/small_07"
+                    android:paddingBottom="@dimen/small_02"
                     android:visibility="gone">
 
                     <ImageView
-                        android:layout_width="12dp"
-                        android:layout_height="12dp"
+                        android:layout_width="@dimen/small_12"
+                        android:layout_height="@dimen/small_12"
                         android:layout_gravity="center_vertical"
                         android:src="@drawable/ic_credits" />
 
@@ -102,11 +102,11 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_gravity="center_vertical"
-                        android:layout_marginStart="1dp"
+                        android:layout_marginStart="@dimen/small_01"
                         android:fontFamily="@font/inter"
                         android:textColor="@android:color/black"
                         android:textFontWeight="300"
-                        android:textSize="14sp" />
+                        android:textSize="@dimen/text_size_04" />
                 </LinearLayout>
             </RelativeLayout>
 
@@ -125,8 +125,8 @@
 
                 <ProgressBar
                     android:id="@+id/player_buffering_progress"
-                    android:layout_width="36dp"
-                    android:layout_height="36dp"
+                    android:layout_width="@dimen/normal_06"
+                    android:layout_height="@dimen/normal_06"
                     android:layout_centerInParent="true"
                     android:visibility="gone" />
             </RelativeLayout>
@@ -136,12 +136,12 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:background="@color/mediaContainerBackground"
-                android:padding="36dp"
+                android:padding="@dimen/normal_06"
                 android:visibility="gone">
 
                 <ImageView
                     android:id="@+id/file_view_unsupported_gerbil"
-                    android:layout_width="64dp"
+                    android:layout_width="@dimen/normal_13"
                     android:layout_height="wrap_content"
                     android:layout_centerVertical="true"
                     android:src="@drawable/gerbil_happy" />
@@ -150,7 +150,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_centerVertical="true"
-                    android:layout_marginStart="24dp"
+                    android:layout_marginStart="@dimen/normal_03"
                     android:layout_toEndOf="@id/file_view_unsupported_gerbil"
                     android:orientation="vertical">
 
@@ -160,7 +160,7 @@
                         android:fontFamily="@font/inter"
                         android:text="@string/unsupported_content"
                         android:textColor="@color/white"
-                        android:textSize="18sp" />
+                        android:textSize="@dimen/text_size_08" />
 
                     <TextView
                         android:id="@+id/file_view_unsupported_text"
@@ -170,7 +170,7 @@
                         android:text="@string/unsupported_content_desc"
                         android:textColor="@color/white"
                         android:textFontWeight="300"
-                        android:textSize="14sp" />
+                        android:textSize="@dimen/text_size_04" />
 
                     <com.google.android.material.button.MaterialButton
                         android:id="@+id/file_view_open_external_button"
@@ -178,7 +178,7 @@
                         android:layout_height="wrap_content"
                         android:fontFamily="@font/inter"
                         android:text="@string/open"
-                        android:textSize="14sp" />
+                        android:textSize="@dimen/text_size_04" />
                 </LinearLayout>
             </RelativeLayout>
         </RelativeLayout>
@@ -206,17 +206,17 @@
                     android:layout_height="wrap_content"
                     android:background="?attr/selectableItemBackground"
                     android:clickable="true"
-                    android:paddingStart="16dp"
-                    android:paddingTop="8dp"
-                    android:paddingEnd="4dp"
-                    android:paddingBottom="8dp">
+                    android:paddingStart="@dimen/normal_01"
+                    android:paddingTop="@dimen/small_08"
+                    android:paddingEnd="@dimen/small_04"
+                    android:paddingBottom="@dimen/small_08">
 
                     <LinearLayout
                         android:id="@+id/file_view_title_layout"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_centerVertical="true"
-                        android:layout_marginEnd="48dp"
+                        android:layout_marginEnd="@dimen/normal_09"
                         android:orientation="vertical">
 
                         <TextView
@@ -224,23 +224,23 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:fontFamily="@font/inter"
-                            android:textSize="16sp"
+                            android:textSize="@dimen/text_size_06"
                             android:textStyle="bold" />
 
                         <LinearLayout
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:layout_marginTop="4dp"
+                            android:layout_marginTop="@dimen/small_04"
                             android:orientation="horizontal">
 
                             <TextView
                                 android:id="@+id/file_view_view_count"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:layout_marginEnd="16dp"
+                                android:layout_marginEnd="@dimen/normal_01"
                                 android:fontFamily="@font/inter"
                                 android:textFontWeight="300"
-                                android:textSize="12sp"
+                                android:textSize="@dimen/text_size_02"
                                 android:visibility="gone" />
 
                             <TextView
@@ -249,14 +249,14 @@
                                 android:layout_height="wrap_content"
                                 android:fontFamily="@font/inter"
                                 android:textFontWeight="300"
-                                android:textSize="12sp" />
+                                android:textSize="@dimen/text_size_02" />
                         </LinearLayout>
                     </LinearLayout>
 
                     <ImageView
                         android:id="@+id/file_view_desc_toggle_arrow"
-                        android:layout_width="24dp"
-                        android:layout_height="24dp"
+                        android:layout_width="@dimen/normal_03"
+                        android:layout_height="@dimen/normal_03"
                         android:layout_alignParentEnd="true"
                         android:layout_centerVertical="true"
                         android:layout_toStartOf="@+id/file_view_title_layout"
@@ -273,23 +273,23 @@
 
                     <LinearLayout
                         android:id="@+id/file_view_action_share"
-                        android:layout_width="0dp"
+                        android:layout_width="@dimen/small_00"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
                         android:background="?attr/selectableItemBackground"
                         android:clickable="true"
                         android:orientation="vertical"
-                        android:paddingTop="8dp"
-                        android:paddingBottom="8dp">
+                        android:paddingTop="@dimen/small_08"
+                        android:paddingBottom="@dimen/small_08">
 
                         <RelativeLayout
-                            android:layout_width="36dp"
-                            android:layout_height="36dp"
+                            android:layout_width="@dimen/normal_06"
+                            android:layout_height="@dimen/normal_06"
                             android:layout_gravity="center_horizontal">
 
                             <ImageView
-                                android:layout_width="24dp"
-                                android:layout_height="24dp"
+                                android:layout_width="@dimen/normal_03"
+                                android:layout_height="@dimen/normal_03"
                                 android:layout_centerInParent="true"
                                 android:src="@drawable/ic_share"
                                 app:tint="@color/foreground" />
@@ -301,32 +301,32 @@
                             android:layout_gravity="center_horizontal"
                             android:fontFamily="@font/inter"
                             android:text="@string/share"
-                            android:textSize="12sp" />
+                            android:textSize="@dimen/text_size_02" />
                     </LinearLayout>
 
                     <LinearLayout
                         android:id="@+id/file_view_action_tip"
-                        android:layout_width="0dp"
+                        android:layout_width="@dimen/small_00"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
                         android:background="?attr/selectableItemBackground"
                         android:clickable="true"
                         android:orientation="vertical"
-                        android:paddingTop="8dp"
-                        android:paddingBottom="8dp">
+                        android:paddingTop="@dimen/small_08"
+                        android:paddingBottom="@dimen/small_08">
 
                         <RelativeLayout
-                            android:layout_width="36dp"
-                            android:layout_height="36dp"
+                            android:layout_width="@dimen/normal_06"
+                            android:layout_height="@dimen/normal_06"
                             android:layout_gravity="center_horizontal">
 
                             <io.lbry.browser.ui.controls.SolidIconView
-                                android:layout_width="24dp"
-                                android:layout_height="24dp"
+                                android:layout_width="@dimen/normal_03"
+                                android:layout_height="@dimen/normal_03"
                                 android:layout_centerInParent="true"
                                 android:text="@string/fa_gift"
                                 android:textColor="@color/foreground"
-                                android:textSize="20dp" />
+                                android:textSize="@dimen/normal_02" />
                         </RelativeLayout>
 
                         <TextView
@@ -335,33 +335,33 @@
                             android:layout_gravity="center_horizontal"
                             android:fontFamily="@font/inter"
                             android:text="@string/support"
-                            android:textSize="12sp" />
+                            android:textSize="@dimen/text_size_02" />
                     </LinearLayout>
 
                     <LinearLayout
                         android:id="@+id/file_view_action_repost"
-                        android:layout_width="0dp"
+                        android:layout_width="@dimen/small_00"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
                         android:background="?attr/selectableItemBackground"
                         android:clickable="true"
                         android:orientation="vertical"
-                        android:paddingTop="8dp"
-                        android:paddingBottom="8dp">
+                        android:paddingTop="@dimen/small_08"
+                        android:paddingBottom="@dimen/small_08">
 
                         <RelativeLayout
-                            android:layout_width="36dp"
-                            android:layout_height="36dp"
+                            android:layout_width="@dimen/normal_06"
+                            android:layout_height="@dimen/normal_06"
                             android:layout_gravity="center_horizontal">
 
                             <io.lbry.browser.ui.controls.SolidIconView
-                                android:layout_width="24dp"
-                                android:layout_height="24dp"
+                                android:layout_width="@dimen/normal_03"
+                                android:layout_height="@dimen/normal_03"
                                 android:layout_centerInParent="true"
                                 android:layout_gravity="center_horizontal"
                                 android:text="@string/fa_repost"
                                 android:textColor="@color/foreground"
-                                android:textSize="20dp" />
+                                android:textSize="@dimen/normal_02" />
                         </RelativeLayout>
 
                         <TextView
@@ -370,29 +370,29 @@
                             android:layout_gravity="center_horizontal"
                             android:fontFamily="@font/inter"
                             android:text="@string/repost"
-                            android:textSize="12sp" />
+                            android:textSize="@dimen/text_size_02" />
                     </LinearLayout>
 
                     <LinearLayout
                         android:id="@+id/file_view_action_edit"
-                        android:layout_width="0dp"
+                        android:layout_width="@dimen/small_00"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
                         android:background="?attr/selectableItemBackground"
                         android:clickable="true"
                         android:orientation="vertical"
-                        android:paddingTop="8dp"
-                        android:paddingBottom="8dp"
+                        android:paddingTop="@dimen/small_08"
+                        android:paddingBottom="@dimen/small_08"
                         android:visibility="gone">
 
                         <RelativeLayout
-                            android:layout_width="36dp"
-                            android:layout_height="36dp"
+                            android:layout_width="@dimen/normal_06"
+                            android:layout_height="@dimen/normal_06"
                             android:layout_gravity="center_horizontal">
 
                             <ImageView
-                                android:layout_width="24dp"
-                                android:layout_height="24dp"
+                                android:layout_width="@dimen/normal_03"
+                                android:layout_height="@dimen/normal_03"
                                 android:layout_centerInParent="true"
                                 android:src="@drawable/ic_edit"
                                 app:tint="@color/foreground" />
@@ -404,37 +404,37 @@
                             android:layout_gravity="center_horizontal"
                             android:fontFamily="@font/inter"
                             android:text="@string/edit"
-                            android:textSize="12sp" />
+                            android:textSize="@dimen/text_size_02" />
                     </LinearLayout>
 
                     <LinearLayout
                         android:id="@+id/file_view_action_download"
-                        android:layout_width="0dp"
+                        android:layout_width="@dimen/small_00"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
                         android:background="?attr/selectableItemBackground"
                         android:clickable="true"
                         android:orientation="vertical"
-                        android:paddingTop="8dp"
-                        android:paddingBottom="8dp">
+                        android:paddingTop="@dimen/small_08"
+                        android:paddingBottom="@dimen/small_08">
 
                         <RelativeLayout
-                            android:layout_width="36dp"
-                            android:layout_height="36dp"
+                            android:layout_width="@dimen/normal_06"
+                            android:layout_height="@dimen/normal_06"
                             android:layout_gravity="center_horizontal">
 
                             <ProgressBar
                                 android:id="@+id/file_view_download_progress"
                                 style="?android:progressBarStyleHorizontal"
-                                android:layout_width="36dp"
-                                android:layout_height="36dp"
+                                android:layout_width="@dimen/normal_06"
+                                android:layout_height="@dimen/normal_06"
                                 android:progressDrawable="@drawable/determinate_progress_circle"
                                 android:visibility="gone" />
 
                             <ImageView
                                 android:id="@+id/file_view_action_download_icon"
-                                android:layout_width="20dp"
-                                android:layout_height="20dp"
+                                android:layout_width="@dimen/normal_02"
+                                android:layout_height="@dimen/normal_02"
                                 android:layout_centerInParent="true"
                                 android:src="@drawable/ic_download"
                                 app:tint="@color/foreground" />
@@ -446,29 +446,29 @@
                             android:layout_gravity="center_horizontal"
                             android:fontFamily="@font/inter"
                             android:text="@string/download"
-                            android:textSize="12sp" />
+                            android:textSize="@dimen/text_size_02" />
                     </LinearLayout>
 
                     <LinearLayout
                         android:id="@+id/file_view_action_delete"
-                        android:layout_width="0dp"
+                        android:layout_width="@dimen/small_00"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
                         android:background="?attr/selectableItemBackground"
                         android:clickable="true"
                         android:orientation="vertical"
-                        android:paddingTop="8dp"
-                        android:paddingBottom="8dp"
+                        android:paddingTop="@dimen/small_08"
+                        android:paddingBottom="@dimen/small_08"
                         android:visibility="gone">
 
                         <RelativeLayout
-                            android:layout_width="36dp"
-                            android:layout_height="36dp"
+                            android:layout_width="@dimen/normal_06"
+                            android:layout_height="@dimen/normal_06"
                             android:layout_gravity="center_horizontal">
 
                             <ImageView
-                                android:layout_width="24dp"
-                                android:layout_height="24dp"
+                                android:layout_width="@dimen/normal_03"
+                                android:layout_height="@dimen/normal_03"
                                 android:layout_centerInParent="true"
                                 android:src="@drawable/ic_delete"
                                 app:tint="@color/foreground" />
@@ -480,28 +480,28 @@
                             android:layout_gravity="center_horizontal"
                             android:fontFamily="@font/inter"
                             android:text="@string/delete"
-                            android:textSize="12sp" />
+                            android:textSize="@dimen/text_size_02" />
                     </LinearLayout>
 
                     <LinearLayout
                         android:id="@+id/file_view_action_unpublish"
-                        android:layout_width="0dp"
+                        android:layout_width="@dimen/small_00"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
                         android:background="?attr/selectableItemBackground"
                         android:clickable="true"
                         android:orientation="vertical"
-                        android:paddingTop="8dp"
-                        android:paddingBottom="8dp">
+                        android:paddingTop="@dimen/small_08"
+                        android:paddingBottom="@dimen/small_08">
 
                         <RelativeLayout
-                            android:layout_width="36dp"
-                            android:layout_height="36dp"
+                            android:layout_width="@dimen/normal_06"
+                            android:layout_height="@dimen/normal_06"
                             android:layout_gravity="center_horizontal">
 
                             <ImageView
-                                android:layout_width="24dp"
-                                android:layout_height="24dp"
+                                android:layout_width="@dimen/normal_03"
+                                android:layout_height="@dimen/normal_03"
                                 android:layout_centerInParent="true"
                                 android:src="@drawable/ic_unpublish"
                                 app:tint="@color/foreground" />
@@ -513,28 +513,28 @@
                             android:layout_gravity="center_horizontal"
                             android:fontFamily="@font/inter"
                             android:text="@string/unpublish"
-                            android:textSize="12sp" />
+                            android:textSize="@dimen/text_size_02" />
                     </LinearLayout>
 
                     <LinearLayout
                         android:id="@+id/file_view_action_report"
-                        android:layout_width="0dp"
+                        android:layout_width="@dimen/small_00"
                         android:layout_height="wrap_content"
                         android:layout_weight="1"
                         android:background="?attr/selectableItemBackground"
                         android:clickable="true"
                         android:orientation="vertical"
-                        android:paddingTop="8dp"
-                        android:paddingBottom="8dp">
+                        android:paddingTop="@dimen/small_08"
+                        android:paddingBottom="@dimen/small_08">
 
                         <RelativeLayout
-                            android:layout_width="36dp"
-                            android:layout_height="36dp"
+                            android:layout_width="@dimen/normal_06"
+                            android:layout_height="@dimen/normal_06"
                             android:layout_gravity="center_horizontal">
 
                             <ImageView
-                                android:layout_width="24dp"
-                                android:layout_height="24dp"
+                                android:layout_width="@dimen/normal_03"
+                                android:layout_height="@dimen/normal_03"
                                 android:layout_centerInParent="true"
                                 android:src="@drawable/ic_report"
                                 app:tint="@color/foreground" />
@@ -546,14 +546,14 @@
                             android:layout_gravity="center_horizontal"
                             android:fontFamily="@font/inter"
                             android:text="@string/report"
-                            android:textSize="12sp" />
+                            android:textSize="@dimen/text_size_02" />
                     </LinearLayout>
                 </LinearLayout>
 
                 <View
                     android:layout_width="match_parent"
-                    android:layout_height="0.5dp"
-                    android:layout_marginTop="12dp"
+                    android:layout_height="@dimen/small_00.5"
+                    android:layout_marginTop="@dimen/small_12"
                     android:background="@color/divider" />
 
                 <RelativeLayout
@@ -568,22 +568,22 @@
                         android:layout_toStartOf="@id/file_view_publisher_area_actions"
                         android:background="?attr/selectableItemBackground"
                         android:clickable="true"
-                        android:paddingStart="16dp"
-                        android:paddingTop="12dp"
-                        android:paddingBottom="12dp">
+                        android:paddingStart="@dimen/normal_01"
+                        android:paddingTop="@dimen/small_12"
+                        android:paddingBottom="@dimen/small_12">
 
                         <RelativeLayout
                             android:id="@+id/file_view_publisher_avatar"
-                            android:layout_width="50dp"
-                            android:layout_height="50dp"
+                            android:layout_width="@dimen/normal_09_02"
+                            android:layout_height="@dimen/normal_09_02"
                             android:layout_gravity="center_vertical"
-                            android:layout_marginEnd="16dp"
+                            android:layout_marginEnd="@dimen/normal_01"
                             android:visibility="gone">
 
                             <RelativeLayout
                                 android:id="@+id/file_view_publisher_no_thumbnail"
-                                android:layout_width="50dp"
-                                android:layout_height="50dp"
+                                android:layout_width="@dimen/normal_09_02"
+                                android:layout_height="@dimen/normal_09_02"
                                 android:layout_centerHorizontal="true"
                                 android:background="@drawable/bg_channel_icon">
 
@@ -596,13 +596,13 @@
                                     android:textAllCaps="true"
                                     android:textColor="@color/white"
                                     android:textFontWeight="300"
-                                    android:textSize="24sp" />
+                                    android:textSize="@dimen/text_size_11" />
                             </RelativeLayout>
 
                             <ImageView
                                 android:id="@+id/file_view_publisher_thumbnail"
-                                android:layout_width="50dp"
-                                android:layout_height="50dp"
+                                android:layout_width="@dimen/normal_09_02"
+                                android:layout_height="@dimen/normal_09_02"
                                 android:layout_centerHorizontal="true" />
                         </RelativeLayout>
 
@@ -619,7 +619,7 @@
                                 android:layout_height="wrap_content"
                                 android:fontFamily="@font/inter"
                                 android:textFontWeight="300"
-                                android:textSize="14sp"
+                                android:textSize="@dimen/text_size_04"
                                 android:visibility="gone" />
 
                             <TextView
@@ -629,7 +629,7 @@
                                 android:fontFamily="@font/inter"
                                 android:textColor="@color/lbryGreen"
                                 android:textFontWeight="600"
-                                android:textSize="14sp" />
+                                android:textSize="@dimen/text_size_04" />
                         </LinearLayout>
                     </LinearLayout>
 
@@ -648,61 +648,61 @@
                             android:background="?attr/selectableItemBackground"
                             android:clickable="true"
                             android:orientation="horizontal"
-                            android:paddingTop="8dp"
-                            android:paddingBottom="8dp">
+                            android:paddingTop="@dimen/small_08"
+                            android:paddingBottom="@dimen/small_08">
 
                             <TextView
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:layout_gravity="center_vertical"
-                                android:layout_marginStart="16dp"
+                                android:layout_marginStart="@dimen/normal_01"
                                 android:fontFamily="@font/inter"
                                 android:text="@string/follow"
                                 android:textAllCaps="true"
-                                android:textSize="12sp"
+                                android:textSize="@dimen/text_size_02"
                                 android:textStyle="bold" />
 
                             <io.lbry.browser.ui.controls.OutlineIconView
-                                android:layout_width="24dp"
-                                android:layout_height="24dp"
-                                android:layout_marginStart="16dp"
-                                android:layout_marginEnd="16dp"
+                                android:layout_width="@dimen/normal_03"
+                                android:layout_height="@dimen/normal_03"
+                                android:layout_marginStart="@dimen/normal_01"
+                                android:layout_marginEnd="@dimen/normal_01"
                                 android:text="@string/fa_heart"
                                 android:textColor="@color/red"
-                                android:textSize="20dp" />
+                                android:textSize="@dimen/normal_02" />
                         </LinearLayout>
 
                         <io.lbry.browser.ui.controls.SolidIconView
                             android:id="@+id/file_view_icon_unfollow"
-                            android:layout_width="24dp"
-                            android:layout_height="24dp"
-                            android:layout_marginStart="16dp"
-                            android:layout_marginEnd="16dp"
+                            android:layout_width="@dimen/normal_03"
+                            android:layout_height="@dimen/normal_03"
+                            android:layout_marginStart="@dimen/normal_01"
+                            android:layout_marginEnd="@dimen/normal_01"
                             android:background="?attr/selectableItemBackground"
                             android:clickable="true"
                             android:text="@string/fa_heart_broken"
                             android:textColor="@color/foreground"
-                            android:textSize="20dp"
+                            android:textSize="@dimen/normal_02"
                             android:visibility="gone" />
 
                         <io.lbry.browser.ui.controls.SolidIconView
                             android:id="@+id/file_view_icon_bell"
-                            android:layout_width="24dp"
-                            android:layout_height="24dp"
-                            android:layout_marginEnd="16dp"
+                            android:layout_width="@dimen/normal_03"
+                            android:layout_height="@dimen/normal_03"
+                            android:layout_marginEnd="@dimen/normal_01"
                             android:background="?attr/selectableItemBackground"
                             android:clickable="true"
                             android:text="@string/fa_bell_slash"
                             android:textColor="@color/foreground"
-                            android:textSize="20dp"
+                            android:textSize="@dimen/normal_02"
                             android:visibility="gone" />
                     </LinearLayout>
                 </RelativeLayout>
 
                 <View
                     android:layout_width="match_parent"
-                    android:layout_height="0.5dp"
-                    android:layout_marginBottom="12dp"
+                    android:layout_height="@dimen/small_00.5"
+                    android:layout_marginBottom="@dimen/small_12"
                     android:background="@color/divider" />
 
                 <LinearLayout
@@ -716,46 +716,46 @@
                         android:id="@+id/file_view_description"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginStart="16dp"
-                        android:layout_marginEnd="16dp"
+                        android:layout_marginStart="@dimen/normal_01"
+                        android:layout_marginEnd="@dimen/normal_01"
                         android:autoLink="all"
                         android:fontFamily="@font/inter"
                         android:textColorLink="@color/lbryGreen"
                         android:textFontWeight="300"
-                        android:textSize="12sp" />
+                        android:textSize="@dimen/text_size_02" />
 
                     <LinearLayout
                         android:id="@+id/file_view_tag_area"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_marginStart="16dp"
-                        android:layout_marginEnd="16dp"
+                        android:layout_marginStart="@dimen/normal_01"
+                        android:layout_marginEnd="@dimen/normal_01"
                         android:layout_weight="10"
                         android:orientation="horizontal"
-                        android:paddingTop="36dp">
+                        android:paddingTop="@dimen/normal_06">
 
                         <TextView
-                            android:layout_width="0dp"
+                            android:layout_width="@dimen/small_00"
                             android:layout_height="wrap_content"
                             android:layout_weight="2"
                             android:fontFamily="@font/inter"
                             android:text="@string/tags"
                             android:textFontWeight="600"
-                            android:textSize="12sp" />
+                            android:textSize="@dimen/text_size_02" />
 
                         <androidx.recyclerview.widget.RecyclerView
                             android:id="@+id/file_view_tag_list"
-                            android:layout_width="0dp"
+                            android:layout_width="@dimen/small_00"
                             android:layout_height="wrap_content"
-                            android:layout_marginStart="8dp"
+                            android:layout_marginStart="@dimen/small_08"
                             android:layout_weight="8" />
                     </LinearLayout>
 
                     <View
                         android:layout_width="match_parent"
-                        android:layout_height="0.5dp"
-                        android:layout_marginTop="12dp"
-                        android:layout_marginBottom="12dp"
+                        android:layout_height="@dimen/small_00.5"
+                        android:layout_marginTop="@dimen/small_12"
+                        android:layout_marginBottom="@dimen/small_12"
                         android:background="@color/divider" />
                 </LinearLayout>
 
@@ -763,14 +763,14 @@
                     android:id="@+id/file_view_related_content_area"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginBottom="8dp"
+                    android:layout_marginBottom="@dimen/small_08"
                     android:orientation="vertical">
 
                     <RelativeLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_marginStart="16dp"
-                        android:layout_marginEnd="16dp">
+                        android:layout_marginStart="@dimen/normal_01"
+                        android:layout_marginEnd="@dimen/normal_01">
 
                         <TextView
                             android:layout_width="wrap_content"
@@ -778,12 +778,12 @@
                             android:layout_centerVertical="true"
                             android:fontFamily="@font/inter"
                             android:text="@string/related_content"
-                            android:textSize="16sp" />
+                            android:textSize="@dimen/text_size_06" />
 
                         <ProgressBar
                             android:id="@+id/file_view_related_content_progress"
-                            android:layout_width="16dp"
-                            android:layout_height="16dp"
+                            android:layout_width="@dimen/normal_01"
+                            android:layout_height="@dimen/normal_01"
                             android:layout_centerHorizontal="true"
                             android:layout_centerVertical="true"
                             android:visibility="gone" />
@@ -793,13 +793,13 @@
                         android:id="@+id/file_view_no_related_content"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginStart="16dp"
-                        android:layout_marginTop="8dp"
-                        android:layout_marginEnd="16dp"
+                        android:layout_marginStart="@dimen/normal_01"
+                        android:layout_marginTop="@dimen/small_08"
+                        android:layout_marginEnd="@dimen/normal_01"
                         android:fontFamily="@font/inter"
                         android:text="@string/no_related_content"
                         android:textFontWeight="300"
-                        android:textSize="14sp"
+                        android:textSize="@dimen/text_size_04"
                         android:visibility="gone" />
 
                     <androidx.recyclerview.widget.RecyclerView
@@ -811,8 +811,8 @@
 
                 <View
                     android:layout_width="match_parent"
-                    android:layout_height="0.5dp"
-                    android:layout_marginBottom="12dp"
+                    android:layout_height="@dimen/small_00.5"
+                    android:layout_marginBottom="@dimen/small_12"
                     android:background="@color/divider" />
 
                 <LinearLayout
@@ -820,18 +820,18 @@
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:orientation="vertical"
-                    android:paddingBottom="16dp">
+                    android:paddingBottom="@dimen/normal_01">
 
                     <RelativeLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_marginStart="16dp"
-                        android:layout_marginEnd="16dp">
+                        android:layout_marginStart="@dimen/normal_01"
+                        android:layout_marginEnd="@dimen/normal_01">
 
                         <ProgressBar
                             android:id="@+id/file_view_comments_progress"
-                            android:layout_width="16dp"
-                            android:layout_height="16dp"
+                            android:layout_width="@dimen/normal_01"
+                            android:layout_height="@dimen/normal_01"
                             android:layout_centerHorizontal="true"
                             android:layout_centerVertical="true"
                             android:visibility="gone" />
@@ -842,7 +842,7 @@
                             android:layout_centerVertical="true"
                             android:fontFamily="@font/inter"
                             android:text="@string/comments"
-                            android:textSize="16sp" />
+                            android:textSize="@dimen/text_size_06" />
                     </RelativeLayout>
 
                     <include layout="@layout/container_comment_form"
@@ -852,26 +852,26 @@
                         android:id="@+id/file_view_disabled_comments"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginStart="16dp"
-                        android:layout_marginTop="8dp"
-                        android:layout_marginEnd="16dp"
+                        android:layout_marginStart="@dimen/normal_01"
+                        android:layout_marginTop="@dimen/small_08"
+                        android:layout_marginEnd="@dimen/normal_01"
                         android:fontFamily="@font/inter"
                         android:text="@string/creator_disabled_comments"
                         android:textFontWeight="300"
-                        android:textSize="14sp"
+                        android:textSize="@dimen/text_size_04"
                         android:visibility="gone" />
 
                     <TextView
                         android:id="@+id/file_view_no_comments"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginStart="16dp"
-                        android:layout_marginTop="8dp"
-                        android:layout_marginEnd="16dp"
+                        android:layout_marginStart="@dimen/normal_01"
+                        android:layout_marginTop="@dimen/small_08"
+                        android:layout_marginEnd="@dimen/normal_01"
                         android:fontFamily="@font/inter"
                         android:text="@string/no_comments"
                         android:textFontWeight="300"
-                        android:textSize="14sp"
+                        android:textSize="@dimen/text_size_04"
                         android:visibility="gone" />
 
                     <androidx.recyclerview.widget.RecyclerView
diff --git a/app/src/main/res/layout/fragment_following.xml b/app/src/main/res/layout/fragment_following.xml
index d636c1b6..98ba42da 100644
--- a/app/src/main/res/layout/fragment_following.xml
+++ b/app/src/main/res/layout/fragment_following.xml
@@ -8,8 +8,8 @@
 
     <ProgressBar
         android:id="@+id/following_main_progress"
-        android:layout_width="36dp"
-        android:layout_height="36dp"
+        android:layout_width="@dimen/normal_06"
+        android:layout_height="@dimen/normal_06"
         android:visibility="gone"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
@@ -20,33 +20,33 @@
         android:orientation="vertical"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:paddingTop="16dp">
+        android:paddingTop="@dimen/normal_01">
 
         <RelativeLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="6dp"
-            android:layout_marginStart="16dp"
-            android:layout_marginEnd="16dp">
+            android:layout_marginBottom="@dimen/small_06"
+            android:layout_marginStart="@dimen/normal_01"
+            android:layout_marginEnd="@dimen/normal_01">
             <TextView
                 android:id="@+id/following_page_title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
                 android:fontFamily="@font/inter"
-                android:textSize="20sp"  />
+                android:textSize="@dimen/text_size_10"  />
             <ProgressBar
                 android:id="@+id/following_channel_load_progress"
-                android:layout_width="16dp"
-                android:layout_height="16dp"
+                android:layout_width="@dimen/normal_01"
+                android:layout_height="@dimen/normal_01"
                 android:visibility="gone"
                 android:layout_centerVertical="true"
                 android:layout_alignParentEnd="true" />
             <ProgressBar
                 android:id="@+id/following_content_progress"
                 android:visibility="gone"
-                android:layout_width="16dp"
-                android:layout_height="16dp"
+                android:layout_width="@dimen/normal_01"
+                android:layout_height="@dimen/normal_01"
                 android:layout_centerVertical="true"
                 android:layout_alignParentEnd="true" />
         </RelativeLayout>
@@ -55,10 +55,10 @@
             android:id="@+id/following_filter_container"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="2dp"
-            android:layout_marginBottom="8dp"
-            android:layout_marginStart="16dp"
-            android:layout_marginEnd="16dp"
+            android:layout_marginTop="@dimen/small_02"
+            android:layout_marginBottom="@dimen/small_08"
+            android:layout_marginStart="@dimen/normal_01"
+            android:layout_marginEnd="@dimen/normal_01"
             android:visibility="gone">
             <LinearLayout
                 android:id="@+id/following_sort_link"
@@ -74,12 +74,12 @@
                     android:layout_gravity="center_vertical"
                     android:fontFamily="@font/inter"
                     android:textFontWeight="300"
-                    android:textSize="12sp"
+                    android:textSize="@dimen/text_size_02"
                     android:text="@string/new_text" />
                 <ImageView
-                    android:layout_width="16dp"
-                    android:layout_height="16dp"
-                    android:layout_marginStart="2dp"
+                    android:layout_width="@dimen/normal_01"
+                    android:layout_height="@dimen/normal_01"
+                    android:layout_marginStart="@dimen/small_02"
                     android:layout_gravity="center_vertical"
                     android:src="@drawable/ic_arrow_dropdown"
                     app:tint="@color/foreground" />
@@ -92,7 +92,7 @@
                 android:clickable="true"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="24dp"
+                android:layout_marginStart="@dimen/normal_03"
                 android:layout_centerVertical="true"
                 android:visibility="gone">
                 <TextView
@@ -102,12 +102,12 @@
                     android:layout_gravity="center_vertical"
                     android:fontFamily="@font/inter"
                     android:textFontWeight="300"
-                    android:textSize="12sp"
+                    android:textSize="@dimen/text_size_02"
                     android:text="@string/past_week" />
                 <ImageView
-                    android:layout_width="16dp"
-                    android:layout_height="16dp"
-                    android:layout_marginStart="2dp"
+                    android:layout_width="@dimen/normal_01"
+                    android:layout_height="@dimen/normal_01"
+                    android:layout_marginStart="@dimen/small_02"
                     android:layout_gravity="center_vertical"
                     android:src="@drawable/ic_arrow_dropdown"
                     app:tint="@color/foreground" />
@@ -123,7 +123,7 @@
                 android:clickable="true"
                 android:fontFamily="@font/inter"
                 android:textFontWeight="300"
-                android:textSize="12sp"
+                android:textSize="@dimen/text_size_02"
                 android:text="@string/discover" />
         </RelativeLayout>
 
@@ -131,14 +131,14 @@
             android:id="@+id/following_page_info"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
-            android:layout_marginEnd="16dp"
+            android:layout_marginStart="@dimen/normal_01"
+            android:layout_marginEnd="@dimen/normal_01"
             android:fontFamily="@font/inter"
             android:textFontWeight="300"
             android:text="@string/lbry_works_better"
-            android:textSize="14sp"
-            android:layout_marginTop="4dp"
-            android:layout_marginBottom="16dp"
+            android:textSize="@dimen/text_size_04"
+            android:layout_marginTop="@dimen/small_04"
+            android:layout_marginBottom="@dimen/normal_01"
             android:visibility="gone" />
 
         <androidx.recyclerview.widget.RecyclerView
@@ -151,7 +151,7 @@
         <View
             android:id="@+id/following_divider"
             android:layout_width="match_parent"
-            android:layout_height="0.5dp"
+            android:layout_height="@dimen/small_00.5"
             android:background="@color/divider"
             />
 
@@ -162,10 +162,10 @@
                 android:id="@+id/following_no_claim_search_content"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_margin="16dp"
+                android:layout_margin="@dimen/normal_01"
                 android:fontFamily="@font/inter"
                 android:text="@string/no_claim_search_content"
-                android:textSize="14sp"
+                android:textSize="@dimen/text_size_04"
                 android:textFontWeight="300"
                 android:visibility="gone" />
 
@@ -175,8 +175,8 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:layout_above="@id/following_suggested_done_button"
-                android:paddingTop="16dp"
-                android:paddingBottom="16dp"
+                android:paddingTop="@dimen/normal_01"
+                android:paddingBottom="@dimen/normal_01"
                 android:visibility="gone" />
 
             <androidx.recyclerview.widget.RecyclerView
@@ -188,11 +188,11 @@
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/following_suggested_done_button"
-                android:layout_marginStart="16dp"
-                android:layout_marginEnd="16dp"
+                android:layout_marginStart="@dimen/normal_01"
+                android:layout_marginEnd="@dimen/normal_01"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginBottom="16dp"
+                android:layout_marginBottom="@dimen/normal_01"
                 android:layout_alignParentBottom="true"
                 android:fontFamily="@font/inter"
                 android:visibility="gone" />
diff --git a/app/src/main/res/layout/fragment_gallery.xml b/app/src/main/res/layout/fragment_gallery.xml
index e682f216..be1dc65a 100644
--- a/app/src/main/res/layout/fragment_gallery.xml
+++ b/app/src/main/res/layout/fragment_gallery.xml
@@ -9,11 +9,11 @@
         android:id="@+id/text_gallery"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginStart="8dp"
-        android:layout_marginTop="8dp"
-        android:layout_marginEnd="8dp"
+        android:layout_marginStart="@dimen/small_08"
+        android:layout_marginTop="@dimen/small_08"
+        android:layout_marginEnd="@dimen/small_08"
         android:textAlignment="center"
-        android:textSize="20sp"
+        android:textSize="@dimen/text_size_10"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index b4899f92..ee2fab0e 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -9,11 +9,11 @@
         android:id="@+id/text_home"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginStart="8dp"
-        android:layout_marginTop="8dp"
-        android:layout_marginEnd="8dp"
+        android:layout_marginStart="@dimen/small_08"
+        android:layout_marginTop="@dimen/small_08"
+        android:layout_marginEnd="@dimen/small_08"
         android:textAlignment="center"
-        android:textSize="20sp"
+        android:textSize="@dimen/text_size_10"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/fragment_invites.xml b/app/src/main/res/layout/fragment_invites.xml
index d6e5fe0d..46dcd657 100644
--- a/app/src/main/res/layout/fragment_invites.xml
+++ b/app/src/main/res/layout/fragment_invites.xml
@@ -12,12 +12,12 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical"
-            android:padding="16dp">
+            android:padding="@dimen/normal_01">
 
             <include layout="@layout/card_reward_driver"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginBottom="16dp"
+                android:layout_marginBottom="@dimen/normal_01"
                 android:visibility="visible" />
 
             <include layout="@layout/card_invites_by_link" />
@@ -35,7 +35,7 @@
         android:background="@color/lbryGreen"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:padding="16dp">
+        android:padding="@dimen/normal_01">
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
@@ -48,15 +48,15 @@
                 android:layout_gravity="center_vertical"
                 android:fontFamily="@font/inter"
                 android:text="@string/lbry_invite_program"
-                android:textSize="24sp"
+                android:textSize="@dimen/text_size_11"
                 android:textColor="@color/white" />
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:fontFamily="@font/inter"
-                android:textSize="16sp"
-                android:layout_marginTop="16dp"
+                android:textSize="@dimen/text_size_06"
+                android:layout_marginTop="@dimen/normal_01"
                 android:text="@string/earn_extra_credits_invites"
                 android:textColor="@color/white"
                 android:textFontWeight="300" />
@@ -66,8 +66,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:fontFamily="@font/inter"
-                android:textSize="16sp"
-                android:layout_marginTop="16dp"
+                android:textSize="@dimen/text_size_06"
+                android:layout_marginTop="@dimen/normal_01"
                 android:text="@string/invites_learn_more"
                 android:textColor="@color/white"
                 android:textFontWeight="300" />
diff --git a/app/src/main/res/layout/fragment_library.xml b/app/src/main/res/layout/fragment_library.xml
index a5f6eb14..a0720af2 100644
--- a/app/src/main/res/layout/fragment_library.xml
+++ b/app/src/main/res/layout/fragment_library.xml
@@ -8,13 +8,13 @@
         android:id="@+id/library_filter_card"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:layout_marginEnd="16dp"
-        android:layout_marginTop="16dp">
+        android:layout_marginStart="@dimen/normal_01"
+        android:layout_marginEnd="@dimen/normal_01"
+        android:layout_marginTop="@dimen/normal_01">
         <RelativeLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:padding="12dp">
+            android:padding="@dimen/small_12">
             <TextView
                 android:id="@+id/library_filter_link_downloads"
                 android:background="?attr/selectableItemBackground"
@@ -32,7 +32,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
-                android:layout_marginStart="24dp"
+                android:layout_marginStart="@dimen/normal_03"
                 android:layout_toEndOf="@id/library_filter_link_downloads"
                 android:fontFamily="@font/inter"
                 android:text="@string/purchases" />
@@ -43,15 +43,15 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerVertical="true"
-                android:layout_marginStart="24dp"
+                android:layout_marginStart="@dimen/normal_03"
                 android:layout_toEndOf="@id/library_filter_link_purchases"
                 android:fontFamily="@font/inter"
                 android:text="@string/history"
-                android:textSize="14sp" />
+                android:textSize="@dimen/text_size_04" />
             <ProgressBar
                 android:id="@+id/library_list_loading"
-                android:layout_width="20dp"
-                android:layout_height="20dp"
+                android:layout_width="@dimen/normal_02"
+                android:layout_height="@dimen/normal_02"
                 android:layout_alignParentEnd="true"
                 android:layout_centerVertical="true"
                 android:visibility="gone" />
@@ -66,7 +66,7 @@
                 android:text="@string/stats"
                 android:textColor="@color/lbryGreen"
                 android:textFontWeight="300"
-                android:textSize="12sp"
+                android:textSize="@dimen/text_size_02"
                 android:visibility="gone" />
         </RelativeLayout>
     </androidx.cardview.widget.CardView>
@@ -75,14 +75,14 @@
         android:layout_below="@id/library_filter_card"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:layout_marginEnd="16dp"
-        android:layout_marginTop="16dp"
+        android:layout_marginStart="@dimen/normal_01"
+        android:layout_marginEnd="@dimen/normal_01"
+        android:layout_marginTop="@dimen/normal_01"
         android:visibility="gone">
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:padding="8dp"
+            android:padding="@dimen/small_08"
             android:orientation="vertical">
 
             <RelativeLayout
@@ -100,17 +100,17 @@
                         android:text="@string/zero"
                         android:textColor="@color/lbryGreen"
                         android:textFontWeight="300"
-                        android:textSize="30sp" />
+                        android:textSize="@dimen/text_size_13" />
                     <TextView
                         android:id="@+id/library_storage_stat_unit"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginStart="3dp"
+                        android:layout_marginStart="@dimen/small_03"
                         android:fontFamily="@font/inter"
                         android:text="@string/mb"
                         android:textColor="@color/lbryGreen"
                         android:textFontWeight="300"
-                        android:textSize="20sp" />
+                        android:textSize="@dimen/text_size_10" />
                 </LinearLayout>
 
                 <TextView
@@ -120,18 +120,18 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_alignParentEnd="true"
-                    android:layout_marginTop="4dp"
+                    android:layout_marginTop="@dimen/small_04"
                     android:fontFamily="@font/inter"
                     android:text="@string/hide"
                     android:textFontWeight="300"
-                    android:textSize="12sp" />
+                    android:textSize="@dimen/text_size_02" />
             </RelativeLayout>
 
             <LinearLayout
                 android:id="@+id/library_storage_stat_distribution"
                 android:layout_width="match_parent"
-                android:layout_height="10dp"
-                android:layout_marginTop="4dp"
+                android:layout_height="@dimen/small_10"
+                android:layout_marginTop="@dimen/small_04"
                 android:orientation="horizontal"
                 android:weightSum="100"
                 android:visibility="gone">
@@ -139,25 +139,25 @@
                     android:id="@+id/library_storage_stat_video_bar"
                     android:background="@color/statsVideo"
                     android:layout_weight="0"
-                    android:layout_width="0dp"
+                    android:layout_width="@dimen/small_00"
                     android:layout_height="match_parent" />
                 <View
                     android:id="@+id/library_storage_stat_audio_bar"
                     android:background="@color/statsAudio"
                     android:layout_weight="0"
-                    android:layout_width="0dp"
+                    android:layout_width="@dimen/small_00"
                     android:layout_height="match_parent" />
                 <View
                     android:id="@+id/library_storage_stat_image_bar"
                     android:background="@color/statsImage"
                     android:layout_weight="0"
-                    android:layout_width="0dp"
+                    android:layout_width="@dimen/small_00"
                     android:layout_height="match_parent" />
                 <View
                     android:id="@+id/library_storage_stat_other_bar"
                     android:background="@color/statsOther"
                     android:layout_weight="0"
-                    android:layout_width="0dp"
+                    android:layout_width="@dimen/small_00"
                     android:layout_height="match_parent" />
             </LinearLayout>
 
@@ -165,13 +165,13 @@
                 android:id="@+id/library_storage_legend_video"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="4dp"
+                android:layout_marginTop="@dimen/small_04"
                 android:visibility="gone">
                 <View
                     android:id="@+id/library_storage_legend_video_icon"
                     android:background="@color/statsVideo"
-                    android:layout_width="10dp"
-                    android:layout_height="10dp"
+                    android:layout_width="@dimen/small_10"
+                    android:layout_height="@dimen/small_10"
                     android:layout_centerVertical="true" />
                 <TextView
                     android:layout_toEndOf="@id/library_storage_legend_video_icon"
@@ -180,9 +180,9 @@
                     android:layout_centerVertical="true"
                     android:fontFamily="@font/inter"
                     android:text="@string/video"
-                    android:layout_marginStart="4dp"
+                    android:layout_marginStart="@dimen/small_04"
                     android:textFontWeight="300"
-                    android:textSize="12sp" />
+                    android:textSize="@dimen/text_size_02" />
 
                 <TextView
                     android:id="@+id/library_storage_stat_video_size"
@@ -194,20 +194,20 @@
                     android:fontFamily="@font/inter"
                     android:text="@string/zero_mb"
                     android:textFontWeight="300"
-                    android:textSize="12sp" />
+                    android:textSize="@dimen/text_size_02" />
             </RelativeLayout>
 
             <RelativeLayout
                 android:id="@+id/library_storage_legend_audio"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="4dp"
+                android:layout_marginTop="@dimen/small_04"
                 android:visibility="gone">
                 <View
                     android:id="@+id/library_storage_legend_audio_icon"
                     android:background="@color/statsAudio"
-                    android:layout_width="10dp"
-                    android:layout_height="10dp"
+                    android:layout_width="@dimen/small_10"
+                    android:layout_height="@dimen/small_10"
                     android:layout_centerVertical="true" />
                 <TextView
                     android:layout_toEndOf="@id/library_storage_legend_audio_icon"
@@ -216,9 +216,9 @@
                     android:layout_centerVertical="true"
                     android:fontFamily="@font/inter"
                     android:text="@string/audio"
-                    android:layout_marginStart="4dp"
+                    android:layout_marginStart="@dimen/small_04"
                     android:textFontWeight="300"
-                    android:textSize="12sp" />
+                    android:textSize="@dimen/text_size_02" />
 
                 <TextView
                     android:id="@+id/library_storage_stat_audio_size"
@@ -230,20 +230,20 @@
                     android:fontFamily="@font/inter"
                     android:text="@string/zero_mb"
                     android:textFontWeight="300"
-                    android:textSize="12sp" />
+                    android:textSize="@dimen/text_size_02" />
             </RelativeLayout>
 
             <RelativeLayout
                 android:id="@+id/library_storage_legend_image"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="4dp"
+                android:layout_marginTop="@dimen/small_04"
                 android:visibility="gone">
                 <View
                     android:id="@+id/library_storage_legend_image_icon"
                     android:background="@color/statsImage"
-                    android:layout_width="10dp"
-                    android:layout_height="10dp"
+                    android:layout_width="@dimen/small_10"
+                    android:layout_height="@dimen/small_10"
                     android:layout_centerVertical="true" />
                 <TextView
                     android:layout_toEndOf="@id/library_storage_legend_image_icon"
@@ -252,9 +252,9 @@
                     android:layout_centerVertical="true"
                     android:fontFamily="@font/inter"
                     android:text="@string/images"
-                    android:layout_marginStart="4dp"
+                    android:layout_marginStart="@dimen/small_04"
                     android:textFontWeight="300"
-                    android:textSize="12sp" />
+                    android:textSize="@dimen/text_size_02" />
 
                 <TextView
                     android:id="@+id/library_storage_stat_image_size"
@@ -266,20 +266,20 @@
                     android:fontFamily="@font/inter"
                     android:text="@string/zero_mb"
                     android:textFontWeight="300"
-                    android:textSize="12sp" />
+                    android:textSize="@dimen/text_size_02" />
             </RelativeLayout>
 
             <RelativeLayout
                 android:id="@+id/library_storage_legend_other"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="4dp"
+                android:layout_marginTop="@dimen/small_04"
                 android:visibility="gone">
                 <View
                     android:id="@+id/library_storage_legend_other_icon"
                     android:background="@color/statsOther"
-                    android:layout_width="10dp"
-                    android:layout_height="10dp"
+                    android:layout_width="@dimen/small_10"
+                    android:layout_height="@dimen/small_10"
                     android:layout_centerVertical="true" />
                 <TextView
                     android:layout_toEndOf="@id/library_storage_legend_other_icon"
@@ -288,9 +288,9 @@
                     android:layout_centerVertical="true"
                     android:fontFamily="@font/inter"
                     android:text="@string/other"
-                    android:layout_marginStart="4dp"
+                    android:layout_marginStart="@dimen/small_04"
                     android:textFontWeight="300"
-                    android:textSize="12sp" />
+                    android:textSize="@dimen/text_size_02" />
 
                 <TextView
                     android:id="@+id/library_storage_stat_other_size"
@@ -302,7 +302,7 @@
                     android:fontFamily="@font/inter"
                     android:text="@string/zero_mb"
                     android:textFontWeight="300"
-                    android:textSize="12sp" />
+                    android:textSize="@dimen/text_size_02" />
             </RelativeLayout>
         </LinearLayout>
     </androidx.cardview.widget.CardView>
@@ -324,11 +324,11 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_centerInParent="true"
-            android:padding="36dp">
+            android:padding="@dimen/normal_06">
             <ImageView
                 android:layout_gravity="center_horizontal"
-                android:layout_width="160dp"
-                android:layout_height="300dp"
+                android:layout_width="@dimen/large_11"
+                android:layout_height="@dimen/large_47"
                 android:adjustViewBounds="true"
                 android:src="@drawable/gerbil_happy" />
             <TextView
@@ -336,11 +336,11 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_horizontal"
-                android:layout_marginTop="16dp"
+                android:layout_marginTop="@dimen/normal_01"
                 android:fontFamily="@font/inter"
                 android:text="@string/library_no_downloads"
                 android:textAlignment="center"
-                android:textSize="16sp"
+                android:textSize="@dimen/text_size_06"
                 android:textFontWeight="300" />
         </LinearLayout>
     </RelativeLayout>
diff --git a/app/src/main/res/layout/fragment_publish.xml b/app/src/main/res/layout/fragment_publish.xml
index 04ba7371..186f3076 100644
--- a/app/src/main/res/layout/fragment_publish.xml
+++ b/app/src/main/res/layout/fragment_publish.xml
@@ -8,7 +8,7 @@
     <RelativeLayout
         android:id="@+id/publish_main_actions"
         android:layout_width="match_parent"
-        android:layout_height="300dp">
+        android:layout_height="@dimen/large_47">
         <androidx.camera.view.PreviewView
             android:id="@+id/publish_camera_preview"
             android:layout_width="match_parent"
@@ -24,17 +24,17 @@
                 android:clickable="true"
                 android:foreground="?attr/selectableItemBackground"
                 android:layout_weight="1"
-                android:layout_width="0dp"
+                android:layout_width="@dimen/small_00"
                 android:layout_height="match_parent"
-                android:layout_marginStart="-1.5dp">
+                android:layout_marginStart="@dimen/negative_small_01.5">
                 <LinearLayout
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_centerInParent="true"
                     android:orientation="vertical">
                     <ImageView
-                        android:layout_width="48dp"
-                        android:layout_height="48dp"
+                        android:layout_width="@dimen/normal_09"
+                        android:layout_height="@dimen/normal_09"
                         android:layout_gravity="center_horizontal"
                         android:src="@drawable/ic_record"
                         app:tint="@color/white" />
@@ -42,22 +42,22 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_gravity="center_horizontal"
-                        android:layout_marginTop="4dp"
+                        android:layout_marginTop="@dimen/small_04"
                         android:fontFamily="@font/inter"
                         android:text="@string/record"
                         android:textAllCaps="true"
                         android:textColor="@color/white"
-                        android:textSize="16sp" />
+                        android:textSize="@dimen/text_size_06" />
                 </LinearLayout>
             </RelativeLayout>
             <RelativeLayout
                 android:layout_weight="1"
-                android:layout_width="0dp"
+                android:layout_width="@dimen/small_00"
                 android:layout_height="match_parent">
                 <View
                     android:id="@+id/publish_vertical_divider"
                     android:background="@color/publishBackground"
-                    android:layout_width="3dp"
+                    android:layout_width="@dimen/small_03"
                     android:layout_height="match_parent" />
                 <RelativeLayout
                     android:id="@+id/publish_photo_button"
@@ -66,15 +66,15 @@
                     android:foreground="?attr/selectableItemBackground"
                     android:layout_toEndOf="@id/publish_vertical_divider"
                     android:layout_width="match_parent"
-                    android:layout_height="148.5dp">
+                    android:layout_height="@dimen/large_08.5">
                     <LinearLayout
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_centerInParent="true"
                         android:orientation="vertical">
                         <ImageView
-                            android:layout_width="48dp"
-                            android:layout_height="48dp"
+                            android:layout_width="@dimen/normal_09"
+                            android:layout_height="@dimen/normal_09"
                             android:layout_gravity="center_horizontal"
                             android:src="@drawable/ic_photo"
                             app:tint="@color/white" />
@@ -82,12 +82,12 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_gravity="center_horizontal"
-                            android:layout_marginTop="4dp"
+                            android:layout_marginTop="@dimen/small_04"
                             android:fontFamily="@font/inter"
                             android:text="@string/take_photo"
                             android:textAllCaps="true"
                             android:textColor="@color/white"
-                            android:textSize="16sp" />
+                            android:textSize="@dimen/text_size_06" />
                     </LinearLayout>
                 </RelativeLayout>
 
@@ -95,7 +95,7 @@
                     android:id="@+id/publish_photo_upload_divider"
                     android:background="@color/publishBackground"
                     android:layout_width="match_parent"
-                    android:layout_height="3dp"
+                    android:layout_height="@dimen/small_03"
                     android:layout_below="@id/publish_photo_button" />
 
                 <RelativeLayout
@@ -113,8 +113,8 @@
                         android:layout_centerInParent="true"
                         android:orientation="vertical">
                         <ImageView
-                            android:layout_width="48dp"
-                            android:layout_height="48dp"
+                            android:layout_width="@dimen/normal_09"
+                            android:layout_height="@dimen/normal_09"
                             android:layout_gravity="center_horizontal"
                             android:src="@drawable/ic_upload"
                             app:tint="@color/white" />
@@ -122,12 +122,12 @@
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_gravity="center_horizontal"
-                            android:layout_marginTop="4dp"
+                            android:layout_marginTop="@dimen/small_04"
                             android:fontFamily="@font/inter"
                             android:text="@string/upload_file"
                             android:textAllCaps="true"
                             android:textColor="@color/white"
-                            android:textSize="16sp" />
+                            android:textSize="@dimen/text_size_06" />
                     </LinearLayout>
                 </RelativeLayout>
             </RelativeLayout>
@@ -139,17 +139,17 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:layout_below="@id/publish_main_actions"
-        android:layout_marginTop="3dp" />
+        android:layout_marginTop="@dimen/small_03" />
     <TextView
         android:id="@+id/publish_grid_no_videos"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_below="@id/publish_main_actions"
-        android:layout_margin="16dp"
+        android:layout_margin="@dimen/normal_01"
         android:fontFamily="@font/inter"
         android:text="@string/no_videos_found"
         android:textColor="@color/white"
-        android:textSize="16sp"
+        android:textSize="@dimen/text_size_06"
         android:visibility="gone" />
     <RelativeLayout
         android:id="@+id/publish_grid_loading"
@@ -163,16 +163,16 @@
             android:layout_centerInParent="true"
             android:orientation="horizontal">
             <ProgressBar
-                android:layout_width="20dp"
-                android:layout_height="20dp" />
+                android:layout_width="@dimen/normal_02"
+                android:layout_height="@dimen/normal_02" />
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="8dp"
+                android:layout_marginStart="@dimen/small_08"
                 android:fontFamily="@font/inter"
                 android:text="@string/loading_videos"
                 android:textColor="@color/white"
-                android:textSize="14sp" />
+                android:textSize="@dimen/text_size_04" />
         </LinearLayout>
     </RelativeLayout>
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_publish_form.xml b/app/src/main/res/layout/fragment_publish_form.xml
index a5860792..249517dd 100644
--- a/app/src/main/res/layout/fragment_publish_form.xml
+++ b/app/src/main/res/layout/fragment_publish_form.xml
@@ -12,14 +12,14 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:paddingBottom="16dp"
+            android:paddingBottom="@dimen/normal_01"
             android:orientation="vertical">
             <RelativeLayout
                 android:id="@+id/publish_form_media_container"
                 android:clickable="true"
                 android:foreground="?attr/selectableItemBackground"
                 android:layout_width="match_parent"
-                android:layout_height="240dp"
+                android:layout_height="@dimen/large_31"
                 android:background="@android:color/black">
 
                 <ImageView
@@ -33,39 +33,39 @@
                     android:layout_alignParentEnd="true"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="4dp"
-                    android:layout_marginTop="4dp"
+                    android:layout_marginStart="@dimen/small_04"
+                    android:layout_marginTop="@dimen/small_04"
                     android:orientation="horizontal"
-                    android:paddingTop="2dp"
-                    android:paddingBottom="2dp"
-                    android:paddingStart="8dp"
-                    android:paddingEnd="8dp"
+                    android:paddingTop="@dimen/small_02"
+                    android:paddingBottom="@dimen/small_02"
+                    android:paddingStart="@dimen/small_08"
+                    android:paddingEnd="@dimen/small_08"
                     android:visibility="gone">
                     <ProgressBar
-                        android:layout_width="16dp"
-                        android:layout_height="16dp" />
+                        android:layout_width="@dimen/normal_01"
+                        android:layout_height="@dimen/normal_01" />
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:layout_marginStart="4dp"
+                        android:layout_marginStart="@dimen/small_04"
                         android:fontFamily="@font/inter"
                         android:text="@string/uploading_thumbnail"
                         android:textColor="@color/white"
                         android:textFontWeight="300"
-                        android:textSize="12sp" />
+                        android:textSize="@dimen/text_size_02" />
                 </LinearLayout>
 
                 <RelativeLayout
                     android:background="@drawable/bg_small_icon"
-                    android:layout_width="24dp"
-                    android:layout_height="24dp"
-                    android:layout_marginStart="16dp"
-                    android:layout_marginBottom="16dp"
+                    android:layout_width="@dimen/normal_03"
+                    android:layout_height="@dimen/normal_03"
+                    android:layout_marginStart="@dimen/normal_01"
+                    android:layout_marginBottom="@dimen/normal_01"
                     android:layout_alignParentBottom="true"
                     android:layout_centerHorizontal="true">
                     <ImageView
-                        android:layout_width="16dp"
-                        android:layout_height="16dp"
+                        android:layout_width="@dimen/normal_01"
+                        android:layout_height="@dimen/normal_01"
                         android:layout_centerInParent="true"
                         android:src="@drawable/ic_edit"
                         app:tint="@color/white" />
@@ -81,7 +81,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="vertical"
-                android:padding="16dp">
+                android:padding="@dimen/normal_01">
 
                 <androidx.cardview.widget.CardView
                     android:layout_width="match_parent"
@@ -90,7 +90,7 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:orientation="vertical"
-                        android:padding="16dp">
+                        android:padding="@dimen/normal_01">
                         <com.google.android.material.textfield.TextInputLayout
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
@@ -103,13 +103,13 @@
                                 android:inputType="textMultiLine"
                                 android:singleLine="false"
                                 android:textFontWeight="300"
-                                android:textSize="14sp" />
+                                android:textSize="@dimen/text_size_04" />
                         </com.google.android.material.textfield.TextInputLayout>
 
                         <com.google.android.material.textfield.TextInputLayout
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:layout_marginTop="16dp"
+                            android:layout_marginTop="@dimen/normal_01"
                             android:hint="@string/description">
                             <com.google.android.material.textfield.TextInputEditText
                                 android:id="@+id/publish_form_input_description"
@@ -118,7 +118,7 @@
                                 android:fontFamily="@font/inter"
                                 android:singleLine="true"
                                 android:textFontWeight="300"
-                                android:textSize="14sp" />
+                                android:textSize="@dimen/text_size_04" />
                         </com.google.android.material.textfield.TextInputLayout>
                     </LinearLayout>
                 </androidx.cardview.widget.CardView>
@@ -127,23 +127,23 @@
                     android:id="@+id/publish_form_video_opt_card"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="16dp"
+                    android:layout_marginTop="@dimen/normal_01"
                     android:visibility="gone">
                     <LinearLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:orientation="vertical"
-                        android:padding="16dp">
+                        android:padding="@dimen/normal_01">
                         <RelativeLayout
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:layout_marginBottom="8dp">
+                            android:layout_marginBottom="@dimen/small_08">
                             <TextView
                                 android:layout_centerVertical="true"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:fontFamily="@font/inter"
-                                android:textSize="20sp"
+                                android:textSize="@dimen/text_size_10"
                                 android:text="@string/video_optimization" />
                             <TextView
                                 android:id="@+id/publish_form_video_opt_elapsed"
@@ -153,7 +153,7 @@
                                 android:layout_alignParentEnd="true"
                                 android:fontFamily="@font/inter"
                                 android:textFontWeight="300"
-                                android:textSize="16sp" />
+                                android:textSize="@dimen/text_size_06" />
                         </RelativeLayout>
                         <TextView
                             android:id="@+id/publish_form_video_opt_status"
@@ -162,13 +162,13 @@
                             android:fontFamily="@font/inter"
                             android:text="@string/video_being_optimized"
                             android:textFontWeight="300"
-                            android:textSize="12sp" />
+                            android:textSize="@dimen/text_size_02" />
 
                         <ProgressBar
                             android:id="@+id/publish_form_video_opt_real_progress"
-                            android:layout_marginTop="8dp"
+                            android:layout_marginTop="@dimen/small_08"
                             android:layout_width="match_parent"
-                            android:layout_height="4dp"
+                            android:layout_height="@dimen/small_04"
                             android:layout_centerVertical="true"
                             android:visibility="gone"
                             style="?android:progressBarStyleHorizontal"
@@ -178,13 +178,13 @@
                             android:id="@+id/publish_form_video_opt_container"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:layout_marginTop="8dp">
+                            android:layout_marginTop="@dimen/small_08">
                             <ProgressBar
                                 android:id="@+id/publish_form_video_opt_progress"
-                                android:layout_width="20dp"
-                                android:layout_height="20dp"
+                                android:layout_width="@dimen/normal_02"
+                                android:layout_height="@dimen/normal_02"
                                 android:layout_centerVertical="true"
-                                android:layout_marginEnd="16dp"
+                                android:layout_marginEnd="@dimen/normal_01"
                                 android:visibility="gone" />
 
                             <TextView
@@ -195,7 +195,7 @@
                                 android:layout_toEndOf="@id/publish_form_video_opt_progress"
                                 android:fontFamily="@font/inter"
                                 android:textFontWeight="300"
-                                android:textSize="14sp" />
+                                android:textSize="@dimen/text_size_04" />
                         </RelativeLayout>
                     </LinearLayout>
                 </androidx.cardview.widget.CardView>
@@ -203,18 +203,18 @@
                 <androidx.cardview.widget.CardView
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="16dp">
+                    android:layout_marginTop="@dimen/normal_01">
                     <LinearLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:orientation="vertical"
-                        android:padding="16dp">
+                        android:padding="@dimen/normal_01">
                         <TextView
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:layout_marginBottom="8dp"
+                            android:layout_marginBottom="@dimen/small_08"
                             android:fontFamily="@font/inter"
-                            android:textSize="20sp"
+                            android:textSize="@dimen/text_size_10"
                             android:text="@string/tags" />
                         <include layout="@layout/container_inline_tag_form" />
                     </LinearLayout>
@@ -223,27 +223,27 @@
                 <androidx.cardview.widget.CardView
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="16dp">
+                    android:layout_marginTop="@dimen/normal_01">
                     <LinearLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:orientation="vertical"
-                        android:padding="16dp">
+                        android:padding="@dimen/normal_01">
                         <RelativeLayout
                             android:layout_width="match_parent"
                             android:layout_height="match_parent"
-                            android:layout_marginBottom="8dp">
+                            android:layout_marginBottom="@dimen/small_08">
                             <TextView
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:layout_centerVertical="true"
                                 android:fontFamily="@font/inter"
-                                android:textSize="20sp"
+                                android:textSize="@dimen/text_size_10"
                                 android:text="@string/channel" />
                             <ProgressBar
                                 android:id="@+id/publish_form_loading_channels"
-                                android:layout_width="20dp"
-                                android:layout_height="20dp"
+                                android:layout_width="@dimen/normal_02"
+                                android:layout_height="@dimen/normal_02"
                                 android:layout_alignParentEnd="true"
                                 android:layout_centerVertical="true"
                                 android:visibility="gone" />
@@ -252,7 +252,7 @@
                             android:id="@+id/publish_form_channel_spinner"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:layout_marginTop="4dp" />
+                            android:layout_marginTop="@dimen/small_04" />
                         <include layout="@layout/container_inline_channel_form" />
                     </LinearLayout>
                 </androidx.cardview.widget.CardView>
@@ -260,22 +260,22 @@
                 <androidx.cardview.widget.CardView
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="16dp">
+                    android:layout_marginTop="@dimen/normal_01">
                     <LinearLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:orientation="vertical"
-                        android:padding="16dp">
+                        android:padding="@dimen/normal_01">
                         <RelativeLayout
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content">
                             <TextView
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:layout_marginBottom="8dp"
+                                android:layout_marginBottom="@dimen/small_08"
                                 android:layout_centerVertical="true"
                                 android:fontFamily="@font/inter"
-                                android:textSize="20sp"
+                                android:textSize="@dimen/text_size_10"
                                 android:text="@string/price" />
                             <com.google.android.material.switchmaterial.SwitchMaterial
                                 android:id="@+id/publish_form_price_switch"
@@ -292,7 +292,7 @@
                             android:fontFamily="@font/inter"
                             android:text="@string/free_publish"
                             android:textFontWeight="300"
-                            android:textSize="14sp" />
+                            android:textSize="@dimen/text_size_04" />
 
                         <RelativeLayout
                             android:id="@+id/publish_form_price_container"
@@ -301,7 +301,7 @@
                             android:visibility="gone">
                             <com.google.android.material.textfield.TextInputLayout
                                 android:id="@+id/publish_form_price_layout"
-                                android:layout_width="100dp"
+                                android:layout_width="@dimen/normal_22"
                                 android:layout_height="wrap_content"
                                 android:hint="@string/price">
                                 <com.google.android.material.textfield.TextInputEditText
@@ -310,18 +310,18 @@
                                     android:layout_height="wrap_content"
                                     android:fontFamily="@font/inter"
                                     android:textFontWeight="300"
-                                    android:textSize="14sp"
+                                    android:textSize="@dimen/text_size_04"
                                     android:inputType="numberDecimal" />
                             </com.google.android.material.textfield.TextInputLayout>
 
                             <androidx.appcompat.widget.AppCompatSpinner
                                 android:id="@+id/publish_form_currency_spinner"
                                 android:entries="@array/publish_currencies"
-                                android:layout_width="160dp"
+                                android:layout_width="@dimen/large_11"
                                 android:layout_height="wrap_content"
                                 android:layout_toEndOf="@+id/publish_form_price_layout"
-                                android:layout_marginStart="4dp"
-                                android:layout_marginTop="24dp" />
+                                android:layout_marginStart="@dimen/small_04"
+                                android:layout_marginTop="@dimen/normal_03" />
                         </RelativeLayout>
                     </LinearLayout>
                 </androidx.cardview.widget.CardView>
@@ -329,12 +329,12 @@
                 <androidx.cardview.widget.CardView
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="16dp">
+                    android:layout_marginTop="@dimen/normal_01">
                     <LinearLayout
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:orientation="vertical"
-                        android:padding="16dp">
+                        android:padding="@dimen/normal_01">
                         <RelativeLayout
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content">
@@ -342,9 +342,9 @@
                                 android:layout_centerVertical="true"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:layout_marginBottom="8dp"
+                                android:layout_marginBottom="@dimen/small_08"
                                 android:fontFamily="@font/inter"
-                                android:textSize="20sp"
+                                android:textSize="@dimen/text_size_10"
                                 android:text="@string/content_address" />
                             <TextView
                                 android:id="@+id/publish_form_generate_address"
@@ -354,9 +354,9 @@
                                 android:layout_centerVertical="true"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:layout_marginBottom="8dp"
+                                android:layout_marginBottom="@dimen/small_08"
                                 android:fontFamily="@font/inter"
-                                android:textSize="14sp"
+                                android:textSize="@dimen/text_size_04"
                                 android:text="@string/randomize"
                                 android:textFontWeight="300" />
                         </RelativeLayout>
@@ -366,12 +366,12 @@
                             android:fontFamily="@font/inter"
                             android:text="@string/content_address_desc"
                             android:textFontWeight="300"
-                            android:textSize="14sp" />
+                            android:textSize="@dimen/text_size_04" />
 
                         <com.google.android.material.textfield.TextInputLayout
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:layout_marginTop="16dp"
+                            android:layout_marginTop="@dimen/normal_01"
                             android:hint="@string/address">
                             <com.google.android.material.textfield.TextInputEditText
                                 android:id="@+id/publish_form_input_address"
@@ -380,28 +380,28 @@
                                 android:fontFamily="@font/inter"
                                 android:inputType="textNoSuggestions"
                                 android:textFontWeight="300"
-                                android:textSize="14sp" />
+                                android:textSize="@dimen/text_size_04" />
                         </com.google.android.material.textfield.TextInputLayout>
 
                         <TextView
                             android:id="@+id/publish_form_inline_address_invalid"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:layout_marginTop="4dp"
+                            android:layout_marginTop="@dimen/small_04"
                             android:fontFamily="@font/inter"
                             android:text="@string/address_invalid_characters"
                             android:textColor="@color/red"
                             android:textFontWeight="300"
-                            android:textSize="12sp"
+                            android:textSize="@dimen/text_size_02"
                             android:visibility="invisible" />
 
                         <RelativeLayout
-                            android:layout_marginTop="16dp"
+                            android:layout_marginTop="@dimen/normal_01"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content">
                             <com.google.android.material.textfield.TextInputLayout
                                 android:id="@+id/publish_form_input_layout_deposit"
-                                android:layout_width="100dp"
+                                android:layout_width="@dimen/normal_22"
                                 android:layout_height="wrap_content"
                                 android:hint="@string/deposit">
                                 <com.google.android.material.textfield.TextInputEditText
@@ -411,7 +411,7 @@
                                     android:layout_height="wrap_content"
                                     android:singleLine="true"
                                     android:text="@string/min_deposit"
-                                    android:textSize="14sp"
+                                    android:textSize="@dimen/text_size_04"
                                     android:inputType="numberDecimal" />
                             </com.google.android.material.textfield.TextInputLayout>
 
@@ -420,26 +420,26 @@
                                 android:layout_toEndOf="@id/publish_form_input_layout_deposit"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:layout_marginStart="8dp"
-                                android:layout_marginTop="30dp"
+                                android:layout_marginStart="@dimen/small_08"
+                                android:layout_marginTop="@dimen/normal_04_02"
                                 android:fontFamily="@font/inter"
                                 android:text="@string/lbc"
                                 android:textAllCaps="true"
-                                android:textSize="10sp"
+                                android:textSize="@dimen/text_size_00"
                                 android:textFontWeight="300" />
 
                             <LinearLayout
                                 android:id="@+id/publish_form_inline_balance_container"
                                 android:layout_toEndOf="@id/publish_form_input_currency"
-                                android:layout_marginStart="24dp"
-                                android:layout_marginTop="28dp"
+                                android:layout_marginStart="@dimen/normal_03"
+                                android:layout_marginTop="@dimen/normal_04"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:orientation="horizontal"
                                 android:visibility="invisible">
                                 <ImageView
-                                    android:layout_width="12dp"
-                                    android:layout_height="12dp"
+                                    android:layout_width="@dimen/small_12"
+                                    android:layout_height="@dimen/small_12"
                                     android:layout_gravity="center_vertical"
                                     android:src="@drawable/ic_credits" />
                                 <TextView
@@ -448,18 +448,18 @@
                                     android:layout_height="wrap_content"
                                     android:fontFamily="@font/inter"
                                     android:textFontWeight="300"
-                                    android:layout_marginStart="2dp" />
+                                    android:layout_marginStart="@dimen/small_02" />
                             </LinearLayout>
                         </RelativeLayout>
 
                         <TextView
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:layout_marginTop="4dp"
+                            android:layout_marginTop="@dimen/small_04"
                             android:fontFamily="@font/inter"
                             android:text="@string/deposit_remains_yours"
                             android:textFontWeight="300"
-                            android:textSize="12sp" />
+                            android:textSize="@dimen/text_size_02" />
                     </LinearLayout>
                 </androidx.cardview.widget.CardView>
 
@@ -471,18 +471,18 @@
                     <androidx.cardview.widget.CardView
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_marginTop="16dp">
+                        android:layout_marginTop="@dimen/normal_01">
                         <LinearLayout
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:orientation="vertical"
-                            android:padding="16dp">
+                            android:padding="@dimen/normal_01">
                             <TextView
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:layout_marginBottom="8dp"
+                                android:layout_marginBottom="@dimen/small_08"
                                 android:fontFamily="@font/inter"
-                                android:textSize="20sp"
+                                android:textSize="@dimen/text_size_10"
                                 android:text="@string/additional_options" />
                             <TextView
                                 android:layout_width="wrap_content"
@@ -490,32 +490,32 @@
                                 android:fontFamily="@font/inter"
                                 android:text="@string/language"
                                 android:textFontWeight="300"
-                                android:textSize="14sp" />
+                                android:textSize="@dimen/text_size_04" />
                             <androidx.appcompat.widget.AppCompatSpinner
                                 android:id="@+id/publish_form_language_spinner"
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
-                                android:layout_marginTop="4dp" />
+                                android:layout_marginTop="@dimen/small_04" />
 
                             <TextView
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:layout_marginTop="8dp"
+                                android:layout_marginTop="@dimen/small_08"
                                 android:fontFamily="@font/inter"
                                 android:text="@string/license"
                                 android:textFontWeight="300"
-                                android:textSize="14sp" />
+                                android:textSize="@dimen/text_size_04" />
                             <androidx.appcompat.widget.AppCompatSpinner
                                 android:id="@+id/publish_form_license_spinner"
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
-                                android:layout_marginTop="4dp" />
+                                android:layout_marginTop="@dimen/small_04" />
 
                             <com.google.android.material.textfield.TextInputLayout
                                 android:id="@+id/publish_form_license_other_layout"
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
-                                android:layout_marginTop="16dp"
+                                android:layout_marginTop="@dimen/normal_01"
                                 android:hint="@string/license_desc"
                                 android:visibility="gone">
                                 <com.google.android.material.textfield.TextInputEditText
@@ -525,7 +525,7 @@
                                     android:fontFamily="@font/inter"
                                     android:inputType="textNoSuggestions"
                                     android:textFontWeight="300"
-                                    android:textSize="14sp" />
+                                    android:textSize="@dimen/text_size_04" />
                             </com.google.android.material.textfield.TextInputLayout>
                         </LinearLayout>
                     </androidx.cardview.widget.CardView>
@@ -539,8 +539,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="end"
-                android:layout_marginTop="24dp"
-                android:layout_marginEnd="16dp"
+                android:layout_marginTop="@dimen/normal_03"
+                android:layout_marginEnd="@dimen/normal_01"
                 android:fontFamily="@font/inter"
                 android:text="@string/show_extra_fields"
                 android:textFontWeight="300" />
@@ -548,9 +548,9 @@
             <RelativeLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:paddingStart="16dp"
-                android:paddingEnd="16dp"
-                android:layout_marginTop="24dp">
+                android:paddingStart="@dimen/normal_01"
+                android:paddingEnd="@dimen/normal_01"
+                android:layout_marginTop="@dimen/normal_03">
                 <TextView
                     android:id="@+id/publish_form_cancel"
                     android:background="?attr/selectableItemBackground"
@@ -558,7 +558,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_centerVertical="true"
-                    android:layout_marginTop="24dp"
+                    android:layout_marginTop="@dimen/normal_03"
                     android:fontFamily="@font/inter"
                     android:text="@string/cancel"
                     android:textFontWeight="300" />
@@ -567,9 +567,9 @@
                 <ProgressBar
                     android:id="@+id/publish_form_publishing"
                     android:layout_centerVertical="true"
-                    android:layout_width="20dp"
-                    android:layout_height="20dp"
-                    android:layout_marginEnd="16dp"
+                    android:layout_width="@dimen/normal_02"
+                    android:layout_height="@dimen/normal_02"
+                    android:layout_marginEnd="@dimen/normal_01"
                     android:layout_toStartOf="@id/publish_form_publish_button"
                     android:visibility="gone" />
                 <com.google.android.material.button.MaterialButton
diff --git a/app/src/main/res/layout/fragment_publishes.xml b/app/src/main/res/layout/fragment_publishes.xml
index 9168ccc2..f94fd496 100644
--- a/app/src/main/res/layout/fragment_publishes.xml
+++ b/app/src/main/res/layout/fragment_publishes.xml
@@ -7,17 +7,17 @@
     android:focusedByDefault="true">
     <ProgressBar
         android:id="@+id/publishes_list_big_loading"
-        android:layout_width="36dp"
-        android:layout_height="36dp"
+        android:layout_width="@dimen/normal_06"
+        android:layout_height="@dimen/normal_06"
         android:layout_centerInParent="true"
         android:visibility="gone" />
     <ProgressBar
         android:id="@+id/publishes_list_loading"
-        android:layout_width="20dp"
-        android:layout_height="20dp"
+        android:layout_width="@dimen/normal_02"
+        android:layout_height="@dimen/normal_02"
         android:layout_alignParentEnd="true"
-        android:layout_marginTop="16dp"
-        android:layout_marginEnd="16dp"
+        android:layout_marginTop="@dimen/normal_01"
+        android:layout_marginEnd="@dimen/normal_01"
         android:visibility="gone" />
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/publishes_list"
@@ -35,28 +35,28 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_centerInParent="true"
-            android:padding="36dp">
+            android:padding="@dimen/normal_06">
             <ImageView
                 android:layout_gravity="center_horizontal"
-                android:layout_width="160dp"
-                android:layout_height="300dp"
+                android:layout_width="@dimen/large_11"
+                android:layout_height="@dimen/large_47"
                 android:adjustViewBounds="true"
                 android:src="@drawable/gerbil_happy" />
             <TextView
                 android:text="@string/no_publishes_created"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="24dp"
+                android:layout_marginTop="@dimen/normal_03"
                 android:layout_gravity="center_horizontal"
                 android:fontFamily="@font/inter"
                 android:textAlignment="center"
-                android:textSize="16sp"
+                android:textSize="@dimen/text_size_06"
                 android:textFontWeight="300"/>
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/publishes_create_button"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="24dp"
+                android:layout_marginTop="@dimen/normal_03"
                 android:fontFamily="@font/inter"
                 android:text="@string/new_publish"  />
         </LinearLayout>
@@ -68,8 +68,8 @@
         android:layout_height="wrap_content"
         android:layout_alignParentEnd="true"
         android:layout_alignParentBottom="true"
-        android:layout_marginEnd="16dp"
-        android:layout_marginBottom="16dp"
+        android:layout_marginEnd="@dimen/normal_01"
+        android:layout_marginBottom="@dimen/normal_01"
         android:src="@drawable/ic_add"
         android:visibility="gone" />
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_rewards.xml b/app/src/main/res/layout/fragment_rewards.xml
index 9d9e82ef..86c04223 100644
--- a/app/src/main/res/layout/fragment_rewards.xml
+++ b/app/src/main/res/layout/fragment_rewards.xml
@@ -7,9 +7,9 @@
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:paddingTop="16dp"
-        android:paddingStart="16dp"
-        android:paddingEnd="16dp">
+        android:paddingTop="@dimen/normal_01"
+        android:paddingStart="@dimen/normal_01"
+        android:paddingEnd="@dimen/normal_01">
         <androidx.cardview.widget.CardView
             android:id="@+id/rewards_filter_card"
             android:layout_width="match_parent"
@@ -17,7 +17,7 @@
             <RelativeLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:padding="12dp">
+                android:padding="@dimen/small_12">
                 <TextView
                     android:id="@+id/rewards_filter_link_unclaimed"
                     android:background="?attr/selectableItemBackground"
@@ -35,15 +35,15 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_centerVertical="true"
-                    android:layout_marginStart="16dp"
+                    android:layout_marginStart="@dimen/normal_01"
                     android:layout_toEndOf="@id/rewards_filter_link_unclaimed"
                     android:fontFamily="@font/inter"
                     android:text="@string/all"
-                    android:textSize="14sp" />
+                    android:textSize="@dimen/text_size_04" />
                 <ProgressBar
                     android:id="@+id/rewards_list_loading"
-                    android:layout_width="20dp"
-                    android:layout_height="20dp"
+                    android:layout_width="@dimen/normal_02"
+                    android:layout_height="@dimen/normal_02"
                     android:layout_alignParentEnd="true"
                     android:layout_centerVertical="true"
                     android:visibility="gone" />
@@ -55,7 +55,7 @@
             android:layout_below="@id/rewards_filter_card"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:paddingTop="16dp" />
+            android:paddingTop="@dimen/normal_01" />
     </RelativeLayout>
 
     <include layout="@layout/container_sdk_initializing" />
@@ -65,7 +65,7 @@
         android:background="@color/lbryGreen"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:padding="16dp">
+        android:padding="@dimen/normal_01">
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
@@ -76,9 +76,9 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content">
                 <io.lbry.browser.ui.controls.SolidIconView
-                    android:layout_width="36dp"
-                    android:layout_height="36dp"
-                    android:textSize="24dp"
+                    android:layout_width="@dimen/normal_06"
+                    android:layout_height="@dimen/normal_06"
+                    android:textSize="@dimen/normal_03"
                     android:layout_gravity="center_vertical"
                     android:text="@string/fa_award"
                     android:textColor="@color/white" />
@@ -87,9 +87,9 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_vertical"
-                    android:layout_marginStart="8dp"
+                    android:layout_marginStart="@dimen/small_08"
                     android:fontFamily="@font/inter"
-                    android:textSize="24sp"
+                    android:textSize="@dimen/text_size_11"
                     android:textColor="@color/white" />
             </LinearLayout>
 
@@ -97,8 +97,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:fontFamily="@font/inter"
-                android:textSize="16sp"
-                android:layout_marginTop="16dp"
+                android:textSize="@dimen/text_size_06"
+                android:layout_marginTop="@dimen/normal_01"
                 android:text="@string/lbry_credits_allow"
                 android:textColor="@color/white"
                 android:textFontWeight="300" />
@@ -108,8 +108,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:fontFamily="@font/inter"
-                android:textSize="16sp"
-                android:layout_marginTop="16dp"
+                android:textSize="@dimen/text_size_06"
+                android:layout_marginTop="@dimen/normal_01"
                 android:text="@string/free_credits_worth"
                 android:textColor="@color/white"
                 android:textFontWeight="300" />
@@ -119,8 +119,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:fontFamily="@font/inter"
-                android:textSize="16sp"
-                android:layout_marginTop="16dp"
+                android:textSize="@dimen/text_size_06"
+                android:layout_marginTop="@dimen/normal_01"
                 android:text="@string/rewards_learn_more"
                 android:textColor="@color/white"
                 android:textFontWeight="300" />
diff --git a/app/src/main/res/layout/fragment_search.xml b/app/src/main/res/layout/fragment_search.xml
index 761835c6..f0a9ec2a 100644
--- a/app/src/main/res/layout/fragment_search.xml
+++ b/app/src/main/res/layout/fragment_search.xml
@@ -8,10 +8,10 @@
 
     <ProgressBar
         android:id="@+id/search_loading"
-        android:layout_width="20dp"
-        android:layout_height="20dp"
-        android:layout_marginTop="8dp"
-        android:layout_marginEnd="8dp"
+        android:layout_width="@dimen/normal_02"
+        android:layout_height="@dimen/normal_02"
+        android:layout_marginTop="@dimen/small_08"
+        android:layout_marginEnd="@dimen/small_08"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintRight_toRightOf="parent"/>
 
@@ -24,14 +24,14 @@
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:padding="32dp">
+        android:padding="@dimen/normal_05">
         <TextView
             android:id="@+id/search_no_results"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_centerInParent="true"
             android:fontFamily="@font/inter"
-            android:textSize="14sp"
+            android:textSize="@dimen/text_size_04"
             android:textFontWeight="300"
             android:text="@string/search_no_results"
             android:visibility="gone" />
@@ -41,7 +41,7 @@
             android:layout_height="wrap_content"
             android:layout_centerInParent="true"
             android:fontFamily="@font/inter"
-            android:textSize="14sp"
+            android:textSize="@dimen/text_size_04"
             android:textFontWeight="300"
             android:text="@string/search_no_query"
             android:visibility="gone" />
diff --git a/app/src/main/res/layout/fragment_shuffle.xml b/app/src/main/res/layout/fragment_shuffle.xml
index 7025333a..c028e86c 100644
--- a/app/src/main/res/layout/fragment_shuffle.xml
+++ b/app/src/main/res/layout/fragment_shuffle.xml
@@ -22,8 +22,8 @@
                 app:controller_layout_id="@layout/exo_playback_control_view"/>
             <ProgressBar
                 android:id="@+id/player_buffering_progress"
-                android:layout_width="36dp"
-                android:layout_height="36dp"
+                android:layout_width="@dimen/normal_06"
+                android:layout_height="@dimen/normal_06"
                 android:layout_centerInParent="true"
                 android:visibility="gone" />
         </RelativeLayout>
@@ -33,10 +33,10 @@
             android:orientation="vertical"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginTop="8dp"
-            android:layout_marginLeft="16dp"
-            android:layout_marginRight="16dp"
-            android:layout_marginBottom="8dp"
+            android:layout_marginTop="@dimen/small_08"
+            android:layout_marginLeft="@dimen/normal_01"
+            android:layout_marginRight="@dimen/normal_01"
+            android:layout_marginBottom="@dimen/small_08"
             android:layout_alignParentBottom="true">
             <TextView
                 android:id="@+id/shuffle_content_title"
@@ -47,7 +47,7 @@
                 android:textFontWeight="300"
                 android:minLines="1"
                 android:maxLines="3"
-                android:textSize="20sp"
+                android:textSize="@dimen/text_size_10"
                 />
             <TextView
                 android:id="@+id/shuffle_content_publisher"
@@ -58,27 +58,27 @@
                 android:textFontWeight="300"
                 android:minLines="1"
                 android:maxLines="1"
-                android:textSize="14sp" />
+                android:textSize="@dimen/text_size_04" />
         </LinearLayout>
 
         <ProgressBar
             android:id="@+id/shuffle_loading"
-            android:layout_width="24dp"
-            android:layout_height="24dp"
+            android:layout_width="@dimen/normal_03"
+            android:layout_height="@dimen/normal_03"
             android:layout_centerInParent="true"
             android:visibility="gone" />
 
         <RelativeLayout
             android:id="@+id/shuffle_share_button"
-            android:layout_width="72dp"
-            android:layout_height="72dp"
+            android:layout_width="@dimen/normal_15"
+            android:layout_height="@dimen/normal_15"
             android:layout_alignParentTop="true"
             android:layout_alignParentRight="true"
             android:clickable="true"
             android:background="?attr/selectableItemBackground">
             <ImageView
-                android:layout_width="24dp"
-                android:layout_height="24dp"
+                android:layout_width="@dimen/normal_03"
+                android:layout_height="@dimen/normal_03"
                 android:layout_centerInParent="true"
                 android:src="@drawable/ic_share"
                 app:tint="@color/white" />
diff --git a/app/src/main/res/layout/fragment_transaction_history.xml b/app/src/main/res/layout/fragment_transaction_history.xml
index 0c545eac..1027ff18 100644
--- a/app/src/main/res/layout/fragment_transaction_history.xml
+++ b/app/src/main/res/layout/fragment_transaction_history.xml
@@ -9,10 +9,10 @@
         android:id="@+id/transaction_history_no_transactions"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:layout_marginEnd="16dp"
+        android:layout_marginStart="@dimen/normal_01"
+        android:layout_marginEnd="@dimen/normal_01"
         android:fontFamily="@font/inter"
-        android:textSize="14sp"
+        android:textSize="@dimen/text_size_04"
         android:text="@string/no_transactions"
         android:visibility="gone" />
 
@@ -23,9 +23,9 @@
 
     <ProgressBar
         android:id="@+id/transaction_history_loading"
-        android:layout_width="20dp"
-        android:layout_height="20dp"
-        android:layout_marginTop="16dp"
+        android:layout_width="@dimen/normal_02"
+        android:layout_height="@dimen/normal_02"
+        android:layout_marginTop="@dimen/normal_01"
         android:layout_centerHorizontal="true" />
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_verification_email.xml b/app/src/main/res/layout/fragment_verification_email.xml
index 27a399f0..289a5912 100644
--- a/app/src/main/res/layout/fragment_verification_email.xml
+++ b/app/src/main/res/layout/fragment_verification_email.xml
@@ -12,19 +12,19 @@
         android:layout_height="wrap_content"
         android:layout_centerVertical="true"
         android:visibility="visible"
-        android:layout_margin="36dp">
+        android:layout_margin="@dimen/normal_06">
 
         <TextView
-            android:textSize="28sp"
+            android:textSize="@dimen/text_size_12"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:fontFamily="@font/inter"
             android:text="@string/email"
-            android:layout_marginBottom="16dp"
+            android:layout_marginBottom="@dimen/normal_01"
             android:textColor="@color/white"
             android:textFontWeight="300" />
         <TextView
-            android:textSize="16sp"
+            android:textSize="@dimen/text_size_06"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:fontFamily="@font/inter"
@@ -36,7 +36,7 @@
             android:id="@+id/verification_email_input_layout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="16dp"
+            android:layout_marginTop="@dimen/normal_01"
             style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
             app:boxStrokeColor="@null">
             <com.google.android.material.textfield.TextInputEditText
@@ -48,7 +48,7 @@
                 android:gravity="center"
                 android:hint="@string/email_placeholder"
                 android:singleLine="true"
-                android:textSize="20sp"
+                android:textSize="@dimen/text_size_10"
                 android:textAlignment="center"
                 android:textFontWeight="300" />
         </com.google.android.material.textfield.TextInputLayout>
@@ -56,7 +56,7 @@
         <RelativeLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_marginTop="16dp">
+            android:layout_marginTop="@dimen/normal_01">
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/verification_email_continue_button"
                 android:layout_width="match_parent"
@@ -66,8 +66,8 @@
             <ProgressBar
                 android:id="@+id/verification_email_add_progress"
                 android:visibility="gone"
-                android:layout_width="24dp"
-                android:layout_height="24dp"
+                android:layout_width="@dimen/normal_03"
+                android:layout_height="@dimen/normal_03"
                 android:layout_centerInParent="true" />
         </RelativeLayout>
     </LinearLayout>
@@ -78,20 +78,20 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_centerVertical="true"
-        android:layout_margin="36dp"
+        android:layout_margin="@dimen/normal_06"
         android:visibility="gone">
 
         <TextView
-            android:textSize="28sp"
+            android:textSize="@dimen/text_size_12"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:fontFamily="@font/inter"
             android:text="@string/sign_in"
-            android:layout_marginBottom="16dp"
+            android:layout_marginBottom="@dimen/normal_01"
             android:textColor="@color/white"
             android:textFontWeight="300" />
         <TextView
-            android:textSize="16sp"
+            android:textSize="@dimen/text_size_06"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:fontFamily="@font/inter"
@@ -101,10 +101,10 @@
 
         <TextView
             android:id="@+id/verification_email_added_address"
-            android:textSize="20sp"
+            android:textSize="@dimen/text_size_10"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="16dp"
+            android:layout_marginTop="@dimen/normal_01"
             android:ellipsize="middle"
             android:fontFamily="@font/inter"
             android:singleLine="true"
@@ -113,10 +113,10 @@
             android:textFontWeight="300" />
 
         <TextView
-            android:textSize="16sp"
+            android:textSize="@dimen/text_size_06"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="16dp"
+            android:layout_marginTop="@dimen/normal_01"
             android:fontFamily="@font/inter"
             android:text="@string/please_click_link"
             android:textColor="@color/white"
@@ -125,21 +125,21 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="16dp"
+            android:layout_marginTop="@dimen/normal_01"
             android:orientation="horizontal"
             android:weightSum="9">
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/verification_email_resend_button"
                 android:layout_weight="3"
-                android:layout_width="0dp"
+                android:layout_width="@dimen/small_00"
                 android:layout_height="wrap_content"
                 android:fontFamily="@font/inter"
                 android:text="@string/resend" />
 
             <View
                 android:layout_weight="3"
-                android:layout_width="0dp"
-                android:layout_height="0dp" />
+                android:layout_width="@dimen/small_00"
+                android:layout_height="@dimen/small_00" />
 
             <TextView
                 android:id="@+id/verification_email_edit_button"
@@ -147,7 +147,7 @@
                 android:clickable="true"
                 android:gravity="right"
                 android:layout_weight="3"
-                android:layout_width="0dp"
+                android:layout_width="@dimen/small_00"
                 android:layout_height="wrap_content"
                 android:fontFamily="@font/inter"
                 android:text="@string/edit"
diff --git a/app/src/main/res/layout/fragment_verification_manual.xml b/app/src/main/res/layout/fragment_verification_manual.xml
index 8817f06f..9b8ae993 100644
--- a/app/src/main/res/layout/fragment_verification_manual.xml
+++ b/app/src/main/res/layout/fragment_verification_manual.xml
@@ -7,8 +7,8 @@
 
     <ProgressBar
         android:id="@+id/verification_manual_loading"
-        android:layout_width="24dp"
-        android:layout_height="24dp"
+        android:layout_width="@dimen/normal_03"
+        android:layout_height="@dimen/normal_03"
         android:layout_centerInParent="true"
         android:visibility="gone" />
 
@@ -22,9 +22,9 @@
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
             android:visibility="visible"
-            android:layout_margin="36dp">
+            android:layout_margin="@dimen/normal_06">
             <TextView
-                android:textSize="28sp"
+                android:textSize="@dimen/text_size_12"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:fontFamily="@font/inter"
@@ -32,10 +32,10 @@
                 android:textColor="@color/white"
                 android:textFontWeight="300" />
             <TextView
-                android:textSize="16sp"
+                android:textSize="@dimen/text_size_06"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="16dp"
+                android:layout_marginTop="@dimen/normal_01"
                 android:fontFamily="@font/inter"
                 android:text="@string/get_instantly_verified"
                 android:textColor="@color/white"
@@ -43,19 +43,19 @@
 
 
             <TextView
-                android:textSize="20sp"
+                android:textSize="@dimen/text_size_10"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="36dp"
+                android:layout_marginTop="@dimen/normal_06"
                 android:fontFamily="@font/inter"
                 android:text="@string/twitter_verification"
                 android:textColor="@color/white"
                 android:textFontWeight="300" />
             <TextView
-                android:textSize="16sp"
+                android:textSize="@dimen/text_size_06"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="4dp"
+                android:layout_marginTop="@dimen/small_04"
                 android:fontFamily="@font/inter"
                 android:text="@string/twitter_verification_desc"
                 android:textColor="@color/white"
@@ -64,25 +64,25 @@
                 android:id="@+id/verification_manual_twitter_button"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="4dp"
+                android:layout_marginTop="@dimen/small_04"
                 android:fontFamily="@font/inter"
                 android:text="@string/twitter_verify" />
 
 
             <TextView
-                android:textSize="20sp"
+                android:textSize="@dimen/text_size_10"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="36dp"
+                android:layout_marginTop="@dimen/normal_06"
                 android:fontFamily="@font/inter"
                 android:text="@string/phone_number_verification"
                 android:textColor="@color/white"
                 android:textFontWeight="300" />
             <TextView
-                android:textSize="16sp"
+                android:textSize="@dimen/text_size_06"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="4dp"
+                android:layout_marginTop="@dimen/small_04"
                 android:fontFamily="@font/inter"
                 android:text="@string/phone_number_verification_desc"
                 android:textColor="@color/white"
@@ -91,24 +91,24 @@
                 android:id="@+id/verification_manual_phone_number_button"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="4dp"
+                android:layout_marginTop="@dimen/small_04"
                 android:fontFamily="@font/inter"
                 android:text="@string/phone_number_verify" />
 
             <TextView
-                android:textSize="20sp"
+                android:textSize="@dimen/text_size_10"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="36dp"
+                android:layout_marginTop="@dimen/normal_06"
                 android:fontFamily="@font/inter"
                 android:text="@string/skip_queue_verification"
                 android:textColor="@color/white"
                 android:textFontWeight="300" />
             <TextView
-                android:textSize="16sp"
+                android:textSize="@dimen/text_size_06"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="4dp"
+                android:layout_marginTop="@dimen/small_04"
                 android:fontFamily="@font/inter"
                 android:text="@string/skip_queue_verification_desc"
                 android:textColor="@color/white"
@@ -117,14 +117,14 @@
                 android:id="@+id/verification_manual_skip_queue"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="4dp"
+                android:layout_marginTop="@dimen/small_04"
                 android:fontFamily="@font/inter"
                 android:text="@string/skip_queue_button_text" />
             <TextView
-                android:textSize="16sp"
+                android:textSize="@dimen/text_size_06"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="16dp"
+                android:layout_marginTop="@dimen/normal_01"
                 android:fontFamily="@font/inter"
                 android:text="@string/skip_queue_manual_check"
                 android:textColor="@color/white"
@@ -133,35 +133,35 @@
                 android:id="@+id/verification_manual_skip_queue_verify"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="4dp"
+                android:layout_marginTop="@dimen/small_04"
                 android:fontFamily="@font/inter"
                 android:text="@string/verify_purchase" />
 
             <TextView
-                android:textSize="20sp"
+                android:textSize="@dimen/text_size_10"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="36dp"
+                android:layout_marginTop="@dimen/normal_06"
                 android:fontFamily="@font/inter"
                 android:text="@string/manual_reward_verification"
                 android:textColor="@color/white"
                 android:textFontWeight="300" />
             <TextView
                 android:id="@+id/verification_manual_discord_verify"
-                android:textSize="16sp"
+                android:textSize="@dimen/text_size_06"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="4dp"
+                android:layout_marginTop="@dimen/small_04"
                 android:fontFamily="@font/inter"
                 android:text="@string/request_to_be_verified"
                 android:textColor="@color/white"
                 android:textFontWeight="300" />
 
             <TextView
-                android:textSize="16sp"
+                android:textSize="@dimen/text_size_06"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="16dp"
+                android:layout_marginTop="@dimen/normal_01"
                 android:fontFamily="@font/inter"
                 android:text="@string/enjoy_free_content"
                 android:textColor="@color/white"
@@ -171,7 +171,7 @@
                 android:id="@+id/verification_manual_continue_button"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="4dp"
+                android:layout_marginTop="@dimen/small_04"
                 android:fontFamily="@font/inter"
                 android:text="@string/continue_text" />
         </LinearLayout>
diff --git a/app/src/main/res/layout/fragment_verification_phone.xml b/app/src/main/res/layout/fragment_verification_phone.xml
index 266de2b5..f621fc8f 100644
--- a/app/src/main/res/layout/fragment_verification_phone.xml
+++ b/app/src/main/res/layout/fragment_verification_phone.xml
@@ -11,19 +11,19 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_centerVertical="true"
-        android:layout_margin="36dp">
+        android:layout_margin="@dimen/normal_06">
 
         <TextView
-            android:textSize="28sp"
+            android:textSize="@dimen/text_size_12"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:fontFamily="@font/inter"
             android:text="@string/phone_number"
-            android:layout_marginBottom="16dp"
+            android:layout_marginBottom="@dimen/normal_01"
             android:textColor="@color/white"
             android:textFontWeight="300" />
         <TextView
-            android:textSize="16sp"
+            android:textSize="@dimen/text_size_06"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:fontFamily="@font/inter"
@@ -34,7 +34,7 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="16dp"
+            android:layout_marginTop="@dimen/normal_01"
             android:orientation="horizontal">
             <com.hbb20.CountryCodePicker
                 android:id="@+id/verification_phone_country_code"
@@ -44,7 +44,7 @@
                 app:ccp_arrowColor="@color/white"
                 app:ccp_countryPreference="US,IN,NG,CH,BR,TH"
                 app:ccp_defaultNameCode="US"
-                app:ccp_textSize="20sp"
+                app:ccp_textSize="@dimen/text_size_10"
                 app:ccpDialog_showTitle="false" />
 
             <EditText
@@ -55,14 +55,14 @@
                 android:background="@android:color/transparent"
                 android:fontFamily="@font/inter"
                 android:singleLine="true"
-                android:textSize="20sp"
+                android:textSize="@dimen/text_size_10"
                 android:textFontWeight="300" />
         </LinearLayout>
 
         <RelativeLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_marginTop="16dp">
+            android:layout_marginTop="@dimen/normal_01">
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/verification_phone_continue_button"
                 android:layout_width="match_parent"
@@ -72,8 +72,8 @@
             <ProgressBar
                 android:id="@+id/verification_phone_new_progress"
                 android:visibility="gone"
-                android:layout_width="24dp"
-                android:layout_height="24dp"
+                android:layout_width="@dimen/normal_03"
+                android:layout_height="@dimen/normal_03"
                 android:layout_centerInParent="true" />
         </RelativeLayout>
     </LinearLayout>
@@ -84,21 +84,21 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_centerVertical="true"
-        android:layout_margin="36dp"
+        android:layout_margin="@dimen/normal_06"
         android:visibility="gone">
 
         <TextView
-            android:textSize="28sp"
+            android:textSize="@dimen/text_size_12"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:fontFamily="@font/inter"
             android:text="@string/verify_phone_number"
-            android:layout_marginBottom="16dp"
+            android:layout_marginBottom="@dimen/normal_01"
             android:textColor="@color/white"
             android:textFontWeight="300" />
         <TextView
             android:id="@+id/verification_phone_verify_paragraph"
-            android:textSize="16sp"
+            android:textSize="@dimen/text_size_06"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:fontFamily="@font/inter"
@@ -110,7 +110,7 @@
             android:id="@+id/verification_phone_code_input"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="16dp"
+            android:layout_marginTop="@dimen/normal_01"
             android:background="@android:color/transparent"
             android:fontFamily="@font/inter"
             android:singleLine="true"
@@ -118,13 +118,13 @@
             android:inputType="number"
             android:letterSpacing="1.25"
             android:textAlignment="center"
-            android:textSize="48sp"
+            android:textSize="@dimen/text_size_15"
             android:textFontWeight="300" />
 
         <RelativeLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="16dp">
+            android:layout_marginTop="@dimen/normal_01">
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/verification_phone_verify_button"
                 android:layout_width="wrap_content"
@@ -134,10 +134,10 @@
                 android:text="@string/verify" />
             <ProgressBar
                 android:id="@+id/verification_phone_verify_progress"
-                android:layout_width="24dp"
-                android:layout_height="24dp"
+                android:layout_width="@dimen/normal_03"
+                android:layout_height="@dimen/normal_03"
                 android:layout_toEndOf="@id/verification_phone_verify_button"
-                android:layout_marginStart="16dp"
+                android:layout_marginStart="@dimen/normal_01"
                 android:layout_centerVertical="true"
                 android:visibility="gone" />
 
diff --git a/app/src/main/res/layout/fragment_verification_wallet.xml b/app/src/main/res/layout/fragment_verification_wallet.xml
index 0c6d6eff..fd4b6cc5 100644
--- a/app/src/main/res/layout/fragment_verification_wallet.xml
+++ b/app/src/main/res/layout/fragment_verification_wallet.xml
@@ -7,7 +7,7 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_margin="36dp"
+        android:layout_margin="@dimen/normal_06"
         android:orientation="vertical"
         android:layout_centerVertical="true">
         <LinearLayout
@@ -19,7 +19,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
                 <TextView
-                    android:textSize="28sp"
+                    android:textSize="@dimen/text_size_12"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:fontFamily="@font/inter"
@@ -30,22 +30,22 @@
                 <ProgressBar
                     android:id="@+id/verification_wallet_loading_progress"
                     android:visibility="gone"
-                    android:layout_width="24dp"
-                    android:layout_height="24dp"
+                    android:layout_width="@dimen/normal_03"
+                    android:layout_height="@dimen/normal_03"
                     android:layout_gravity="center"
                     android:layout_alignParentEnd="true"
                     android:layout_centerVertical="true"
-                    android:layout_marginTop="24dp" />
+                    android:layout_marginTop="@dimen/normal_03" />
             </RelativeLayout>
 
             <TextView
                 android:id="@+id/verification_wallet_loading_text"
                 android:visibility="gone"
-                android:textSize="16sp"
+                android:textSize="@dimen/text_size_06"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:fontFamily="@font/inter"
-                android:layout_marginTop="8dp"
+                android:layout_marginTop="@dimen/small_08"
                 android:text="@string/retrieving_account_information"
                 android:textColor="@color/white"
                 android:textFontWeight="300" />
@@ -56,12 +56,12 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_below="@id/verification_wallet_sync_title"
-            android:layout_marginTop="8dp"
+            android:layout_marginTop="@dimen/small_08"
             android:orientation="vertical"
             android:visibility="visible">
             <TextView
                 android:id="@+id/verification_wallet_sync_paragraph"
-                android:textSize="16sp"
+                android:textSize="@dimen/text_size_06"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:fontFamily="@font/inter"
@@ -72,7 +72,7 @@
             <com.google.android.material.textfield.TextInputLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="16dp"
+                android:layout_marginTop="@dimen/normal_01"
                 style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
                 app:boxStrokeColor="@null">
                 <com.google.android.material.textfield.TextInputEditText
@@ -85,17 +85,17 @@
                     android:inputType="textPassword"
                     android:hint="@string/password"
                     android:singleLine="true"
-                    android:textSize="20sp"
+                    android:textSize="@dimen/text_size_10"
                     android:textAlignment="center"
                     android:textFontWeight="300" />
             </com.google.android.material.textfield.TextInputLayout>
 
             <TextView
-                android:textSize="12sp"
+                android:textSize="@dimen/text_size_02"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:fontFamily="@font/inter"
-                android:layout_marginTop="16dp"
+                android:layout_marginTop="@dimen/normal_01"
                 android:text="@string/wallet_security_purposes"
                 android:textColor="@color/white"
                 android:textFontWeight="300" />
@@ -104,7 +104,7 @@
                 android:id="@+id/verification_wallet_done_button"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="24dp"
+                android:layout_marginTop="@dimen/normal_03"
                 android:fontFamily="@font/inter"
                 android:text="@string/done" />
         </LinearLayout>
diff --git a/app/src/main/res/layout/fragment_wallet.xml b/app/src/main/res/layout/fragment_wallet.xml
index 4b0fff98..f9002781 100644
--- a/app/src/main/res/layout/fragment_wallet.xml
+++ b/app/src/main/res/layout/fragment_wallet.xml
@@ -11,13 +11,13 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:orientation="vertical"
-            android:padding="16dp">
+            android:padding="@dimen/normal_01">
 
             <include layout="@layout/card_reward_driver"
                 android:visibility="gone"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginBottom="16dp" />
+                android:layout_marginBottom="@dimen/normal_01" />
 
             <!-- Balance view -->
             <include layout="@layout/card_wallet_balance" />
@@ -43,7 +43,7 @@
         android:background="@color/lbryGreen"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:padding="16dp">
+        android:padding="@dimen/normal_01">
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
@@ -53,7 +53,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:fontFamily="@font/inter"
-                android:textSize="24sp"
+                android:textSize="@dimen/text_size_11"
                 android:text="@string/account_recommended"
                 android:textColor="@color/white" />
 
@@ -61,8 +61,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:fontFamily="@font/inter"
-                android:textSize="16sp"
-                android:layout_marginTop="16dp"
+                android:textSize="@dimen/text_size_06"
+                android:layout_marginTop="@dimen/normal_01"
                 android:text="@string/wallet_account_desc"
                 android:textColor="@color/white"
                 android:textFontWeight="300" />
@@ -71,8 +71,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:fontFamily="@font/inter"
-                android:textSize="16sp"
-                android:layout_marginTop="16dp"
+                android:textSize="@dimen/text_size_06"
+                android:layout_marginTop="@dimen/normal_01"
                 android:text="@string/wallet_without_account"
                 android:textColor="@color/white"
                 android:textFontWeight="300" />
diff --git a/app/src/main/res/layout/list_item_boosting_balance.xml b/app/src/main/res/layout/list_item_boosting_balance.xml
index 73e7e71a..91be4795 100644
--- a/app/src/main/res/layout/list_item_boosting_balance.xml
+++ b/app/src/main/res/layout/list_item_boosting_balance.xml
@@ -5,17 +5,17 @@
     android:id="@+id/relativeLayout"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginTop="8dp"
-    android:layout_marginBottom="16dp">
+    android:layout_marginTop="@dimen/small_08"
+    android:layout_marginBottom="@dimen/normal_01">
 
     <TextView
         android:id="@+id/detail"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:layout_marginTop="16dp"
+        android:layout_marginStart="@dimen/normal_01"
+        android:layout_marginTop="@dimen/normal_01"
         android:textColor="@color/white"
-        android:textSize="12sp"
+        android:textSize="@dimen/text_size_02"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
@@ -23,11 +23,11 @@
         android:id="@+id/detail_explanation"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="8dp"
-        android:layout_marginTop="8dp"
-        android:layout_marginBottom="8dp"
+        android:layout_marginStart="@dimen/small_08"
+        android:layout_marginTop="@dimen/small_08"
+        android:layout_marginBottom="@dimen/small_08"
         android:textColor="@color/white"
-        android:textSize="12sp"
+        android:textSize="@dimen/text_size_02"
         android:visibility="gone"
         app:layout_constraintBottom_toTopOf="@+id/detail"
         app:layout_constraintStart_toStartOf="parent"
@@ -35,10 +35,10 @@
 
     <ProgressBar
         android:id="@+id/wallet_unlock_tips_progress"
-        android:layout_width="16dp"
+        android:layout_width="@dimen/normal_01"
         android:layout_height="match_parent"
         android:layout_centerVertical="true"
-        android:layout_marginEnd="8dp"
+        android:layout_marginEnd="@dimen/small_08"
         android:visibility="gone"
         app:layout_constraintEnd_toStartOf="@id/wallet_supporting_balance" />
 
@@ -46,7 +46,7 @@
         android:id="@+id/lock_button"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="8dp"
+        android:layout_marginEnd="@dimen/small_08"
         android:background="@android:color/transparent"
         android:src="@drawable/ic_lock"
         android:visibility="gone"
@@ -62,7 +62,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         android:textColor="@color/white"
-        lbry:iconSize="18dp"
+        lbry:iconSize="@dimen/normal_01_02"
         lbry:textSize="@dimen/wallet_detail_balance_font_size" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/list_item_channel.xml b/app/src/main/res/layout/list_item_channel.xml
index bcb32887..81528780 100644
--- a/app/src/main/res/layout/list_item_channel.xml
+++ b/app/src/main/res/layout/list_item_channel.xml
@@ -3,10 +3,10 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:paddingStart="16dp"
-    android:paddingEnd="16dp"
-    android:paddingTop="8dp"
-    android:paddingBottom="8dp"
+    android:paddingStart="@dimen/normal_01"
+    android:paddingEnd="@dimen/normal_01"
+    android:paddingTop="@dimen/small_08"
+    android:paddingBottom="@dimen/small_08"
     android:clickable="true"
     android:focusable="true"
     android:orientation="vertical"
@@ -16,15 +16,15 @@
         android:id="@+id/claim_repost_info"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="4dp"
+        android:layout_marginBottom="@dimen/small_04"
         android:orientation="horizontal"
         android:visibility="gone">
         <io.lbry.browser.ui.controls.SolidIconView
-            android:layout_width="16dp"
-            android:layout_height="12dp"
+            android:layout_width="@dimen/normal_01"
+            android:layout_height="@dimen/small_12"
             android:layout_gravity="center_vertical"
             android:textColor="@color/lightForeground"
-            android:textSize="12dp"
+            android:textSize="@dimen/small_12"
             android:text="@string/fa_repost" />
         <TextView
             android:id="@+id/claim_repost_channel"
@@ -33,40 +33,40 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
-            android:layout_marginStart="4dp"
+            android:layout_marginStart="@dimen/small_04"
             android:fontFamily="@font/inter"
             android:textColor="@color/lightForeground"
             android:textFontWeight="300"
-            android:textSize="12sp" />
+            android:textSize="@dimen/text_size_02" />
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
-            android:layout_marginStart="4dp"
+            android:layout_marginStart="@dimen/small_04"
             android:fontFamily="@font/inter"
             android:text="@string/reposted"
             android:textColor="@color/lightForeground"
             android:textFontWeight="300"
-            android:textSize="12sp" />
+            android:textSize="@dimen/text_size_02" />
     </LinearLayout>
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
         <RelativeLayout
             android:id="@+id/claim_media_container"
-            android:layout_width="160dp"
-            android:layout_height="90dp">
+            android:layout_width="@dimen/large_11"
+            android:layout_height="@dimen/normal_19_02">
             <ImageView
                 android:layout_centerHorizontal="true"
                 android:id="@+id/claim_thumbnail"
-                android:layout_width="90dp"
-                android:layout_height="90dp" />
+                android:layout_width="@dimen/normal_19_02"
+                android:layout_height="@dimen/normal_19_02" />
             <RelativeLayout
                 android:layout_centerHorizontal="true"
                 android:background="@drawable/bg_channel_icon"
                 android:id="@+id/claim_no_thumbnail"
-                android:layout_width="90dp"
-                android:layout_height="90dp">
+                android:layout_width="@dimen/normal_19_02"
+                android:layout_height="@dimen/normal_19_02">
                 <TextView
                     android:id="@+id/claim_thumbnail_alpha"
                     android:layout_centerInParent="true"
@@ -74,7 +74,7 @@
                     android:layout_height="wrap_content"
                     android:fontFamily="@font/inter"
                     android:textAllCaps="true"
-                    android:textSize="48sp"
+                    android:textSize="@dimen/text_size_15"
                     android:textColor="@color/white"
                     android:textFontWeight="300" />
             </RelativeLayout>
@@ -85,16 +85,16 @@
                 android:layout_height="wrap_content"
                 android:orientation="horizontal"
                 android:layout_alignParentEnd="true"
-                android:layout_marginTop="4dp"
-                android:layout_marginEnd="4dp"
-                android:paddingTop="1dp"
-                android:paddingBottom="1dp"
-                android:paddingStart="2dp"
-                android:paddingEnd="2dp"
+                android:layout_marginTop="@dimen/small_04"
+                android:layout_marginEnd="@dimen/small_04"
+                android:paddingTop="@dimen/small_01"
+                android:paddingBottom="@dimen/small_01"
+                android:paddingStart="@dimen/small_02"
+                android:paddingEnd="@dimen/small_02"
                 android:visibility="gone">
                 <ImageView
-                    android:layout_width="12dp"
-                    android:layout_height="12dp"
+                    android:layout_width="@dimen/small_12"
+                    android:layout_height="@dimen/small_12"
                     android:layout_gravity="center_vertical"
                     android:src="@drawable/ic_credits" />
                 <TextView
@@ -102,21 +102,21 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_vertical"
-                    android:layout_marginStart="2dp"
+                    android:layout_marginStart="@dimen/small_02"
                     android:fontFamily="@font/inter"
-                    android:textSize="14sp"
+                    android:textSize="@dimen/text_size_04"
                     android:textFontWeight="300" />
             </LinearLayout>
             <RelativeLayout
                 android:layout_centerHorizontal="true"
                 android:background="@drawable/bg_channel_overlay_icon"
                 android:id="@+id/claim_selected_overlay"
-                android:layout_width="90dp"
-                android:layout_height="90dp"
+                android:layout_width="@dimen/normal_19_02"
+                android:layout_height="@dimen/normal_19_02"
                 android:visibility="gone">
                 <ImageView
-                    android:layout_width="36dp"
-                    android:layout_height="36dp"
+                    android:layout_width="@dimen/normal_06"
+                    android:layout_height="@dimen/normal_06"
                     android:layout_centerInParent="true"
                     android:src="@drawable/ic_check"
                     app:tint="@color/nextLbryGreen" />
@@ -128,7 +128,7 @@
             android:layout_height="wrap_content"
             android:orientation="vertical"
             android:layout_centerVertical="true"
-            android:layout_marginStart="16dp"
+            android:layout_marginStart="@dimen/normal_01"
             android:layout_toEndOf="@id/claim_media_container">
             <TextView
                 android:id="@+id/claim_vanity_url"
@@ -142,7 +142,7 @@
                 android:maxLines="2"
                 android:ellipsize="end"
                 android:fontFamily="@font/inter"
-                android:textSize="14sp"
+                android:textSize="@dimen/text_size_04"
                 android:textFontWeight="600" />
             <TextView
                 android:id="@+id/claim_publisher"
@@ -150,13 +150,13 @@
                 android:layout_height="wrap_content"
                 android:textColor="@color/lbryGreen"
                 android:fontFamily="@font/inter"
-                android:textSize="12sp" />
+                android:textSize="@dimen/text_size_02" />
             <TextView
                 android:id="@+id/claim_publish_time"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:fontFamily="@font/inter"
-                android:textSize="11sp"
+                android:textSize="@dimen/text_size_01"
                 android:textFontWeight="300" />
             <TextView
                 android:id="@+id/claim_pending_text"
@@ -164,7 +164,7 @@
                 android:layout_height="wrap_content"
                 android:fontFamily="@font/inter"
                 android:text="@string/pending"
-                android:textSize="11sp"
+                android:textSize="@dimen/text_size_01"
                 android:textStyle="italic"
                 android:textFontWeight="300"
                 android:visibility="gone" />
diff --git a/app/src/main/res/layout/list_item_channel_filter.xml b/app/src/main/res/layout/list_item_channel_filter.xml
index cc2290ce..172accd6 100644
--- a/app/src/main/res/layout/list_item_channel_filter.xml
+++ b/app/src/main/res/layout/list_item_channel_filter.xml
@@ -2,16 +2,16 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:clickable="true"
     android:focusable="true"
-    android:padding="8dp"
+    android:padding="@dimen/small_08"
     android:foreground="?attr/selectableItemBackground"
     android:background="@drawable/bg_selected_item"
-    android:layout_width="100dp"
+    android:layout_width="@dimen/normal_22"
     android:layout_height="wrap_content"
-    android:layout_marginEnd="2dp">
+    android:layout_marginEnd="@dimen/small_02">
     <RelativeLayout
         android:id="@+id/channel_filter_media_container"
-        android:layout_width="80dp"
-        android:layout_height="80dp">
+        android:layout_width="@dimen/normal_17"
+        android:layout_height="@dimen/normal_17">
         <RelativeLayout
             android:id="@+id/channel_filter_no_thumbnail"
             android:background="@drawable/bg_channel_icon"
@@ -23,7 +23,7 @@
                 android:layout_height="wrap_content"
                 android:layout_centerInParent="true"
                 android:fontFamily="@font/inter"
-                android:textSize="48sp"
+                android:textSize="@dimen/text_size_15"
                 android:textColor="@color/white"
                 android:textFontWeight="300" />
         </RelativeLayout>
@@ -55,6 +55,6 @@
         android:layout_below="@id/channel_filter_media_container"
         android:layout_centerHorizontal="true"
         android:singleLine="true"
-        android:textSize="12sp"
-        android:layout_marginTop="4dp" />
+        android:textSize="@dimen/text_size_02"
+        android:layout_marginTop="@dimen/small_04" />
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/list_item_comment.xml b/app/src/main/res/layout/list_item_comment.xml
index ab1584fc..75664d54 100644
--- a/app/src/main/res/layout/list_item_comment.xml
+++ b/app/src/main/res/layout/list_item_comment.xml
@@ -6,10 +6,10 @@
     android:clickable="true"
     android:focusable="true"
     android:orientation="vertical"
-    android:paddingBottom="8dp"
-    android:paddingStart="16dp"
-    android:paddingEnd="16dp"
-    android:paddingTop="8dp">
+    android:paddingBottom="@dimen/small_08"
+    android:paddingStart="@dimen/normal_01"
+    android:paddingEnd="@dimen/normal_01"
+    android:paddingTop="@dimen/small_08">
 
     <RelativeLayout
         android:layout_width="match_parent"
@@ -17,14 +17,14 @@
 
         <RelativeLayout
             android:id="@+id/comment_avatar_container"
-            android:layout_width="40dp"
-            android:layout_height="40dp">
+            android:layout_width="@dimen/normal_07"
+            android:layout_height="@dimen/normal_07">
             <RelativeLayout
                 android:layout_centerHorizontal="true"
                 android:background="@drawable/bg_channel_icon"
                 android:id="@+id/comment_no_thumbnail"
-                android:layout_width="40dp"
-                android:layout_height="40dp">
+                android:layout_width="@dimen/normal_07"
+                android:layout_height="@dimen/normal_07">
                 <TextView
                     android:id="@+id/comment_thumbnail_alpha"
                     android:layout_centerInParent="true"
@@ -32,22 +32,22 @@
                     android:layout_height="wrap_content"
                     android:fontFamily="@font/inter"
                     android:textAllCaps="true"
-                    android:textSize="24sp"
+                    android:textSize="@dimen/text_size_11"
                     android:textColor="@color/white"
                     android:textFontWeight="300" />
             </RelativeLayout>
             <ImageView
                 android:layout_centerHorizontal="true"
                 android:id="@+id/comment_thumbnail"
-                android:layout_width="40dp"
-                android:layout_height="40dp" />
+                android:layout_width="@dimen/normal_07"
+                android:layout_height="@dimen/normal_07" />
         </RelativeLayout>
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_toEndOf="@id/comment_avatar_container"
-            android:layout_marginStart="16dp"
+            android:layout_marginStart="@dimen/normal_01"
             android:orientation="vertical">
 
             <RelativeLayout
@@ -61,7 +61,7 @@
                     android:layout_height="wrap_content"
                     android:fontFamily="@font/inter"
                     android:textColor="@color/lbryGreen"
-                    android:textSize="14sp" />
+                    android:textSize="@dimen/text_size_04" />
                 <TextView
                     android:id="@+id/comment_time"
                     android:layout_width="wrap_content"
@@ -70,19 +70,19 @@
                     android:layout_centerInParent="true"
                     android:fontFamily="@font/inter"
                     android:textColor="@color/lightGrey"
-                    android:textSize="12sp" />
+                    android:textSize="@dimen/text_size_02" />
             </RelativeLayout>
 
             <TextView
                 android:id="@+id/comment_text"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="2dp"
+                android:layout_marginTop="@dimen/small_02"
                 android:lineSpacingMultiplier="1.1"
                 android:fontFamily="@font/inter"
                 android:textFontWeight="300"
                 android:textIsSelectable="true"
-                android:textSize="14sp" />
+                android:textSize="@dimen/text_size_04" />
 
             <TextView
                 android:id="@+id/comment_reply_link"
@@ -90,12 +90,12 @@
                 android:clickable="true"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="4dp"
+                android:layout_marginTop="@dimen/small_04"
                 android:fontFamily="@font/inter"
                 android:text="@string/reply"
                 android:textFontWeight="300"
                 android:textColor="@color/lbryGreen"
-                android:textSize="12sp" />
+                android:textSize="@dimen/text_size_02" />
         </LinearLayout>
     </RelativeLayout>
 
diff --git a/app/src/main/res/layout/list_item_editors_choice.xml b/app/src/main/res/layout/list_item_editors_choice.xml
index 49aad7f6..250603c2 100644
--- a/app/src/main/res/layout/list_item_editors_choice.xml
+++ b/app/src/main/res/layout/list_item_editors_choice.xml
@@ -9,11 +9,11 @@
         android:id="@+id/editors_choice_header_title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:layout_marginEnd="16dp"
-        android:layout_marginBottom="16dp"
+        android:layout_marginStart="@dimen/normal_01"
+        android:layout_marginEnd="@dimen/normal_01"
+        android:layout_marginBottom="@dimen/normal_01"
         android:fontFamily="@font/inter"
-        android:textSize="24sp"
+        android:textSize="@dimen/text_size_11"
         android:textColor="@color/lbryGreen" />
 
     <androidx.cardview.widget.CardView
@@ -22,43 +22,43 @@
         android:foreground="?attr/selectableItemBackground"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:layout_marginEnd="16dp"
-        android:layout_marginBottom="16dp">
+        android:layout_marginStart="@dimen/normal_01"
+        android:layout_marginEnd="@dimen/normal_01"
+        android:layout_marginBottom="@dimen/normal_01">
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:orientation="vertical"
-            android:padding="16dp">
+            android:padding="@dimen/normal_01">
             <TextView
                 android:id="@+id/editors_choice_content_title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:fontFamily="@font/inter"
-                android:textSize="18sp"
+                android:textSize="@dimen/text_size_08"
                 android:singleLine="true" />
 
             <RelativeLayout
-                android:layout_marginTop="8dp"
+                android:layout_marginTop="@dimen/small_08"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
                 <ImageView
                     android:id="@+id/editors_choice_content_thumbnail"
-                    android:layout_width="160dp"
-                    android:layout_height="120dp"
+                    android:layout_width="@dimen/large_11"
+                    android:layout_height="@dimen/large_01"
                     android:layout_centerVertical="true"/>
                 <TextView
                     android:id="@+id/editors_choice_content_description"
                     android:layout_toEndOf="@id/editors_choice_content_thumbnail"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="16dp"
+                    android:layout_marginStart="@dimen/normal_01"
                     android:lineSpacingMultiplier="1.2"
                     android:fontFamily="@font/inter"
                     android:ellipsize="end"
                     android:maxLines="8"
                     android:textFontWeight="300"
-                    android:textSize="12sp" />
+                    android:textSize="@dimen/text_size_02" />
             </RelativeLayout>
         </LinearLayout>
     </androidx.cardview.widget.CardView>
diff --git a/app/src/main/res/layout/list_item_featured_search_result.xml b/app/src/main/res/layout/list_item_featured_search_result.xml
index a6cffcee..3318b9df 100644
--- a/app/src/main/res/layout/list_item_featured_search_result.xml
+++ b/app/src/main/res/layout/list_item_featured_search_result.xml
@@ -3,10 +3,10 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:paddingStart="16dp"
-    android:paddingEnd="16dp"
-    android:paddingTop="8dp"
-    android:paddingBottom="8dp"
+    android:paddingStart="@dimen/normal_01"
+    android:paddingEnd="@dimen/normal_01"
+    android:paddingTop="@dimen/small_08"
+    android:paddingBottom="@dimen/small_08"
     android:clickable="true"
     android:focusable="true"
     android:orientation="vertical"
@@ -18,9 +18,9 @@
         android:orientation="horizontal"
         android:visibility="gone">
         <io.lbry.browser.ui.controls.SolidIconView
-            android:layout_width="20dp"
-            android:layout_height="20dp"
-            android:textSize="18dp"
+            android:layout_width="@dimen/normal_02"
+            android:layout_height="@dimen/normal_02"
+            android:textSize="@dimen/normal_01_02"
             android:layout_gravity="center_vertical"
             android:text="@string/fa_repost" />
         <TextView
@@ -28,19 +28,19 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
-            android:layout_marginStart="4dp"
+            android:layout_marginStart="@dimen/small_04"
             android:clickable="true"
             android:fontFamily="@font/inter"
             android:textFontWeight="300"
-            android:textSize="12sp" />
+            android:textSize="@dimen/text_size_02" />
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
-            android:layout_marginStart="4dp"
+            android:layout_marginStart="@dimen/small_04"
             android:fontFamily="@font/inter"
             android:text="@string/reposted"
-            android:textSize="12sp"
+            android:textSize="@dimen/text_size_02"
             android:textFontWeight="300"
             />
     </LinearLayout>
@@ -49,8 +49,8 @@
         android:layout_height="wrap_content">
         <RelativeLayout
             android:id="@+id/claim_media_container"
-            android:layout_width="160dp"
-            android:layout_height="90dp">
+            android:layout_width="@dimen/large_11"
+            android:layout_height="@dimen/normal_19_02">
             <RelativeLayout
                 android:layout_centerHorizontal="true"
                 android:background="@drawable/bg_thumbnail_icon"
@@ -64,15 +64,15 @@
                     android:layout_height="wrap_content"
                     android:fontFamily="@font/inter"
                     android:textAllCaps="true"
-                    android:textSize="24sp"
+                    android:textSize="@dimen/text_size_11"
                     android:singleLine="true"
                     android:textColor="@color/white"
                     android:textFontWeight="300" />
             </RelativeLayout>
             <ImageView
                 android:id="@+id/claim_thumbnail"
-                android:layout_width="160dp"
-                android:layout_height="90dp" />
+                android:layout_width="@dimen/large_11"
+                android:layout_height="@dimen/normal_19_02" />
             <TextView
                 android:background="@android:color/black"
                 android:id="@+id/claim_duration"
@@ -80,13 +80,13 @@
                 android:layout_height="wrap_content"
                 android:layout_alignParentBottom="true"
                 android:layout_alignParentEnd="true"
-                android:layout_marginEnd="4dp"
-                android:layout_marginBottom="4dp"
+                android:layout_marginEnd="@dimen/small_04"
+                android:layout_marginBottom="@dimen/small_04"
                 android:fontFamily="@font/inter"
                 android:textColor="@android:color/white"
-                android:textSize="10sp"
+                android:textSize="@dimen/text_size_00"
                 android:textFontWeight="300"
-                android:padding="2dp"
+                android:padding="@dimen/small_02"
                 android:visibility="gone" />
             <LinearLayout
                 android:id="@+id/claim_fee_container"
@@ -95,16 +95,16 @@
                 android:layout_height="wrap_content"
                 android:orientation="horizontal"
                 android:layout_alignParentEnd="true"
-                android:layout_marginTop="4dp"
-                android:layout_marginEnd="4dp"
-                android:paddingTop="2dp"
-                android:paddingBottom="2dp"
-                android:paddingStart="6dp"
-                android:paddingEnd="7dp"
+                android:layout_marginTop="@dimen/small_04"
+                android:layout_marginEnd="@dimen/small_04"
+                android:paddingTop="@dimen/small_02"
+                android:paddingBottom="@dimen/small_02"
+                android:paddingStart="@dimen/small_06"
+                android:paddingEnd="@dimen/small_07"
                 android:visibility="gone">
                 <ImageView
-                    android:layout_width="12dp"
-                    android:layout_height="12dp"
+                    android:layout_width="@dimen/small_12"
+                    android:layout_height="@dimen/small_12"
                     android:layout_gravity="center_vertical"
                     android:src="@drawable/ic_credits" />
                 <TextView
@@ -112,10 +112,10 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_vertical"
-                    android:layout_marginStart="1dp"
+                    android:layout_marginStart="@dimen/small_01"
                     android:fontFamily="@font/inter"
                     android:textColor="@android:color/black"
-                    android:textSize="14sp"
+                    android:textSize="@dimen/text_size_04"
                     android:textFontWeight="300" />
             </LinearLayout>
             <RelativeLayout
@@ -126,8 +126,8 @@
                 android:layout_height="match_parent"
                 android:visibility="gone">
                 <ImageView
-                    android:layout_width="36dp"
-                    android:layout_height="36dp"
+                    android:layout_width="@dimen/normal_06"
+                    android:layout_height="@dimen/normal_06"
                     android:layout_centerInParent="true"
                     android:src="@drawable/ic_check"
                     app:tint="@color/nextLbryGreen" />
@@ -138,7 +138,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical"
-            android:layout_marginStart="16dp"
+            android:layout_marginStart="@dimen/normal_01"
             android:layout_toEndOf="@id/claim_media_container">
             <TextView
                 android:id="@+id/claim_vanity_url"
@@ -148,7 +148,7 @@
                 android:singleLine="true"
                 android:ellipsize="end"
                 android:textColor="@android:color/white"
-                android:textSize="18sp"
+                android:textSize="@dimen/text_size_08"
                 android:textFontWeight="600" />
             <TextView
                 android:id="@+id/claim_title"
@@ -158,7 +158,7 @@
                 android:ellipsize="end"
                 android:fontFamily="@font/inter"
                 android:textColor="@android:color/white"
-                android:textSize="14sp"
+                android:textSize="@dimen/text_size_04"
                 android:textFontWeight="600" />
             <TextView
                 android:id="@+id/claim_publisher"
@@ -166,14 +166,14 @@
                 android:layout_height="wrap_content"
                 android:textColor="@color/lbryGreen"
                 android:fontFamily="@font/inter"
-                android:textSize="12sp" />
+                android:textSize="@dimen/text_size_02" />
             <TextView
                 android:id="@+id/claim_publish_time"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:fontFamily="@font/inter"
                 android:textColor="@android:color/white"
-                android:textSize="11sp"
+                android:textSize="@dimen/text_size_01"
                 android:textFontWeight="300" />
             <TextView
                 android:id="@+id/claim_pending_text"
@@ -182,7 +182,7 @@
                 android:fontFamily="@font/inter"
                 android:text="@string/pending"
                 android:textColor="@color/white"
-                android:textSize="11sp"
+                android:textSize="@dimen/text_size_01"
                 android:textStyle="italic"
                 android:textFontWeight="300"
                 android:visibility="gone" />
diff --git a/app/src/main/res/layout/list_item_gallery.xml b/app/src/main/res/layout/list_item_gallery.xml
index 02577a3e..64df91a5 100644
--- a/app/src/main/res/layout/list_item_gallery.xml
+++ b/app/src/main/res/layout/list_item_gallery.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="wrap_content"
-    android:layout_height="100dp"
+    android:layout_height="@dimen/normal_22"
     android:orientation="vertical"
     android:clickable="true"
     android:focusable="true"
@@ -17,12 +17,12 @@
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
         android:layout_alignParentEnd="true"
-        android:layout_marginEnd="4dp"
-        android:layout_marginBottom="4dp"
+        android:layout_marginEnd="@dimen/small_04"
+        android:layout_marginBottom="@dimen/small_04"
         android:fontFamily="@font/inter"
         android:textColor="@android:color/white"
-        android:textSize="10sp"
+        android:textSize="@dimen/text_size_00"
         android:textFontWeight="300"
-        android:padding="2dp"
+        android:padding="@dimen/small_02"
         android:visibility="gone" />
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/list_item_invitee.xml b/app/src/main/res/layout/list_item_invitee.xml
index 57c3f597..4fb3e664 100644
--- a/app/src/main/res/layout/list_item_invitee.xml
+++ b/app/src/main/res/layout/list_item_invitee.xml
@@ -8,9 +8,9 @@
     android:weightSum="10">
     <RelativeLayout
         android:layout_weight="6"
-        android:layout_width="0dp"
+        android:layout_width="@dimen/small_00"
         android:layout_height="wrap_content"
-        android:padding="4dp">
+        android:padding="@dimen/small_04">
         <TextView
             android:id="@+id/invitee_email"
             android:layout_width="wrap_content"
@@ -18,20 +18,20 @@
             android:ellipsize="middle"
             android:fontFamily="@font/inter"
             android:singleLine="true"
-            android:textSize="14sp"
+            android:textSize="@dimen/text_size_04"
             android:textFontWeight="300" />
     </RelativeLayout>
     <RelativeLayout
         android:layout_weight="4"
-        android:layout_width="0dp"
+        android:layout_width="@dimen/small_00"
         android:layout_height="wrap_content"
-        android:padding="4dp">
+        android:padding="@dimen/small_04">
         <TextView
             android:id="@+id/invitee_reward"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:fontFamily="@font/inter"
-            android:textSize="14sp"
+            android:textSize="@dimen/text_size_04"
             android:textFontWeight="300" />
     </RelativeLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/list_item_nav_menu_group.xml b/app/src/main/res/layout/list_item_nav_menu_group.xml
index 720d31ce..08f6955c 100644
--- a/app/src/main/res/layout/list_item_nav_menu_group.xml
+++ b/app/src/main/res/layout/list_item_nav_menu_group.xml
@@ -3,16 +3,16 @@
     android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginTop="16dp"
-    android:layout_marginStart="16dp"
-    android:layout_marginEnd="16dp"
-    android:layout_marginBottom="4dp">
+    android:layout_marginTop="@dimen/normal_01"
+    android:layout_marginStart="@dimen/normal_01"
+    android:layout_marginEnd="@dimen/normal_01"
+    android:layout_marginBottom="@dimen/small_04">
     <TextView
         android:id="@+id/nav_menu_title"
         android:fontFamily="@font/inter"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:textFontWeight="300"
-        android:textSize="11sp"
+        android:textSize="@dimen/text_size_01"
         android:textAllCaps="true" />
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/list_item_nav_menu_item.xml b/app/src/main/res/layout/list_item_nav_menu_item.xml
index 06021870..f4df0800 100644
--- a/app/src/main/res/layout/list_item_nav_menu_item.xml
+++ b/app/src/main/res/layout/list_item_nav_menu_item.xml
@@ -3,29 +3,29 @@
     android:orientation="horizontal"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:paddingTop="12dp"
-    android:paddingBottom="12dp"
-    android:paddingStart="20dp"
-    android:paddingEnd="20dp"
+    android:paddingTop="@dimen/small_12"
+    android:paddingBottom="@dimen/small_12"
+    android:paddingStart="@dimen/normal_02"
+    android:paddingEnd="@dimen/normal_02"
     android:clickable="true"
     android:focusable="true"
     android:background="@drawable/bg_selected_nav_item"
     android:foreground="?attr/selectableItemBackground">
     <io.lbry.browser.ui.controls.SolidIconView
         android:id="@+id/nav_menu_item_icon"
-        android:layout_width="20dp"
-        android:layout_height="20dp"
+        android:layout_width="@dimen/normal_02"
+        android:layout_height="@dimen/normal_02"
         android:layout_gravity="center_vertical"
         android:textColor="@drawable/fg_nav_menu_item"
-        android:textSize="14dp" />
+        android:textSize="@dimen/small_14" />
 
     <TextView
         android:id="@+id/nav_menu_title"
         android:fontFamily="@font/inter"
-        android:layout_marginStart="12dp"
+        android:layout_marginStart="@dimen/small_12"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
         android:textColor="@drawable/fg_nav_menu_item"
-        android:textSize="14sp" />
+        android:textSize="@dimen/text_size_04" />
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/list_item_notification.xml b/app/src/main/res/layout/list_item_notification.xml
index 3c478664..947f0cad 100644
--- a/app/src/main/res/layout/list_item_notification.xml
+++ b/app/src/main/res/layout/list_item_notification.xml
@@ -6,39 +6,39 @@
     android:clickable="true"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginStart="8dp"
-    android:layout_marginEnd="8dp"
-    android:layout_marginBottom="8dp">
+    android:layout_marginStart="@dimen/small_08"
+    android:layout_marginEnd="@dimen/small_08"
+    android:layout_marginBottom="@dimen/small_08">
     <LinearLayout
         android:id="@+id/notification_layout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal">
         <RelativeLayout
-            android:layout_marginStart="16dp"
-            android:layout_width="48dp"
-            android:layout_height="48dp"
+            android:layout_marginStart="@dimen/normal_01"
+            android:layout_width="@dimen/normal_09"
+            android:layout_height="@dimen/normal_09"
             android:layout_gravity="center_vertical">
             <io.lbry.browser.ui.controls.SolidIconView
                 android:id="@+id/notification_icon"
-                android:layout_width="48dp"
-                android:layout_height="48dp"
-                android:textSize="24dp" />
+                android:layout_width="@dimen/normal_09"
+                android:layout_height="@dimen/normal_09"
+                android:textSize="@dimen/normal_03" />
             <ImageView
                 android:id="@+id/notification_author_thumbnail"
-                android:layout_width="48dp"
-                android:layout_height="48dp"
+                android:layout_width="@dimen/normal_09"
+                android:layout_height="@dimen/normal_09"
                 android:visibility="invisible" />
             <RelativeLayout
                 android:layout_centerHorizontal="true"
                 android:background="@drawable/bg_channel_overlay_icon"
                 android:id="@+id/notification_selected_overlay"
-                android:layout_width="48dp"
-                android:layout_height="48dp"
+                android:layout_width="@dimen/normal_09"
+                android:layout_height="@dimen/normal_09"
                 android:visibility="gone">
                 <ImageView
-                    android:layout_width="36dp"
-                    android:layout_height="36dp"
+                    android:layout_width="@dimen/normal_06"
+                    android:layout_height="@dimen/normal_06"
                     android:layout_centerInParent="true"
                     android:src="@drawable/ic_check"
                     app:tint="@color/nextLbryGreen" />
@@ -48,28 +48,28 @@
             android:orientation="vertical"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:padding="16dp">
+            android:padding="@dimen/normal_01">
             <TextView
                 android:id="@+id/notification_title"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginBottom="2dp"
+                android:layout_marginBottom="@dimen/small_02"
                 android:fontFamily="@font/inter"
                 android:textStyle="bold"
-                android:textSize="13sp" />
+                android:textSize="@dimen/text_size_03" />
             <TextView
                 android:id="@+id/notification_body"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginBottom="4dp"
+                android:layout_marginBottom="@dimen/small_04"
                 android:fontFamily="@font/inter"
-                android:textSize="14sp" />
+                android:textSize="@dimen/text_size_04" />
             <TextView
                 android:id="@+id/notification_time"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:fontFamily="@font/inter"
-                android:textSize="11sp" />
+                android:textSize="@dimen/text_size_01" />
         </LinearLayout>
     </LinearLayout>
 </androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/list_item_reward.xml b/app/src/main/res/layout/list_item_reward.xml
index 8e4a5b35..0d466093 100644
--- a/app/src/main/res/layout/list_item_reward.xml
+++ b/app/src/main/res/layout/list_item_reward.xml
@@ -6,23 +6,23 @@
     android:foreground="?attr/selectableItemBackground"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginBottom="16dp">
+    android:layout_marginBottom="@dimen/normal_01">
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:paddingTop="12dp"
-        android:paddingBottom="12dp"
+        android:paddingTop="@dimen/small_12"
+        android:paddingBottom="@dimen/small_12"
         android:orientation="horizontal"
         android:weightSum="10">
         <RelativeLayout
             android:layout_weight="1"
-            android:layout_width="0dp"
+            android:layout_width="@dimen/small_00"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical">
             <ImageView
                 android:id="@+id/reward_item_claimed_icon"
-                android:layout_width="16dp"
-                android:layout_height="16dp"
+                android:layout_width="@dimen/normal_01"
+                android:layout_height="@dimen/normal_01"
                 android:layout_centerInParent="true"
                 android:src="@drawable/ic_check_circle"
                 android:visibility="invisible"
@@ -30,13 +30,13 @@
             <ProgressBar
                 android:id="@+id/reward_item_loading"
                 android:layout_centerInParent="true"
-                android:layout_width="16dp"
-                android:layout_height="16dp"
+                android:layout_width="@dimen/normal_01"
+                android:layout_height="@dimen/normal_01"
                 android:visibility="invisible" />
         </RelativeLayout>
         <LinearLayout
             android:layout_weight="7"
-            android:layout_width="0dp"
+            android:layout_width="@dimen/small_00"
             android:orientation="vertical"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical">
@@ -48,15 +48,15 @@
                 android:fontFamily="@font/inter"
                 android:singleLine="true"
                 android:textColor="@color/lbryGreen"
-                android:textSize="16sp"
+                android:textSize="@dimen/text_size_06"
                 android:textFontWeight="300" />
             <TextView
                 android:id="@+id/reward_item_description"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="2dp"
+                android:layout_marginTop="@dimen/small_02"
                 android:fontFamily="@font/inter"
-                android:textSize="14sp"
+                android:textSize="@dimen/text_size_04"
                 android:textFontWeight="300" />
             <TextView
                 android:id="@+id/reward_item_tx_link"
@@ -64,23 +64,23 @@
                 android:clickable="true"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="2dp"
+                android:layout_marginTop="@dimen/small_02"
                 android:fontFamily="@font/inter"
                 android:textColor="@color/lbryGreen"
                 android:textFontWeight="300"
-                android:textSize="12sp"
+                android:textSize="@dimen/text_size_02"
                 android:visibility="gone" />
             <EditText
                 android:id="@+id/reward_item_custom_code_input"
                 android:background="@android:color/transparent"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="8dp"
+                android:layout_marginTop="@dimen/small_08"
                 android:fontFamily="@font/inter"
                 android:letterSpacing="1.1"
                 android:hint="@string/reward_code_placeholder"
                 android:singleLine="true"
-                android:textSize="16sp"
+                android:textSize="@dimen/text_size_06"
                 android:textFontWeight="300"
                 android:visibility="gone" />
             <com.google.android.material.button.MaterialButton
@@ -88,7 +88,7 @@
                 android:enabled="false"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="16dp"
+                android:layout_marginTop="@dimen/normal_01"
                 android:text="@string/claim"
                 android:fontFamily="@font/inter"
                 android:textFontWeight="300"
@@ -97,7 +97,7 @@
         </LinearLayout>
         <LinearLayout
             android:layout_weight="2"
-            android:layout_width="0dp"
+            android:layout_width="@dimen/small_00"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:orientation="vertical">
@@ -108,7 +108,7 @@
                 android:layout_gravity="center_horizontal"
                 android:text="@string/up_to"
                 android:fontFamily="@font/inter"
-                android:textSize="10sp"
+                android:textSize="@dimen/text_size_00"
                 android:textFontWeight="300"
                 android:visibility="gone" />
             <TextView
@@ -117,23 +117,23 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_horizontal"
                 android:fontFamily="@font/inter"
-                android:textSize="24sp" />
+                android:textSize="@dimen/text_size_11" />
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_horizontal"
                 android:fontFamily="@font/inter"
-                android:textSize="12sp"
+                android:textSize="@dimen/text_size_02"
                 android:text="@string/lbc"
                 android:textFontWeight="300" />
             <TextView
                 android:id="@+id/reward_item_usd_value"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="2dp"
+                android:layout_marginTop="@dimen/small_02"
                 android:layout_gravity="center_horizontal"
                 android:fontFamily="@font/inter"
-                android:textSize="12sp"
+                android:textSize="@dimen/text_size_02"
                 android:textFontWeight="300" />
         </LinearLayout>
     </LinearLayout>
diff --git a/app/src/main/res/layout/list_item_startupstage.xml b/app/src/main/res/layout/list_item_startupstage.xml
index c168ac6f..8950fa4b 100644
--- a/app/src/main/res/layout/list_item_startupstage.xml
+++ b/app/src/main/res/layout/list_item_startupstage.xml
@@ -6,8 +6,8 @@
     xmlns:tools="http://schemas.android.com/tools">
     <ImageView
         android:id="@+id/startup_stage_icon"
-        android:layout_width="16dp"
-        android:layout_height="16dp"
+        android:layout_width="@dimen/normal_01"
+        android:layout_height="@dimen/normal_01"
         android:layout_gravity="center_vertical"
         android:src="@drawable/ic_check"
         app:tint="@color/white" />
@@ -15,12 +15,12 @@
         android:id="@+id/startup_stage_text"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="8dp"
+        android:layout_marginStart="@dimen/small_08"
         android:layout_gravity="center_vertical"
         android:fontFamily="@font/inter"
         tools:text="@string/installation_id_loaded"
         android:textColor="@color/white"
         android:textFontWeight="300"
-        android:textSize="14sp" />
+        android:textSize="@dimen/text_size_04" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/list_item_stream.xml b/app/src/main/res/layout/list_item_stream.xml
index 50a45390..3f60c27c 100644
--- a/app/src/main/res/layout/list_item_stream.xml
+++ b/app/src/main/res/layout/list_item_stream.xml
@@ -4,10 +4,10 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
-    android:paddingStart="16dp"
-    android:paddingEnd="16dp"
-    android:paddingTop="8dp"
-    android:paddingBottom="8dp"
+    android:paddingStart="@dimen/normal_01"
+    android:paddingEnd="@dimen/normal_01"
+    android:paddingTop="@dimen/small_08"
+    android:paddingBottom="@dimen/small_08"
     android:clickable="true"
     android:focusable="true"
     android:foreground="?attr/selectableItemBackground"
@@ -16,15 +16,15 @@
         android:id="@+id/claim_repost_info"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="4dp"
+        android:layout_marginBottom="@dimen/small_04"
         android:orientation="horizontal"
         android:visibility="gone">
         <io.lbry.browser.ui.controls.SolidIconView
-            android:layout_width="16dp"
-            android:layout_height="12dp"
+            android:layout_width="@dimen/normal_01"
+            android:layout_height="@dimen/small_12"
             android:layout_gravity="center_vertical"
             android:textColor="@color/lightForeground"
-            android:textSize="12dp"
+            android:textSize="@dimen/small_12"
             android:text="@string/fa_repost" />
         <TextView
             android:id="@+id/claim_repost_channel"
@@ -33,29 +33,29 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
-            android:layout_marginStart="4dp"
+            android:layout_marginStart="@dimen/small_04"
             android:fontFamily="@font/inter"
             android:textColor="@color/lightForeground"
             android:textFontWeight="300"
-            android:textSize="12sp" />
+            android:textSize="@dimen/text_size_02" />
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
-            android:layout_marginStart="4dp"
+            android:layout_marginStart="@dimen/small_04"
             android:fontFamily="@font/inter"
             android:text="@string/reposted"
             android:textColor="@color/lightForeground"
             android:textFontWeight="300"
-            android:textSize="12sp" />
+            android:textSize="@dimen/text_size_02" />
     </LinearLayout>
     <RelativeLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
         <RelativeLayout
             android:id="@+id/claim_media_container"
-            android:layout_width="160dp"
-            android:layout_height="90dp">
+            android:layout_width="@dimen/large_11"
+            android:layout_height="@dimen/normal_19_02">
             <RelativeLayout
                 android:layout_centerHorizontal="true"
                 android:background="@drawable/bg_thumbnail_icon"
@@ -69,15 +69,15 @@
                     android:layout_height="wrap_content"
                     android:fontFamily="@font/inter"
                     android:textAllCaps="true"
-                    android:textSize="24sp"
+                    android:textSize="@dimen/text_size_11"
                     android:singleLine="true"
                     android:textColor="@color/white"
                     android:textFontWeight="300" />
             </RelativeLayout>
             <ImageView
                 android:id="@+id/claim_thumbnail"
-                android:layout_width="160dp"
-                android:layout_height="90dp" />
+                android:layout_width="@dimen/large_11"
+                android:layout_height="@dimen/normal_19_02" />
             <TextView
                 android:background="@android:color/black"
                 android:id="@+id/claim_duration"
@@ -85,13 +85,13 @@
                 android:layout_height="wrap_content"
                 android:layout_alignParentBottom="true"
                 android:layout_alignParentEnd="true"
-                android:layout_marginEnd="4dp"
-                android:layout_marginBottom="4dp"
+                android:layout_marginEnd="@dimen/small_04"
+                android:layout_marginBottom="@dimen/small_04"
                 android:fontFamily="@font/inter"
                 android:textColor="@android:color/white"
-                android:textSize="10sp"
+                android:textSize="@dimen/text_size_00"
                 android:textFontWeight="300"
-                android:padding="2dp"
+                android:padding="@dimen/small_02"
                 android:visibility="gone" />
             <LinearLayout
                 android:id="@+id/claim_fee_container"
@@ -100,16 +100,16 @@
                 android:layout_height="wrap_content"
                 android:orientation="horizontal"
                 android:layout_alignParentEnd="true"
-                android:layout_marginTop="4dp"
-                android:layout_marginEnd="4dp"
-                android:paddingTop="2dp"
-                android:paddingBottom="2dp"
-                android:paddingStart="6dp"
-                android:paddingEnd="7dp"
+                android:layout_marginTop="@dimen/small_04"
+                android:layout_marginEnd="@dimen/small_04"
+                android:paddingTop="@dimen/small_02"
+                android:paddingBottom="@dimen/small_02"
+                android:paddingStart="@dimen/small_06"
+                android:paddingEnd="@dimen/small_07"
                 android:visibility="gone">
                 <ImageView
-                    android:layout_width="12dp"
-                    android:layout_height="12dp"
+                    android:layout_width="@dimen/small_12"
+                    android:layout_height="@dimen/small_12"
                     android:layout_gravity="center_vertical"
                     android:src="@drawable/ic_credits" />
                 <TextView
@@ -117,10 +117,10 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_vertical"
-                    android:layout_marginStart="1dp"
+                    android:layout_marginStart="@dimen/small_01"
                     android:fontFamily="@font/inter"
                     android:textColor="@android:color/black"
-                    android:textSize="14sp"
+                    android:textSize="@dimen/text_size_04"
                     android:textFontWeight="300" />
             </LinearLayout>
             <RelativeLayout
@@ -131,8 +131,8 @@
                 android:layout_height="match_parent"
                 android:visibility="gone">
                 <ImageView
-                    android:layout_width="36dp"
-                    android:layout_height="36dp"
+                    android:layout_width="@dimen/normal_06"
+                    android:layout_height="@dimen/normal_06"
                     android:layout_centerInParent="true"
                     android:src="@drawable/ic_check"
                     app:tint="@color/nextLbryGreen" />
@@ -141,8 +141,8 @@
                 android:id="@+id/claim_thumbnail_placeholder"
                 android:background="@color/lighterGrey"
                 android:orientation="vertical"
-                android:layout_width="160dp"
-                android:layout_height="90dp"
+                android:layout_width="@dimen/large_11"
+                android:layout_height="@dimen/normal_19_02"
                 android:visibility="gone" />
         </RelativeLayout>
 
@@ -150,22 +150,22 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical"
-            android:layout_marginStart="16dp"
+            android:layout_marginStart="@dimen/normal_01"
             android:layout_toEndOf="@id/claim_media_container">
             <LinearLayout
                 android:id="@+id/claim_text_loading_placeholder_1"
                 android:background="@color/lighterGrey"
                 android:orientation="vertical"
                 android:layout_width="match_parent"
-                android:layout_height="16dp"
+                android:layout_height="@dimen/normal_01"
                 android:visibility="gone" />
             <LinearLayout
                 android:id="@+id/claim_text_loading_placeholder_2"
                 android:background="@color/lighterGrey"
                 android:orientation="vertical"
                 android:layout_width="match_parent"
-                android:layout_height="16dp"
-                android:layout_marginTop="8dp"
+                android:layout_height="@dimen/normal_01"
+                android:layout_marginTop="@dimen/small_08"
                 android:visibility="gone" />
 
             <TextView
@@ -180,7 +180,7 @@
                 android:maxLines="2"
                 android:ellipsize="end"
                 android:fontFamily="@font/inter"
-                android:textSize="14sp"
+                android:textSize="@dimen/text_size_04"
                 android:textFontWeight="600" />
             <TextView
                 android:id="@+id/claim_publisher"
@@ -190,7 +190,7 @@
                 android:layout_height="wrap_content"
                 android:textColor="@color/lbryGreen"
                 android:fontFamily="@font/inter"
-                android:textSize="12sp" />
+                android:textSize="@dimen/text_size_02" />
             <RelativeLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">
@@ -199,7 +199,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:fontFamily="@font/inter"
-                    android:textSize="11sp"
+                    android:textSize="@dimen/text_size_01"
                     android:textFontWeight="300" />
                 <TextView
                     android:id="@+id/claim_pending_text"
@@ -207,7 +207,7 @@
                     android:layout_height="wrap_content"
                     android:fontFamily="@font/inter"
                     android:text="@string/pending"
-                    android:textSize="11sp"
+                    android:textSize="@dimen/text_size_01"
                     android:textStyle="italic"
                     android:textFontWeight="300"
                     android:visibility="gone" />
@@ -218,28 +218,28 @@
                     android:layout_height="wrap_content"
                     android:layout_alignParentEnd="true"
                     android:fontFamily="@font/inter"
-                    android:textSize="11sp"
+                    android:textSize="@dimen/text_size_01"
                     android:textFontWeight="300" />
             </RelativeLayout>
             <!-- download progress bar -->
             <ProgressBar
                 android:id="@+id/claim_download_progress"
                 android:layout_width="match_parent"
-                android:layout_height="4dp"
-                android:layout_marginTop="4dp"
+                android:layout_height="@dimen/small_04"
+                android:layout_marginTop="@dimen/small_04"
                 android:visibility="invisible"
                 style="?android:progressBarStyleHorizontal" />
             <TextView
                 android:id="@+id/claim_view_device"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="4dp"
+                android:layout_marginTop="@dimen/small_04"
                 android:layout_gravity="end"
                 android:ellipsize="end"
                 android:fontFamily="@font/inter"
                 android:singleLine="true"
                 android:textColor="@color/lightGrey"
-                android:textSize="10sp"
+                android:textSize="@dimen/text_size_00"
                 android:textFontWeight="300" />
         </LinearLayout>
     </RelativeLayout>
diff --git a/app/src/main/res/layout/list_item_suggested_channel.xml b/app/src/main/res/layout/list_item_suggested_channel.xml
index 49ebf048..d7c345cf 100644
--- a/app/src/main/res/layout/list_item_suggested_channel.xml
+++ b/app/src/main/res/layout/list_item_suggested_channel.xml
@@ -3,19 +3,19 @@
     android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_margin="2dp"
+    android:layout_margin="@dimen/small_02"
     android:foreground="?attr/selectableItemBackground"
     android:background="@drawable/bg_selected_item"
     android:clickable="true"
     android:focusable="true"
-    android:paddingTop="12dp"
-    android:paddingBottom="12dp"
-    android:paddingStart="8dp"
-    android:paddingEnd="8dp">
+    android:paddingTop="@dimen/small_12"
+    android:paddingBottom="@dimen/small_12"
+    android:paddingStart="@dimen/small_08"
+    android:paddingEnd="@dimen/small_08">
     <RelativeLayout
         android:id="@+id/suggested_media_container"
-        android:layout_width="80dp"
-        android:layout_height="80dp"
+        android:layout_width="@dimen/normal_17"
+        android:layout_height="@dimen/normal_17"
         android:layout_gravity="center_horizontal">
         <RelativeLayout
             android:layout_centerHorizontal="true"
@@ -31,7 +31,7 @@
                 android:layout_centerInParent="true"
                 android:fontFamily="@font/inter"
                 android:textAllCaps="true"
-                android:textSize="48sp"
+                android:textSize="@dimen/text_size_15"
                 android:textColor="@color/white" />
         </RelativeLayout>
         <ImageView
@@ -45,25 +45,25 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
-        android:layout_marginTop="4dp"
+        android:layout_marginTop="@dimen/small_04"
         android:minLines="2"
         android:maxLines="2"
         android:fontFamily="@font/inter"
         android:textAlignment="center"
-        android:textSize="13sp" />
+        android:textSize="@dimen/text_size_03" />
     <TextView
         android:id="@+id/suggested_channel_tag"
         android:singleLine="true"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
-        android:layout_marginTop="2dp"
+        android:layout_marginTop="@dimen/small_02"
         android:fontFamily="@font/inter"
         android:textAlignment="center"
         android:textFontWeight="300"
-        android:textSize="12sp"
-        android:paddingTop="2dp"
-        android:paddingBottom="3dp"
-        android:paddingStart="8dp"
-        android:paddingEnd="8dp" />
+        android:textSize="@dimen/text_size_02"
+        android:paddingTop="@dimen/small_02"
+        android:paddingBottom="@dimen/small_03"
+        android:paddingStart="@dimen/small_08"
+        android:paddingEnd="@dimen/small_08" />
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/list_item_tag.xml b/app/src/main/res/layout/list_item_tag.xml
index f40fdc07..62410551 100644
--- a/app/src/main/res/layout/list_item_tag.xml
+++ b/app/src/main/res/layout/list_item_tag.xml
@@ -5,20 +5,20 @@
     android:clickable="true"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:layout_marginBottom="6dp"
-    android:layout_marginEnd="6dp"
+    android:layout_marginBottom="@dimen/small_06"
+    android:layout_marginEnd="@dimen/small_06"
     android:orientation="horizontal"
-    android:paddingTop="4dp"
-    android:paddingBottom="4dp"
-    android:paddingStart="8dp"
-    android:paddingEnd="12dp"
+    android:paddingTop="@dimen/small_04"
+    android:paddingBottom="@dimen/small_04"
+    android:paddingStart="@dimen/small_08"
+    android:paddingEnd="@dimen/small_12"
     android:foreground="?attr/selectableItemBackground">
     <ImageView
         android:id="@+id/tag_action"
-        android:layout_width="16dp"
-        android:layout_height="16dp"
+        android:layout_width="@dimen/normal_01"
+        android:layout_height="@dimen/normal_01"
         android:layout_gravity="center_vertical"
-        android:layout_marginEnd="4dp"
+        android:layout_marginEnd="@dimen/small_04"
         app:tint="@color/darkForeground" />
     <TextView
         android:id="@+id/tag_name"
@@ -26,7 +26,7 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
         android:fontFamily="@font/inter"
-        android:layout_marginStart="4dp"
-        android:textSize="12sp"
+        android:layout_marginStart="@dimen/small_04"
+        android:textSize="@dimen/text_size_02"
         android:textFontWeight="300" />
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/list_item_transaction.xml b/app/src/main/res/layout/list_item_transaction.xml
index 7f66d2e5..2e5404af 100644
--- a/app/src/main/res/layout/list_item_transaction.xml
+++ b/app/src/main/res/layout/list_item_transaction.xml
@@ -4,7 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
-    android:padding="16dp"
+    android:padding="@dimen/normal_01"
     android:clickable="true"
     android:focusable="true"
     android:background="?attr/selectableItemBackground">
@@ -16,24 +16,24 @@
         <TextView
             android:id="@+id/transaction_desc"
             android:layout_weight="6"
-            android:layout_width="0dp"
+            android:layout_width="@dimen/small_00"
             android:layout_height="wrap_content"
             android:ellipsize="end"
             android:fontFamily="@font/inter"
             android:singleLine="true"
-            android:textSize="14sp"
+            android:textSize="@dimen/text_size_04"
             android:textFontWeight="300"
             />
         <TextView
             android:id="@+id/transaction_amount"
             android:gravity="end"
             android:layout_weight="4"
-            android:layout_width="0dp"
+            android:layout_width="@dimen/small_00"
             android:layout_height="wrap_content"
             android:ellipsize="end"
             android:fontFamily="@font/inter"
             android:singleLine="true"
-            android:textSize="14sp"
+            android:textSize="@dimen/text_size_04"
             android:textFontWeight="300"
             android:textAlignment="viewEnd"
             android:textDirection="ltr"/>
@@ -51,26 +51,26 @@
             android:clickable="true"
             android:background="?attr/selectableItemBackground"
             android:layout_weight="6"
-            android:layout_width="0dp"
+            android:layout_width="@dimen/small_00"
             android:layout_height="wrap_content"
             android:ellipsize="end"
             android:fontFamily="@font/inter"
             android:singleLine="true"
             android:textColor="@color/lbryGreen"
-            android:textSize="14sp"
+            android:textSize="@dimen/text_size_04"
             android:textFontWeight="300"
             />
         <TextView
             android:id="@+id/transaction_fee"
             android:gravity="end"
             android:layout_weight="4"
-            android:layout_width="0dp"
+            android:layout_width="@dimen/small_00"
             android:layout_height="wrap_content"
             android:ellipsize="end"
             android:fontFamily="@font/inter"
             android:singleLine="true"
             android:textColor="@color/lightGrey"
-            android:textSize="14sp"
+            android:textSize="@dimen/text_size_04"
             android:textFontWeight="300" />
     </LinearLayout>
 
@@ -84,13 +84,13 @@
             android:clickable="true"
             android:background="?attr/selectableItemBackground"
             android:layout_weight="6"
-            android:layout_width="0dp"
+            android:layout_width="@dimen/small_00"
             android:layout_height="wrap_content"
             android:ellipsize="end"
             android:fontFamily="@font/inter"
             android:singleLine="true"
             android:textColor="@color/lbryGreen"
-            android:textSize="12sp"
+            android:textSize="@dimen/text_size_02"
             android:textFontWeight="300"
             android:textAlignment="viewStart"
             />
@@ -98,27 +98,27 @@
             android:id="@+id/transaction_date"
             android:gravity="end"
             android:layout_weight="4"
-            android:layout_width="0dp"
+            android:layout_width="@dimen/small_00"
             android:layout_height="wrap_content"
             android:ellipsize="end"
             android:fontFamily="@font/inter"
             android:singleLine="true"
             android:textColor="@color/lightGrey"
-            android:textSize="12sp"
+            android:textSize="@dimen/text_size_02"
             android:textFontWeight="300"
             android:visibility="gone" />
         <TextView
             android:id="@+id/transaction_pending_text"
             android:gravity="end"
             android:layout_weight="4"
-            android:layout_width="0dp"
+            android:layout_width="@dimen/small_00"
             android:layout_height="wrap_content"
             android:ellipsize="end"
             android:fontFamily="@font/inter"
             android:singleLine="true"
             android:text="@string/pending"
             android:textColor="@color/lightGrey"
-            android:textSize="12sp"
+            android:textSize="@dimen/text_size_02"
             android:textStyle="italic"
             android:textFontWeight="300"
             android:visibility="gone" />
diff --git a/app/src/main/res/layout/list_item_url_suggestion.xml b/app/src/main/res/layout/list_item_url_suggestion.xml
index 2be0703e..5ec682af 100644
--- a/app/src/main/res/layout/list_item_url_suggestion.xml
+++ b/app/src/main/res/layout/list_item_url_suggestion.xml
@@ -2,25 +2,25 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent" android:layout_height="wrap_content"
     android:background="?attr/selectableItemBackground"
-    android:paddingStart="12dp"
-    android:paddingEnd="12dp"
-    android:paddingTop="12dp"
-    android:paddingBottom="12dp"
+    android:paddingStart="@dimen/small_12"
+    android:paddingEnd="@dimen/small_12"
+    android:paddingTop="@dimen/small_12"
+    android:paddingBottom="@dimen/small_12"
     android:clickable="true"
     android:focusable="true">
     <io.lbry.browser.ui.controls.SolidIconView
         android:id="@+id/url_suggestion_icon"
         android:textColor="@color/foreground"
-        android:layout_width="24dp"
-        android:layout_height="24dp"
-        android:textSize="18dp"
+        android:layout_width="@dimen/normal_03"
+        android:layout_height="@dimen/normal_03"
+        android:textSize="@dimen/normal_01_02"
         android:layout_centerVertical="true" />
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_toEndOf="@id/url_suggestion_icon"
         android:layout_centerVertical="true"
-        android:layout_marginStart="12dp"
+        android:layout_marginStart="@dimen/small_12"
         android:orientation="vertical">
         <TextView
             android:id="@+id/url_suggestion_title"
@@ -29,7 +29,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:singleLine="true"
-            android:textSize="14sp" />
+            android:textSize="@dimen/text_size_04" />
         <TextView
             android:id="@+id/url_suggestion_description"
             android:ellipsize="end"
@@ -37,7 +37,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:singleLine="true"
-            android:textSize="12sp"
+            android:textSize="@dimen/text_size_02"
             android:textColor="@color/uriDescBlue"
             android:textFontWeight="300" />
     </LinearLayout>
diff --git a/app/src/main/res/layout/nav_header_main.xml b/app/src/main/res/layout/nav_header_main.xml
index c30ccbf5..15f1da68 100644
--- a/app/src/main/res/layout/nav_header_main.xml
+++ b/app/src/main/res/layout/nav_header_main.xml
@@ -21,8 +21,8 @@
             android:layout_height="wrap_content"
             android:layout_gravity="bottom"
             android:background="@color/lbryGreen"
-            android:paddingTop="16dp"
-            android:paddingBottom="16dp">
+            android:paddingTop="@dimen/normal_01"
+            android:paddingBottom="@dimen/normal_01">
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
@@ -30,7 +30,7 @@
                 android:gravity="center"
                 android:text="@string/sign_in"
                 android:fontFamily="@font/inter"
-                android:textSize="14sp"
+                android:textSize="@dimen/text_size_04"
                 android:textFontWeight="600"
                 android:textAllCaps="true" />
         </RelativeLayout>
@@ -45,8 +45,8 @@
         <RelativeLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:paddingTop="16dp"
-            android:paddingBottom="16dp">
+            android:paddingTop="@dimen/normal_01"
+            android:paddingBottom="@dimen/normal_01">
             <TextView
                 android:id="@+id/signed_in_email"
                 android:layout_width="wrap_content"
@@ -56,7 +56,7 @@
                 android:fontFamily="@font/inter"
                 android:gravity="center"
                 android:singleLine="true"
-                android:textSize="14sp"
+                android:textSize="@dimen/text_size_04"
                 android:textAllCaps="true"
                 android:textColor="@color/menuItemForeground"
                 android:textFontWeight="300" />
@@ -67,5 +67,5 @@
         android:id="@+id/sign_in_header_divider"
         android:background="@color/lbryGreen"
         android:layout_width="match_parent"
-        android:layout_height="0.5dp" />
+        android:layout_height="@dimen/small_00.5" />
 </LinearLayout>
diff --git a/app/src/main/res/layout/popup_webview.xml b/app/src/main/res/layout/popup_webview.xml
index 4384b454..37c96a58 100644
--- a/app/src/main/res/layout/popup_webview.xml
+++ b/app/src/main/res/layout/popup_webview.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="340dp"
-    android:layout_height="480dp">
+    android:layout_width="@dimen/large_57"
+    android:layout_height="@dimen/large_92">
     <LinearLayout
         android:id="@+id/popup_webivew_container"
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/spinner_item_channel.xml b/app/src/main/res/layout/spinner_item_channel.xml
index bcc2f763..280c4df2 100644
--- a/app/src/main/res/layout/spinner_item_channel.xml
+++ b/app/src/main/res/layout/spinner_item_channel.xml
@@ -3,12 +3,12 @@
     android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:padding="12dp">
+    android:padding="@dimen/small_12">
     <TextView
         android:id="@+id/channel_item_name"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:fontFamily="@font/inter"
-        android:textSize="14sp"
+        android:textSize="@dimen/text_size_04"
         android:textFontWeight="300" />
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/spinner_item_generic.xml b/app/src/main/res/layout/spinner_item_generic.xml
index fc84a1ee..8951a2d1 100644
--- a/app/src/main/res/layout/spinner_item_generic.xml
+++ b/app/src/main/res/layout/spinner_item_generic.xml
@@ -3,7 +3,7 @@
     android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:padding="12dp">
+    android:padding="@dimen/small_12">
     <TextView
         android:id="@+id/item_display_name"
         android:layout_width="wrap_content"
@@ -11,6 +11,6 @@
         android:ellipsize="end"
         android:fontFamily="@font/inter"
         android:singleLine="true"
-        android:textSize="14sp"
+        android:textSize="@dimen/text_size_04"
         android:textFontWeight="300" />
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index e7aef495..16b6c8eb 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -8,4 +8,176 @@
     <dimen name="wallet_total_balance_font_size">14sp</dimen>
     <dimen name="wallet_detail_balance_font_size">12sp</dimen>
     <dimen name="wallet_detail_balance_desc_font_size">12sp</dimen>
+
+    <!--Text Dimensions-->
+    <dimen name="text_size_00">10sp</dimen>
+    <dimen name="text_size_01">11sp</dimen>
+    <dimen name="text_size_02">12sp</dimen>
+    <dimen name="text_size_03">13sp</dimen>
+    <dimen name="text_size_04">14sp</dimen>
+    <dimen name="text_size_05">15sp</dimen>
+    <dimen name="text_size_06">16sp</dimen>
+    <dimen name="text_size_07">17sp</dimen>
+    <dimen name="text_size_08">18sp</dimen>
+    <dimen name="text_size_09">19sp</dimen>
+    <dimen name="text_size_10">20sp</dimen>
+    <dimen name="text_size_11">24sp</dimen>
+    <dimen name="text_size_12">28sp</dimen>
+    <dimen name="text_size_13">30sp</dimen>
+    <dimen name="text_size_14">32sp</dimen>
+    <dimen name="text_size_15">48sp</dimen>
+    <dimen name="text_size_16">56sp</dimen>
+
+    <!--Layout Dimensions-->
+    <dimen name="small_00">0dp</dimen>
+    <dimen name="small_00.5">0.5dp</dimen>
+    <dimen name="small_01">1dp</dimen>
+    <dimen name="small_02">2dp</dimen>
+    <dimen name="small_03">3dp</dimen>
+    <dimen name="small_04">4dp</dimen>
+    <dimen name="small_05">5dp</dimen>
+    <dimen name="small_06">6dp</dimen>
+    <dimen name="small_07">7dp</dimen>
+    <dimen name="small_08">8dp</dimen>
+    <dimen name="small_09">9dp</dimen>
+    <dimen name="small_10">10dp</dimen>
+    <dimen name="small_11">11dp</dimen>
+    <dimen name="small_12">12dp</dimen>
+    <dimen name="small_13">13dp</dimen>
+    <dimen name="small_14">14dp</dimen>
+    <dimen name="small_15">15dp</dimen>
+
+    <dimen name="normal_01">16dp</dimen>
+    <dimen name="normal_01_01">17dp</dimen>
+    <dimen name="normal_01_02">18dp</dimen>
+    <dimen name="normal_01_03">19dp</dimen>
+
+    <dimen name="normal_02">20dp</dimen>
+    <dimen name="normal_02_01">21dp</dimen>
+    <dimen name="normal_02_02">22dp</dimen>
+    <dimen name="normal_02_03">23dp</dimen>
+
+    <dimen name="normal_03">24dp</dimen>
+
+    <dimen name="normal_04">28dp</dimen>
+    <dimen name="normal_04_01">29dp</dimen>
+    <dimen name="normal_04_02">30dp</dimen>
+    <dimen name="normal_04_03">31dp</dimen>
+
+    <dimen name="normal_05">32dp</dimen>
+    <dimen name="normal_06">36dp</dimen>
+    <dimen name="normal_07">40dp</dimen>
+    <dimen name="normal_08">44dp</dimen>
+
+    <dimen name="normal_09">48dp</dimen>
+    <dimen name="normal_09_01">49dp</dimen>
+    <dimen name="normal_09_02">50dp</dimen>
+    <dimen name="normal_09_03">51dp</dimen>
+
+    <dimen name="normal_10">52dp</dimen>
+    <dimen name="normal_11">56dp</dimen>
+    <dimen name="normal_12">60dp</dimen>
+    <dimen name="normal_13">64dp</dimen>
+    <dimen name="normal_14">68dp</dimen>
+    <dimen name="normal_15">72dp</dimen>
+    <dimen name="normal_16">76dp</dimen>
+    <dimen name="normal_17">80dp</dimen>
+    <dimen name="normal_18">84dp</dimen>
+
+    <dimen name="normal_19">88dp</dimen>
+    <dimen name="normal_19_01">89dp</dimen>
+    <dimen name="normal_19_02">90dp</dimen>
+    <dimen name="normal_19_03">91dp</dimen>
+
+    <dimen name="normal_20">92dp</dimen>
+    <dimen name="normal_21">96dp</dimen>
+    <dimen name="normal_22">100dp</dimen>
+    <dimen name="normal_23">104dp</dimen>
+
+    <dimen name="normal_24">108dp</dimen>
+    <dimen name="normal_24_01">109dp</dimen>
+    <dimen name="normal_24_02">110dp</dimen>
+    <dimen name="normal_24_03">111dp</dimen>
+
+    <dimen name="normal_25">112dp</dimen>
+    <dimen name="normal_26">116dp</dimen>
+
+    <dimen name="large_01">120dp</dimen>
+    <dimen name="large_02">124dp</dimen>
+    <dimen name="large_03">128dp</dimen>
+    <dimen name="large_04">132dp</dimen>
+    <dimen name="large_05">136dp</dimen>
+    <dimen name="large_06">140dp</dimen>
+    <dimen name="large_07">144dp</dimen>
+    <dimen name="large_08">148dp</dimen>
+    <dimen name="large_08.5">148.5dp</dimen>
+
+    <dimen name="large_09">152dp</dimen>
+    <dimen name="large_10">156dp</dimen>
+    <dimen name="large_11">160dp</dimen>
+
+    <dimen name="large_12">164dp</dimen>
+    <dimen name="large_13">168dp</dimen>
+    <dimen name="large_14">172dp</dimen>
+    <dimen name="large_15">176dp</dimen>
+    <dimen name="large_16">180dp</dimen>
+    <dimen name="large_17">184dp</dimen>
+    <dimen name="large_18">188dp</dimen>
+    <dimen name="large_19">192dp</dimen>
+    <dimen name="large_20">196dp</dimen>
+    <dimen name="large_21">200dp</dimen>
+    <dimen name="large_22">204dp</dimen>
+    <dimen name="large_23">208dp</dimen>
+    <dimen name="large_24">212dp</dimen>
+    <dimen name="large_25">216dp</dimen>
+    <dimen name="large_26">220dp</dimen>
+    <dimen name="large_27">224dp</dimen>
+    <dimen name="large_28">228dp</dimen>
+    <dimen name="large_29">232dp</dimen>
+    <dimen name="large_30">236dp</dimen>
+
+    <dimen name="large_31">240dp</dimen>
+    <dimen name="large_31_01">241dp</dimen>
+    <dimen name="large_31_02">242dp</dimen>
+    <dimen name="large_31_03">243dp</dimen>
+
+    <dimen name="large_32">244dp</dimen>
+    <dimen name="large_32_01">245dp</dimen>
+    <dimen name="large_32_02">246dp</dimen>
+    <dimen name="large_32_03">247dp</dimen>
+
+    <dimen name="large_33">248dp</dimen>
+    <dimen name="large_34">252dp</dimen>
+    <dimen name="large_35">256dp</dimen>
+    <dimen name="large_36">260dp</dimen>
+
+    <dimen name="large_37">260dp</dimen>
+    <dimen name="large_38">264dp</dimen>
+    <dimen name="large_39">268dp</dimen>
+    <dimen name="large_40">272dp</dimen>
+    <dimen name="large_41">276dp</dimen>
+    <dimen name="large_42">280dp</dimen>
+    <dimen name="large_43">284dp</dimen>
+    <dimen name="large_44">288dp</dimen>
+    <dimen name="large_45">292dp</dimen>
+    <dimen name="large_46">296dp</dimen>
+    <dimen name="large_47">300dp</dimen>
+
+    <dimen name="large_48">304dp</dimen>
+    <dimen name="large_49">308dp</dimen>
+    <dimen name="large_50">312dp</dimen>
+    <dimen name="large_51">316dp</dimen>
+    <dimen name="large_52">320dp</dimen>
+    <dimen name="large_53">324dp</dimen>
+    <dimen name="large_54">328dp</dimen>
+    <dimen name="large_55">332dp</dimen>
+    <dimen name="large_56">336dp</dimen>
+    <dimen name="large_57">340dp</dimen>
+
+    <dimen name="large_92">480dp</dimen>
+
+    <dimen name="negative_small_01.5">-1.5dp</dimen>
+    <dimen name="negative_small_01">-1dp</dimen>
+    <dimen name="negative_normal_06">-36dp</dimen>
+
 </resources>
\ No newline at end of file