diff --git a/app/src/main/java/com/github/vase4kin/teamcityapp/app_navigation/BottomNavigationView.kt b/app/src/main/java/com/github/vase4kin/teamcityapp/app_navigation/BottomNavigationView.kt
index ae7088cc..b9f54ac2 100644
--- a/app/src/main/java/com/github/vase4kin/teamcityapp/app_navigation/BottomNavigationView.kt
+++ b/app/src/main/java/com/github/vase4kin/teamcityapp/app_navigation/BottomNavigationView.kt
@@ -101,7 +101,7 @@ class BottomNavigationViewImpl(
         }
 
         val elevation =
-            activity.resources.getDimension(R.dimen.elevation_bottom_navigation)
+            activity.resources.getDimension(R.dimen.dp_8)
         val backgroundColor = ElevationOverlayProvider(activity).compositeOverlayIfNeeded(
             activity.getThemeColor(R.attr.colorPrimarySurface), elevation
         )
diff --git a/app/src/main/java/com/github/vase4kin/teamcityapp/buildlist/view/BuildListViewImpl.kt b/app/src/main/java/com/github/vase4kin/teamcityapp/buildlist/view/BuildListViewImpl.kt
index 535571c2..ed03e5c3 100644
--- a/app/src/main/java/com/github/vase4kin/teamcityapp/buildlist/view/BuildListViewImpl.kt
+++ b/app/src/main/java/com/github/vase4kin/teamcityapp/buildlist/view/BuildListViewImpl.kt
@@ -312,8 +312,8 @@ open class BuildListViewImpl(
             .setCaptureTouchEventOutsidePrompt(true)
             .setPromptFocal(
                 RectanglePromptFocal().setCornerRadius(
-                    activity.resources.getDimension(R.dimen.default_prompt_fab_radius),
-                    activity.resources.getDimension(R.dimen.default_prompt_fab_radius)
+                    activity.resources.getDimension(R.dimen.dp_38),
+                    activity.resources.getDimension(R.dimen.dp_38)
                 )
             )
             .setPromptStateChangeListener { _, state ->
@@ -390,7 +390,7 @@ open class BuildListViewImpl(
 
     private fun getBackgroundColor(): Int {
         val elevation =
-            activity.resources.getDimension(R.dimen.default_elevation)
+            activity.resources.getDimension(R.dimen.dp_4)
         return ElevationOverlayProvider(activity).compositeOverlayIfNeeded(
             activity.getThemeColor(R.attr.colorPrimarySurface), elevation
         )
diff --git a/app/src/main/java/com/github/vase4kin/teamcityapp/home/view/HomeViewImpl.kt b/app/src/main/java/com/github/vase4kin/teamcityapp/home/view/HomeViewImpl.kt
index 72947ce7..088040b3 100644
--- a/app/src/main/java/com/github/vase4kin/teamcityapp/home/view/HomeViewImpl.kt
+++ b/app/src/main/java/com/github/vase4kin/teamcityapp/home/view/HomeViewImpl.kt
@@ -228,7 +228,7 @@ class HomeViewImpl(private val activity: AppCompatActivity) : HomeView {
 
     private fun getBackgroundColor(): Int {
         val elevation =
-            activity.resources.getDimension(R.dimen.default_elevation)
+            activity.resources.getDimension(R.dimen.dp_4)
         return ElevationOverlayProvider(activity).compositeOverlayIfNeeded(
             activity.getThemeColor(R.attr.colorPrimarySurface), elevation
         )
diff --git a/app/src/main/java/com/github/vase4kin/teamcityapp/overview/view/OverviewViewImpl.kt b/app/src/main/java/com/github/vase4kin/teamcityapp/overview/view/OverviewViewImpl.kt
index 8b453752..0319e28e 100644
--- a/app/src/main/java/com/github/vase4kin/teamcityapp/overview/view/OverviewViewImpl.kt
+++ b/app/src/main/java/com/github/vase4kin/teamcityapp/overview/view/OverviewViewImpl.kt
@@ -460,7 +460,7 @@ class OverviewViewImpl(
 
     private fun getBackgroundColor(): Int {
         val elevation =
-            activity.resources.getDimension(R.dimen.default_elevation)
+            activity.resources.getDimension(R.dimen.dp_4)
         return ElevationOverlayProvider(activity).compositeOverlayIfNeeded(
             activity.getThemeColor(R.attr.colorPrimarySurface), elevation
         )
diff --git a/app/src/main/res/layout/activity_build.xml b/app/src/main/res/layout/activity_build.xml
index 12fe10be..d634af86 100644
--- a/app/src/main/res/layout/activity_build.xml
+++ b/app/src/main/res/layout/activity_build.xml
@@ -45,8 +45,12 @@
         android:layout_height="match_parent"
         app:layout_behavior="@string/appbar_scrolling_view_behavior" />
 
-    <include
-        style="@style/BaseFloatingActionButton.NotVisible"
-        layout="@layout/layout_float_button" />
+    <com.google.android.material.floatingactionbutton.FloatingActionButton xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/floating_action_button"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="end|bottom"
+        android:visibility="gone"
+        tools:src="@drawable/ic_add_black_24dp" />
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_build_list.xml b/app/src/main/res/layout/activity_build_list.xml
index ee810656..f489e57d 100644
--- a/app/src/main/res/layout/activity_build_list.xml
+++ b/app/src/main/res/layout/activity_build_list.xml
@@ -70,7 +70,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="bottom|end"
-        android:layout_margin="@dimen/default_margin"
+        android:layout_margin="@dimen/dp_16"
         android:text="@string/title_run_build"
         android:visibility="invisible"
         app:icon="@drawable/ic_directions_run_white_24px"
diff --git a/app/src/main/res/layout/activity_create_account.xml b/app/src/main/res/layout/activity_create_account.xml
index c0fbe9b0..91284440 100644
--- a/app/src/main/res/layout/activity_create_account.xml
+++ b/app/src/main/res/layout/activity_create_account.xml
@@ -47,9 +47,9 @@
                 android:id="@+id/teamcity_url_wrapper"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="@dimen/default_margin"
-                android:layout_marginTop="@dimen/default_margin"
-                android:layout_marginRight="@dimen/default_margin"
+                android:layout_marginLeft="@dimen/dp_16"
+                android:layout_marginTop="@dimen/dp_16"
+                android:layout_marginRight="@dimen/dp_16"
                 android:hint="@string/server_field_hint">
 
                 <com.github.vase4kin.teamcityapp.login.view.EditTextNoAutofill
@@ -65,18 +65,18 @@
                 android:id="@+id/guest_user_switch"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="@dimen/default_margin"
-                android:layout_marginTop="@dimen/default_margin"
-                android:layout_marginRight="@dimen/default_margin"
+                android:layout_marginLeft="@dimen/dp_16"
+                android:layout_marginTop="@dimen/dp_16"
+                android:layout_marginRight="@dimen/dp_16"
                 android:text="@string/text_guest_user_switch" />
 
             <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/user_field_wrapper"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="@dimen/default_margin"
-                android:layout_marginTop="@dimen/default_margin"
-                android:layout_marginRight="@dimen/default_margin"
+                android:layout_marginLeft="@dimen/dp_16"
+                android:layout_marginTop="@dimen/dp_16"
+                android:layout_marginRight="@dimen/dp_16"
                 android:hint="@string/hint_user_name">
 
                 <com.github.vase4kin.teamcityapp.login.view.EditTextNoAutofill
@@ -92,9 +92,9 @@
                 android:id="@+id/password_field_wrapper"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="@dimen/default_margin"
-                android:layout_marginTop="@dimen/default_margin"
-                android:layout_marginRight="@dimen/default_margin"
+                android:layout_marginLeft="@dimen/dp_16"
+                android:layout_marginTop="@dimen/dp_16"
+                android:layout_marginRight="@dimen/dp_16"
                 android:hint="@string/hint_password">
 
                 <com.github.vase4kin.teamcityapp.login.view.EditTextNoAutofill
@@ -110,10 +110,10 @@
                 android:id="@+id/disable_ssl_switch"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="@dimen/default_margin"
-                android:layout_marginTop="@dimen/default_margin"
-                android:layout_marginRight="@dimen/default_margin"
-                android:layout_marginBottom="@dimen/default_margin"
+                android:layout_marginLeft="@dimen/dp_16"
+                android:layout_marginTop="@dimen/dp_16"
+                android:layout_marginRight="@dimen/dp_16"
+                android:layout_marginBottom="@dimen/dp_16"
                 android:text="@string/text_disable_ssl_switch" />
 
             <include layout="@layout/layout_divider" />
diff --git a/app/src/main/res/layout/activity_filter_builds.xml b/app/src/main/res/layout/activity_filter_builds.xml
index db997efe..c662291f 100644
--- a/app/src/main/res/layout/activity_filter_builds.xml
+++ b/app/src/main/res/layout/activity_filter_builds.xml
@@ -39,7 +39,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="bottom|center"
-        android:layout_margin="@dimen/default_margin"
+        android:layout_margin="@dimen/dp_16"
         android:text="@string/text_apply_filters_button"
         app:icon="@drawable/ic_done_24px" />
 
@@ -71,23 +71,23 @@
                     android:background="?attr/selectableItemBackground"
                     android:clickable="true"
                     android:orientation="vertical"
-                    android:paddingLeft="@dimen/default_margin"
-                    android:paddingTop="@dimen/padding_switch"
-                    android:paddingRight="@dimen/default_margin"
-                    android:paddingBottom="@dimen/padding_switch">
+                    android:paddingLeft="@dimen/dp_16"
+                    android:paddingTop="@dimen/dp_12"
+                    android:paddingRight="@dimen/dp_16"
+                    android:paddingBottom="@dimen/dp_12">
 
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="@string/text_filters"
-                        android:textColor="@color/material_on_background_emphasis_high_type"
-                        android:textSize="18sp" />
+                        android:textAppearance="?textAppearanceBody1" />
 
                     <TextView
                         android:id="@+id/selected_filter"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="@string/text_filters_none"
+                        android:textAppearance="?textAppearanceBody2"
                         android:textColor="@color/material_on_background_emphasis_medium" />
 
                 </LinearLayout>
@@ -116,9 +116,9 @@
 
                 <!--View that makes a view scrollable for low-res devices, to make fab to not overlap the content-->
                 <View
-                    android:background="?android:attr/colorBackground"
                     android:layout_width="match_parent"
-                    android:layout_height="@dimen/dimen_96dp"/>
+                    android:layout_height="@dimen/dp_96"
+                    android:background="?android:attr/colorBackground" />
 
             </LinearLayout>
 
diff --git a/app/src/main/res/layout/activity_home.xml b/app/src/main/res/layout/activity_home.xml
index 6aa56015..f1c75c9c 100644
--- a/app/src/main/res/layout/activity_home.xml
+++ b/app/src/main/res/layout/activity_home.xml
@@ -57,7 +57,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="end|bottom"
-        android:layout_marginEnd="@dimen/default_margin"
+        android:layout_marginEnd="@dimen/dp_16"
         android:layout_marginBottom="74dp"
         android:visibility="gone"
         tools:src="@drawable/ic_favorite_white_24dp"
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index acdfc849..44fdec6d 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -27,7 +27,7 @@
         android:layout_height="wrap_content"
         android:fillViewport="true"
         android:orientation="vertical"
-        android:paddingTop="48dp">
+        android:paddingTop="@dimen/dp_48">
 
         <ImageView
             android:layout_width="wrap_content"
@@ -39,7 +39,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
-            android:layout_marginTop="@dimen/default_margin"
+            android:layout_marginTop="@dimen/dp_16"
             android:text="@string/app_name"
             android:textAppearance="?attr/textAppearanceHeadline5" />
 
@@ -47,20 +47,19 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
-            android:layout_marginTop="@dimen/small_margin"
+            android:layout_marginTop="@dimen/dp_8"
             android:gravity="center"
             android:text="@string/text_app_description"
-            android:textAppearance="?attr/textAppearanceSubtitle1"
-            android:textColor="@color/material_on_background_emphasis_medium"
-            android:textSize="20sp" />
+            android:textAppearance="?attr/textAppearanceHeadline6"
+            android:textColor="@color/material_on_background_emphasis_medium" />
 
         <com.google.android.material.textfield.TextInputLayout
             android:id="@+id/teamcity_url_wrapper"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/login_screen_margin"
-            android:layout_marginTop="@dimen/login_screen_margin"
-            android:layout_marginRight="@dimen/login_screen_margin"
+            android:layout_marginLeft="@dimen/dp_24"
+            android:layout_marginTop="@dimen/dp_24"
+            android:layout_marginRight="@dimen/dp_24"
             android:hint="@string/server_field_hint">
 
             <com.github.vase4kin.teamcityapp.login.view.EditTextNoAutofill
@@ -76,17 +75,17 @@
             android:id="@+id/guest_user_switch"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginStart="28dp"
-            android:layout_marginTop="@dimen/small_margin"
-            android:layout_marginEnd="@dimen/login_screen_margin"
+            android:layout_marginStart="@dimen/dp_24"
+            android:layout_marginTop="@dimen/dp_8"
+            android:layout_marginEnd="@dimen/dp_24"
             android:text="@string/text_guest_user_switch" />
 
         <com.google.android.material.textfield.TextInputLayout
             android:id="@+id/user_field_wrapper"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/login_screen_margin"
-            android:layout_marginRight="@dimen/login_screen_margin"
+            android:layout_marginLeft="@dimen/dp_24"
+            android:layout_marginRight="@dimen/dp_24"
             android:hint="@string/hint_user_name">
 
             <com.github.vase4kin.teamcityapp.login.view.EditTextNoAutofill
@@ -102,8 +101,8 @@
             android:id="@+id/password_field_wrapper"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/login_screen_margin"
-            android:layout_marginRight="@dimen/login_screen_margin"
+            android:layout_marginLeft="@dimen/dp_24"
+            android:layout_marginRight="@dimen/dp_24"
             android:hint="@string/hint_password">
 
             <com.github.vase4kin.teamcityapp.login.view.EditTextNoAutofill
@@ -119,16 +118,16 @@
             android:id="@+id/disable_ssl_switch"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginStart="28dp"
-            android:layout_marginTop="@dimen/small_margin"
-            android:layout_marginEnd="@dimen/login_screen_margin"
+            android:layout_marginStart="@dimen/dp_24"
+            android:layout_marginTop="@dimen/dp_8"
+            android:layout_marginEnd="@dimen/dp_24"
             android:text="@string/text_disable_ssl_switch" />
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/btn_login"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_margin="@dimen/login_screen_margin"
+            android:layout_margin="@dimen/dp_24"
             android:text="@string/text_login_button" />
 
         <ProgressBar
@@ -136,7 +135,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
-            android:layout_marginBottom="@dimen/login_screen_margin"
+            android:layout_marginBottom="@dimen/dp_24"
             android:visibility="gone"
             tools:visibility="visible" />
 
@@ -144,9 +143,9 @@
             android:id="@+id/give_it_a_try_view"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="@dimen/login_screen_margin"
-            android:layout_marginRight="@dimen/login_screen_margin"
-            android:layout_marginBottom="@dimen/login_screen_margin"
+            android:layout_marginLeft="@dimen/dp_24"
+            android:layout_marginRight="@dimen/dp_24"
+            android:layout_marginBottom="@dimen/dp_24"
             android:visibility="gone"
             tools:visibility="visible">
 
@@ -156,9 +155,9 @@
 
                 <ImageView
                     android:id="@+id/imageView"
-                    android:layout_width="32dp"
-                    android:layout_height="32dp"
-                    android:layout_margin="@dimen/default_margin"
+                    android:layout_width="@dimen/dp_32"
+                    android:layout_height="@dimen/dp_32"
+                    android:layout_margin="@dimen/dp_16"
                     app:layout_constraintBottom_toBottomOf="@id/text"
                     app:layout_constraintEnd_toStartOf="@id/text"
                     app:layout_constraintStart_toStartOf="parent"
@@ -168,10 +167,10 @@
 
                 <TextView
                     android:id="@+id/text"
-                    android:layout_width="0dp"
+                    android:layout_width="@dimen/dp_0"
                     android:layout_height="wrap_content"
-                    android:layout_marginTop="@dimen/default_margin"
-                    android:layout_marginEnd="@dimen/default_margin"
+                    android:layout_marginTop="@dimen/dp_16"
+                    android:layout_marginEnd="@dimen/dp_16"
                     android:gravity="start"
                     android:text="@string/text_try_it_out"
                     android:textAppearance="?attr/textAppearanceSubtitle1"
@@ -185,8 +184,8 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="end"
-                    android:layout_marginTop="@dimen/small_margin"
-                    android:layout_marginEnd="@dimen/default_margin"
+                    android:layout_marginTop="@dimen/dp_8"
+                    android:layout_marginEnd="@dimen/dp_16"
                     android:text="@string/text_button_try_it_out"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintTop_toBottomOf="@id/text" />
diff --git a/app/src/main/res/layout/activity_run_build.xml b/app/src/main/res/layout/activity_run_build.xml
index b28c85c7..72a98854 100644
--- a/app/src/main/res/layout/activity_run_build.xml
+++ b/app/src/main/res/layout/activity_run_build.xml
@@ -38,7 +38,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="bottom|center"
-        android:layout_margin="@dimen/default_margin"
+        android:layout_margin="@dimen/dp_16"
         android:text="@string/title_run_build"
         app:icon="@drawable/ic_directions_run_white_24px" />
 
@@ -66,22 +66,22 @@
                 <LinearLayout
                     android:id="@+id/chooser_agent"
                     android:layout_width="match_parent"
-                    android:layout_height="82dp"
+                    android:layout_height="wrap_content"
                     android:background="?attr/selectableItemBackground"
                     android:clickable="true"
+                    android:focusable="true"
                     android:orientation="vertical"
-                    android:paddingLeft="@dimen/default_margin"
-                    android:paddingTop="@dimen/padding_switch"
-                    android:paddingRight="@dimen/default_margin"
-                    android:paddingBottom="@dimen/padding_switch">
+                    android:paddingLeft="@dimen/dp_16"
+                    android:paddingTop="@dimen/dp_12"
+                    android:paddingRight="@dimen/dp_16"
+                    android:paddingBottom="@dimen/dp_12">
 
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="4dp"
                         android:text="@string/text_agents"
-                        android:textColor="@color/material_on_background_emphasis_high_type"
-                        android:textSize="18sp" />
+                        android:textAppearance="?attr/textAppearanceBody1" />
 
                     <TextView
                         android:id="@+id/selected_agent"
@@ -91,8 +91,8 @@
                         android:ellipsize="end"
                         android:maxLines="1"
                         android:text="@string/hint_default_filter_agent"
+                        android:textAppearance="?attr/textAppearanceBody2"
                         android:textColor="@color/material_on_background_emphasis_medium"
-                        android:textSize="16sp"
                         android:visibility="gone"
                         tools:visibility="visible" />
 
@@ -102,9 +102,10 @@
                         android:layout_height="wrap_content"
                         android:layout_marginTop="4dp"
                         android:text="@string/text_no_agents_available"
+                        android:textAppearance="?attr/textAppearanceBody2"
                         android:textColor="@color/material_on_background_emphasis_medium"
-                        android:textSize="16sp"
-                        android:visibility="gone" />
+                        android:visibility="gone"
+                        tools:visibility="visible" />
 
                     <LinearLayout
                         android:id="@+id/progress_agents_loading"
@@ -113,15 +114,15 @@
                         android:gravity="center_vertical"
                         android:orientation="horizontal"
                         android:visibility="visible"
-                        tools:visibility="gone">
+                        tools:visibility="visible">
 
                         <TextView
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:layout_marginRight="@dimen/default_margin"
+                            android:layout_marginRight="@dimen/dp_16"
                             android:text="@string/text_loading_agents"
-                            android:textColor="@color/material_on_background_emphasis_medium"
-                            android:textSize="18sp" />
+                            android:textAppearance="?attr/textAppearanceBody2"
+                            android:textColor="@color/material_on_background_emphasis_medium" />
 
                         <ProgressBar
                             android:id="@+id/progress_wheel"
@@ -169,18 +170,17 @@
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:orientation="vertical"
-                    android:paddingLeft="@dimen/default_margin"
-                    android:paddingTop="@dimen/padding_switch"
-                    android:paddingRight="@dimen/default_margin"
-                    android:paddingBottom="@dimen/padding_switch">
+                    android:paddingLeft="@dimen/dp_16"
+                    android:paddingTop="@dimen/dp_12"
+                    android:paddingRight="@dimen/dp_16"
+                    android:paddingBottom="@dimen/dp_12">
 
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="4dp"
                         android:text="@string/text_parameters"
-                        android:textColor="@color/material_on_background_emphasis_high_type"
-                        android:textSize="18sp" />
+                        android:textAppearance="?attr/textAppearanceBody1" />
 
                     <TextView
                         android:id="@+id/parameters_none"
@@ -190,8 +190,8 @@
                         android:ellipsize="end"
                         android:maxLines="1"
                         android:text="@string/text_filters_none"
-                        android:textColor="@color/material_on_background_emphasis_medium"
-                        android:textSize="16sp" />
+                        android:textAppearance="?attr/textAppearanceBody2"
+                        android:textColor="@color/material_on_background_emphasis_medium" />
 
                     <LinearLayout
                         android:id="@+id/container_parameters"
@@ -225,7 +225,7 @@
                             style="@style/Widget.MaterialComponents.Button.OutlinedButton"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:layout_marginStart="@dimen/default_margin"
+                            android:layout_marginStart="@dimen/dp_16"
                             android:enabled="false"
                             android:text="@string/text_clear_parameters" />
 
@@ -237,9 +237,9 @@
 
                 <!--View that makes a view scrollable for low-res devices, to make fab to not overlap the content-->
                 <View
-                    android:background="?android:attr/colorBackground"
                     android:layout_width="match_parent"
-                    android:layout_height="@dimen/dimen_96dp"/>
+                    android:layout_height="@dimen/dp_96"
+                    android:background="?android:attr/colorBackground" />
 
             </LinearLayout>
 
diff --git a/app/src/main/res/layout/dialog_bottom_sheet.xml b/app/src/main/res/layout/dialog_bottom_sheet.xml
index 26014477..b7f0c1ea 100644
--- a/app/src/main/res/layout/dialog_bottom_sheet.xml
+++ b/app/src/main/res/layout/dialog_bottom_sheet.xml
@@ -23,18 +23,18 @@
     android:orientation="vertical">
 
     <View
-        android:layout_width="32dp"
-        android:layout_height="4dp"
+        android:layout_width="@dimen/dp_32"
+        android:layout_height="@dimen/dp_4"
         android:layout_gravity="center"
-        android:layout_marginTop="8dp"
+        android:layout_marginTop="@dimen/dp_8"
         android:background="@drawable/bottom_sheet_view" />
 
     <TextView
         android:id="@+id/bs_main_title"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="16dp"
-        android:layout_marginRight="16dp"
+        android:layout_marginLeft="@dimen/dp_16"
+        android:layout_marginRight="@dimen/dp_16"
         android:gravity="center_vertical"
         android:minHeight="52dp"
         android:singleLine="true"
@@ -47,7 +47,7 @@
         android:id="@+id/my_recycler_view"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="@dimen/small_margin"
+        android:layout_marginBottom="@dimen/dp_8"
         tools:listitem="@layout/item_bottom_sheet" />
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/dialog_bottom_sheet_filter.xml b/app/src/main/res/layout/dialog_bottom_sheet_filter.xml
index 67876652..aef15a93 100644
--- a/app/src/main/res/layout/dialog_bottom_sheet_filter.xml
+++ b/app/src/main/res/layout/dialog_bottom_sheet_filter.xml
@@ -55,7 +55,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
-            android:layout_marginStart="@dimen/default_margin"
+            android:layout_marginStart="@dimen/dp_16"
             app:srcCompat="@drawable/ic_done_24px"
             app:tint="?attr/colorOnBackground" />
 
diff --git a/app/src/main/res/layout/fragment_build_list.xml b/app/src/main/res/layout/fragment_build_list.xml
index e8807143..1ba3434e 100644
--- a/app/src/main/res/layout/fragment_build_list.xml
+++ b/app/src/main/res/layout/fragment_build_list.xml
@@ -58,7 +58,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="bottom|end"
-        android:layout_margin="@dimen/default_margin"
+        android:layout_margin="@dimen/dp_16"
         android:text="@string/title_run_build"
         android:visibility="invisible"
         app:icon="@drawable/ic_directions_run_white_24px"
diff --git a/app/src/main/res/layout/fragment_build_log.xml b/app/src/main/res/layout/fragment_build_log.xml
index a82ee060..3355acf3 100644
--- a/app/src/main/res/layout/fragment_build_log.xml
+++ b/app/src/main/res/layout/fragment_build_log.xml
@@ -36,7 +36,7 @@
         android:id="@+id/auth_view"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_margin="@dimen/default_margin"
+        android:layout_margin="@dimen/dp_16"
         android:gravity="center"
         android:orientation="vertical"
         android:visibility="gone"
@@ -45,18 +45,18 @@
         <ImageView
             android:layout_width="80dp"
             android:layout_height="80dp"
-            android:layout_marginBottom="@dimen/default_margin"
+            android:layout_marginBottom="@dimen/dp_16"
             app:srcCompat="@drawable/ic_accessible_black_24px"
             app:tint="@color/material_on_background_emphasis_medium" />
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="@dimen/default_margin"
+            android:layout_marginBottom="@dimen/dp_16"
             android:gravity="center"
             android:text="@string/text_login_again"
-            android:textColor="@color/material_on_background_emphasis_medium"
-            android:textSize="18sp" />
+            android:textAppearance="?attr/textAppearanceBody1"
+            android:textColor="@color/material_on_background_emphasis_medium" />
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/auth_button"
@@ -70,7 +70,7 @@
         android:id="@+id/warning_build_log_view"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_margin="@dimen/default_margin"
+        android:layout_margin="@dimen/dp_16"
         android:gravity="center"
         android:orientation="vertical"
         android:visibility="gone"
@@ -86,11 +86,11 @@
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="@dimen/default_margin"
+            android:layout_marginBottom="@dimen/dp_16"
             android:gravity="center"
             android:text="@string/text_browse_build_log"
-            android:textColor="@color/material_on_background_emphasis_high_type"
-            android:textSize="18sp" />
+            android:textAppearance="?attr/textAppearanceBody1"
+            android:textColor="@color/material_on_background_emphasis_high_type" />
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/view_build_log_button"
diff --git a/app/src/main/res/layout/fragment_overview_list.xml b/app/src/main/res/layout/fragment_overview_list.xml
index 31c746b5..52da449e 100644
--- a/app/src/main/res/layout/fragment_overview_list.xml
+++ b/app/src/main/res/layout/fragment_overview_list.xml
@@ -32,8 +32,8 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:clipToPadding="false"
-            android:paddingTop="8dp"
-            android:paddingBottom="8dp" />
+            android:paddingTop="@dimen/dp_8"
+            android:paddingBottom="@dimen/dp_8" />
 
     </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
 
diff --git a/app/src/main/res/layout/fragment_snapshot_dependencies.xml b/app/src/main/res/layout/fragment_snapshot_dependencies.xml
index 9a1a5090..ad3a1213 100644
--- a/app/src/main/res/layout/fragment_snapshot_dependencies.xml
+++ b/app/src/main/res/layout/fragment_snapshot_dependencies.xml
@@ -55,7 +55,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="bottom|end"
-        android:layout_margin="@dimen/default_margin"
+        android:layout_margin="@dimen/dp_16"
         android:text="@string/title_run_build"
         android:visibility="invisible"
         app:icon="@drawable/ic_directions_run_white_24px"
diff --git a/app/src/main/res/layout/header_default.xml b/app/src/main/res/layout/header_default.xml
index dcfe831d..ccc5110a 100644
--- a/app/src/main/res/layout/header_default.xml
+++ b/app/src/main/res/layout/header_default.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <!--
-  ~ Copyright 2016 Andrey Tolpeev
+  ~ Copyright 2020 Andrey Tolpeev
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
   ~ You may obtain a copy of the License at
   ~
-  ~        http://www.apache.org/licenses/LICENSE-2.0
+  ~    http://www.apache.org/licenses/LICENSE-2.0
   ~
   ~ Unless required by applicable law or agreed to in writing, software
   ~ distributed under the License is distributed on an "AS IS" BASIS,
@@ -17,10 +17,13 @@
   -->
 
 <HorizontalScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="48dp"
     android:fillViewport="true">
 
-    <TextView style="@style/Header" />
+    <TextView
+        style="@style/Header"
+        tools:text="Header" />
 
 </HorizontalScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_agent_list.xml b/app/src/main/res/layout/item_agent_list.xml
index 669a15a6..3c2854b5 100644
--- a/app/src/main/res/layout/item_agent_list.xml
+++ b/app/src/main/res/layout/item_agent_list.xml
@@ -25,7 +25,7 @@
         android:id="@+id/image"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_margin="@dimen/default_margin"
+        android:layout_margin="@dimen/dp_16"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
@@ -35,11 +35,11 @@
     <TextView
         android:id="@id/title"
         style="@style/ItemTitle"
-        android:layout_width="0dp"
+        android:layout_width="@dimen/dp_0"
         android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/default_margin"
-        android:layout_marginTop="@dimen/default_margin"
-        android:layout_marginEnd="@dimen/default_margin"
+        android:layout_marginStart="@dimen/dp_16"
+        android:layout_marginTop="@dimen/dp_16"
+        android:layout_marginEnd="@dimen/dp_16"
         app:layout_constrainedWidth="true"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@+id/image"
@@ -49,8 +49,8 @@
     <include
         layout="@layout/layout_divider"
         android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:layout_marginTop="@dimen/default_margin"
+        android:layout_height="@dimen/dp_1"
+        android:layout_marginTop="@dimen/dp_16"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/item_artifact_list.xml b/app/src/main/res/layout/item_artifact_list.xml
index 19ce90ef..7ac7391c 100644
--- a/app/src/main/res/layout/item_artifact_list.xml
+++ b/app/src/main/res/layout/item_artifact_list.xml
@@ -25,7 +25,7 @@
         android:id="@+id/image"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_margin="@dimen/default_margin"
+        android:layout_margin="@dimen/dp_16"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
@@ -35,11 +35,11 @@
     <TextView
         android:id="@id/title"
         style="@style/ItemTitle"
-        android:layout_width="0dp"
+        android:layout_width="@dimen/dp_0"
         android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/default_margin"
-        android:layout_marginTop="@dimen/default_margin"
-        android:layout_marginEnd="@dimen/default_margin"
+        android:layout_marginStart="@dimen/dp_16"
+        android:layout_marginTop="@dimen/dp_16"
+        android:layout_marginEnd="@dimen/dp_16"
         app:layout_constrainedWidth="true"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@+id/image"
@@ -49,9 +49,9 @@
     <TextView
         android:id="@+id/subTitle"
         style="@style/ItemSubTitle"
-        android:layout_width="0dp"
+        android:layout_width="@dimen/dp_0"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="@dimen/default_margin"
+        android:layout_marginEnd="@dimen/dp_16"
         app:layout_constrainedWidth="true"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="@id/title"
@@ -61,8 +61,8 @@
     <include
         layout="@layout/layout_divider"
         android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:layout_marginTop="@dimen/default_margin"
+        android:layout_height="@dimen/dp_1"
+        android:layout_marginTop="@dimen/dp_16"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/item_bottom_sheet.xml b/app/src/main/res/layout/item_bottom_sheet.xml
index f91d5c7d..ea961876 100644
--- a/app/src/main/res/layout/item_bottom_sheet.xml
+++ b/app/src/main/res/layout/item_bottom_sheet.xml
@@ -27,7 +27,7 @@
         android:id="@+id/bs_image"
         android:layout_width="24dp"
         android:layout_height="24dp"
-        android:layout_marginStart="@dimen/default_margin"
+        android:layout_marginStart="@dimen/dp_16"
         app:tint="@color/material_on_surface_emphasis_high_type"
         tools:ignore="ContentDescription"
         tools:src="@drawable/ic_done_24px" />
@@ -38,8 +38,8 @@
         android:layout_height="wrap_content"
         android:gravity="center_vertical"
         android:minHeight="64dp"
-        android:paddingLeft="16dp"
-        android:paddingRight="16dp"
+        android:paddingLeft="@dimen/dp_16"
+        android:paddingRight="@dimen/dp_16"
         android:singleLine="true"
         app:tint="@color/material_on_surface_emphasis_high_type"
         android:textAppearance="?attr/textAppearanceBody1"
diff --git a/app/src/main/res/layout/item_build_list.xml b/app/src/main/res/layout/item_build_list.xml
index 446a7588..6edd1d30 100644
--- a/app/src/main/res/layout/item_build_list.xml
+++ b/app/src/main/res/layout/item_build_list.xml
@@ -25,7 +25,7 @@
         android:id="@+id/buildStatusContainer"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_margin="@dimen/default_margin"
+        android:layout_margin="@dimen/dp_16"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
@@ -39,8 +39,8 @@
 
         <ProgressBar
             android:id="@+id/buildStatusProgress"
-            android:layout_width="24dp"
-            android:layout_height="24dp"
+            android:layout_width="@dimen/dp_24"
+            android:layout_height="@dimen/dp_24"
             android:indeterminate="true"
             android:indeterminateTint="@color/material_on_surface_emphasis_high_type"
             tools:visibility="gone" />
@@ -50,11 +50,11 @@
     <TextView
         android:id="@+id/buildNumber"
         style="@style/ItemSubTitle"
-        android:layout_width="0dp"
+        android:layout_width="@dimen/dp_0"
         android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/default_margin"
-        android:layout_marginTop="@dimen/default_margin"
-        android:layout_marginEnd="@dimen/default_margin"
+        android:layout_marginStart="@dimen/dp_16"
+        android:layout_marginTop="@dimen/dp_16"
+        android:layout_marginEnd="@dimen/dp_16"
         android:maxLines="1"
         app:layout_constrainedWidth="true"
         app:layout_constraintEnd_toEndOf="@id/isPersonal"
@@ -64,9 +64,9 @@
 
     <ImageView
         android:id="@+id/isPersonal"
-        android:layout_width="16dp"
-        android:layout_height="16dp"
-        android:layout_margin="@dimen/small_margin"
+        android:layout_width="@dimen/dp_16"
+        android:layout_height="@dimen/dp_16"
+        android:layout_margin="@dimen/dp_8"
         app:layout_constraintEnd_toStartOf="@id/isPinned"
         app:layout_constraintTop_toTopOf="parent"
         app:srcCompat="@drawable/ic_person_black_24dp"
@@ -74,9 +74,9 @@
 
     <ImageView
         android:id="@+id/isPinned"
-        android:layout_width="16dp"
-        android:layout_height="16dp"
-        android:layout_margin="@dimen/small_margin"
+        android:layout_width="@dimen/dp_16"
+        android:layout_height="@dimen/dp_16"
+        android:layout_margin="@dimen/dp_8"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:srcCompat="@drawable/ic_pin"
@@ -85,9 +85,9 @@
     <TextView
         android:id="@+id/buildStatus"
         style="@style/ItemTitle"
-        android:layout_width="0dp"
+        android:layout_width="@dimen/dp_0"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="@dimen/default_margin"
+        android:layout_marginEnd="@dimen/dp_16"
         app:layout_constrainedWidth="true"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="@id/buildNumber"
@@ -97,9 +97,9 @@
     <TextView
         android:id="@+id/branchName"
         style="@style/ItemSubTitle"
-        android:layout_width="0dp"
+        android:layout_width="@dimen/dp_0"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="@dimen/default_margin"
+        android:layout_marginEnd="@dimen/dp_16"
         app:layout_constrainedWidth="true"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="@id/buildStatus"
@@ -109,8 +109,8 @@
     <include
         layout="@layout/layout_divider"
         android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:layout_marginTop="@dimen/default_margin"
+        android:layout_height="@dimen/dp_1"
+        android:layout_marginTop="@dimen/dp_16"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/item_build_overview_list.xml b/app/src/main/res/layout/item_build_overview_list.xml
index f09deaca..77b1e892 100644
--- a/app/src/main/res/layout/item_build_overview_list.xml
+++ b/app/src/main/res/layout/item_build_overview_list.xml
@@ -19,10 +19,10 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginLeft="16dp"
-    android:layout_marginTop="4dp"
-    android:layout_marginRight="16dp"
-    android:layout_marginBottom="4dp"
+    android:layout_marginLeft="@dimen/dp_16"
+    android:layout_marginTop="@dimen/dp_4"
+    android:layout_marginRight="@dimen/dp_16"
+    android:layout_marginBottom="@dimen/dp_4"
     android:foreground="?attr/selectableItemBackground">
 
     <androidx.constraintlayout.widget.ConstraintLayout
@@ -33,7 +33,7 @@
             android:id="@+id/ImageContainer"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_margin="@dimen/default_margin"
+            android:layout_margin="@dimen/dp_16"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent">
@@ -47,8 +47,8 @@
 
             <ProgressBar
                 android:id="@+id/progress"
-                android:layout_width="24dp"
-                android:layout_height="24dp"
+                android:layout_width="@dimen/dp_24"
+                android:layout_height="@dimen/dp_24"
                 android:indeterminate="true"
                 android:indeterminateTint="@color/material_on_surface_emphasis_high_type"
                 tools:visibility="gone"/>
@@ -58,11 +58,11 @@
         <TextView
             android:id="@id/title"
             style="@style/ItemTitle"
-            android:layout_width="0dp"
+            android:layout_width="@dimen/dp_0"
             android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/default_margin"
-            android:layout_marginTop="@dimen/default_margin"
-            android:layout_marginEnd="@dimen/default_margin"
+            android:layout_marginStart="@dimen/dp_16"
+            android:layout_marginTop="@dimen/dp_16"
+            android:layout_marginEnd="@dimen/dp_16"
             android:maxLines="1"
             app:layout_constrainedWidth="true"
             app:layout_constraintEnd_toEndOf="parent"
@@ -73,10 +73,10 @@
         <TextView
             android:id="@+id/subTitle"
             style="@style/ItemSubTitle"
-            android:layout_width="0dp"
+            android:layout_width="@dimen/dp_0"
             android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/default_margin"
-            android:layout_marginBottom="@dimen/default_margin"
+            android:layout_marginEnd="@dimen/dp_16"
+            android:layout_marginBottom="@dimen/dp_16"
             android:maxLines="5"
             app:layout_constrainedWidth="true"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/item_changes_list.xml b/app/src/main/res/layout/item_changes_list.xml
index c88b832a..a8a8b484 100644
--- a/app/src/main/res/layout/item_changes_list.xml
+++ b/app/src/main/res/layout/item_changes_list.xml
@@ -25,7 +25,7 @@
         android:id="@+id/image"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_margin="@dimen/default_margin"
+        android:layout_margin="@dimen/dp_16"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
@@ -35,11 +35,11 @@
     <TextView
         android:id="@+id/userName"
         style="@style/ItemSubTitle"
-        android:layout_width="0dp"
+        android:layout_width="@dimen/dp_0"
         android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/default_margin"
-        android:layout_marginTop="@dimen/default_margin"
-        android:layout_marginEnd="@dimen/default_margin"
+        android:layout_marginStart="@dimen/dp_16"
+        android:layout_marginTop="@dimen/dp_16"
+        android:layout_marginEnd="@dimen/dp_16"
         app:layout_constrainedWidth="true"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@+id/image"
@@ -49,9 +49,9 @@
     <TextView
         android:id="@+id/commitName"
         style="@style/ItemTitle"
-        android:layout_width="0dp"
+        android:layout_width="@dimen/dp_0"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="@dimen/default_margin"
+        android:layout_marginEnd="@dimen/dp_16"
         app:layout_constrainedWidth="true"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="@id/userName"
@@ -61,9 +61,9 @@
     <TextView
         android:id="@+id/commitHash"
         style="@style/ItemSubTitle"
-        android:layout_width="0dp"
+        android:layout_width="@dimen/dp_0"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="@dimen/default_margin"
+        android:layout_marginEnd="@dimen/dp_16"
         app:layout_constrainedWidth="true"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="@id/commitName"
@@ -73,9 +73,9 @@
     <TextView
         android:id="@+id/commitDate"
         style="@style/ItemSubTitle"
-        android:layout_width="0dp"
+        android:layout_width="@dimen/dp_0"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="@dimen/default_margin"
+        android:layout_marginEnd="@dimen/dp_16"
         app:layout_constrainedWidth="true"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="@id/commitHash"
@@ -85,8 +85,8 @@
     <include
         layout="@layout/layout_divider"
         android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:layout_marginTop="@dimen/default_margin"
+        android:layout_height="@dimen/dp_1"
+        android:layout_marginTop="@dimen/dp_16"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/item_load_more.xml b/app/src/main/res/layout/item_load_more.xml
index f0418919..3e56b422 100644
--- a/app/src/main/res/layout/item_load_more.xml
+++ b/app/src/main/res/layout/item_load_more.xml
@@ -17,7 +17,7 @@
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:padding="@dimen/default_margin">
+    android:padding="@dimen/dp_16">
 
     <ProgressBar
         android:id="@+id/progress_wheel"
diff --git a/app/src/main/res/layout/item_navigation_list.xml b/app/src/main/res/layout/item_navigation_list.xml
index 447a4252..de115019 100644
--- a/app/src/main/res/layout/item_navigation_list.xml
+++ b/app/src/main/res/layout/item_navigation_list.xml
@@ -25,7 +25,7 @@
         android:id="@+id/image"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_margin="@dimen/default_margin"
+        android:layout_margin="@dimen/dp_16"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
@@ -35,11 +35,11 @@
     <TextView
         android:id="@id/title"
         style="@style/ItemTitle"
-        android:layout_width="0dp"
+        android:layout_width="@dimen/dp_0"
         android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/default_margin"
-        android:layout_marginTop="@dimen/default_margin"
-        android:layout_marginEnd="@dimen/default_margin"
+        android:layout_marginStart="@dimen/dp_16"
+        android:layout_marginTop="@dimen/dp_16"
+        android:layout_marginEnd="@dimen/dp_16"
         app:layout_constrainedWidth="true"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@+id/image"
@@ -49,9 +49,9 @@
     <TextView
         android:id="@+id/subTitle"
         style="@style/ItemSubTitle"
-        android:layout_width="0dp"
+        android:layout_width="@dimen/dp_0"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="@dimen/default_margin"
+        android:layout_marginEnd="@dimen/dp_16"
         app:layout_constrainedWidth="true"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="@id/title"
@@ -61,8 +61,8 @@
     <include
         layout="@layout/layout_divider"
         android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:layout_marginTop="@dimen/default_margin"
+        android:layout_height="@dimen/dp_1"
+        android:layout_marginTop="@dimen/dp_16"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/item_properties_list.xml b/app/src/main/res/layout/item_properties_list.xml
index 1572f1d8..3bc370f6 100644
--- a/app/src/main/res/layout/item_properties_list.xml
+++ b/app/src/main/res/layout/item_properties_list.xml
@@ -24,11 +24,11 @@
     <TextView
         android:id="@id/title"
         style="@style/ItemSubTitle"
-        android:layout_width="0dp"
+        android:layout_width="@dimen/dp_0"
         android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/default_margin"
-        android:layout_marginTop="@dimen/default_margin"
-        android:layout_marginEnd="@dimen/default_margin"
+        android:layout_marginStart="@dimen/dp_16"
+        android:layout_marginTop="@dimen/dp_16"
+        android:layout_marginEnd="@dimen/dp_16"
         app:layout_constrainedWidth="true"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -38,9 +38,9 @@
     <TextView
         android:id="@+id/subTitle"
         style="@style/ItemTitle"
-        android:layout_width="0dp"
+        android:layout_width="@dimen/dp_0"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="@dimen/default_margin"
+        android:layout_marginEnd="@dimen/dp_16"
         app:layout_constrainedWidth="true"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="@id/title"
@@ -50,8 +50,8 @@
     <include
         layout="@layout/layout_divider"
         android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:layout_marginTop="@dimen/default_margin"
+        android:layout_height="@dimen/dp_1"
+        android:layout_marginTop="@dimen/dp_16"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/item_rate_the_app.xml b/app/src/main/res/layout/item_rate_the_app.xml
index 145c8206..55087139 100644
--- a/app/src/main/res/layout/item_rate_the_app.xml
+++ b/app/src/main/res/layout/item_rate_the_app.xml
@@ -24,7 +24,7 @@
         android:id="@+id/image"
         android:layout_width="48dp"
         android:layout_height="48dp"
-        android:layout_margin="@dimen/default_margin"
+        android:layout_margin="@dimen/dp_16"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
@@ -34,11 +34,11 @@
     <TextView
         android:id="@id/title"
         style="@style/ItemTitle"
-        android:layout_width="0dp"
+        android:layout_width="@dimen/dp_0"
         android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/default_margin"
-        android:layout_marginTop="@dimen/default_margin"
-        android:layout_marginEnd="@dimen/default_margin"
+        android:layout_marginStart="@dimen/dp_16"
+        android:layout_marginTop="@dimen/dp_16"
+        android:layout_marginEnd="@dimen/dp_16"
         android:text="@string/rate_title"
         app:layout_constrainedWidth="true"
         app:layout_constraintEnd_toEndOf="parent"
@@ -48,9 +48,9 @@
     <TextView
         android:id="@+id/subTitle"
         style="@style/ItemSubTitle"
-        android:layout_width="0dp"
+        android:layout_width="@dimen/dp_0"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="@dimen/default_margin"
+        android:layout_marginEnd="@dimen/dp_16"
         android:text="@string/rate_description"
         app:layout_constrainedWidth="true"
         app:layout_constraintEnd_toEndOf="parent"
@@ -59,9 +59,9 @@
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/button_cancel"
-        android:layout_width="0dp"
+        android:layout_width="@dimen/dp_0"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="@dimen/default_margin"
+        android:layout_marginEnd="@dimen/dp_16"
         android:text="@string/rate_cancel"
         app:layout_constraintEnd_toStartOf="@id/button_rate"
         app:layout_constraintStart_toStartOf="@id/subTitle"
@@ -69,9 +69,9 @@
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/button_rate"
-        android:layout_width="0dp"
+        android:layout_width="@dimen/dp_0"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="@dimen/default_margin"
+        android:layout_marginEnd="@dimen/dp_16"
         android:text="@string/rate_now"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@id/button_cancel"
@@ -80,8 +80,8 @@
     <include
         layout="@layout/layout_divider"
         android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:layout_marginTop="@dimen/default_margin"
+        android:layout_height="@dimen/dp_1"
+        android:layout_marginTop="@dimen/dp_16"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/item_test_occurence_list.xml b/app/src/main/res/layout/item_test_occurence_list.xml
index 45c9ff0a..d7126d61 100644
--- a/app/src/main/res/layout/item_test_occurence_list.xml
+++ b/app/src/main/res/layout/item_test_occurence_list.xml
@@ -25,7 +25,7 @@
         android:id="@+id/image"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_margin="@dimen/default_margin"
+        android:layout_margin="@dimen/dp_16"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
@@ -35,11 +35,11 @@
     <TextView
         android:id="@id/title"
         style="@style/ItemTitle"
-        android:layout_width="0dp"
+        android:layout_width="@dimen/dp_0"
         android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/default_margin"
-        android:layout_marginTop="@dimen/default_margin"
-        android:layout_marginEnd="@dimen/default_margin"
+        android:layout_marginStart="@dimen/dp_16"
+        android:layout_marginTop="@dimen/dp_16"
+        android:layout_marginEnd="@dimen/dp_16"
         app:layout_constrainedWidth="true"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@+id/image"
@@ -49,8 +49,8 @@
     <include
         layout="@layout/layout_divider"
         android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:layout_marginTop="@dimen/default_margin"
+        android:layout_height="@dimen/dp_1"
+        android:layout_marginTop="@dimen/dp_16"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/layout_branch_filter.xml b/app/src/main/res/layout/layout_branch_filter.xml
index 7df706db..514aed5e 100644
--- a/app/src/main/res/layout/layout_branch_filter.xml
+++ b/app/src/main/res/layout/layout_branch_filter.xml
@@ -25,8 +25,7 @@
         android:layout_height="wrap_content"
         android:layout_marginLeft="4dp"
         android:text="@string/text_build_branch"
-        android:textColor="@color/material_on_background_emphasis_high_type"
-        android:textSize="18sp" />
+        android:textAppearance="?attr/textAppearanceBody1" />
 
     <AutoCompleteTextView
         android:id="@+id/autocomplete_branches"
@@ -46,8 +45,8 @@
         android:layout_height="wrap_content"
         android:layout_marginLeft="4dp"
         android:text="@string/text_no_branches_available"
+        android:textAppearance="?attr/textAppearanceBody2"
         android:textColor="@color/material_on_background_emphasis_medium"
-        android:textSize="18sp"
         android:visibility="gone" />
 
     <TextView
@@ -56,8 +55,8 @@
         android:layout_height="wrap_content"
         android:layout_marginLeft="4dp"
         android:text="@string/text_no_branches_available_to_filter"
+        android:textAppearance="?attr/textAppearanceBody2"
         android:textColor="@color/material_on_background_emphasis_medium"
-        android:textSize="18sp"
         android:visibility="gone" />
 
     <LinearLayout
@@ -71,10 +70,10 @@
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginRight="@dimen/default_margin"
+            android:layout_marginRight="@dimen/dp_16"
             android:text="@string/text_loading_branches"
-            android:textColor="@color/material_on_background_emphasis_medium"
-            android:textSize="18sp" />
+            android:textAppearance="?attr/textAppearanceBody2"
+            android:textColor="@color/material_on_background_emphasis_medium" />
 
         <ProgressBar
             android:id="@+id/progress_wheel"
diff --git a/app/src/main/res/layout/layout_dialog_add_parameter.xml b/app/src/main/res/layout/layout_dialog_add_parameter.xml
index 424228ab..0769e7d0 100644
--- a/app/src/main/res/layout/layout_dialog_add_parameter.xml
+++ b/app/src/main/res/layout/layout_dialog_add_parameter.xml
@@ -17,7 +17,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:layout_margin="@dimen/default_margin"
+    android:layout_margin="@dimen/dp_16"
     android:orientation="vertical">
 
     <com.google.android.material.textfield.TextInputLayout
diff --git a/app/src/main/res/layout/layout_empty.xml b/app/src/main/res/layout/layout_empty.xml
index 387e956f..40c24166 100644
--- a/app/src/main/res/layout/layout_empty.xml
+++ b/app/src/main/res/layout/layout_empty.xml
@@ -28,17 +28,16 @@
     <ImageView
         android:layout_width="124dp"
         android:layout_height="124dp"
-        app:tint="@color/material_on_background_emphasis_medium"
-        app:srcCompat="@drawable/ic_format_list_bulleted_black_24dp" />
+        app:srcCompat="@drawable/ic_format_list_bulleted_black_24dp"
+        app:tint="@color/material_on_background_emphasis_medium" />
 
     <TextView
         android:id="@+id/empty_title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:padding="@dimen/default_margin"
-        android:textColor="@color/material_on_background_emphasis_medium"
+        android:padding="@dimen/dp_16"
         android:textAppearance="?attr/textAppearanceBody1"
-        android:textSize="16sp"
+        android:textColor="@color/material_on_background_emphasis_medium"
         tools:text="@string/empty_list_message_builds" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/layout_error_view.xml b/app/src/main/res/layout/layout_error_view.xml
index fd8672f0..3ae1b085 100644
--- a/app/src/main/res/layout/layout_error_view.xml
+++ b/app/src/main/res/layout/layout_error_view.xml
@@ -19,7 +19,7 @@
     android:id="@+id/error_view"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:layout_margin="@dimen/default_margin"
+    android:layout_margin="@dimen/dp_16"
     android:gravity="center"
     android:visibility="gone"
     app:ev_retryColor="@color/material_on_background_emphasis_medium"
diff --git a/app/src/main/res/layout/layout_float_button.xml b/app/src/main/res/layout/layout_float_button.xml
deleted file mode 100644
index 157cfbcf..00000000
--- a/app/src/main/res/layout/layout_float_button.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright 2019 Andrey Tolpeev
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~    http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<com.google.android.material.floatingactionbutton.FloatingActionButton xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/floating_action_button"
-    style="@style/BaseFloatingActionButton"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    tools:src="@drawable/ic_add_black_24dp" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/layout_parameter_view.xml b/app/src/main/res/layout/layout_parameter_view.xml
index f7f95832..c2897b22 100644
--- a/app/src/main/res/layout/layout_parameter_view.xml
+++ b/app/src/main/res/layout/layout_parameter_view.xml
@@ -14,36 +14,36 @@
   ~ limitations under the License.
   -->
 
-<LinearLayout xmlns:tools="http://schemas.android.com/tools"
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:orientation="vertical"
-    android:layout_margin="2dp">
+    android:layout_margin="@dimen/dp_2"
+    android:orientation="vertical">
 
     <TextView
         android:id="@+id/parameter_name"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:maxLines="1"
         android:ellipsize="end"
-        android:textSize="14sp"
-        android:textColor="@color/material_on_background_emphasis_medium"
+        android:maxLines="1"
+        android:textAppearance="?attr/textAppearanceBody2"
         tools:text="env.kotlin.version" />
 
     <TextView
         android:id="@+id/parameter_value"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="2dp"
-        android:maxLines="1"
+        android:layout_marginBottom="@dimen/dp_2"
         android:ellipsize="end"
-        android:textSize="16sp"
-        android:textColor="@color/material_on_background_emphasis_high_type"
+        android:maxLines="1"
+        android:textAppearance="?attr/textAppearanceBody2"
+        android:textColor="@color/material_on_background_emphasis_medium"
         tools:text="1.1" />
 
-    <include layout="@layout/layout_divider"
+    <include
+        layout="@layout/layout_divider"
         android:layout_width="132dp"
-        android:layout_height="1dp"/>
+        android:layout_height="@dimen/dp_1" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/layout_skeleton_agent_item.xml b/app/src/main/res/layout/layout_skeleton_agent_item.xml
index ecb1ee73..523aeb72 100644
--- a/app/src/main/res/layout/layout_skeleton_agent_item.xml
+++ b/app/src/main/res/layout/layout_skeleton_agent_item.xml
@@ -24,7 +24,7 @@
         android:id="@+id/image"
         android:layout_width="44dp"
         android:layout_height="44dp"
-        android:layout_margin="@dimen/default_margin"
+        android:layout_margin="@dimen/dp_16"
         android:background="@drawable/skeleton_image_background"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -32,10 +32,10 @@
 
     <View
         android:id="@+id/description"
-        android:layout_width="0dp"
+        android:layout_width="@dimen/dp_0"
         android:layout_height="22dp"
-        android:layout_marginStart="@dimen/default_margin"
-        android:layout_marginEnd="@dimen/default_margin"
+        android:layout_marginStart="@dimen/dp_16"
+        android:layout_marginEnd="@dimen/dp_16"
         android:background="?attr/colorControlHighlight"
         app:layout_constrainedWidth="true"
         app:layout_constraintBottom_toBottomOf="parent"
@@ -46,7 +46,7 @@
     <include
         layout="@layout/layout_divider"
         android:layout_width="match_parent"
-        android:layout_height="1dp"
+        android:layout_height="@dimen/dp_1"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent" />
diff --git a/app/src/main/res/layout/layout_skeleton_build_list_item.xml b/app/src/main/res/layout/layout_skeleton_build_list_item.xml
index d0f9c0df..980e5439 100644
--- a/app/src/main/res/layout/layout_skeleton_build_list_item.xml
+++ b/app/src/main/res/layout/layout_skeleton_build_list_item.xml
@@ -24,7 +24,7 @@
         android:id="@+id/image"
         android:layout_width="44dp"
         android:layout_height="44dp"
-        android:layout_margin="@dimen/default_margin"
+        android:layout_margin="@dimen/dp_16"
         android:background="@drawable/skeleton_image_background"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -34,8 +34,8 @@
         android:id="@+id/block1"
         android:layout_width="64dp"
         android:layout_height="18dp"
-        android:layout_marginStart="@dimen/default_margin"
-        android:layout_marginTop="@dimen/default_margin"
+        android:layout_marginStart="@dimen/dp_16"
+        android:layout_marginTop="@dimen/dp_16"
         android:background="?attr/colorControlHighlight"
         app:layout_constraintStart_toEndOf="@+id/image"
         app:layout_constraintTop_toTopOf="parent" />
@@ -54,7 +54,7 @@
         android:layout_width="wrap_content"
         android:layout_height="16dp"
         android:layout_marginTop="8dp"
-        android:layout_marginEnd="@dimen/default_margin"
+        android:layout_marginEnd="@dimen/dp_16"
         android:background="?attr/colorControlHighlight"
         app:layout_constrainedWidth="true"
         app:layout_constraintEnd_toEndOf="parent"
@@ -63,9 +63,9 @@
 
     <include
         layout="@layout/layout_divider"
-        android:layout_width="0dp"
-        android:layout_height="1dp"
-        android:layout_marginTop="@dimen/default_margin"
+        android:layout_width="@dimen/dp_0"
+        android:layout_height="@dimen/dp_1"
+        android:layout_marginTop="@dimen/dp_16"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/layout_skeleton_change_list_item.xml b/app/src/main/res/layout/layout_skeleton_change_list_item.xml
index 13c07e35..7be7d08c 100644
--- a/app/src/main/res/layout/layout_skeleton_change_list_item.xml
+++ b/app/src/main/res/layout/layout_skeleton_change_list_item.xml
@@ -24,7 +24,7 @@
         android:id="@+id/image"
         android:layout_width="44dp"
         android:layout_height="44dp"
-        android:layout_margin="@dimen/default_margin"
+        android:layout_margin="@dimen/dp_16"
         android:background="@drawable/skeleton_image_background"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -34,8 +34,8 @@
         android:id="@+id/block1"
         android:layout_width="64dp"
         android:layout_height="18dp"
-        android:layout_marginStart="@dimen/default_margin"
-        android:layout_marginTop="@dimen/default_margin"
+        android:layout_marginStart="@dimen/dp_16"
+        android:layout_marginTop="@dimen/dp_16"
         android:background="?attr/colorControlHighlight"
         app:layout_constraintStart_toEndOf="@+id/image"
         app:layout_constraintTop_toTopOf="parent" />
@@ -63,7 +63,7 @@
         android:layout_width="wrap_content"
         android:layout_height="16dp"
         android:layout_marginTop="8dp"
-        android:layout_marginEnd="@dimen/default_margin"
+        android:layout_marginEnd="@dimen/dp_16"
         android:background="?attr/colorControlHighlight"
         app:layout_constrainedWidth="true"
         app:layout_constraintEnd_toEndOf="parent"
@@ -72,9 +72,9 @@
 
     <include
         layout="@layout/layout_divider"
-        android:layout_width="0dp"
-        android:layout_height="1dp"
-        android:layout_marginTop="@dimen/default_margin"
+        android:layout_width="@dimen/dp_0"
+        android:layout_height="@dimen/dp_1"
+        android:layout_marginTop="@dimen/dp_16"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/layout_skeleton_navigation_item.xml b/app/src/main/res/layout/layout_skeleton_navigation_item.xml
index 79e49844..d11b1483 100644
--- a/app/src/main/res/layout/layout_skeleton_navigation_item.xml
+++ b/app/src/main/res/layout/layout_skeleton_navigation_item.xml
@@ -24,7 +24,7 @@
         android:id="@+id/image"
         android:layout_width="44dp"
         android:layout_height="44dp"
-        android:layout_margin="@dimen/default_margin"
+        android:layout_margin="@dimen/dp_16"
         android:background="@drawable/skeleton_image_background"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -34,8 +34,8 @@
         android:id="@+id/block1"
         android:layout_width="122dp"
         android:layout_height="18dp"
-        android:layout_marginStart="@dimen/default_margin"
-        android:layout_marginTop="@dimen/default_margin"
+        android:layout_marginStart="@dimen/dp_16"
+        android:layout_marginTop="@dimen/dp_16"
         android:background="?attr/colorControlHighlight"
         app:layout_constraintStart_toEndOf="@+id/image"
         app:layout_constraintTop_toTopOf="parent" />
@@ -45,7 +45,7 @@
         android:layout_width="wrap_content"
         android:layout_height="16dp"
         android:layout_marginTop="8dp"
-        android:layout_marginEnd="@dimen/default_margin"
+        android:layout_marginEnd="@dimen/dp_16"
         android:background="?attr/colorControlHighlight"
         app:layout_constrainedWidth="true"
         app:layout_constraintEnd_toEndOf="parent"
@@ -54,9 +54,9 @@
 
     <include
         layout="@layout/layout_divider"
-        android:layout_width="0dp"
-        android:layout_height="1dp"
-        android:layout_marginTop="@dimen/default_margin"
+        android:layout_width="@dimen/dp_0"
+        android:layout_height="@dimen/dp_1"
+        android:layout_marginTop="@dimen/dp_16"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/layout_skeleton_overview_item.xml b/app/src/main/res/layout/layout_skeleton_overview_item.xml
index ea78fb69..1d73fdcc 100644
--- a/app/src/main/res/layout/layout_skeleton_overview_item.xml
+++ b/app/src/main/res/layout/layout_skeleton_overview_item.xml
@@ -31,7 +31,7 @@
             android:id="@+id/image"
             android:layout_width="44dp"
             android:layout_height="44dp"
-            android:layout_margin="@dimen/default_margin"
+            android:layout_margin="@dimen/dp_16"
             android:background="@drawable/skeleton_image_background"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"
@@ -41,8 +41,8 @@
             android:id="@+id/block1"
             android:layout_width="122dp"
             android:layout_height="18dp"
-            android:layout_marginStart="@dimen/default_margin"
-            android:layout_marginTop="@dimen/default_margin"
+            android:layout_marginStart="@dimen/dp_16"
+            android:layout_marginTop="@dimen/dp_16"
             android:background="?attr/colorControlHighlight"
             app:layout_constraintStart_toEndOf="@+id/image"
             app:layout_constraintTop_toTopOf="parent" />
@@ -52,7 +52,7 @@
             android:layout_width="wrap_content"
             android:layout_height="16dp"
             android:layout_marginTop="8dp"
-            android:layout_marginEnd="@dimen/default_margin"
+            android:layout_marginEnd="@dimen/dp_16"
             android:background="?attr/colorControlHighlight"
             app:layout_constrainedWidth="true"
             app:layout_constraintEnd_toEndOf="parent"
@@ -61,9 +61,9 @@
 
         <include
             layout="@layout/layout_divider"
-            android:layout_width="0dp"
-            android:layout_height="1dp"
-            android:layout_marginTop="@dimen/default_margin"
+            android:layout_width="@dimen/dp_0"
+            android:layout_height="@dimen/dp_1"
+            android:layout_marginTop="@dimen/dp_16"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
deleted file mode 100644
index 2de369b2..00000000
--- a/app/src/main/res/values/dimens.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright 2019 Andrey Tolpeev
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~    http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<resources>
-    <dimen name="small_margin">8dp</dimen>
-    <dimen name="login_screen_margin">24dp</dimen>
-    <dimen name="padding_switch">12dp</dimen>
-    <dimen name="default_fab_radius">32dp</dimen>
-    <dimen name="default_prompt_fab_radius">38dp</dimen>
-    <integer name="shimmer_length">1000</integer>
-</resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index b7f296b4..784377a9 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -16,25 +16,21 @@
 
 <resources>
 
-    <style name="BaseFloatingActionButton.NotVisible">
-        <item name="android:visibility">gone</item>
-    </style>
-
     <style name="Switch">
-        <item name="android:paddingTop">@dimen/padding_switch</item>
-        <item name="android:paddingBottom">@dimen/padding_switch</item>
-        <item name="android:paddingLeft">@dimen/default_margin</item>
-        <item name="android:paddingRight">@dimen/default_margin</item>
-        <item name="android:textSize">18sp</item>
+        <item name="android:paddingTop">@dimen/dp_12</item>
+        <item name="android:paddingBottom">@dimen/dp_12</item>
+        <item name="android:paddingLeft">@dimen/dp_16</item>
+        <item name="android:paddingRight">@dimen/dp_16</item>
         <item name="android:foreground">?attr/selectableItemBackground</item>
+        <item name="android:textAppearance">?attr/textAppearanceBody1</item>
     </style>
 
     <style name="ShimmerStyle">
-        <item name="android:layout_marginBottom">24dp</item>
+        <item name="android:layout_marginBottom">@dimen/dp_24</item>
         <item name="shimmer_animation_duration">@integer/shimmer_length</item>
         <item name="shimmer_color">?attr/colorSurface</item>
     </style>
 
-    <style name="ShimmerStyle.CardView"/>
+    <style name="ShimmerStyle.CardView" />
 
 </resources>
\ No newline at end of file
diff --git a/features/about/feature/src/main/java/teamcityapp/features/about/AboutFragment.kt b/features/about/feature/src/main/java/teamcityapp/features/about/AboutFragment.kt
index 0a044258..e1bbdcb5 100644
--- a/features/about/feature/src/main/java/teamcityapp/features/about/AboutFragment.kt
+++ b/features/about/feature/src/main/java/teamcityapp/features/about/AboutFragment.kt
@@ -285,7 +285,7 @@ class AboutFragment : MaterialAboutFragment() {
 
     private fun getBackgroundColor(activity: Activity): Int {
         val elevation =
-            activity.resources.getDimension(R.dimen.default_elevation)
+            activity.resources.getDimension(R.dimen.dp_4)
         return ElevationOverlayProvider(activity).compositeOverlayIfNeeded(
             activity.getThemeColor(R.attr.colorSurface), elevation
         )
diff --git a/features/drawer/src/main/res/layout/item_drawer_bottom.xml b/features/drawer/src/main/res/layout/item_drawer_bottom.xml
index a0942759..abde7f33 100644
--- a/features/drawer/src/main/res/layout/item_drawer_bottom.xml
+++ b/features/drawer/src/main/res/layout/item_drawer_bottom.xml
@@ -18,8 +18,8 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_marginTop="12dp"
-    android:layout_marginBottom="@dimen/default_margin">
+    android:layout_marginTop="@dimen/dp_12"
+    android:layout_marginBottom="@dimen/dp_16">
 
     <TextView
         android:id="@+id/privacy"
@@ -28,7 +28,7 @@
         android:background="?attr/selectableItemBackground"
         android:clickable="true"
         android:focusable="true"
-        android:padding="4dp"
+        android:padding="@dimen/dp_4"
         android:text="@string/about_app_text_privacy"
         android:textAppearance="?attr/textAppearanceBody2"
         android:textColor="@color/material_on_surface_emphasis_medium"
@@ -60,7 +60,7 @@
         android:background="?attr/selectableItemBackground"
         android:clickable="true"
         android:focusable="true"
-        android:padding="4dp"
+        android:padding="@dimen/dp_4"
         android:text="@string/text_rate_the_app"
         android:textAppearance="?attr/textAppearanceBody2"
         android:textColor="@color/material_on_surface_emphasis_medium"
diff --git a/features/drawer/src/main/res/layout/item_drawer_menu.xml b/features/drawer/src/main/res/layout/item_drawer_menu.xml
index 39924b43..2b6d6c4b 100644
--- a/features/drawer/src/main/res/layout/item_drawer_menu.xml
+++ b/features/drawer/src/main/res/layout/item_drawer_menu.xml
@@ -25,7 +25,7 @@
         android:id="@+id/image"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_margin="@dimen/default_margin"
+        android:layout_margin="@dimen/dp_16"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
@@ -34,10 +34,10 @@
 
     <TextView
         android:id="@id/title"
-        android:layout_width="0dp"
+        android:layout_width="@dimen/dp_0"
         android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/default_margin"
-        android:layout_marginEnd="@dimen/default_margin"
+        android:layout_marginStart="@dimen/dp_16"
+        android:layout_marginEnd="@dimen/dp_16"
         android:textAppearance="?attr/textAppearanceBody1"
         android:textColor="@color/material_on_surface_emphasis_high_type"
         app:layout_constrainedWidth="true"
diff --git a/features/drawer/src/main/res/layout/item_drawer_user_account.xml b/features/drawer/src/main/res/layout/item_drawer_user_account.xml
index 35f505c9..b989ee3d 100644
--- a/features/drawer/src/main/res/layout/item_drawer_user_account.xml
+++ b/features/drawer/src/main/res/layout/item_drawer_user_account.xml
@@ -25,7 +25,7 @@
         android:id="@+id/image"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_margin="@dimen/default_margin"
+        android:layout_margin="@dimen/dp_16"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
@@ -34,11 +34,11 @@
 
     <TextView
         android:id="@id/title"
-        android:layout_width="0dp"
+        android:layout_width="@dimen/dp_0"
         android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/default_margin"
-        android:layout_marginTop="@dimen/small_margin"
-        android:layout_marginEnd="@dimen/default_margin"
+        android:layout_marginStart="@dimen/dp_16"
+        android:layout_marginTop="@dimen/dp_8"
+        android:layout_marginEnd="@dimen/dp_16"
         android:textAppearance="?attr/textAppearanceBody1"
         android:textColor="@color/material_on_surface_emphasis_high_type"
         app:layout_constrainedWidth="true"
@@ -49,10 +49,10 @@
 
     <TextView
         android:id="@+id/subTitle"
-        android:layout_width="0dp"
+        android:layout_width="@dimen/dp_0"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="@dimen/default_margin"
-        android:layout_marginBottom="@dimen/small_margin"
+        android:layout_marginEnd="@dimen/dp_16"
+        android:layout_marginBottom="@dimen/dp_8"
         android:textAppearance="?attr/textAppearanceBody1"
         android:textColor="@color/material_on_surface_emphasis_medium"
         app:layout_constrainedWidth="true"
diff --git a/features/drawer/src/main/res/layout/layout_drawer_accounts_divider.xml b/features/drawer/src/main/res/layout/layout_drawer_accounts_divider.xml
index e7610ee3..824c851f 100644
--- a/features/drawer/src/main/res/layout/layout_drawer_accounts_divider.xml
+++ b/features/drawer/src/main/res/layout/layout_drawer_accounts_divider.xml
@@ -28,9 +28,9 @@
 
     <include
         layout="@layout/layout_divider"
-        android:layout_width="0dp"
-        android:layout_height="1dp"
-        android:layout_marginTop="@dimen/default_margin"
+        android:layout_width="@dimen/dp_0"
+        android:layout_height="@dimen/dp_1"
+        android:layout_marginTop="@dimen/dp_16"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="@id/guideline" />
diff --git a/features/manage-accounts/src/main/res/layout/activity_manage_accounts.xml b/features/manage-accounts/src/main/res/layout/activity_manage_accounts.xml
index f70e6a19..c8cefbe0 100644
--- a/features/manage-accounts/src/main/res/layout/activity_manage_accounts.xml
+++ b/features/manage-accounts/src/main/res/layout/activity_manage_accounts.xml
@@ -58,7 +58,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="bottom|end"
-            android:layout_margin="@dimen/default_margin"
+            android:layout_margin="@dimen/dp_16"
             android:onClick="@{() -> viewmodel.onFabClick()}"
             app:srcCompat="@drawable/ic_add_black_24dp" />
 
diff --git a/features/manage-accounts/src/main/res/layout/item_user_account_list.xml b/features/manage-accounts/src/main/res/layout/item_user_account_list.xml
index fdc57df9..c94f3a44 100644
--- a/features/manage-accounts/src/main/res/layout/item_user_account_list.xml
+++ b/features/manage-accounts/src/main/res/layout/item_user_account_list.xml
@@ -27,7 +27,7 @@
             android:id="@+id/image"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_margin="@dimen/default_margin"
+            android:layout_margin="@dimen/dp_16"
             app:tint="@color/material_on_surface_emphasis_high_type"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"
@@ -37,11 +37,11 @@
         <TextView
             android:id="@+id/title"
             style="@style/ItemTitle"
-            android:layout_width="0dp"
+            android:layout_width="@dimen/dp_0"
             android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/default_margin"
-            android:layout_marginTop="@dimen/default_margin"
-            android:layout_marginEnd="@dimen/default_margin"
+            android:layout_marginStart="@dimen/dp_16"
+            android:layout_marginTop="@dimen/dp_16"
+            android:layout_marginEnd="@dimen/dp_16"
             app:layout_constrainedWidth="true"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@+id/image"
@@ -51,9 +51,9 @@
         <TextView
             android:id="@+id/subTitle"
             style="@style/ItemSubTitle"
-            android:layout_width="0dp"
+            android:layout_width="@dimen/dp_0"
             android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/default_margin"
+            android:layout_marginEnd="@dimen/dp_16"
             app:layout_constrainedWidth="true"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="@id/title"
@@ -63,10 +63,10 @@
         <TextView
             android:id="@+id/sslDisabled"
             style="@style/ItemSubTitle"
-            android:layout_width="0dp"
+            android:layout_width="@dimen/dp_0"
             android:layout_height="wrap_content"
-            android:layout_marginTop="4dp"
-            android:layout_marginEnd="@dimen/default_margin"
+            android:layout_marginTop="@dimen/dp_4"
+            android:layout_marginEnd="@dimen/dp_16"
             android:background="?attr/selectableItemBackground"
             android:clickable="true"
             android:focusable="true"
@@ -80,8 +80,8 @@
         <include
             layout="@layout/layout_divider"
             android:layout_width="match_parent"
-            android:layout_height="1dp"
-            android:layout_marginTop="@dimen/default_margin"
+            android:layout_height="@dimen/dp_1"
+            android:layout_marginTop="@dimen/dp_16"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
diff --git a/libraries/resources/src/main/res/values-large-xhdpi/dimens.xml b/libraries/resources/src/main/res/values-large-xhdpi/dimens.xml
index d9c2e14e..c39aed5e 100644
--- a/libraries/resources/src/main/res/values-large-xhdpi/dimens.xml
+++ b/libraries/resources/src/main/res/values-large-xhdpi/dimens.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright 2019 Andrey Tolpeev
+  ~ Copyright 2020 Andrey Tolpeev
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -16,5 +16,5 @@
 
 <resources>
     <!--(1200x1920 - Nexus 7"(latest))-->
-    <dimen name="recycler_view_horizontal_margin">64dp</dimen>
+    <dimen name="dp_recycler_view_horizontal">64dp</dimen>
 </resources>
diff --git a/libraries/resources/src/main/res/values-xlarge-xhdpi/dimens.xml b/libraries/resources/src/main/res/values-xlarge-xhdpi/dimens.xml
index 1861a9db..f02f0984 100644
--- a/libraries/resources/src/main/res/values-xlarge-xhdpi/dimens.xml
+++ b/libraries/resources/src/main/res/values-xlarge-xhdpi/dimens.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright 2019 Andrey Tolpeev
+  ~ Copyright 2020 Andrey Tolpeev
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -16,5 +16,5 @@
 
 <resources>
     <!--(2560x1600 - Nexus 10")-->
-    <dimen name="recycler_view_horizontal_margin">64dp</dimen>
+    <dimen name="dp_recycler_view_horizontal">64dp</dimen>
 </resources>
diff --git a/libraries/resources/src/main/res/values/dimens.xml b/libraries/resources/src/main/res/values/dimens.xml
index 8adcfa59..d31dfc7a 100644
--- a/libraries/resources/src/main/res/values/dimens.xml
+++ b/libraries/resources/src/main/res/values/dimens.xml
@@ -15,11 +15,21 @@
   -->
 
 <resources>
-    <dimen name="default_elevation">4dp</dimen>
-    <dimen name="elevation_bottom_navigation">8dp</dimen>
-    <dimen name="default_margin">16dp</dimen>
-    <dimen name="recycler_view_horizontal_margin">0dp</dimen>
-    <dimen name="recycler_view_vertical_margin">0dp</dimen>
-    <dimen name="default_corner_radius">8dp</dimen>
-    <dimen name="dimen_96dp">96dp</dimen>
+    <dimen name="dp_0">0dp</dimen>
+    <dimen name="dp_1">1dp</dimen>
+    <dimen name="dp_2">2dp</dimen>
+    <dimen name="dp_4">4dp</dimen>
+    <dimen name="dp_8">8dp</dimen>
+    <dimen name="dp_12">12dp</dimen>
+    <dimen name="dp_16">16dp</dimen>
+    <dimen name="dp_24">24dp</dimen>
+    <dimen name="dp_32">32dp</dimen>
+    <dimen name="dp_38">38dp</dimen>
+    <dimen name="dp_48">48dp</dimen>
+    <dimen name="dp_96">96dp</dimen>
+
+    <dimen name="dp_recycler_view_horizontal">@dimen/dp_0</dimen>
+
+    <integer name="shimmer_length">1000</integer>
+
 </resources>
diff --git a/libraries/theme/src/main/res/drawable/bottom_sheet_view.xml b/libraries/theme/src/main/res/drawable/bottom_sheet_view.xml
index 0fa0eb3b..20762c48 100644
--- a/libraries/theme/src/main/res/drawable/bottom_sheet_view.xml
+++ b/libraries/theme/src/main/res/drawable/bottom_sheet_view.xml
@@ -15,6 +15,6 @@
   -->
 
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <corners android:radius="16dp" />
+    <corners android:radius="@dimen/dp_16" />
     <solid android:color="?attr/colorControlHighlight" />
 </shape>
\ No newline at end of file
diff --git a/libraries/theme/src/main/res/drawable/tabs_rounded_line_indicator.xml b/libraries/theme/src/main/res/drawable/tabs_rounded_line_indicator.xml
index ab76126f..5da67afc 100644
--- a/libraries/theme/src/main/res/drawable/tabs_rounded_line_indicator.xml
+++ b/libraries/theme/src/main/res/drawable/tabs_rounded_line_indicator.xml
@@ -21,8 +21,8 @@
         <shape android:shape="rectangle">
             <solid android:color="?attr/colorOnPrimary" />
             <corners
-                android:bottomLeftRadius="0dp"
-                android:bottomRightRadius="0dp"
+                android:bottomLeftRadius="@dimen/dp_0"
+                android:bottomRightRadius="@dimen/dp_0"
                 android:topLeftRadius="3dp"
                 android:topRightRadius="3dp" />
             <size android:height="3dp" />
diff --git a/libraries/theme/src/main/res/layout/layout_divider.xml b/libraries/theme/src/main/res/layout/layout_divider.xml
index 8f1f460f..ce91ceb1 100644
--- a/libraries/theme/src/main/res/layout/layout_divider.xml
+++ b/libraries/theme/src/main/res/layout/layout_divider.xml
@@ -16,6 +16,6 @@
 
 <View xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="1dp"
+    android:layout_height="@dimen/dp_1"
     android:background="?attr/colorControlHighlight"
     android:layout_gravity="bottom"/>
\ No newline at end of file
diff --git a/libraries/theme/src/main/res/values/styles.xml b/libraries/theme/src/main/res/values/styles.xml
index 335815c7..0041979a 100644
--- a/libraries/theme/src/main/res/values/styles.xml
+++ b/libraries/theme/src/main/res/values/styles.xml
@@ -35,7 +35,7 @@
 
     <style name="Toolbar" parent="@style/Widget.MaterialComponents.Toolbar.PrimarySurface">
         <item name="android:background">@null</item>
-        <item name="android:elevation">0dp</item>
+        <item name="android:elevation">@dimen/dp_0</item>
     </style>
 
     <style name="TabLayout" parent="@style/Widget.MaterialComponents.TabLayout.PrimarySurface">
@@ -49,7 +49,6 @@
     </style>
 
     <style name="ItemTitle">
-        <item name="android:textSize">18sp</item>
         <item name="android:ellipsize">end</item>
         <item name="android:maxLines">2</item>
         <item name="android:textColor">@color/material_on_background_emphasis_high_type</item>
@@ -66,19 +65,11 @@
         <item name="android:textAppearance">?attr/textAppearanceBody2</item>
     </style>
 
-    <style name="BaseFloatingActionButton" parent="Widget.MaterialComponents.FloatingActionButton">
-        <item name="android:layout_gravity">end|bottom</item>
-        <item name="android:layout_margin">@dimen/default_margin</item>
-        <item name="elevation">@dimen/default_elevation</item>
-        <item name="android:clickable">true</item>
-        <item name="fabSize">normal</item>
-    </style>
-
     <style name="RecyclerView">
-        <item name="android:paddingBottom">24dp</item>
-        <item name="android:paddingLeft">@dimen/recycler_view_horizontal_margin</item>
-        <item name="android:paddingRight">@dimen/recycler_view_horizontal_margin</item>
-        <item name="android:paddingTop">@dimen/recycler_view_vertical_margin</item>
+        <item name="android:paddingBottom">@dimen/dp_24</item>
+        <item name="android:paddingLeft">@dimen/dp_recycler_view_horizontal</item>
+        <item name="android:paddingRight">@dimen/dp_recycler_view_horizontal</item>
+        <item name="android:paddingTop">@dimen/dp_0</item>
         <item name="android:clipChildren">true</item>
         <item name="android:clipToPadding">false</item>
         <item name="android:scrollbarStyle">outsideOverlay</item>
@@ -96,13 +87,12 @@
     <style name="Header">
         <item name="android:id">@id/section_text</item>
         <item name="android:layout_width">match_parent</item>
-        <item name="android:layout_height">48dp</item>
+        <item name="android:layout_height">@dimen/dp_48</item>
         <item name="android:gravity">center_vertical</item>
-        <item name="android:paddingLeft">@dimen/default_margin</item>
-        <item name="android:paddingRight">@dimen/default_margin</item>
+        <item name="android:paddingLeft">@dimen/dp_16</item>
+        <item name="android:paddingRight">@dimen/dp_16</item>
         <item name="android:singleLine">true</item>
         <item name="android:textAllCaps">false</item>
-        <item name="android:textSize">14sp</item>
         <item name="android:textAppearance">?attr/textAppearanceBody2</item>
         <item name="android:foreground">?attr/selectableItemBackground</item>
         <item name="android:textColor">@color/material_on_background_emphasis_medium</item>