diff --git a/app/src/androidTest/java/com/anytypeio/anytype/features/relations/AddRelationTagValueTest.kt b/app/src/androidTest/java/com/anytypeio/anytype/features/relations/AddRelationTagValueTest.kt
index 7637414c60..4df855875c 100644
--- a/app/src/androidTest/java/com/anytypeio/anytype/features/relations/AddRelationTagValueTest.kt
+++ b/app/src/androidTest/java/com/anytypeio/anytype/features/relations/AddRelationTagValueTest.kt
@@ -466,7 +466,7 @@ class AddRelationTagValueTest {
 
         // Veryfying UI
 
-        R.id.tvSelectionCounter.matchView().checkHasText("2")
+        R.id.btnAdd.matchView().checkHasText("2")
 
         R.id.btnAdd.performClick()
 
diff --git a/app/src/androidTest/java/com/anytypeio/anytype/features/sets/filter/ModifyStatusFilterTest.kt b/app/src/androidTest/java/com/anytypeio/anytype/features/sets/filter/ModifyStatusFilterTest.kt
index 2529ab4da9..0d4735cf8e 100644
--- a/app/src/androidTest/java/com/anytypeio/anytype/features/sets/filter/ModifyStatusFilterTest.kt
+++ b/app/src/androidTest/java/com/anytypeio/anytype/features/sets/filter/ModifyStatusFilterTest.kt
@@ -221,7 +221,7 @@ class ModifyStatusFilterTest {
 
         // Verifying that the selection counter is equal to 1
 
-        onView(withId(R.id.tvOptionCount)).apply {
+        onView(withId(R.id.btnAdd)).apply {
             check(matches(withText("1")))
         }
 
@@ -247,7 +247,7 @@ class ModifyStatusFilterTest {
 
         // Verifying that the selection counter is still equal to 1
 
-        onView(withId(R.id.tvOptionCount)).apply {
+        onView(withId(R.id.btnAdd)).apply {
             check(matches(withText("1")))
         }
 
diff --git a/app/src/androidTest/java/com/anytypeio/anytype/features/sets/filter/ModifyTagFilterTest.kt b/app/src/androidTest/java/com/anytypeio/anytype/features/sets/filter/ModifyTagFilterTest.kt
index 539c34e8d6..789882e653 100644
--- a/app/src/androidTest/java/com/anytypeio/anytype/features/sets/filter/ModifyTagFilterTest.kt
+++ b/app/src/androidTest/java/com/anytypeio/anytype/features/sets/filter/ModifyTagFilterTest.kt
@@ -222,7 +222,7 @@ class ModifyTagFilterTest {
 
         // Verifying that the selection counter is equal to 1
 
-        onView(withId(R.id.tvOptionCount)).apply {
+        onView(withId(R.id.btnAdd)).apply {
             check(matches(withText("1")))
         }
 
@@ -248,7 +248,7 @@ class ModifyTagFilterTest {
 
         // Verifying that the selection counter is now equal to 2
 
-        onView(withId(R.id.tvOptionCount)).apply {
+        onView(withId(R.id.btnAdd)).apply {
             check(matches(withText("2")))
         }
     }
diff --git a/app/src/main/java/com/anytypeio/anytype/ui/relations/LimitObjectTypeFragment.kt b/app/src/main/java/com/anytypeio/anytype/ui/relations/LimitObjectTypeFragment.kt
index 3db4418ffe..5c214b900d 100644
--- a/app/src/main/java/com/anytypeio/anytype/ui/relations/LimitObjectTypeFragment.kt
+++ b/app/src/main/java/com/anytypeio/anytype/ui/relations/LimitObjectTypeFragment.kt
@@ -41,8 +41,8 @@ class LimitObjectTypeFragment : BaseBottomSheetFragment<FragmentObjectTypeChange
             adapter = objectTypeAdapter
             layoutManager = LinearLayoutManager(context)
         }
-        binding.bottomButton.visible()
-        binding.btnBottomAction.setOnClickListener {
+        binding.btnBottom.visible()
+        binding.btnBottom.setOnClickListener {
             vm.onAddClicked()
         }
         lifecycleScope.launch {
@@ -54,7 +54,7 @@ class LimitObjectTypeFragment : BaseBottomSheetFragment<FragmentObjectTypeChange
                 }
                 launch {
                     vm.count.collectLatest {
-                        binding.tvCount.text = it.toString()
+                        binding.btnBottom.setNumber(it.toString())
                     }
                 }
                 launch {
diff --git a/app/src/main/java/com/anytypeio/anytype/ui/relations/add/AddFileRelationFragment.kt b/app/src/main/java/com/anytypeio/anytype/ui/relations/add/AddFileRelationFragment.kt
index 55882abd2d..80a3cca96a 100644
--- a/app/src/main/java/com/anytypeio/anytype/ui/relations/add/AddFileRelationFragment.kt
+++ b/app/src/main/java/com/anytypeio/anytype/ui/relations/add/AddFileRelationFragment.kt
@@ -58,7 +58,7 @@ class AddFileRelationFragment :
         super.onViewCreated(view, savedInstanceState)
         binding.rvFiles.layoutManager = LinearLayoutManager(requireContext())
         binding.rvFiles.adapter = adapter
-        binding.btnBottomAction.setOnClickListener { vm.onActionButtonClicked() }
+        binding.btnAdd.setOnClickListener { vm.onActionButtonClicked() }
         searchRelationInput = binding.searchBar.root.findViewById(R.id.filterInputField)
         searchRelationInput.apply {
             hint = getString(R.string.choose_options)
@@ -93,7 +93,7 @@ class AddFileRelationFragment :
 
     private fun observeState(state: FileValueAddView) {
         adapter.update(state.files)
-        binding.tvFilesCount.text = state.count
+        binding.btnAdd.setNumber(state.count.orEmpty())
     }
 
     private fun observeCommands(command: FileValueAddCommand) {
diff --git a/app/src/main/java/com/anytypeio/anytype/ui/relations/add/AddObjectRelationFragment.kt b/app/src/main/java/com/anytypeio/anytype/ui/relations/add/AddObjectRelationFragment.kt
index c4dbf39834..caf69f3e0c 100644
--- a/app/src/main/java/com/anytypeio/anytype/ui/relations/add/AddObjectRelationFragment.kt
+++ b/app/src/main/java/com/anytypeio/anytype/ui/relations/add/AddObjectRelationFragment.kt
@@ -73,7 +73,7 @@ class AddObjectRelationFragment : BaseDialogFragment<FragmentRelationObjectValue
         }
         binding.rvObjects.layoutManager = LinearLayoutManager(requireContext())
         binding.rvObjects.adapter = adapter
-        binding.btnBottomAction.setOnClickListener { vm.onActionButtonClicked() }
+        binding.btnAdd.setOnClickListener { vm.onActionButtonClicked() }
         setupBottomSheet()
         searchRelationInput = binding.searchBar.root.findViewById(R.id.filterInputField)
         searchRelationInput.apply {
@@ -96,11 +96,10 @@ class AddObjectRelationFragment : BaseDialogFragment<FragmentRelationObjectValue
                     }
 
                     override fun onSlide(bottomSheet: View, slideOffset: Float) {
-                        if (binding.btnAddContainer == null) return
                         if (slideOffset < 0)
-                            binding.btnAddContainer.gone()
+                            binding.btnAdd.gone()
                         else
-                            binding.btnAddContainer.visible()
+                            binding.btnAdd.visible()
                     }
                 }
             )
@@ -132,7 +131,7 @@ class AddObjectRelationFragment : BaseDialogFragment<FragmentRelationObjectValue
 
     private fun observeState(state: ObjectValueAddView) {
         adapter.update(state.objects)
-        binding.tvObjectsCount.text = state.count
+        binding.btnAdd.setNumber(state.count.orEmpty())
     }
 
     private fun observeCommands(command: ObjectValueAddCommand) {
diff --git a/app/src/main/java/com/anytypeio/anytype/ui/relations/add/BaseAddOptionsRelationFragment.kt b/app/src/main/java/com/anytypeio/anytype/ui/relations/add/BaseAddOptionsRelationFragment.kt
index 1f78a160cd..dfa5ac79dc 100644
--- a/app/src/main/java/com/anytypeio/anytype/ui/relations/add/BaseAddOptionsRelationFragment.kt
+++ b/app/src/main/java/com/anytypeio/anytype/ui/relations/add/BaseAddOptionsRelationFragment.kt
@@ -117,9 +117,9 @@ abstract class BaseAddOptionsRelationFragment : BaseDialogFragment<AddOptionRela
                     override fun onSlide(bottomSheet: View, slideOffset: Float) {
                         if (vm.isMultiple.value) {
                             if (slideOffset < 0)
-                                binding.btnAddContainer.gone()
+                                binding.btnAdd.gone()
                             else
-                                binding.btnAddContainer.visible()
+                                binding.btnAdd.visible()
                         }
                     }
                 }
@@ -131,9 +131,9 @@ abstract class BaseAddOptionsRelationFragment : BaseDialogFragment<AddOptionRela
         super.onActivityCreated(savedInstanceState)
         with(lifecycleScope) {
             subscribe(vm.ui) { editCellTagAdapter.update(it) }
-            subscribe(vm.counter) { binding.tvSelectionCounter.text = it.toString() }
+            subscribe(vm.counter) { binding.btnAdd.setNumber(it.toString()) }
             subscribe(vm.isAddButtonVisible) { isVisible ->
-                if (!isVisible) binding.btnAddContainer.gone() else binding.btnAddContainer.visible()
+                if (!isVisible) binding.btnAdd.gone() else binding.btnAdd.visible()
             }
             subscribe(vm.isDismissed) { isDismissed ->
                 if (isDismissed) {
diff --git a/app/src/main/java/com/anytypeio/anytype/ui/sets/modals/filter/CreateFilterFromSelectedValueFragment.kt b/app/src/main/java/com/anytypeio/anytype/ui/sets/modals/filter/CreateFilterFromSelectedValueFragment.kt
index 90fdf93eed..1d4792c236 100644
--- a/app/src/main/java/com/anytypeio/anytype/ui/sets/modals/filter/CreateFilterFromSelectedValueFragment.kt
+++ b/app/src/main/java/com/anytypeio/anytype/ui/sets/modals/filter/CreateFilterFromSelectedValueFragment.kt
@@ -67,7 +67,6 @@ open class CreateFilterFromSelectedValueFragment :
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        binding.btnBottomAction.setText(R.string.create)
         searchRelationInput = binding.searchBar.root.findViewById(R.id.filterInputField)
         searchRelationInput.apply {
             hint = getString(R.string.choose_options)
@@ -97,7 +96,7 @@ open class CreateFilterFromSelectedValueFragment :
                 binding.tvRelationName.text = it.title
                 binding.ivRelationIcon.setImageResource(it.format.relationIcon(true))
             }
-            subscribe(vm.optionCountState) { binding.tvOptionCount.text = it.toString() }
+            subscribe(vm.optionCountState) { binding.btnBottomAction.setNumber(it.toString()) }
             subscribe(vm.isCompleted) { isCompleted ->
                 if (isCompleted) withParent<CreateFilterFlow> { onFilterCreated() }
             }
@@ -156,8 +155,8 @@ open class CreateFilterFromSelectedValueFragment :
                     index = commands.index
                 ).showChildFragment()
             }
-            FilterViewModel.Commands.ShowCount -> binding.tvOptionCount.visible()
-            FilterViewModel.Commands.HideCount -> binding.tvOptionCount.gone()
+            FilterViewModel.Commands.ShowCount -> binding.btnBottomAction.showNumber()
+            FilterViewModel.Commands.HideCount -> binding.btnBottomAction.hideNumber()
             FilterViewModel.Commands.ShowSearchbar -> binding.searchBar.root.visible()
             FilterViewModel.Commands.HideSearchbar -> binding.searchBar.root.gone()
             FilterViewModel.Commands.DateDivider -> setDivider(R.drawable.divider_relation_date)
diff --git a/app/src/main/java/com/anytypeio/anytype/ui/sets/modals/filter/ModifyFilterFromSelectedValueFragment.kt b/app/src/main/java/com/anytypeio/anytype/ui/sets/modals/filter/ModifyFilterFromSelectedValueFragment.kt
index 140360440c..f3f7cab50f 100644
--- a/app/src/main/java/com/anytypeio/anytype/ui/sets/modals/filter/ModifyFilterFromSelectedValueFragment.kt
+++ b/app/src/main/java/com/anytypeio/anytype/ui/sets/modals/filter/ModifyFilterFromSelectedValueFragment.kt
@@ -60,7 +60,6 @@ open class ModifyFilterFromSelectedValueFragment :
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-        binding.btnBottomAction.setText(R.string.apply)
         searchRelationInput = binding.searchBar.root.findViewById(R.id.filterInputField)
         searchRelationInput.apply {
             hint = getString(R.string.choose_options)
@@ -89,12 +88,12 @@ open class ModifyFilterFromSelectedValueFragment :
             subscribe(vm.relationState.filterNotNull()) {
                 if (it.format == ColumnView.Format.DATE) {
                     binding.searchBar.root.gone()
-                    binding.tvOptionCount.gone()
+                    binding.btnBottomAction.hideNumber()
                 }
                 binding.tvRelationName.text = it.title
                 binding.ivRelationIcon.setImageResource(it.format.relationIcon(true))
             }
-            subscribe(vm.optionCountState) { binding.tvOptionCount.text = it.toString() }
+            subscribe(vm.optionCountState) { binding.btnBottomAction.setNumber(it.toString()) }
             subscribe(vm.isCompleted) { isCompleted -> if (isCompleted) dismiss() }
             subscribe(vm.conditionState) {
                 binding.tvFilterCondition.text = it?.condition?.title
@@ -134,8 +133,8 @@ open class ModifyFilterFromSelectedValueFragment :
                 )
                     .showChildFragment()
             }
-            FilterViewModel.Commands.ShowCount -> binding.tvOptionCount.visible()
-            FilterViewModel.Commands.HideCount -> binding.tvOptionCount.gone()
+            FilterViewModel.Commands.ShowCount -> binding.btnBottomAction.showNumber()
+            FilterViewModel.Commands.HideCount -> binding.btnBottomAction.hideNumber()
             FilterViewModel.Commands.ShowSearchbar -> binding.searchBar.root.visible()
             FilterViewModel.Commands.HideSearchbar -> binding.searchBar.root.gone()
             FilterViewModel.Commands.DateDivider -> setDivider(R.drawable.divider_relation_date)
diff --git a/app/src/main/res/layout/add_option_relation_fragment.xml b/app/src/main/res/layout/add_option_relation_fragment.xml
index 1931d32e93..7e5967fac0 100644
--- a/app/src/main/res/layout/add_option_relation_fragment.xml
+++ b/app/src/main/res/layout/add_option_relation_fragment.xml
@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--typography, buttons 05.04-->
 <androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:context="com.anytypeio.anytype.ui.relations.add.BaseAddOptionsRelationFragment">
 
     <LinearLayout
         android:id="@+id/sheet"
@@ -37,37 +39,21 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="16dp"
-            android:layout_marginEnd="16dp"
-            android:layout_marginStart="16dp" />
+            android:layout_marginEnd="20dp"
+            android:layout_marginStart="20dp" />
 
     </LinearLayout>
 
-    <FrameLayout
-        android:layout_gravity="bottom"
-        android:id="@+id/btnAddContainer"
-        android:paddingStart="20dp"
-        android:paddingEnd="20dp"
+    <com.anytypeio.anytype.core_ui.widgets.ButtonPrimaryNumber
+        android:id="@+id/btnAdd"
         android:layout_width="match_parent"
-        android:layout_height="68dp">
+        android:layout_height="wrap_content"
+        android:layout_marginStart="20dp"
+        android:layout_marginEnd="20dp"
+        android:layout_marginBottom="@dimen/dp_10"
+        android:layout_gravity="bottom"
+        app:buttonTitle="@string/add">
 
-        <TextView
-            android:id="@+id/btnAdd"
-            style="@style/DefaultSolidButtonStyle"
-            android:layout_width="match_parent"
-            android:layout_gravity="center_vertical"
-            android:layout_height="44dp"
-            android:text="@string/add"
-            android:textSize="17sp" />
-
-        <TextView
-            tools:text="1"
-            android:layout_marginEnd="12dp"
-            android:layout_gravity="end|center_vertical"
-            android:id="@+id/tvSelectionCounter"
-            android:layout_width="24dp"
-            android:layout_height="24dp"
-            style="@style/SelectRelationValueCounterStyle" />
-
-    </FrameLayout>
+    </com.anytypeio.anytype.core_ui.widgets.ButtonPrimaryNumber>
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/alert_mnemonic_reminder.xml b/app/src/main/res/layout/alert_mnemonic_reminder.xml
index d5f7188097..16c0b04d3b 100644
--- a/app/src/main/res/layout/alert_mnemonic_reminder.xml
+++ b/app/src/main/res/layout/alert_mnemonic_reminder.xml
@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--typography, buttons 05.04-->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:orientation="vertical">
+    xmlns:tools="http://schemas.android.com/tools"
+    android:orientation="vertical"
+    tools:context="com.anytypeio.anytype.ui.dashboard.MnemonicReminderDialog">
 
     <TextView
         android:id="@+id/tvTitle"
+        style="@style/TextView.ContentStyle.Headline.Heading"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="20dp"
         android:layout_marginTop="23dp"
         android:layout_marginEnd="20dp"
-        android:lineHeight="26sp"
-        android:fontFamily="@font/inter_bold"
-        android:textColor="@color/text_primary"
-        android:textSize="22sp"
         android:text="@string/do_not_forget_to_save_recovery_phrase_msg" />
 
     <LinearLayout
@@ -26,9 +26,8 @@
         android:paddingStart="20dp"
         android:paddingEnd="20dp">
 
-        <TextView
+        <com.anytypeio.anytype.core_ui.views.ButtonSecondaryLarge
             android:id="@+id/btnClose"
-            style="@style/DefaultStrokeButtonStyle"
             android:layout_width="0dp"
             android:layout_height="match_parent"
             android:layout_marginEnd="5dp"
@@ -36,9 +35,8 @@
             android:gravity="center"
             android:text="@string/close" />
 
-        <TextView
+        <com.anytypeio.anytype.core_ui.views.ButtonWarningLarge
             android:id="@+id/btnSettings"
-            style="@style/DefaultSolidButtonStyle"
             android:layout_width="0dp"
             android:layout_height="match_parent"
             android:layout_marginStart="5dp"
diff --git a/app/src/main/res/layout/dialog_create_bookmark.xml b/app/src/main/res/layout/dialog_create_bookmark.xml
index 7900b00eb5..79b94404b5 100644
--- a/app/src/main/res/layout/dialog_create_bookmark.xml
+++ b/app/src/main/res/layout/dialog_create_bookmark.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--typography, buttons 05.04-->
 <com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
@@ -20,30 +21,21 @@
             android:background="@null"
             android:hint="@string/hint_paste_or_type_a_url"
             android:inputType="textUri"
-            android:textColor="@color/text_primary"
+            style="@style/TextView.ContentStyle.Body.Regular"
             android:textColorHint="@color/text_tertiary"
-            android:textSize="17sp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <TextView
+        <com.anytypeio.anytype.core_ui.views.ButtonPrimaryLarge
             android:id="@+id/createBookmarkButton"
             android:layout_width="0dp"
-            android:layout_height="@dimen/auth_default_button_height"
+            android:layout_height="wrap_content"
             android:layout_marginStart="5dp"
             android:layout_marginTop="16dp"
             android:layout_marginEnd="20dp"
             android:layout_marginBottom="16dp"
-            android:background="@drawable/rectangle_default_button"
-            android:clickable="true"
-            android:focusable="true"
-            android:fontFamily="@font/inter_medium"
-            android:gravity="center"
-            android:stateListAnimator="@animator/scale_shrink"
             android:text="@string/create_bookmark"
-            android:textColor="@color/white"
-            android:textSize="17sp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="@+id/guideline3"
@@ -61,21 +53,13 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/urlInput" />
 
-        <TextView
+        <com.anytypeio.anytype.core_ui.views.ButtonSecondaryLarge
             android:id="@+id/cancelBookmarkButton"
             android:layout_width="0dp"
             android:layout_height="@dimen/auth_default_button_height"
             android:layout_marginStart="20dp"
             android:layout_marginEnd="5dp"
-            android:clickable="true"
-            android:focusable="true"
-            android:fontFamily="@font/inter_regular"
-            android:gravity="center"
-            android:background="@drawable/bg_bookmark_cancel_button"
-            android:stateListAnimator="@animator/scale_shrink"
             android:text="@string/cancel"
-            android:textColor="@color/text_primary"
-            android:textSize="17sp"
             app:layout_constraintEnd_toStartOf="@+id/guideline3"
             app:layout_constraintHorizontal_chainStyle="packed"
             app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/dialog_dashboard_keychain_phrase.xml b/app/src/main/res/layout/dialog_dashboard_keychain_phrase.xml
index 56bd11f437..debe72c10b 100644
--- a/app/src/main/res/layout/dialog_dashboard_keychain_phrase.xml
+++ b/app/src/main/res/layout/dialog_dashboard_keychain_phrase.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--typography, buttons 05.04-->
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
@@ -20,11 +21,11 @@
 
     <TextView
         android:id="@+id/title"
-        style="@style/KeychainDialogTitleStyle"
+        style="@style/TextView.ContentStyle.Headline.Heading"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="20dp"
-        android:layout_marginTop="23dp"
+        android:layout_marginTop="30dp"
         android:layout_marginEnd="20dp"
         android:text="@string/do_not_forget_mnemonic_phrase"
         app:layout_constraintStart_toStartOf="parent"
@@ -32,11 +33,11 @@
 
     <TextView
         android:id="@+id/subtitle"
-        style="@style/KeychainDialogSubtitleStyle"
+        style="@style/TextView.UXStyle.Body.Callout.Regular"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="20dp"
-        android:layout_marginTop="12dp"
+        android:layout_marginTop="8dp"
         android:layout_marginEnd="20dp"
         android:text="@string/if_you_lose_recovery_phrase_warning"
         app:layout_constraintEnd_toEndOf="parent"
@@ -45,11 +46,13 @@
 
     <TextView
         android:id="@+id/keychain"
-        style="@style/KeychainDialogKeychainStyle"
+        style="@style/TextView.ContentStyle.CodeBlock"
+        android:textColor="@color/palette_dark_ice"
+        android:background="@drawable/keychain_ripple"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="20dp"
-        android:layout_marginTop="18dp"
+        android:layout_marginTop="24dp"
         android:layout_marginEnd="20dp"
         android:clickable="true"
         android:foreground="?attr/selectableItemBackground"
@@ -64,17 +67,14 @@
 
         tools:text="@string/keychain_mock" />
 
-    <TextView
+    <com.anytypeio.anytype.core_ui.views.ButtonSecondaryLarge
         android:id="@+id/btnCopy"
-        style="@style/DefaultStrokeButtonStyle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="20dp"
         android:layout_marginTop="20dp"
         android:layout_marginEnd="20dp"
         android:layout_marginBottom="24dp"
-        android:paddingTop="@dimen/dp_12"
-        android:paddingBottom="@dimen/dp_12"
         android:text="@string/show_and_copy_mnemonic"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/dialog_keychain_phrase.xml b/app/src/main/res/layout/dialog_keychain_phrase.xml
index 02ee0a9e83..926ca53390 100644
--- a/app/src/main/res/layout/dialog_keychain_phrase.xml
+++ b/app/src/main/res/layout/dialog_keychain_phrase.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--typography, buttons 05.04-->
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
@@ -19,7 +20,7 @@
 
     <TextView
         android:id="@+id/title"
-        style="@style/KeychainDialogTitleStyle"
+        style="@style/TextView.ContentStyle.Headline.Heading"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="30dp"
@@ -31,7 +32,7 @@
 
     <TextView
         android:id="@+id/subtitle"
-        style="@style/KeychainDialogSubtitleStyle"
+        style="@style/TextView.UXStyle.Body.Callout.Regular"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="20dp"
@@ -44,7 +45,9 @@
 
     <TextView
         android:id="@+id/keychain"
-        style="@style/KeychainDialogKeychainStyle"
+        style="@style/TextView.ContentStyle.CodeBlock"
+        android:textColor="@color/palette_dark_ice"
+        android:background="@drawable/keychain_ripple"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="20dp"
@@ -63,17 +66,14 @@
         app:layout_constraintTop_toBottomOf="@+id/subtitle"
         tools:text="@string/keychain_mock" />
 
-    <TextView
+    <com.anytypeio.anytype.core_ui.views.ButtonSecondaryLarge
         android:id="@+id/btnCopy"
-        style="@style/DefaultStrokeButtonStyle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="20dp"
         android:layout_marginTop="20dp"
         android:layout_marginEnd="20dp"
         android:layout_marginBottom="24dp"
-        android:paddingTop="@dimen/dp_12"
-        android:paddingBottom="@dimen/dp_12"
         android:text="@string/show_and_copy_mnemonic"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/fragment_add_block.xml b/app/src/main/res/layout/fragment_add_block.xml
deleted file mode 100644
index 2598e9f2f7..0000000000
--- a/app/src/main/res/layout/fragment_add_block.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/recycler"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_marginStart="20dp"
-        android:layout_marginEnd="20dp"
-        android:clipToPadding="false"
-        android:paddingBottom="20dp" />
-
-    <ImageView
-        android:layout_gravity="end"
-        android:contentDescription="@string/content_description_close_button"
-        android:id="@+id/close"
-        android:layout_width="28dp"
-        android:layout_height="28dp"
-        android:layout_marginTop="18dp"
-        android:layout_marginEnd="16dp"
-        android:src="@drawable/ic_close_round" />
-
-</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_alert.xml b/app/src/main/res/layout/fragment_alert.xml
index 2b743866ff..cb3a897b1e 100644
--- a/app/src/main/res/layout/fragment_alert.xml
+++ b/app/src/main/res/layout/fragment_alert.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--typography, buttons 05.04-->
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
@@ -43,9 +44,8 @@
 
             </FrameLayout>
 
-            <TextView
+            <com.anytypeio.anytype.core_ui.views.ButtonPrimaryLarge
                 android:id="@+id/update"
-                style="@style/DefaultSolidButtonStyle"
                 android:layout_width="0dp"
                 android:layout_height="@dimen/auth_default_button_height"
                 android:layout_marginStart="5dp"
@@ -57,9 +57,8 @@
                 app:layout_constraintHorizontal_bias="0.5"
                 app:layout_constraintStart_toEndOf="@+id/later" />
 
-            <TextView
+            <com.anytypeio.anytype.core_ui.views.ButtonSecondaryLarge
                 android:id="@+id/later"
-                style="@style/DefaultStrokeButtonStyle"
                 android:layout_width="0dp"
                 android:layout_height="@dimen/auth_default_button_height"
                 android:layout_marginStart="@dimen/auth_default_margin_start"
@@ -73,7 +72,7 @@
 
             <TextView
                 android:id="@+id/title"
-                style="@style/AuthHeaderStyle"
+                style="@style/TextView.ContentStyle.Headline.Heading"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="20dp"
@@ -84,15 +83,13 @@
 
             <TextView
                 android:id="@+id/subtitle"
+                style="@style/TextView.UXStyle.Body.Callout.Regular"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="20dp"
                 android:layout_marginEnd="20dp"
                 android:layout_marginBottom="18dp"
-                android:fontFamily="@font/inter_regular"
                 android:text="@string/time_to_update_text"
-                android:textColor="@color/black"
-                android:textSize="15sp"
                 app:layout_constraintBottom_toTopOf="@+id/update"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent" />
diff --git a/app/src/main/res/layout/fragment_clear_cache.xml b/app/src/main/res/layout/fragment_clear_cache.xml
index 291660c0dd..ab1008ecad 100644
--- a/app/src/main/res/layout/fragment_clear_cache.xml
+++ b/app/src/main/res/layout/fragment_clear_cache.xml
@@ -1,32 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--typography, buttons 05.04-->
 <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:orientation="vertical"
+    tools:context="com.anytypeio.anytype.ui.dashboard.ClearCacheAlertFragment">
 
     <TextView
         android:id="@+id/tvTitle"
+        style="@style/TextView.ContentStyle.Headline.Heading"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="20dp"
         android:layout_marginTop="20dp"
         android:layout_marginEnd="20dp"
-        android:fontFamily="@font/inter_bold"
-        android:textColor="@color/black"
-        android:textSize="22sp"
         android:text="@string/clear_cache" />
 
     <TextView
         android:id="@+id/tvSubtitle"
+        style="@style/TextView.UXStyle.Body.Callout.Regular"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="20dp"
         android:layout_marginTop="12dp"
         android:layout_marginEnd="20dp"
-        android:fontFamily="@font/inter_regular"
-        android:textColor="@color/black"
-        android:textSize="15sp"
         android:text="@string/download_from_node" />
 
     <LinearLayout
@@ -38,9 +36,8 @@
         android:paddingStart="20dp"
         android:paddingEnd="20dp">
 
-        <TextView
+        <com.anytypeio.anytype.core_ui.views.ButtonSecondaryLarge
             android:id="@+id/btnCancel"
-            style="@style/DefaultStrokeButtonStyle"
             android:layout_width="0dp"
             android:layout_height="match_parent"
             android:layout_marginEnd="5dp"
@@ -48,9 +45,8 @@
             android:gravity="center"
             android:text="@string/cancel" />
 
-        <TextView
+        <com.anytypeio.anytype.core_ui.views.ButtonWarningLarge
             android:id="@+id/btnClear"
-            style="@style/DefaultRedButtonStyle"
             android:layout_width="0dp"
             android:layout_height="match_parent"
             android:layout_marginStart="5dp"
diff --git a/app/src/main/res/layout/fragment_create_account.xml b/app/src/main/res/layout/fragment_create_account.xml
index 12714bfd94..8e7ef76407 100644
--- a/app/src/main/res/layout/fragment_create_account.xml
+++ b/app/src/main/res/layout/fragment_create_account.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--typography, buttons 05.04-->
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
@@ -48,29 +49,26 @@
 
             <TextView
                 android:id="@+id/tvNewProfile"
+                style="@style/TextView.UXStyle.Captions.1.Regular"
+                android:textColor="@color/text_secondary"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="20dp"
-                android:textSize="13sp"
                 android:layout_marginTop="11dp"
                 android:text="@string/new_profile"
-                android:textColor="@color/text_secondary"
-                android:fontFamily="@font/inter_regular"
                 app:layout_constraintTop_toBottomOf="@id/profileIcon"
                 app:layout_constraintStart_toStartOf="parent" />
 
             <EditText
                 android:id="@+id/nameInputField"
+                style="@style/TextView.ContentStyle.Headline.Heading"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="20dp"
                 android:layout_marginTop="6dp"
                 android:background="@null"
-                android:fontFamily="@font/inter_bold"
                 android:hint="@string/type_your_name"
-                android:textColor="@color/text_primary"
                 android:textColorHint="@color/text_tertiary"
-                android:textSize="22sp"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/tvNewProfile" />
 
@@ -86,9 +84,8 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/nameInputField" />
 
-            <TextView
+            <com.anytypeio.anytype.core_ui.views.ButtonPrimaryLarge
                 android:id="@+id/createProfileButton"
-                style="@style/DefaultSolidButtonStyle"
                 android:layout_width="0dp"
                 android:layout_height="@dimen/auth_default_button_height"
                 android:layout_marginTop="20dp"
@@ -102,9 +99,8 @@
                 app:layout_constraintHorizontal_bias="0.5"
                 app:layout_constraintStart_toEndOf="@+id/backButton" />
 
-            <TextView
+            <com.anytypeio.anytype.core_ui.views.ButtonSecondaryLarge
                 android:id="@+id/backButton"
-                style="@style/DefaultStrokeButtonStyle"
                 android:layout_width="0dp"
                 android:layout_height="@dimen/auth_default_button_height"
                 android:layout_marginTop="20dp"
diff --git a/app/src/main/res/layout/fragment_create_data_view_relation.xml b/app/src/main/res/layout/fragment_create_data_view_relation.xml
deleted file mode 100644
index a912f0d781..0000000000
--- a/app/src/main/res/layout/fragment_create_data_view_relation.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <FrameLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="20dp"
-        android:layout_marginEnd="20dp"
-        android:layout_marginBottom="12dp">
-
-        <View
-            android:id="@+id/dragger"
-            android:layout_width="48dp"
-            android:layout_height="4dp"
-            android:layout_gravity="center_horizontal"
-            android:layout_marginTop="6dp"
-            android:background="@drawable/page_icon_picker_dragger_background" />
-
-    </FrameLayout>
-
-    <FrameLayout
-        android:padding="8dp"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="20dp"
-        android:layout_marginEnd="20dp"
-        android:background="@drawable/page_icon_picker_filter_background">
-
-        <EditText
-            android:textCursorDrawable="@drawable/cursor"
-            android:textColor="@color/black"
-            android:id="@+id/nameInputField"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:layout_marginStart="4dp"
-            android:layout_marginEnd="4dp"
-            android:background="@null"
-            android:fontFamily="@font/inter_regular"
-            android:imeOptions="actionDone"
-            android:hint="@string/hint_type_name_for_new_relation"
-            android:inputType="textNoSuggestions"
-            android:maxLines="1"
-            android:singleLine="true" />
-
-    </FrameLayout>
-
-    <androidx.recyclerview.widget.RecyclerView xmlns:tools="http://schemas.android.com/tools"
-        android:layout_marginTop="16dp"
-        tools:listitem="@layout/item_create_data_view_relation_relation_format"
-        app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
-        android:layout_marginStart="20dp"
-        android:layout_marginEnd="20dp"
-        android:id="@+id/formatRecycler"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_create_data_view_viewer.xml b/app/src/main/res/layout/fragment_create_data_view_viewer.xml
index fd4fb7ca4c..a5ad9dec23 100644
--- a/app/src/main/res/layout/fragment_create_data_view_viewer.xml
+++ b/app/src/main/res/layout/fragment_create_data_view_viewer.xml
@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--typography, buttons 05.04-->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    xmlns:tools="http://schemas.android.com/tools"
     android:orientation="vertical"
     android:paddingStart="20dp"
     android:paddingEnd="20dp">
@@ -14,7 +16,7 @@
         android:layout_marginTop="6dp"/>
 
     <TextView
-        style="@style/DefaultDataViewModalHeaderStyle"
+        style="@style/TextView.UXStyle.Titles.1"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:layout_gravity="center"
@@ -23,16 +25,16 @@
         android:text="@string/new_view" />
 
     <TextView
+        style="@style/TextView.UXStyle.Captions.1.Regular"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:fontFamily="@font/inter_regular"
-        android:textSize="@dimen/sp_13"
         android:textColor="@color/text_secondary"
         android:layout_marginTop="23dp"
         android:text="@string/name" />
 
     <EditText
         android:id="@+id/viewerNameInput"
+        style="@style/TextView.ContentStyle.Headline.Heading"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="6dp"
@@ -41,11 +43,8 @@
         android:singleLine="true"
         android:maxLines="1"
         android:imeOptions="actionDone"
-        android:fontFamily="@font/inter_bold"
         android:textColorHint="@color/text_secondary"
-        android:textColor="@color/text_primary"
-        android:textCursorDrawable="@drawable/cursor"
-        android:textSize="22sp" />
+        tools:text="View"/>
 
     <View
         android:layout_width="match_parent"
@@ -56,8 +55,7 @@
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:fontFamily="@font/inter_regular"
-        android:textSize="@dimen/sp_13"
+        style="@style/TextView.UXStyle.Captions.1.Regular"
         android:textColor="@color/text_secondary"
         android:layout_marginTop="27dp"
         android:text="@string/viewer_as" />
@@ -88,7 +86,7 @@
         </FrameLayout>
 
         <TextView
-            style="@style/CreateViewerViewerNameStyle"
+            style="@style/TextView.UXStyle.Body"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
@@ -129,7 +127,7 @@
         </FrameLayout>
 
         <TextView
-            style="@style/CreateViewerViewerNameStyle"
+            style="@style/TextView.UXStyle.Body"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
@@ -171,7 +169,7 @@
         </FrameLayout>
 
         <TextView
-            style="@style/CreateViewerViewerNameStyle"
+            style="@style/TextView.UXStyle.Body"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
@@ -212,7 +210,8 @@
         </FrameLayout>
 
         <TextView
-            style="@style/CreateViewerViewerNameStyle"
+            style="@style/TextView.UXStyle.Body"
+            android:textColor="@color/text_tertiary"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
@@ -228,11 +227,12 @@
             android:visibility="invisible" />
 
         <TextView
-            style="@style/DataViewComingSoonStyle"
+            style="@style/TextView.UXStyle.Captions.1.Regular"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="end|center_vertical"
             android:textAllCaps="true"
+            android:textColor="@color/text_tertiary"
             android:text="@string/soon" />
 
     </FrameLayout>
@@ -242,14 +242,12 @@
         android:layout_height="0.5dp"
         android:background="@color/shape_primary" />
 
-    <TextView
+    <com.anytypeio.anytype.core_ui.views.ButtonPrimaryLarge
         android:id="@+id/btnCreateViewer"
-        style="@style/DefaultSolidButtonStyle"
         android:layout_width="match_parent"
-        android:layout_height="48dp"
+        android:layout_height="wrap_content"
         android:layout_marginTop="20dp"
         android:layout_marginBottom="40dp"
-        android:text="@string/create"
-        android:textSize="17sp" />
+        android:text="@string/create" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_create_object_type.xml b/app/src/main/res/layout/fragment_create_object_type.xml
deleted file mode 100644
index 58258901ad..0000000000
--- a/app/src/main/res/layout/fragment_create_object_type.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <TextView
-        android:id="@+id/textView2"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:layout_marginTop="16dp"
-        android:layout_marginEnd="16dp"
-        android:textSize="18sp"
-        android:textColor="@color/black"
-        android:text="@string/object_type_name"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <EditText
-        android:id="@+id/edtTypeName"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:layout_marginTop="8dp"
-        android:layout_marginEnd="16dp"
-        android:ems="10"
-        android:inputType="textPersonName"
-        android:hint="Enter Name"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/textView2" />
-
-    <TextView
-        android:id="@+id/textView3"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:layout_marginTop="8dp"
-        android:layout_marginEnd="16dp"
-        android:textSize="18sp"
-        android:textColor="@color/black"
-        android:text="@string/object_view_type"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/edtTypeName" />
-
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/rvTypes"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/dp_8"
-        android:layout_marginStart="8dp"
-        android:layout_marginEnd="8dp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/textView3" />
-
-    <androidx.appcompat.widget.AppCompatButton
-        android:id="@+id/btnCreate"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/modal_button_height"
-        android:layout_marginStart="16dp"
-        android:layout_marginTop="16dp"
-        android:layout_marginEnd="16dp"
-        android:layout_marginBottom="16dp"
-        android:background="@drawable/rounded_button_add"
-        android:fontFamily="@font/inter_regular"
-        android:stateListAnimator="@animator/scale_shrink"
-        android:text="Create"
-        android:textColor="@color/white"
-        android:textSize="17sp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/rvTypes" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_create_or_update_filter.xml b/app/src/main/res/layout/fragment_create_or_update_filter.xml
index e90fb47916..eef6d53c38 100644
--- a/app/src/main/res/layout/fragment_create_or_update_filter.xml
+++ b/app/src/main/res/layout/fragment_create_or_update_filter.xml
@@ -1,14 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--typography, buttons 05.04-->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:orientation="vertical"
+    android:layout_height="wrap_content"
+    android:layout_gravity="bottom"
     android:clickable="true"
     android:focusable="true"
-    android:layout_gravity="bottom"
+    android:orientation="vertical"
     android:transitionName="checkoutTransition"
-    android:layout_height="wrap_content">
+    tools:context="com.anytypeio.anytype.ui.sets.modals.filter.CreateFilterFromSelectedValueFragment">
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
@@ -36,17 +38,15 @@
 
         <TextView
             android:id="@+id/tvRelationName"
+            style="@style/TextView.ContentStyle.PreviewTitles.2.Medium"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="12dp"
             android:layout_marginTop="16dp"
             android:layout_marginEnd="20dp"
-            android:fontFamily="@font/inter_medium"
-            android:textColor="@color/black"
-            android:textSize="15sp"
-            android:singleLine="true"
-            android:maxLines="1"
             android:ellipsize="end"
+            android:maxLines="1"
+            android:singleLine="true"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@+id/ivRelationIcon"
             app:layout_constraintTop_toBottomOf="@+id/dragger"
@@ -54,13 +54,14 @@
 
         <TextView
             android:id="@+id/tvFilterCondition"
-            style="@style/FilterConditionTextStyle"
+            style="@style/TextView.ContentStyle.Relations.1"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:paddingStart="@dimen/dp_12"
             android:paddingEnd="@dimen/dp_12"
             android:paddingBottom="@dimen/dp_12"
             android:text="@string/filter_condition_is"
+            android:textColor="@color/text_secondary"
             app:drawableEndCompat="@drawable/ic_list_arrow"
             app:layout_constraintStart_toEndOf="@+id/ivRelationIcon"
             app:layout_constraintTop_toBottomOf="@+id/tvRelationName"
@@ -71,8 +72,8 @@
             layout="@layout/widget_search_view"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="20dp"
             android:layout_marginStart="20dp"
+            android:layout_marginTop="20dp"
             android:layout_marginEnd="20dp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
@@ -84,43 +85,24 @@
         android:id="@+id/rvViewerFilterRecycler"
         android:layout_width="match_parent"
         android:layout_height="0dp"
-        android:layout_weight="1"
-        android:layout_marginTop="16dp"
         android:layout_marginStart="20dp"
+        android:layout_marginTop="16dp"
         android:layout_marginEnd="20dp"
+        android:layout_weight="1"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/searchBar" />
 
-    <FrameLayout
+    <com.anytypeio.anytype.core_ui.widgets.ButtonPrimaryNumber
+        android:id="@+id/btnBottomAction"
         android:layout_width="match_parent"
-        android:layout_height="68dp">
-
-        <TextView
-            android:id="@+id/btnBottomAction"
-            style="@style/DefaultOrangeActionButtonStyle"
-            android:layout_width="match_parent"
-            android:layout_height="48dp"
-            android:layout_gravity="center_vertical"
-            android:layout_marginStart="20dp"
-            android:layout_marginEnd="20dp"
-            android:background="@drawable/rect_orange_action_button"
-            tools:text="Apply" />
-
-        <TextView
-            android:id="@+id/tvOptionCount"
-            android:layout_width="24dp"
-            android:layout_height="24dp"
-            android:layout_gravity="center_vertical|end"
-            android:layout_marginEnd="34dp"
-            android:background="@drawable/circle_solid_default"
-            android:backgroundTint="#E89D00"
-            android:fontFamily="@font/inter_medium"
-            android:gravity="center"
-            android:textColor="@color/white"
-            android:textSize="14sp" />
-
-    </FrameLayout>
+        android:layout_height="wrap_content"
+        android:layout_gravity="bottom"
+        android:layout_marginStart="20dp"
+        android:layout_marginEnd="20dp"
+        android:layout_marginBottom="@dimen/dp_10"
+        app:buttonTitle="@string/apply">
+    </com.anytypeio.anytype.core_ui.widgets.ButtonPrimaryNumber>
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/fragment_create_or_update_filter_input_field_value.xml b/app/src/main/res/layout/fragment_create_or_update_filter_input_field_value.xml
index 749da37f16..06688a33ea 100644
--- a/app/src/main/res/layout/fragment_create_or_update_filter_input_field_value.xml
+++ b/app/src/main/res/layout/fragment_create_or_update_filter_input_field_value.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--typography, buttons 05.04-->
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
@@ -7,7 +8,8 @@
     android:layout_gravity="bottom"
     android:clickable="true"
     android:focusable="true"
-    android:transitionName="checkoutTransition">
+    android:transitionName="checkoutTransition"
+    tools:context="com.anytypeio.anytype.ui.sets.modals.filter.CreateFilterFromInputFieldValueFragment">
 
     <View
         android:id="@+id/dragger"
@@ -31,33 +33,28 @@
 
     <TextView
         android:id="@+id/tvRelationName"
+        style="@style/TextView.ContentStyle.PreviewTitles.2.Medium"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="12dp"
         android:layout_marginTop="16dp"
-        android:fontFamily="@font/inter_medium"
-        android:textColor="@color/text_primary"
-        android:textSize="15sp"
         app:layout_constraintStart_toEndOf="@+id/ivRelationIcon"
         app:layout_constraintTop_toBottomOf="@+id/dragger"
         tools:text="Tag" />
 
     <EditText
         android:id="@+id/enterTextValueInputField"
+        style="@style/TextView.UXStyle.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="20dp"
         android:layout_marginTop="32dp"
         android:layout_marginEnd="20dp"
         android:background="@null"
-        android:fontFamily="@font/inter_regular"
         android:hint="@string/value"
         android:imeOptions="actionDone"
         android:maxLines="1"
         android:singleLine="true"
-        android:textColor="@color/black"
-        android:textCursorDrawable="@drawable/cursor"
-        android:textSize="17sp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/ivRelationIcon" />
@@ -76,7 +73,8 @@
 
     <TextView
         android:id="@+id/tvFilterCondition"
-        style="@style/FilterConditionTextStyle"
+        style="@style/TextView.ContentStyle.Relations.1"
+        android:textColor="@color/text_secondary"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:paddingStart="@dimen/dp_12"
@@ -88,16 +86,14 @@
         app:layout_constraintTop_toBottomOf="@+id/tvRelationName"
         tools:text="Is" />
 
-    <TextView
+    <com.anytypeio.anytype.core_ui.views.ButtonPrimaryLarge
         android:id="@+id/btnBottomAction"
-        style="@style/DefaultOrangeActionButtonStyle"
         android:layout_width="match_parent"
-        android:layout_height="48dp"
+        android:layout_height="wrap_content"
         android:layout_marginStart="20dp"
         android:layout_marginTop="20dp"
         android:layout_marginEnd="20dp"
         android:layout_marginBottom="10dp"
-        android:background="@drawable/rect_orange_action_button"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/fragment_delete_alert.xml b/app/src/main/res/layout/fragment_delete_alert.xml
index 42ae3b0e62..7fff3478af 100644
--- a/app/src/main/res/layout/fragment_delete_alert.xml
+++ b/app/src/main/res/layout/fragment_delete_alert.xml
@@ -1,32 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--typography, buttons 05.04-->
 <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:orientation="vertical"
+    tools:context="com.anytypeio.anytype.ui.dashboard.DeleteAlertFragment">
 
     <TextView
         android:id="@+id/tvTitle"
+        style="@style/TextView.ContentStyle.Headline.Heading"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="20dp"
         android:layout_marginTop="20dp"
         android:layout_marginEnd="20dp"
-        android:fontFamily="@font/inter_bold"
-        android:textColor="@color/black"
-        android:textSize="22sp"
         tools:text="Are you sure you want to delete 3 objects?" />
 
     <TextView
         android:id="@+id/tvSubtitle"
+        style="@style/TextView.UXStyle.Body.Callout.Regular"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="20dp"
         android:layout_marginTop="12dp"
         android:layout_marginEnd="20dp"
-        android:fontFamily="@font/inter_regular"
-        android:textColor="@color/black"
-        android:textSize="15sp"
         tools:text="@string/delete_irrevocably" />
 
     <LinearLayout
@@ -38,9 +36,8 @@
         android:paddingStart="20dp"
         android:paddingEnd="20dp">
 
-        <TextView
+        <com.anytypeio.anytype.core_ui.views.ButtonSecondaryLarge
             android:id="@+id/btnCancel"
-            style="@style/DefaultStrokeButtonStyle"
             android:layout_width="0dp"
             android:layout_height="match_parent"
             android:layout_marginEnd="5dp"
@@ -48,9 +45,8 @@
             android:gravity="center"
             android:text="@string/cancel" />
 
-        <TextView
+        <com.anytypeio.anytype.core_ui.views.ButtonWarningLarge
             android:id="@+id/btnDelete"
-            style="@style/DefaultRedButtonStyle"
             android:layout_width="0dp"
             android:layout_height="match_parent"
             android:layout_marginStart="5dp"
@@ -59,5 +55,4 @@
             android:text="@string/delete" />
 
     </LinearLayout>
-
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_doc_cover_gallery.xml b/app/src/main/res/layout/fragment_doc_cover_gallery.xml
index 33d262a390..5118cc0361 100644
--- a/app/src/main/res/layout/fragment_doc_cover_gallery.xml
+++ b/app/src/main/res/layout/fragment_doc_cover_gallery.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--typography, buttons 05.04-->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -22,7 +23,7 @@
 
         <TextView
             android:id="@+id/textView4"
-            style="@style/CoverModalTitleStyle"
+            style="@style/TextView.UXStyle.Titles.1"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
@@ -31,14 +32,13 @@
 
         <TextView
             android:id="@+id/btnRemove"
-            style="@style/CoverModalTitleStyle"
+            style="@style/TextView.UXStyle.Body"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:layout_gravity="end"
             android:gravity="center_vertical"
             android:paddingEnd="@dimen/dp_16"
             android:text="@string/remove"
-            android:fontFamily="@font/inter_regular"
             android:textColor="@color/palette_system_red" />
 
     </FrameLayout>
@@ -75,16 +75,15 @@
 
         <TextView
             android:id="@+id/btnUpload"
+            style="@style/TextView.UXStyle.Body"
             android:layout_width="0dp"
             android:layout_height="match_parent"
             android:layout_weight="1"
-            android:fontFamily="@font/inter_regular"
             android:background="?attr/selectableItemBackground"
             android:clickable="true"
             android:gravity="center"
             android:text="@string/btn_upload"
-            android:textColor="@color/glyph_active"
-            android:textSize="17sp" />
+            android:textColor="@color/glyph_active" />
 
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/fragment_doc_menu_bottom_sheet.xml b/app/src/main/res/layout/fragment_doc_menu_bottom_sheet.xml
deleted file mode 100644
index f4d82889eb..0000000000
--- a/app/src/main/res/layout/fragment_doc_menu_bottom_sheet.xml
+++ /dev/null
@@ -1,333 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="@drawable/rectangle_doc_menu_background"
-    android:paddingBottom="12dp">
-
-    <FrameLayout
-        android:id="@+id/iconContainer"
-        android:layout_width="48dp"
-        android:layout_height="48dp"
-        android:layout_marginStart="12dp"
-        android:layout_marginTop="12dp"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
-
-        <ImageView
-            android:id="@+id/icon"
-            android:layout_width="32dp"
-            android:layout_height="32dp"
-            android:layout_gravity="center"
-            tools:src="@drawable/circle_solid_default" />
-
-        <com.anytypeio.anytype.core_ui.widgets.AvatarWidget
-            android:id="@+id/avatar"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:background="@drawable/circle_solid_default"
-            android:visibility="invisible" />
-
-    </FrameLayout>
-
-    <ImageView
-        android:id="@+id/closeButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="18dp"
-        android:src="@drawable/ic_doc_menu_close"
-        app:layout_constraintBottom_toBottomOf="@+id/iconContainer"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="@+id/iconContainer" />
-
-    <View
-        android:id="@+id/badge"
-        android:layout_width="8dp"
-        android:layout_height="8dp"
-        android:layout_marginStart="8dp"
-        android:layout_marginTop="3dp"
-        android:background="@drawable/circle_solid_default"
-        android:backgroundTint="@color/white"
-        app:layout_constraintStart_toEndOf="@+id/iconContainer"
-        app:layout_constraintTop_toBottomOf="@+id/tvTitle"
-        tools:background="@drawable/circle_solid_default"
-        tools:backgroundTint="@color/palette_dark_red" />
-
-    <TextView
-        android:id="@+id/tvTitle"
-        android:hint="@string/untitled"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="8dp"
-        android:layout_marginTop="15dp"
-        android:layout_marginEnd="8dp"
-        android:ellipsize="end"
-        android:fontFamily="@font/inter_medium"
-        android:maxLines="1"
-        android:singleLine="true"
-        android:textColor="@color/black"
-        android:textSize="15sp"
-        app:layout_constraintEnd_toStartOf="@+id/closeButton"
-        app:layout_constraintStart_toEndOf="@+id/iconContainer"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:text="Anytype is a next generation software that breaks down barriers between applications, gives back privacy and data ownership to users." />
-
-    <TextView
-        android:id="@+id/tvSubtitle"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="6dp"
-        android:lineHeight="20sp"
-        android:textSize="13sp"
-        app:layout_constraintBottom_toBottomOf="@+id/badge"
-        app:layout_constraintStart_toEndOf="@+id/badge"
-        app:layout_constraintTop_toTopOf="@+id/badge"
-        tools:text="Offline" />
-
-    <View
-        android:id="@+id/statusDivider"
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:layout_marginTop="12dp"
-        android:background="#DFDDD0"
-        app:layout_constraintTop_toBottomOf="@+id/iconContainer" />
-
-    <FrameLayout
-        android:id="@+id/searchOnPageContainer"
-        android:layout_width="0dp"
-        android:layout_height="48dp"
-        android:layout_marginStart="16dp"
-        android:layout_marginTop="16dp"
-        android:layout_marginEnd="16dp"
-        android:layout_marginBottom="12dp"
-        android:background="@drawable/rectangle_doc_menu_top"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/statusDivider">
-
-        <TextView
-            style="@style/DocMenuOptionTextStyle"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:layout_marginStart="16dp"
-            android:text="@string/search_on_page" />
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical|end"
-            android:layout_marginEnd="12dp"
-            android:src="@drawable/ic_doc_menu_search" />
-
-    </FrameLayout>
-
-    <View
-        android:id="@+id/optionDivider1"
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:layout_marginStart="16dp"
-        android:layout_marginEnd="16dp"
-        app:layout_constraintTop_toBottomOf="@+id/searchOnPageContainer" />
-
-    <FrameLayout
-        android:id="@+id/addCoverContainer"
-        android:layout_width="0dp"
-        android:layout_height="48dp"
-        android:layout_marginStart="16dp"
-        android:layout_marginEnd="16dp"
-        android:background="@color/white"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/optionDivider1">
-
-        <TextView
-            android:id="@+id/tvSetCover"
-            style="@style/DocMenuOptionTextStyle"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:layout_marginStart="16dp"
-            android:text="Add cover" />
-
-        <ImageView
-            android:id="@+id/ivSetCover"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical|end"
-            android:layout_marginEnd="12dp"
-            android:src="@drawable/ic_doc_menu_doc_style" />
-
-    </FrameLayout>
-
-    <View
-        android:id="@+id/optionDivider2"
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:layout_marginStart="16dp"
-        android:layout_marginEnd="16dp"
-        app:layout_constraintTop_toBottomOf="@+id/addCoverContainer" />
-
-    <FrameLayout
-        android:id="@+id/setIconContainer"
-        android:layout_width="0dp"
-        android:layout_height="48dp"
-        android:layout_marginStart="16dp"
-        android:layout_marginEnd="16dp"
-        android:background="@color/white"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/optionDivider2">
-
-        <TextView
-            android:id="@+id/tvSetIcon"
-            style="@style/DocMenuOptionTextStyle"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:layout_marginStart="16dp"
-            android:text="Set icon" />
-
-        <ImageView
-            android:id="@+id/ivSetIcon"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical|end"
-            android:layout_marginEnd="12dp"
-            android:src="@drawable/ic_doc_menu_doc_style" />
-
-    </FrameLayout>
-
-    <View
-        android:id="@+id/optionDivider3"
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:layout_marginStart="16dp"
-        android:layout_marginEnd="16dp"
-        app:layout_constraintTop_toBottomOf="@+id/setIconContainer" />
-
-    <FrameLayout
-        android:id="@+id/setLayoutContainer"
-        android:layout_width="0dp"
-        android:layout_height="48dp"
-        android:layout_marginStart="16dp"
-        android:layout_marginEnd="16dp"
-        android:background="@color/white"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/optionDivider3">
-
-        <TextView
-            android:id="@+id/tvSetLayout"
-            style="@style/DocMenuOptionTextStyle"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:layout_marginStart="16dp"
-            android:text="@string/layout" />
-
-        <ImageView
-            android:id="@+id/ivSetLayout"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical|end"
-            android:layout_marginEnd="12dp"
-            android:src="@drawable/ic_doc_menu_doc_style" />
-
-    </FrameLayout>
-
-    <View
-        android:id="@+id/optionDivider4"
-        android:layout_width="match_parent"
-        android:layout_height="1dp"
-        android:layout_marginStart="16dp"
-        android:layout_marginEnd="16dp"
-        app:layout_constraintTop_toBottomOf="@+id/setLayoutContainer" />
-
-    <FrameLayout
-        android:id="@+id/archiveContainer"
-        android:layout_width="0dp"
-        android:layout_height="48dp"
-        android:layout_marginStart="16dp"
-        android:layout_marginEnd="16dp"
-        android:background="@drawable/rectangle_doc_menu_bottom"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/optionDivider4">
-
-        <TextView
-            android:id="@+id/tvArchive"
-            style="@style/DocMenuOptionTextStyle"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:layout_marginStart="16dp"
-            android:text="@string/archive" />
-
-        <ImageView
-            android:id="@+id/ivArchive"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical|end"
-            android:layout_marginEnd="12dp"
-            android:src="@drawable/ic_doc_menu_move_to_bin" />
-
-    </FrameLayout>
-
-    <FrameLayout
-        android:id="@+id/relationContainer"
-        android:layout_width="0dp"
-        android:layout_height="48dp"
-        android:layout_marginStart="16dp"
-        android:layout_marginTop="16dp"
-        android:layout_marginEnd="16dp"
-        android:background="@drawable/rectangle_doc_menu_default"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/archiveContainer">
-
-        <TextView
-            android:id="@+id/tvSettings"
-            style="@style/DocMenuOptionTextStyle"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:layout_marginStart="16dp"
-            android:text="@string/relations" />
-
-    </FrameLayout>
-
-    <FrameLayout
-        android:id="@+id/downloadContainer"
-        android:layout_width="0dp"
-        android:layout_height="48dp"
-        android:layout_marginStart="16dp"
-        android:layout_marginTop="16dp"
-        android:layout_marginEnd="16dp"
-        android:background="@drawable/rectangle_doc_menu_default"
-        android:visibility="gone"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/relationContainer"
-        tools:visibility="visible">
-
-        <TextView
-            style="@style/DocMenuOptionTextStyle"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:layout_marginStart="16dp"
-            android:text="@string/download" />
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical|end"
-            android:layout_marginEnd="12dp"
-            android:src="@drawable/ic_action_download" />
-
-    </FrameLayout>
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_edit_data_view_viewer.xml b/app/src/main/res/layout/fragment_edit_data_view_viewer.xml
index 15fc3af3a7..e42352ab9b 100644
--- a/app/src/main/res/layout/fragment_edit_data_view_viewer.xml
+++ b/app/src/main/res/layout/fragment_edit_data_view_viewer.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--typography, buttons 05.04-->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -19,7 +20,7 @@
         android:layout_marginTop="18dp">
 
         <TextView
-            style="@style/DefaultDataViewModalHeaderStyle"
+            style="@style/TextView.UXStyle.Titles.1"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:layout_gravity="center"
@@ -38,27 +39,23 @@
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        style="@style/TextView.UXStyle.Captions.1.Regular"
         android:layout_marginTop="23dp"
-        android:fontFamily="@font/inter_regular"
         android:text="@string/name"
-        android:textColor="@color/text_secondary"
-        android:textSize="@dimen/sp_13" />
+        android:textColor="@color/text_secondary" />
 
     <EditText
         android:id="@+id/viewerNameInput"
+        style="@style/TextView.ContentStyle.Headline.Heading"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginTop="6dp"
         android:background="@null"
-        android:fontFamily="@font/inter_bold"
         android:hint="@string/untitled"
         android:imeOptions="actionDone"
         android:maxLines="1"
         android:singleLine="true"
-        android:textColorHint="@color/text_secondary"
-        android:textColor="@color/text_primary"
-        android:textCursorDrawable="@drawable/cursor"
-        android:textSize="22sp" />
+        android:textColorHint="@color/text_secondary" />
 
     <View
         android:layout_width="match_parent"
@@ -69,11 +66,10 @@
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        style="@style/TextView.UXStyle.Captions.1.Regular"
         android:layout_marginTop="27dp"
-        android:fontFamily="@font/inter_regular"
         android:text="@string/viewer_as"
-        android:textColor="@color/text_secondary"
-        android:textSize="@dimen/sp_13" />
+        android:textColor="@color/text_secondary" />
 
     <View
         android:layout_width="match_parent"
@@ -101,7 +97,7 @@
         </FrameLayout>
 
         <TextView
-            style="@style/CreateViewerViewerNameStyle"
+            style="@style/TextView.UXStyle.Body"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
@@ -142,7 +138,7 @@
         </FrameLayout>
 
         <TextView
-            style="@style/CreateViewerViewerNameStyle"
+            style="@style/TextView.UXStyle.Body"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
@@ -184,7 +180,7 @@
         </FrameLayout>
 
         <TextView
-            style="@style/CreateViewerViewerNameStyle"
+            style="@style/TextView.UXStyle.Body"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
@@ -225,7 +221,8 @@
         </FrameLayout>
 
         <TextView
-            style="@style/CreateViewerViewerNameStyle"
+            style="@style/TextView.UXStyle.Body"
+            android:textColor="@color/text_tertiary"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
@@ -241,11 +238,12 @@
             android:visibility="invisible" />
 
         <TextView
-            style="@style/DataViewComingSoonStyle"
+            style="@style/TextView.UXStyle.Captions.1.Regular"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="end|center_vertical"
             android:text="@string/soon"
+            android:textColor="@color/text_tertiary"
             android:textAllCaps="true" />
 
     </FrameLayout>
@@ -262,13 +260,11 @@
         android:layout_marginTop="20dp"
         android:layout_marginBottom="40dp">
 
-        <TextView
+        <com.anytypeio.anytype.core_ui.views.ButtonPrimaryLarge
             android:id="@+id/btnDone"
-            style="@style/DefaultSolidButtonStyle"
             android:layout_width="match_parent"
-            android:layout_height="48dp"
-            android:text="@string/done"
-            android:textSize="17sp" />
+            android:layout_height="wrap_content"
+            android:text="@string/done" />
 
         <ProgressBar
             android:visibility="gone"
diff --git a/app/src/main/res/layout/fragment_editor.xml b/app/src/main/res/layout/fragment_editor.xml
index abeda219ae..339f6f82b9 100644
--- a/app/src/main/res/layout/fragment_editor.xml
+++ b/app/src/main/res/layout/fragment_editor.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--typography, buttons 05.04-->
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
@@ -102,7 +103,7 @@
             android:id="@+id/bottomMenu"
             android:layout_width="0dp"
             android:layout_height="@dimen/default_toolbar_height"
-            android:background="@color/defaultCanvasColor"
+            android:background="@color/chapter_yellow"
             android:translationY="@dimen/default_toolbar_height"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/fragment_invitation.xml b/app/src/main/res/layout/fragment_invitation.xml
index 7367eb1c99..1098078fab 100644
--- a/app/src/main/res/layout/fragment_invitation.xml
+++ b/app/src/main/res/layout/fragment_invitation.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--typography, buttons 05.04-->
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
@@ -26,50 +27,43 @@
 
             <TextView
                 android:id="@+id/title"
+                style="@style/TextView.ContentStyle.Headline.Heading"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="20dp"
-                android:layout_marginTop="18dp"
+                android:layout_marginTop="23dp"
                 android:layout_marginEnd="20dp"
-                android:fontFamily="@font/inter_bold"
-                android:letterSpacing="-0.0218"
                 android:text="@string/enter_your_code"
-                android:textColor="@color/black"
-                android:textSize="22sp"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
 
             <TextView
                 android:id="@+id/description"
+                style="@style/TextView.UXStyle.Body.Callout.Regular"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="20dp"
-                android:layout_marginTop="14dp"
+                android:layout_marginTop="11dp"
                 android:layout_marginEnd="20dp"
-                android:fontFamily="@font/inter_regular"
-                android:lineSpacingMultiplier="1.21"
                 android:text="@string/enter_invitation_text"
-                android:textColor="@color/text_primary"
-                android:textSize="15sp"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/title" />
 
             <EditText
                 android:id="@+id/edtCode"
+                style="@style/TextView.UXStyle.Body"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="20dp"
                 android:layout_marginTop="30dp"
                 android:layout_marginEnd="20dp"
                 android:background="@null"
-                android:fontFamily="@font/inter_regular"
                 android:hint="@string/enter_invitation_hint"
                 android:inputType="text|textNoSuggestions"
                 android:maxLines="1"
-                android:textColorHint="#ACA996"
-                android:textSize="17sp"
+                android:textColorHint="@color/text_tertiary"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/description" />
@@ -86,9 +80,8 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/edtCode" />
 
-            <TextView
+            <com.anytypeio.anytype.core_ui.views.ButtonSecondaryLarge
                 android:id="@+id/btnBack"
-                style="@style/DefaultStrokeButtonStyle"
                 android:layout_width="0dp"
                 android:layout_height="@dimen/auth_default_button_height"
                 android:layout_marginStart="20dp"
@@ -102,9 +95,8 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/divider" />
 
-            <TextView
+            <com.anytypeio.anytype.core_ui.views.ButtonPrimaryLarge
                 android:id="@+id/btnConfirm"
-                style="@style/DefaultSolidButtonStyle"
                 android:layout_width="0dp"
                 android:layout_height="@dimen/auth_default_button_height"
                 android:layout_marginStart="5dp"
diff --git a/app/src/main/res/layout/fragment_keychain_login.xml b/app/src/main/res/layout/fragment_keychain_login.xml
index 5f4e89f330..5fec4d8df0 100644
--- a/app/src/main/res/layout/fragment_keychain_login.xml
+++ b/app/src/main/res/layout/fragment_keychain_login.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-
+<!--typography, buttons 05.04-->
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
@@ -23,19 +23,20 @@
 
             <TextView
                 android:id="@+id/title"
-                style="@style/AuthHeaderStyle"
+                style="@style/TextView.ContentStyle.Headline.Heading"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="@dimen/auth_default_margin_start"
-                android:layout_marginTop="22dp"
+                android:layout_marginTop="20dp"
                 android:layout_marginEnd="@dimen/auth_default_margin_end"
-                android:text="@string/login"
+                android:text="@string/login_with_recovery_phrase"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
 
             <TextView
                 android:id="@+id/tvqrcode"
+                style="@style/TextView.UXStyle.Body"
                 android:layout_width="0dp"
                 android:layout_height="48dp"
                 android:layout_marginTop="20dp"
@@ -43,12 +44,9 @@
                 android:gravity="center_vertical"
                 android:layout_marginEnd="20dp"
                 android:drawableEnd="@drawable/ic_arrow_forward_legacy"
-                android:paddingTop="8dp"
-                android:paddingBottom="8dp"
+                android:paddingTop="12dp"
+                android:paddingBottom="12dp"
                 android:text="@string/or_scan_qr_code"
-                android:textSize="17sp"
-                android:textColor="@color/black"
-                android:fontFamily="@font/inter_regular"
                 android:visibility="visible"
                 app:layout_constraintTop_toBottomOf="@id/title"
                 app:layout_constraintStart_toStartOf="parent"
@@ -68,6 +66,7 @@
 
             <EditText
                 android:id="@+id/keychainInputField"
+                style="@style/TextView.ContentStyle.CodeBlock"
                 android:layout_width="0dp"
                 android:layout_height="96dp"
                 android:layout_marginStart="@dimen/auth_default_margin_start"
@@ -75,19 +74,16 @@
                 android:layout_marginEnd="@dimen/auth_default_margin_end"
                 android:gravity="top"
                 android:background="@null"
-                android:fontFamily="@font/inconsolata"
                 android:hint="@string/type_your_recovery_phrase"
                 android:imeOptions="actionDone"
                 android:inputType="textMultiLine|text"
-                android:textColorHint="@color/keychain_hint_color"
-                android:textSize="15sp"
+                android:textColorHint="@color/text_tertiary"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/divider"/>
 
-            <TextView
+            <com.anytypeio.anytype.core_ui.views.ButtonPrimaryLarge
                 android:id="@+id/loginButton"
-                style="@style/DefaultSolidButtonStyle"
                 android:layout_width="0dp"
                 android:layout_height="@dimen/auth_default_button_height"
                 android:layout_marginStart="6dp"
@@ -100,9 +96,8 @@
                 app:layout_constraintStart_toEndOf="@+id/backButton"
                 app:layout_constraintTop_toTopOf="@+id/backButton" />
 
-            <TextView
+            <com.anytypeio.anytype.core_ui.views.ButtonSecondaryLarge
                 android:id="@+id/backButton"
-                style="@style/DefaultStrokeButtonStyle"
                 android:layout_width="0dp"
                 android:layout_height="@dimen/auth_default_button_height"
                 android:layout_marginStart="@dimen/auth_default_margin_start"
diff --git a/app/src/main/res/layout/fragment_limit_object_type.xml b/app/src/main/res/layout/fragment_limit_object_type.xml
index 4199e606d1..a4e68a6112 100644
--- a/app/src/main/res/layout/fragment_limit_object_type.xml
+++ b/app/src/main/res/layout/fragment_limit_object_type.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--typography, buttons 05.04-->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -14,7 +15,7 @@
         android:background="@drawable/dragger" />
 
     <TextView
-        style="@style/ModalTitleStyle"
+        style="@style/TextView.UXStyle.Titles.1"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="18dp"
@@ -43,20 +44,16 @@
 
         <EditText
             android:id="@+id/searchObjectTypeInput"
+            style="@style/TextView.UXStyle.Body"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_marginStart="4dp"
             android:background="@null"
-            android:fontFamily="@font/inter_regular"
             android:gravity="center_vertical"
             android:hint="@string/search"
             android:maxLines="1"
             android:singleLine="true"
-            android:textColor="@color/text_primary"
-            android:textColorHint="@color/text_secondary"
-            android:textCursorDrawable="@drawable/cursor"
-            android:textSize="15sp"
-            tools:text="Search" />
+            android:textColorHint="@color/text_secondary" />
 
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/fragment_link_to_object_or_web.xml b/app/src/main/res/layout/fragment_link_to_object_or_web.xml
index 219a2ed44d..2f2473bfa3 100644
--- a/app/src/main/res/layout/fragment_link_to_object_or_web.xml
+++ b/app/src/main/res/layout/fragment_link_to_object_or_web.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--typography, buttons 05.04-->
 <androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
@@ -100,7 +101,7 @@
 
         <TextView
             android:id="@+id/tvScreenTitle"
-            style="@style/MoveToLinkToTitleStyle"
+            style="@style/TextView.UXStyle.Titles.1"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="18dp"
diff --git a/app/src/main/res/layout/fragment_manage_viewer.xml b/app/src/main/res/layout/fragment_manage_viewer.xml
index 2b050656c6..8cc1dfe4aa 100644
--- a/app/src/main/res/layout/fragment_manage_viewer.xml
+++ b/app/src/main/res/layout/fragment_manage_viewer.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--typography, buttons 05.04-->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -21,7 +22,8 @@
 
         <TextView
             android:id="@+id/btnEditViewers"
-            style="@style/DefaultGrayTextButtonStyle"
+            style="@style/TextView.UXStyle.Body"
+            android:textColor="@color/glyph_active"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:gravity="center"
@@ -30,7 +32,7 @@
             android:text="@string/edit" />
 
         <TextView
-            style="@style/DefaultDataViewModalHeaderStyle"
+            style="@style/TextView.UXStyle.Titles.1"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:layout_gravity="center_horizontal"
diff --git a/app/src/main/res/layout/fragment_modify_viewer_sort.xml b/app/src/main/res/layout/fragment_modify_viewer_sort.xml
index 68d76ca6ec..2f748f40f3 100644
--- a/app/src/main/res/layout/fragment_modify_viewer_sort.xml
+++ b/app/src/main/res/layout/fragment_modify_viewer_sort.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--typography, buttons 05.04-->
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
@@ -35,7 +36,7 @@
 
         <TextView
             android:id="@+id/tvSortAsc"
-            style="@style/ModifyViewerTextStyle"
+            style="@style/TextView.UXStyle.Body"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="20dp"
@@ -72,7 +73,7 @@
 
         <TextView
             android:id="@+id/tvSortDesc"
-            style="@style/ModifyViewerTextStyle"
+            style="@style/TextView.UXStyle.Body"
             android:layout_width="0dp"
             android:layout_height="19dp"
             android:layout_marginStart="20dp"
@@ -85,13 +86,11 @@
 
         <TextView
             android:id="@+id/txtName"
+            style="@style/TextView.UXStyle.Titles.1"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="18dp"
             tools:text="Object"
-            android:fontFamily="@font/inter_semibold"
-            android:textSize="17sp"
-            android:textColor="@color/text_primary"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/dragger" />
diff --git a/app/src/main/res/layout/fragment_obj_appearance_base.xml b/app/src/main/res/layout/fragment_obj_appearance_base.xml
index d64a294266..338db2d827 100644
--- a/app/src/main/res/layout/fragment_obj_appearance_base.xml
+++ b/app/src/main/res/layout/fragment_obj_appearance_base.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--typography, buttons 05.04-->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
@@ -20,7 +21,7 @@
 
     <TextView
         android:id="@+id/tvScreenTitle"
-        style="@style/MoveToLinkToTitleStyle"
+        style="@style/TextView.UXStyle.Titles.1"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="18dp"
diff --git a/app/src/main/res/layout/fragment_object_appearance_setting.xml b/app/src/main/res/layout/fragment_object_appearance_setting.xml
index d64a294266..338db2d827 100644
--- a/app/src/main/res/layout/fragment_object_appearance_setting.xml
+++ b/app/src/main/res/layout/fragment_object_appearance_setting.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--typography, buttons 05.04-->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
@@ -20,7 +21,7 @@
 
     <TextView
         android:id="@+id/tvScreenTitle"
-        style="@style/MoveToLinkToTitleStyle"
+        style="@style/TextView.UXStyle.Titles.1"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="18dp"
diff --git a/app/src/main/res/layout/fragment_object_layout.xml b/app/src/main/res/layout/fragment_object_layout.xml
index 156bffa482..84c9ec5bcb 100644
--- a/app/src/main/res/layout/fragment_object_layout.xml
+++ b/app/src/main/res/layout/fragment_object_layout.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--typography, buttons 05.04-->
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
@@ -19,7 +20,7 @@
 
     <TextView
         android:id="@+id/tvRelationHeader"
-        style="@style/DefaultCellRelationHeaderStyle"
+        style="@style/TextView.UXStyle.Titles.1"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="18dp"
diff --git a/app/src/main/res/layout/fragment_object_menu.xml b/app/src/main/res/layout/fragment_object_menu.xml
index 6a2cbd7c50..94ec9cb16d 100644
--- a/app/src/main/res/layout/fragment_object_menu.xml
+++ b/app/src/main/res/layout/fragment_object_menu.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--typography, buttons 05.04-->
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/fragment_object_search.xml b/app/src/main/res/layout/fragment_object_search.xml
index bbc2e9dd74..2e41793927 100644
--- a/app/src/main/res/layout/fragment_object_search.xml
+++ b/app/src/main/res/layout/fragment_object_search.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--typography, buttons 05.04-->
 <androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
@@ -67,15 +68,13 @@
 
         <TextView
             android:id="@+id/tvScreenStateMessage"
+            style="@style/TextView.UXStyle.Body.Callout.Regular"
+            android:gravity="center"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
             android:layout_marginTop="176dp"
             android:layout_marginEnd="16dp"
-            android:fontFamily="@font/inter_regular"
-            android:gravity="center"
-            android:textColor="@color/black"
-            android:textSize="17sp"
             android:visibility="invisible"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
@@ -84,15 +83,13 @@
 
         <TextView
             android:id="@+id/tvScreenStateSubMessage"
+            style="@style/TextView.UXStyle.Body.Callout.Regular"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
             android:layout_marginEnd="16dp"
-            android:fontFamily="@font/inter_regular"
             android:gravity="center"
             android:text="@string/search_no_results_try"
-            android:textColor="@color/text_secondary"
-            android:textSize="17sp"
             android:visibility="invisible"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
@@ -101,7 +98,7 @@
 
         <TextView
             android:id="@+id/tvScreenTitle"
-            style="@style/MoveToLinkToTitleStyle"
+            style="@style/TextView.UXStyle.Titles.1"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="18dp"
diff --git a/app/src/main/res/layout/fragment_object_set.xml b/app/src/main/res/layout/fragment_object_set.xml
index 26f59cf2cf..73d67d4241 100644
--- a/app/src/main/res/layout/fragment_object_set.xml
+++ b/app/src/main/res/layout/fragment_object_set.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--typography, buttons 05.04-->
 <androidx.constraintlayout.motion.widget.MotionLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
diff --git a/app/src/main/res/layout/fragment_object_type_change.xml b/app/src/main/res/layout/fragment_object_type_change.xml
index 1a694c310b..fa839b0fd6 100644
--- a/app/src/main/res/layout/fragment_object_type_change.xml
+++ b/app/src/main/res/layout/fragment_object_type_change.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--typography, buttons 05.04-->
 <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="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:orientation="vertical">
 
     <View
@@ -15,7 +17,7 @@
 
     <TextView
         android:id="@+id/tvTitle"
-        style="@style/ModalTitleStyle"
+        style="@style/TextView.UXStyle.Titles.1"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
@@ -71,37 +73,16 @@
         android:layout_weight="1"
         tools:listitem="@layout/item_document_relation_default" />
 
-    <FrameLayout
-        android:id="@+id/bottomButton"
+    <com.anytypeio.anytype.core_ui.widgets.ButtonPrimaryNumber
+        android:id="@+id/btnBottom"
         android:layout_width="match_parent"
-        android:layout_height="68dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="20dp"
+        android:layout_marginEnd="20dp"
+        android:layout_marginBottom="@dimen/dp_10"
+        tools:visibility="visible"
+        app:buttonTitle="@string/add"
         android:visibility="gone">
-
-        <TextView
-            android:id="@+id/btnBottomAction"
-            style="@style/DefaultOrangeActionButtonStyle"
-            android:layout_width="match_parent"
-            android:layout_height="48dp"
-            android:layout_gravity="center_vertical"
-            android:layout_marginStart="20dp"
-            android:layout_marginEnd="20dp"
-            android:background="@drawable/rect_orange_action_button"
-            android:text="@string/add" />
-
-        <TextView
-            android:id="@+id/tvCount"
-            android:layout_width="24dp"
-            android:layout_height="24dp"
-            android:layout_gravity="center_vertical|end"
-            android:layout_marginEnd="34dp"
-            android:background="@drawable/circle_solid_default"
-            android:backgroundTint="#E89D00"
-            android:fontFamily="@font/inter_medium"
-            android:gravity="center"
-            android:textColor="@color/white"
-            android:textSize="14sp"
-            tools:text="1" />
-
-    </FrameLayout>
+    </com.anytypeio.anytype.core_ui.widgets.ButtonPrimaryNumber>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_page_icon_picker.xml b/app/src/main/res/layout/fragment_page_icon_picker.xml
index 77831cbe2c..97b9fba305 100644
--- a/app/src/main/res/layout/fragment_page_icon_picker.xml
+++ b/app/src/main/res/layout/fragment_page_icon_picker.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--typography, buttons 05.04-->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/sheet"
@@ -31,26 +32,23 @@
 
         <TextView
             android:id="@+id/tvHeader"
+            style="@style/TextView.UXStyle.Titles.1"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:layout_gravity="center_horizontal"
-            android:fontFamily="@font/inter_semibold"
             android:gravity="center"
-            android:text="Change icon"
-            android:textColor="@color/text_primary"
-            android:textSize="17sp" />
+            android:text="@string/change_icon" />
 
         <TextView
             android:id="@+id/btnRemoveIcon"
+            style="@style/TextView.UXStyle.Body"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:layout_gravity="end"
             android:layout_marginEnd="16dp"
-            android:fontFamily="@font/inter_regular"
             android:gravity="center_vertical"
-            android:text="@string/remove"
-            android:textColor="@color/palette_dark_red"
-            android:textSize="17sp" />
+            android:textColor="@color/palette_system_red"
+            android:text="@string/remove" />
 
     </FrameLayout>
 
@@ -144,36 +142,32 @@
 
         <TextView
             android:id="@+id/tvTabEmoji"
+            style="@style/TextView.UXStyle.Body"
             android:layout_width="0dp"
             android:layout_height="match_parent"
             android:layout_weight="1"
-            android:fontFamily="@font/inter_regular"
             android:gravity="center"
-            android:text="Emoji"
-            android:textColor="@color/black"
-            android:textSize="17sp" />
+            android:text="@string/emoji" />
 
         <TextView
             android:id="@+id/tvTabRandom"
+            style="@style/TextView.UXStyle.Body"
+            android:textColor="@color/glyph_active"
             android:layout_width="0dp"
             android:layout_height="match_parent"
             android:layout_weight="1"
-            android:fontFamily="@font/inter_regular"
             android:gravity="center"
-            android:text="Random"
-            android:textColor="#ACA996"
-            android:textSize="17sp" />
+            android:text="@string/random" />
 
         <TextView
             android:id="@+id/tvTabUpload"
+            style="@style/TextView.UXStyle.Body"
+            android:textColor="@color/glyph_active"
             android:layout_width="0dp"
             android:layout_height="match_parent"
             android:layout_weight="1"
-            android:fontFamily="@font/inter_regular"
             android:gravity="center"
-            android:text="Upload"
-            android:textColor="#ACA996"
-            android:textSize="17sp" />
+            android:text="@string/btn_upload" />
 
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/fragment_relation_add.xml b/app/src/main/res/layout/fragment_relation_add.xml
index 79a06aaea1..1bbda1f672 100644
--- a/app/src/main/res/layout/fragment_relation_add.xml
+++ b/app/src/main/res/layout/fragment_relation_add.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--typography, buttons 05.04-->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/root"
diff --git a/app/src/main/res/layout/fragment_relation_create_from_scratch.xml b/app/src/main/res/layout/fragment_relation_create_from_scratch.xml
index a11364e4f4..728b1e955e 100644
--- a/app/src/main/res/layout/fragment_relation_create_from_scratch.xml
+++ b/app/src/main/res/layout/fragment_relation_create_from_scratch.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--typography, buttons 05.04-->
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
@@ -18,10 +19,8 @@
             android:background="@drawable/dragger" />
 
         <TextView
+            style="@style/TextView.UXStyle.Titles.1"
             android:layout_marginTop="18sp"
-            android:textSize="17sp"
-            android:fontFamily="@font/inter_bold"
-            android:textColor="@color/text_primary"
             android:text="@string/new_relation"
             android:layout_gravity="center_horizontal"
             android:layout_width="wrap_content"
@@ -43,15 +42,12 @@
         android:layout_width="match_parent"
         android:layout_height="68dp">
 
-        <TextView
-            android:background="@drawable/rectangle_default_button_selector"
+        <com.anytypeio.anytype.core_ui.views.ButtonPrimaryLarge
             android:id="@+id/btnAction"
-            style="@style/DefaultSolidButtonStyle"
             android:layout_width="match_parent"
             android:layout_gravity="center_vertical"
-            android:layout_height="44dp"
-            android:text="@string/create"
-            android:textSize="17sp" />
+            android:layout_height="wrap_content"
+            android:text="@string/create" />
 
     </FrameLayout>
 
diff --git a/app/src/main/res/layout/fragment_relation_create_from_scratch_format_picker.xml b/app/src/main/res/layout/fragment_relation_create_from_scratch_format_picker.xml
index dd23107711..8fc8bd103f 100644
--- a/app/src/main/res/layout/fragment_relation_create_from_scratch_format_picker.xml
+++ b/app/src/main/res/layout/fragment_relation_create_from_scratch_format_picker.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--typography, buttons 05.04-->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -14,7 +15,7 @@
         android:background="@drawable/dragger" />
 
     <TextView
-        style="@style/ModalTitleStyle"
+        style="@style/TextView.UXStyle.Titles.1"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
diff --git a/app/src/main/res/layout/fragment_relation_date_value.xml b/app/src/main/res/layout/fragment_relation_date_value.xml
index 8cfd795123..79b1321da1 100644
--- a/app/src/main/res/layout/fragment_relation_date_value.xml
+++ b/app/src/main/res/layout/fragment_relation_date_value.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--typography, buttons 05.04-->
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
@@ -17,7 +18,7 @@
 
     <TextView
         android:id="@+id/tvRelationHeader"
-        style="@style/DefaultCellRelationHeaderStyle"
+        style="@style/TextView.UXStyle.Titles.1"
         android:layout_width="0dp"
         android:layout_height="48dp"
         android:layout_marginStart="@dimen/dp_20"
@@ -35,7 +36,7 @@
 
     <TextView
         android:id="@+id/tvToday"
-        style="@style/DefaultDataViewDateCellTextViewStyle"
+        style="@style/TextView.UXStyle.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="20dp"
@@ -62,7 +63,7 @@
 
     <TextView
         android:id="@+id/tvYesterday"
-        style="@style/DefaultDataViewDateCellTextViewStyle"
+        style="@style/TextView.UXStyle.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="20dp"
@@ -89,7 +90,7 @@
 
     <TextView
         android:id="@+id/tvTomorrow"
-        style="@style/DefaultDataViewDateCellTextViewStyle"
+        style="@style/TextView.UXStyle.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="20dp"
@@ -116,7 +117,7 @@
 
     <TextView
         android:id="@+id/tvExactDay"
-        style="@style/DefaultDataViewDateCellTextViewStyle"
+        style="@style/TextView.UXStyle.Body"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="20dp"
@@ -129,14 +130,13 @@
 
     <TextView
         android:id="@+id/tvDate"
+        style="@style/TextView.UXStyle.Body"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
         android:layout_marginEnd="4dp"
-        android:fontFamily="@font/inter_regular"
         android:gravity="end"
-        android:textColor="#ACA996"
-        android:textSize="17sp"
+        android:textColor="@color/text_secondary"
         app:layout_constraintBottom_toBottomOf="@+id/tvExactDay"
         app:layout_constraintEnd_toStartOf="@+id/ivExactDayCheck"
         app:layout_constraintStart_toEndOf="@+id/tvExactDay"
@@ -191,16 +191,14 @@
         app:layout_constraintTop_toTopOf="@+id/tvToday"
         tools:visibility="visible" />
 
-    <TextView
+    <com.anytypeio.anytype.core_ui.views.ButtonPrimaryLarge
         android:id="@+id/btnBottomAction"
-        style="@style/DefaultOrangeActionButtonStyle"
         android:layout_width="match_parent"
-        android:layout_height="48dp"
+        android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
         android:layout_marginStart="20dp"
         android:layout_marginTop="32dp"
         android:layout_marginEnd="20dp"
-        android:background="@drawable/rect_orange_action_button"
         android:text="@string/done"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -233,7 +231,7 @@
         android:layout_marginTop="12dp"
         android:layout_marginEnd="8dp"
         android:text="@string/no_date"
-        style="@style/DefaultDataViewDateCellTextViewStyle"
+        style="@style/TextView.UXStyle.Body"
         app:layout_constraintEnd_toStartOf="@+id/ivNoDateCheck"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/tvRelationHeader" />
diff --git a/app/src/main/res/layout/fragment_relation_file_value_action.xml b/app/src/main/res/layout/fragment_relation_file_value_action.xml
index 19acbd87f3..f6ea506d24 100644
--- a/app/src/main/res/layout/fragment_relation_file_value_action.xml
+++ b/app/src/main/res/layout/fragment_relation_file_value_action.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--typography, buttons 05.04-->
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
@@ -16,7 +17,8 @@
 
         <TextView
             android:id="@+id/btnAdd"
-            style="@style/RelationValueActionHeaderStyle"
+            style="@style/TextView.UXStyle.Body"
+            android:gravity="center_vertical"
             android:layout_width="match_parent"
             android:layout_height="52dp"
             android:paddingStart="@dimen/dp_16"
@@ -36,7 +38,8 @@
 
         <TextView
             android:id="@+id/btnUploadFromGallery"
-            style="@style/RelationValueActionHeaderStyle"
+            style="@style/TextView.UXStyle.Body"
+            android:gravity="center_vertical"
             android:layout_width="match_parent"
             android:layout_height="52dp"
             android:paddingStart="@dimen/dp_16"
@@ -56,7 +59,8 @@
 
         <TextView
             android:id="@+id/btnUploadFromStorage"
-            style="@style/RelationValueActionHeaderStyle"
+            style="@style/TextView.UXStyle.Body"
+            android:gravity="center_vertical"
             android:layout_width="match_parent"
             android:layout_height="52dp"
             android:paddingStart="@dimen/dp_16"
diff --git a/app/src/main/res/layout/fragment_relation_list.xml b/app/src/main/res/layout/fragment_relation_list.xml
index 60477ba794..31f9e97e06 100644
--- a/app/src/main/res/layout/fragment_relation_list.xml
+++ b/app/src/main/res/layout/fragment_relation_list.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--typography, buttons 05.04-->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:orientation="vertical"
@@ -22,9 +23,11 @@
 
         <TextView
             android:id="@+id/btnEditOrDone"
-            style="@style/DefaultCellInteractionTextButtonStyle"
+            style="@style/TextView.UXStyle.Body"
+            android:textColor="@color/glyph_active"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
+            android:gravity="center"
             android:paddingStart="16dp"
             android:paddingEnd="16dp"
             android:text="@string/edit" />
diff --git a/app/src/main/res/layout/fragment_relation_object_value_add.xml b/app/src/main/res/layout/fragment_relation_object_value_add.xml
index 40fcc4232a..6fb9a0257a 100644
--- a/app/src/main/res/layout/fragment_relation_object_value_add.xml
+++ b/app/src/main/res/layout/fragment_relation_object_value_add.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--typography, buttons 05.04-->
 <androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:context="com.anytypeio.anytype.ui.relations.add.AddObjectRelationFragment">
 
     <LinearLayout
         android:id="@+id/sheet"
@@ -57,36 +60,14 @@
 
     </LinearLayout>
 
-    <FrameLayout
-        android:id="@+id/btnAddContainer"
+    <com.anytypeio.anytype.core_ui.widgets.ButtonPrimaryNumber
+        android:id="@+id/btnAdd"
         android:layout_width="match_parent"
-        android:layout_height="68dp"
-        android:layout_gravity="bottom"
-        android:background="@color/background_secondary">
-
-        <TextView
-            android:id="@+id/btnBottomAction"
-            style="@style/DefaultOrangeActionButtonStyle"
-            android:layout_width="match_parent"
-            android:layout_height="48dp"
-            android:layout_gravity="center_vertical"
-            android:layout_marginStart="20dp"
-            android:layout_marginEnd="20dp"
-            android:background="@drawable/rect_orange_action_button"
-            android:text="@string/btn_apply_new_object" />
-
-        <TextView
-            android:id="@+id/tvObjectsCount"
-            android:layout_width="24dp"
-            android:layout_height="24dp"
-            android:layout_gravity="center_vertical|end"
-            android:layout_marginEnd="34dp"
-            android:background="@drawable/circle_solid_default"
-            android:backgroundTint="#E89D00"
-            android:fontFamily="@font/inter_medium"
-            android:gravity="center"
-            android:textColor="@color/white"
-            android:textSize="14sp" />
-
-    </FrameLayout>
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="20dp"
+        android:layout_marginStart="20dp"
+        android:layout_marginBottom="10dp"
+        app:buttonTitle="@string/btn_apply_new_object"
+        android:layout_gravity="bottom">
+    </com.anytypeio.anytype.core_ui.widgets.ButtonPrimaryNumber>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_relation_status_value.xml b/app/src/main/res/layout/fragment_relation_status_value.xml
index 483f26bdf1..a663644366 100644
--- a/app/src/main/res/layout/fragment_relation_status_value.xml
+++ b/app/src/main/res/layout/fragment_relation_status_value.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--typography, buttons 05.04-->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
@@ -23,7 +24,8 @@
 
         <TextView
             android:id="@+id/btnEditOrDone"
-            style="@style/DefaultCellInteractionTextButtonStyle"
+            style="@style/TextView.UXStyle.Body"
+            android:textColor="@color/glyph_active"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:paddingStart="@dimen/dp_16"
@@ -37,7 +39,7 @@
 
         <TextView
             android:id="@+id/tvRelationHeader"
-            style="@style/DefaultCellRelationHeaderStyle"
+            style="@style/TextView.UXStyle.Titles.1"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="52dp"
diff --git a/app/src/main/res/layout/fragment_relation_text_value.xml b/app/src/main/res/layout/fragment_relation_text_value.xml
index ee3300c594..029b3fd68a 100644
--- a/app/src/main/res/layout/fragment_relation_text_value.xml
+++ b/app/src/main/res/layout/fragment_relation_text_value.xml
@@ -16,7 +16,7 @@
 
     <TextView
         android:id="@+id/tvRelationHeader"
-        style="@style/DefaultCellRelationHeaderStyle"
+        style="@style/TextView.UXStyle.Titles.1"
         android:layout_width="match_parent"
         android:layout_height="48dp"
         android:layout_marginStart="20dp"
diff --git a/app/src/main/res/layout/fragment_relation_value.xml b/app/src/main/res/layout/fragment_relation_value.xml
index 5aa992eaa3..38ec2c275d 100644
--- a/app/src/main/res/layout/fragment_relation_value.xml
+++ b/app/src/main/res/layout/fragment_relation_value.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--typography, buttons 05.04-->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
@@ -23,7 +24,8 @@
 
         <TextView
             android:id="@+id/btnEditOrDone"
-            style="@style/DefaultCellInteractionTextButtonStyle"
+            style="@style/TextView.UXStyle.Body"
+            android:textColor="@color/glyph_active"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:paddingStart="@dimen/dp_16"
@@ -37,7 +39,7 @@
 
         <TextView
             android:id="@+id/tvRelationHeader"
-            style="@style/DefaultCellRelationHeaderStyle"
+            style="@style/TextView.UXStyle.Titles.1"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="52dp"
diff --git a/app/src/main/res/layout/fragment_relation_value_file_add.xml b/app/src/main/res/layout/fragment_relation_value_file_add.xml
index 3cdef17713..c7db3ebc40 100644
--- a/app/src/main/res/layout/fragment_relation_value_file_add.xml
+++ b/app/src/main/res/layout/fragment_relation_value_file_add.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--typography, buttons 05.04-->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:orientation="vertical">
+    android:orientation="vertical"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:context="com.anytypeio.anytype.ui.relations.add.AddFileRelationFragment">
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
@@ -46,34 +49,14 @@
         android:layout_marginEnd="20dp"
         android:layout_weight="1" />
 
-    <FrameLayout
+    <com.anytypeio.anytype.core_ui.widgets.ButtonPrimaryNumber
+        android:id="@+id/btnAdd"
         android:layout_width="match_parent"
-        android:layout_height="68dp">
-
-        <TextView
-            android:id="@+id/btnBottomAction"
-            style="@style/DefaultOrangeActionButtonStyle"
-            android:layout_width="match_parent"
-            android:layout_height="48dp"
-            android:layout_gravity="center_vertical"
-            android:layout_marginStart="20dp"
-            android:layout_marginEnd="20dp"
-            android:text="@string/btn_apply_new_object"
-            android:background="@drawable/rect_orange_action_button" />
-
-        <TextView
-            android:id="@+id/tvFilesCount"
-            android:layout_width="24dp"
-            android:layout_height="24dp"
-            android:layout_gravity="center_vertical|end"
-            android:layout_marginEnd="34dp"
-            android:background="@drawable/circle_solid_default"
-            android:backgroundTint="#E89D00"
-            android:fontFamily="@font/inter_medium"
-            android:gravity="center"
-            android:textColor="@color/white"
-            android:textSize="14sp" />
-
-    </FrameLayout>
-
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="20dp"
+        android:layout_marginStart="20dp"
+        android:layout_marginBottom="10dp"
+        app:buttonTitle="@string/btn_apply_new_object"
+        android:layout_gravity="bottom">
+    </com.anytypeio.anytype.core_ui.widgets.ButtonPrimaryNumber>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_set_object_create_bookmark_record.xml b/app/src/main/res/layout/fragment_set_object_create_bookmark_record.xml
index 9636c45f46..33108cb7f1 100644
--- a/app/src/main/res/layout/fragment_set_object_create_bookmark_record.xml
+++ b/app/src/main/res/layout/fragment_set_object_create_bookmark_record.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--typography, buttons 05.04-->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/root"
@@ -23,6 +24,7 @@
 
         <EditText
             android:id="@+id/textInputField"
+            style="@style/TextView.ContentStyle.Body.Regular"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
@@ -30,26 +32,24 @@
             android:layout_marginEnd="6dp"
             android:layout_weight="1"
             android:background="@null"
-            android:fontFamily="@font/inter_regular"
             android:hint="@string/hint_paste_link"
             android:imeOptions="actionDone"
             android:paddingTop="@dimen/dp_14"
             android:paddingBottom="@dimen/dp_14"
-            android:textColor="@color/text_primary"
             android:textColorHint="@color/text_tertiary"
-            android:textCursorDrawable="@drawable/cursor"
             tools:text="http://www.reallylong.link/rll/jZxOZV6GUAwRucSxhnpWJwr1NZB1v5ck/dThI2STuLl" />
 
         <TextView
             android:id="@+id/button"
+            style="@style/TextView.UXStyle.Body"
+            android:textColor="@color/glyph_active"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical|end"
             android:layout_marginEnd="16dp"
             android:background="@drawable/default_ripple"
             android:stateListAnimator="@animator/scale_shrink"
-            android:text="@string/create"
-            android:textSize="17sp" />
+            android:text="@string/create" />
 
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/fragment_set_object_set_record_name.xml b/app/src/main/res/layout/fragment_set_object_set_record_name.xml
index b0aa7b882b..9d74413579 100644
--- a/app/src/main/res/layout/fragment_set_object_set_record_name.xml
+++ b/app/src/main/res/layout/fragment_set_object_set_record_name.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--typography, buttons 05.04-->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/root"
     android:layout_width="match_parent"
@@ -21,19 +22,17 @@
 
         <EditText
             android:id="@+id/textInputField"
+            style="@style/TextView.UXStyle.Body"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:layout_marginStart="20dp"
             android:background="@null"
-            android:fontFamily="@font/inter_regular"
             android:hint="@string/untitled"
             android:imeOptions="actionDone"
             android:maxLines="1"
             android:singleLine="true"
-            android:textColor="@color/text_primary"
-            android:textColorHint="@color/text_tertiary"
-            android:textCursorDrawable="@drawable/cursor" />
+            android:textColorHint="@color/text_tertiary" />
 
         <androidx.appcompat.widget.AppCompatImageButton
             android:id="@+id/icExpand"
diff --git a/app/src/main/res/layout/fragment_setup_new_account.xml b/app/src/main/res/layout/fragment_setup_new_account.xml
index 62914bba1e..8d4d6a06a2 100644
--- a/app/src/main/res/layout/fragment_setup_new_account.xml
+++ b/app/src/main/res/layout/fragment_setup_new_account.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--typography, buttons 05.04-->
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
@@ -51,7 +52,7 @@
 
                 <TextView
                     android:id="@+id/header"
-                    style="@style/AuthHeaderStyle"
+                    style="@style/TextView.ContentStyle.Headline.Heading"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="@dimen/auth_default_margin_start"
@@ -62,15 +63,11 @@
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent" />
 
-                <TextView
+                <com.anytypeio.anytype.core_ui.views.ButtonWarningSmall
                     android:id="@+id/btnRetry"
-                    style="@style/DefaultSolidButtonStyle"
                     android:layout_width="0dp"
                     android:layout_height="@dimen/auth_default_button_height"
                     android:layout_marginStart="16dp"
-                    android:backgroundTint="@color/palette_dark_red"
-                    android:paddingStart="16dp"
-                    android:paddingEnd="16dp"
                     android:text="@string/retry"
                     android:visibility="invisible"
                     app:layout_constraintBottom_toBottomOf="@+id/frameLayout"
@@ -84,7 +81,8 @@
 
         <TextView
             android:id="@+id/tvError"
-            style="@style/DefaultTextViewErrorStyle"
+            style="@style/TextView.UXStyle.Body.Callout.Regular"
+            android:textColor="@color/palette_system_red"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="20dp"
diff --git a/app/src/main/res/layout/fragment_setup_selected_account.xml b/app/src/main/res/layout/fragment_setup_selected_account.xml
index cbf4056e78..baaac34b60 100644
--- a/app/src/main/res/layout/fragment_setup_selected_account.xml
+++ b/app/src/main/res/layout/fragment_setup_selected_account.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--typography, buttons 05.04-->
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
@@ -66,7 +67,7 @@
 
                 <TextView
                     android:id="@+id/header"
-                    style="@style/AuthHeaderStyle"
+                    style="@style/TextView.ContentStyle.Headline.Heading"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="@dimen/auth_default_margin_start"
@@ -77,15 +78,11 @@
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent" />
 
-                <TextView
+                <com.anytypeio.anytype.core_ui.views.ButtonWarningSmall
                     android:id="@+id/btnRetry"
-                    style="@style/DefaultSolidButtonStyle"
                     android:layout_width="0dp"
                     android:layout_height="@dimen/auth_default_button_height"
                     android:layout_marginStart="16dp"
-                    android:backgroundTint="@color/palette_dark_red"
-                    android:paddingStart="16dp"
-                    android:paddingEnd="16dp"
                     android:text="@string/retry"
                     android:visibility="invisible"
                     app:layout_constraintBottom_toBottomOf="@+id/frameLayout"
@@ -99,7 +96,8 @@
 
         <TextView
             android:id="@+id/tvError"
-            style="@style/DefaultTextViewErrorStyle"
+            style="@style/TextView.UXStyle.Body.Callout.Regular"
+            android:textColor="@color/palette_system_red"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="20dp"
diff --git a/app/src/main/res/layout/fragment_splash.xml b/app/src/main/res/layout/fragment_splash.xml
index 7d47a02035..baa1d1acd6 100644
--- a/app/src/main/res/layout/fragment_splash.xml
+++ b/app/src/main/res/layout/fragment_splash.xml
@@ -1,3 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--typography, buttons 05.04-->
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -24,14 +26,13 @@
 
     <TextView
         android:id="@+id/error"
+        style="@style/TextView.UXStyle.Captions.2.Regular"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="bottom|center_horizontal"
         android:layout_marginBottom="100dp"
-        android:fontFamily="monospace"
         android:text="@string/failed_to_launch_wallet"
-        android:textColor="#FF5722"
-        android:textSize="10sp"
+        android:textColor="@color/palette_system_red"
         android:visibility="invisible"
         tools:ignore="SmallSp"
         tools:visibility="visible" />
diff --git a/app/src/main/res/layout/fragment_start_login.xml b/app/src/main/res/layout/fragment_start_login.xml
index 10bd850a69..0a6c3a17e7 100644
--- a/app/src/main/res/layout/fragment_start_login.xml
+++ b/app/src/main/res/layout/fragment_start_login.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--typography, buttons 05.04-->
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
@@ -30,44 +31,32 @@
 
             <TextView
                 android:id="@+id/title"
+                style="@style/TextView.ContentStyle.Headline.Heading"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="@dimen/auth_default_margin_start"
                 android:layout_marginTop="23dp"
                 android:layout_marginBottom="11dp"
-                android:fontFamily="@font/inter_bold"
                 android:text="@string/organize_everything"
-                android:letterSpacing="-0.02"
-                android:lineSpacingExtra="-1sp"
-                android:textColor="@color/text_primary"
-                android:textSize="22sp"
-                android:lineHeight="26sp"
                 app:layout_constraintBottom_toTopOf="@+id/textView"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
 
             <TextView
                 android:id="@+id/textView"
+                style="@style/TextView.UXStyle.Body.Callout.Regular"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="@dimen/auth_default_margin_start"
                 android:layout_marginEnd="@dimen/auth_default_margin_end"
                 android:layout_marginBottom="18dp"
-                android:fontFamily="@font/inter_regular"
-                android:lineSpacingMultiplier="1.21"
-                android:lineHeight="22sp"
                 android:text="@string/start_login_text"
-                android:textColor="@color/text_primary"
-                android:textSize="15sp"
-                android:lineSpacingExtra="4sp"
-                android:letterSpacing="-0.02"
                 app:layout_constraintBottom_toTopOf="@+id/loginButton"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent" />
 
-            <TextView
+            <com.anytypeio.anytype.core_ui.views.ButtonPrimaryLarge
                 android:id="@+id/loginButton"
-                style="@style/DefaultSolidButtonStyle"
                 android:layout_width="0dp"
                 android:layout_height="@dimen/auth_default_button_height"
                 android:layout_marginStart="6dp"
@@ -79,7 +68,7 @@
                 app:layout_constraintHorizontal_bias="0.5"
                 app:layout_constraintStart_toEndOf="@+id/signUpButton" />
 
-            <TextView
+            <com.anytypeio.anytype.core_ui.views.ButtonSecondaryLarge
                 android:id="@+id/signUpButton"
                 style="@style/DefaultStrokeButtonStyle"
                 android:layout_width="0dp"
diff --git a/app/src/main/res/layout/fragment_template_select.xml b/app/src/main/res/layout/fragment_template_select.xml
index 9f79ee71cf..ec6461fe87 100644
--- a/app/src/main/res/layout/fragment_template_select.xml
+++ b/app/src/main/res/layout/fragment_template_select.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--typography, buttons 05.04-->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
@@ -17,18 +18,16 @@
 
     <TextView
         android:id="@+id/tvTemplateCountOrTutorial"
+        style="@style/TextView.UXStyle.Captions.1.Medium"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
         android:layout_marginTop="12dp"
         android:layout_marginEnd="12dp"
-        android:fontFamily="@font/inter_medium"
         android:gravity="center"
         android:maxLines="1"
         android:singleLine="true"
         android:textAlignment="center"
-        android:textColor="@color/text_primary"
-        android:textSize="13sp"
         tools:text="Type Task has 2 templates" />
 
     <androidx.viewpager2.widget.ViewPager2
@@ -44,9 +43,8 @@
         android:background="@color/background_primary"
         android:orientation="horizontal">
 
-        <TextView
+        <com.anytypeio.anytype.core_ui.views.ButtonSecondaryLarge
             android:id="@+id/btnCancel"
-            style="@style/DefaultStrokeButtonStyle"
             android:layout_width="0dp"
             android:layout_height="@dimen/dp_48"
             android:layout_gravity="center_vertical"
@@ -55,9 +53,8 @@
             android:layout_weight="1"
             android:text="@string/without_template" />
 
-        <TextView
+        <com.anytypeio.anytype.core_ui.views.ButtonPrimaryLarge
             android:id="@+id/btnUseTemplate"
-            style="@style/DefaultSolidButtonStyle"
             android:layout_width="0dp"
             android:layout_height="@dimen/dp_48"
             android:layout_gravity="center_vertical"
diff --git a/app/src/main/res/layout/fragment_unsplash.xml b/app/src/main/res/layout/fragment_unsplash.xml
index f76ca83ea2..6d578b6adf 100644
--- a/app/src/main/res/layout/fragment_unsplash.xml
+++ b/app/src/main/res/layout/fragment_unsplash.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--typography, buttons 05.04-->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -21,7 +22,7 @@
         android:layout_marginTop="@dimen/dp_6">
 
         <TextView
-            style="@style/CoverModalTitleStyle"
+            style="@style/TextView.UXStyle.Titles.1"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
@@ -56,15 +57,15 @@
 
     <TextView
         android:id="@+id/tvError"
+        style="@style/TextView.UXStyle.Body"
         android:layout_width="match_parent"
         android:layout_height="56dp"
-        android:fontFamily="monospace"
         android:gravity="center_horizontal"
         android:paddingStart="20dp"
         android:paddingEnd="20dp"
         android:text="@string/unsplash_generic_error"
         android:textColor="@color/text_secondary"
-        android:textSize="10sp"
-        android:visibility="gone" />
+        android:visibility="gone"
+        tools:visibility="visible"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_user_settings.xml b/app/src/main/res/layout/fragment_user_settings.xml
index 7ebe05ae52..9f9d770235 100644
--- a/app/src/main/res/layout/fragment_user_settings.xml
+++ b/app/src/main/res/layout/fragment_user_settings.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--typography, buttons 05.04-->
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
@@ -20,7 +21,7 @@
 
     <TextView
         android:id="@+id/tvUserSettingsHeader"
-        style="@style/DefaultCellRelationHeaderStyle"
+        style="@style/TextView.UXStyle.Titles.1"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="18dp"
@@ -43,17 +44,16 @@
 
         <TextView
             android:id="@+id/tvDefaultObjectTypeTitle"
+            style="@style/TextView.UXStyle.Body"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
             android:layout_marginStart="20dp"
-            android:fontFamily="@font/inter_regular"
-            android:text="@string/default_object_type_title"
-            android:textColor="@color/text_primary"
-            android:textSize="17sp" />
+            android:text="@string/default_object_type_title" />
 
         <TextView
             android:id="@+id/objectType"
+            style="@style/TextView.UXStyle.Body"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
@@ -61,14 +61,11 @@
             android:layout_marginEnd="10dp"
             android:layout_weight="1"
             android:ellipsize="end"
-            android:fontFamily="@font/inter_regular"
             android:gravity="center_vertical|end"
             android:hint="@string/unknown"
             android:maxLines="1"
             android:singleLine="true"
             android:textColor="@color/text_secondary"
-            android:textColorHint="@color/text_tertiary"
-            android:textSize="17sp"
             tools:text="Note" />
 
         <ImageView
diff --git a/app/src/main/res/layout/fragment_viewer_card_size_select.xml b/app/src/main/res/layout/fragment_viewer_card_size_select.xml
index 7074e17d1c..d9b8fd65cd 100644
--- a/app/src/main/res/layout/fragment_viewer_card_size_select.xml
+++ b/app/src/main/res/layout/fragment_viewer_card_size_select.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--typography, buttons 05.04-->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -19,7 +20,7 @@
         android:layout_height="48dp">
 
         <TextView
-            style="@style/DefaultDataViewModalHeaderStyle"
+            style="@style/TextView.UXStyle.Titles.1"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
@@ -34,7 +35,7 @@
         android:background="@drawable/default_ripple">
 
         <TextView
-            style="@style/ViewerSettingOptionTextStyle"
+            style="@style/TextView.UXStyle.Body"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
@@ -67,7 +68,7 @@
         android:background="@drawable/default_ripple">
 
         <TextView
-            style="@style/ViewerSettingOptionTextStyle"
+            style="@style/TextView.UXStyle.Body"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
diff --git a/app/src/main/res/layout/fragment_viewer_image_preview_select.xml b/app/src/main/res/layout/fragment_viewer_image_preview_select.xml
index e0ca4d30d9..8a83cacc25 100644
--- a/app/src/main/res/layout/fragment_viewer_image_preview_select.xml
+++ b/app/src/main/res/layout/fragment_viewer_image_preview_select.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--typography, buttons 05.04-->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -19,7 +20,7 @@
         android:layout_marginTop="6dp">
 
         <TextView
-            style="@style/DefaultDataViewModalHeaderStyle"
+            style="@style/TextView.UXStyle.Titles.1"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
diff --git a/app/src/main/res/layout/fragment_viewer_relations_list.xml b/app/src/main/res/layout/fragment_viewer_relations_list.xml
index 370c97a5af..b1ddb1b8f9 100644
--- a/app/src/main/res/layout/fragment_viewer_relations_list.xml
+++ b/app/src/main/res/layout/fragment_viewer_relations_list.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--typography, buttons 05.04-->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/root"
@@ -22,9 +23,11 @@
 
         <TextView
             android:id="@+id/editBtn"
-            style="@style/DefaultCellInteractionTextButtonStyle"
+            style="@style/TextView.UXStyle.Body"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
+            android:gravity="center"
+            android:textColor="@color/glyph_active"
             android:paddingStart="@dimen/dp_16"
             android:paddingEnd="16dp"
             android:text="@string/edit" />
diff --git a/app/src/main/res/layout/fragment_viewer_sort.xml b/app/src/main/res/layout/fragment_viewer_sort.xml
index a2ed06efc6..b813d2a323 100644
--- a/app/src/main/res/layout/fragment_viewer_sort.xml
+++ b/app/src/main/res/layout/fragment_viewer_sort.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--typography, buttons 05.04-->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -21,16 +22,17 @@
 
         <TextView
             android:id="@+id/btnEditSortOrDone"
-            style="@style/DefaultGrayTextButtonStyle"
+            style="@style/TextView.UXStyle.Body"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:gravity="center"
+            android:textColor="@color/glyph_active"
             android:paddingStart="16dp"
             android:paddingEnd="16dp"
             android:text="@string/edit" />
 
         <TextView
-            style="@style/DefaultDataViewModalHeaderStyle"
+            style="@style/TextView.UXStyle.Titles.1"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:layout_gravity="center_horizontal"
@@ -50,11 +52,10 @@
 
     <TextView
         android:id="@+id/txtEmptyState"
+        style="@style/TextView.UXStyle.Body.Callout.Regular"
         android:layout_width="match_parent"
         android:layout_height="68dp"
-        android:textSize="15sp"
-        android:fontFamily="@font/inter_regular"
-        android:textColor="@color/glyph_active"
+        android:textColor="@color/text_secondary"
         android:gravity="center"
         android:layout_marginBottom="@dimen/dp_20"
         android:text="@string/sort_empty_state" />
diff --git a/app/src/main/res/layout/fragment_wallpaper_select.xml b/app/src/main/res/layout/fragment_wallpaper_select.xml
index 911c0dffb9..a3de82c66d 100644
--- a/app/src/main/res/layout/fragment_wallpaper_select.xml
+++ b/app/src/main/res/layout/fragment_wallpaper_select.xml
@@ -1,8 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--typography, buttons 05.04-->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical">
+    android:orientation="vertical"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:context="com.anytypeio.anytype.ui.dashboard.WallpaperSelectFragment">
 
     <View
         android:id="@+id/dragger"
@@ -17,12 +20,12 @@
         android:layout_height="@dimen/default_toolbar_height">
 
         <TextView
-            style="@style/DefaultDataViewModalHeaderStyle"
+            style="@style/TextView.UXStyle.Titles.1"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:layout_gravity="center"
             android:gravity="center"
-            android:text="Change wallpaper" />
+            android:text="@string/change_wallpaper" />
 
     </FrameLayout>
 
diff --git a/app/src/main/res/layout/item_dashboard_card_default.xml b/app/src/main/res/layout/item_dashboard_card_default.xml
deleted file mode 100644
index 31fce8280f..0000000000
--- a/app/src/main/res/layout/item_dashboard_card_default.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="@dimen/default_dashboard_card_height"
-    app:cardCornerRadius="16dp"
-    app:cardBackgroundColor="@color/dashboard_card_background"
-    app:cardElevation="0dp">
-
-    <com.anytypeio.anytype.core_ui.widgets.ObjectCardIconWidget
-        android:id="@+id/iconWidget"
-        android:layout_width="@dimen/dashboard_object_icon_default_size"
-        android:layout_height="@dimen/dashboard_object_icon_default_size"
-        android:layout_marginStart="16dp"
-        android:layout_marginTop="16dp"/>
-
-    <TextView
-        android:id="@+id/title"
-        style="@style/DashboardDocumentTitleStyle"
-        android:layout_width="match_parent"
-        android:hint="@string/untitled"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:layout_marginTop="76dp"
-        android:layout_marginEnd="16dp"
-        tools:text="Movies" />
-
-    <TextView
-        android:id="@+id/typeTitle"
-        style="@style/DashboardDocumentSubtitleStyle"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:layout_marginTop="98dp"
-        android:layout_marginEnd="16dp"
-        tools:text="Page" />
-
-    <com.facebook.shimmer.ShimmerFrameLayout
-        android:id="@+id/shimmer"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        app:shimmer_auto_start="false"
-        app:shimmer_duration="2000"
-        tools:visibility="visible">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <View
-                android:id="@+id/iconSkeleton"
-                android:layout_width="48dp"
-                android:layout_height="48dp"
-                android:layout_marginStart="16dp"
-                android:layout_marginTop="16dp"
-                android:background="@drawable/shimmer_circle" />
-
-            <View
-                android:id="@+id/txtSkeleton"
-                android:layout_width="match_parent"
-                android:layout_height="22dp"
-                android:layout_marginStart="16dp"
-                android:layout_marginTop="12dp"
-                android:layout_marginEnd="16dp"
-                android:background="@drawable/rectangle_dashboard_text_skeleton" />
-
-        </LinearLayout>
-
-    </com.facebook.shimmer.ShimmerFrameLayout>
-
-    <ImageView
-        android:visibility="invisible"
-        android:paddingEnd="10dp"
-        android:paddingBottom="10dp"
-        android:layout_gravity="end|bottom"
-        android:id="@+id/ivSelection"
-        android:src="@drawable/ic_bin_selection"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"/>
-
-</androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_dashboard_inbox.xml b/app/src/main/res/layout/item_dashboard_inbox.xml
deleted file mode 100644
index 2eb5420531..0000000000
--- a/app/src/main/res/layout/item_dashboard_inbox.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.recyclerview.widget.RecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:clipToPadding="false"
-    android:paddingStart="10dp"
-    android:paddingEnd="10dp"
-    android:paddingBottom="16dp"
-    android:overScrollMode="never"
-    android:id="@+id/rvDashboardInbox"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"/>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_dashboard_page.xml b/app/src/main/res/layout/item_dashboard_page.xml
deleted file mode 100644
index 10a5654f47..0000000000
--- a/app/src/main/res/layout/item_dashboard_page.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.recyclerview.widget.RecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:clipToPadding="false"
-    android:paddingBottom="16dp"
-    android:overScrollMode="never"
-    android:id="@+id/rvDashboard"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"/>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_dashboard_page_archived.xml b/app/src/main/res/layout/item_dashboard_page_archived.xml
deleted file mode 100644
index defca5a33a..0000000000
--- a/app/src/main/res/layout/item_dashboard_page_archived.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.recyclerview.widget.RecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:clipToPadding="false"
-    android:paddingBottom="16dp"
-    android:overScrollMode="never"
-    android:id="@+id/rvDashboardArchived"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"/>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_dashboard_profile_header.xml b/app/src/main/res/layout/item_dashboard_profile_header.xml
deleted file mode 100644
index 5363dda7bb..0000000000
--- a/app/src/main/res/layout/item_dashboard_profile_header.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/header"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical"
-    tools:background="@color/black"
-    app:layout_constraintEnd_toEndOf="parent"
-    app:layout_constraintHeight_percent="0.5"
-    app:layout_constraintStart_toStartOf="parent"
-    app:layout_constraintTop_toTopOf="parent">
-
-    <TextView
-        android:id="@+id/greeting"
-        style="@style/HomeDashboardGreetingStyle"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="43dp"
-        android:layout_marginEnd="10dp"
-        android:lineSpacingExtra="2sp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:text="Hi, Konstantin Ivanov" />
-
-    <com.anytypeio.anytype.core_ui.widgets.AvatarWidget
-        android:id="@+id/avatar"
-        android:layout_width="@dimen/width_avatar_on_dashboard"
-        android:layout_height="@dimen/height_avatar_on_dashboard"
-        android:layout_marginTop="24dp"
-        android:background="@drawable/circle_solid_default"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/greeting"
-        app:text_size="36sp" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_dashboard_recent.xml b/app/src/main/res/layout/item_dashboard_recent.xml
deleted file mode 100644
index 3deffbac2f..0000000000
--- a/app/src/main/res/layout/item_dashboard_recent.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.recyclerview.widget.RecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:clipToPadding="false"
-    android:paddingBottom="16dp"
-    android:overScrollMode="never"
-    android:id="@+id/rvDashboardRecent"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"/>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_dashboard_sets.xml b/app/src/main/res/layout/item_dashboard_sets.xml
deleted file mode 100644
index 3516b56d1b..0000000000
--- a/app/src/main/res/layout/item_dashboard_sets.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.recyclerview.widget.RecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:clipToPadding="false"
-    android:paddingBottom="16dp"
-    android:overScrollMode="never"
-    android:id="@+id/rvDashboardSets"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"/>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_dashboard_shared.xml b/app/src/main/res/layout/item_dashboard_shared.xml
deleted file mode 100644
index 9299d034ae..0000000000
--- a/app/src/main/res/layout/item_dashboard_shared.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.recyclerview.widget.RecyclerView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:clipToPadding="false"
-    android:paddingBottom="16dp"
-    android:overScrollMode="never"
-    android:id="@+id/rvDashboardShared"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"/>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_desktop_archive.xml b/app/src/main/res/layout/item_desktop_archive.xml
deleted file mode 100644
index 0ed2e31fdc..0000000000
--- a/app/src/main/res/layout/item_desktop_archive.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    app:cardBackgroundColor="@color/white"
-    app:cardElevation="0dp"
-    app:cardCornerRadius="12dp">
-
-    <LinearLayout
-        android:background="@drawable/ripple_dashboard_card"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical">
-
-        <FrameLayout
-            android:id="@+id/icon"
-            android:layout_width="48dp"
-            android:layout_height="48dp"
-            android:layout_marginStart="16dp"
-            android:layout_marginTop="16dp"
-            android:background="@drawable/circle_default">
-
-            <ImageView
-                android:id="@+id/archiveImage"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:src="@drawable/ic_bin"/>
-
-        </FrameLayout>
-
-        <TextView
-            android:id="@+id/archiveTitle"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
-            android:layout_marginEnd="16dp"
-            android:layout_marginTop="12dp"
-            android:layout_marginBottom="12dp"
-            android:text="@string/bin"
-            style="@style/DashboardDocumentTitleStyle" />
-
-    </LinearLayout>
-
-    <ImageView
-        android:visibility="invisible"
-        android:paddingEnd="10dp"
-        android:paddingBottom="10dp"
-        android:layout_gravity="end|bottom"
-        android:id="@+id/ivSelection"
-        android:src="@drawable/ic_bin_selection"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"/>
-
-</androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_desktop_bookmark.xml b/app/src/main/res/layout/item_desktop_bookmark.xml
deleted file mode 100644
index 15dbbe9c89..0000000000
--- a/app/src/main/res/layout/item_desktop_bookmark.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="@dimen/default_dashboard_card_height"
-    android:clickable="true"
-    app:cardBackgroundColor="@color/dashboard_card_background"
-    app:cardCornerRadius="16dp"
-    app:cardElevation="0dp">
-
-    <ImageView
-        android:id="@+id/ivIcon"
-        android:layout_width="18dp"
-        android:layout_height="18dp"
-        android:layout_marginStart="10dp"
-        android:layout_marginTop="17dp" />
-
-    <TextView
-        android:id="@+id/tvDocTitle"
-        style="@style/DashboardDocAlternativeTitleStyle"
-        android:layout_width="match_parent"
-        android:layout_height="80dp"
-        android:layout_marginStart="36dp"
-        android:layout_marginTop="16dp"
-        android:layout_marginEnd="16dp"
-        android:maxLines="4"
-        tools:text="@string/default_text_placeholder" />
-
-    <TextView
-        android:id="@+id/tvDocTypeName"
-        style="@style/DashboardDocumentSubtitleStyle"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:layout_marginTop="98dp"
-        android:layout_marginEnd="16dp"
-        tools:text="Task" />
-
-    <com.facebook.shimmer.ShimmerFrameLayout
-        android:id="@+id/shimmer"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        app:shimmer_auto_start="false"
-        app:shimmer_duration="2000"
-        tools:visibility="gone">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <View
-                android:id="@+id/iconSkeleton"
-                android:layout_width="48dp"
-                android:layout_height="48dp"
-                android:layout_marginStart="16dp"
-                android:layout_marginTop="16dp"
-                android:background="@drawable/circle_default" />
-
-            <View
-                android:id="@+id/txtSkeleton"
-                android:layout_width="match_parent"
-                android:layout_height="22dp"
-                android:layout_marginStart="16dp"
-                android:layout_marginTop="12dp"
-                android:layout_marginEnd="16dp"
-                android:background="@drawable/rectangle_dashboard_text_skeleton" />
-
-        </LinearLayout>
-
-    </com.facebook.shimmer.ShimmerFrameLayout>
-
-    <ImageView
-        android:id="@+id/ivSelection"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="end|bottom"
-        android:paddingEnd="10dp"
-        android:paddingBottom="10dp"
-        android:src="@drawable/ic_bin_selection"
-        android:visibility="invisible" />
-
-</androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_desktop_new_document.xml b/app/src/main/res/layout/item_desktop_new_document.xml
deleted file mode 100644
index cc974fdcfe..0000000000
--- a/app/src/main/res/layout/item_desktop_new_document.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:layout_margin="4dp"
-    android:orientation="vertical">
-
-    <androidx.cardview.widget.CardView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_margin="4dp"
-        android:stateListAnimator="@animator/scale_shrink"
-        app:cardBackgroundColor="@color/white"
-        app:cardElevation="0dp"
-        app:cardCornerRadius="4dp">
-
-        <TextView
-            android:id="@+id/icon"
-            android:layout_width="48dp"
-            android:layout_height="48dp"
-            android:layout_gravity="center"
-            android:layout_marginTop="32dp"
-            android:layout_marginBottom="32dp"
-            android:gravity="center"
-            android:text="+"
-            android:textSize="26sp" />
-
-    </androidx.cardview.widget.CardView>
-
-    <TextView
-        android:id="@+id/title"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_margin="8dp"
-        android:layout_marginTop="12dp"
-        android:fontFamily="monospace"
-        android:textSize="14sp"
-        android:textStyle="bold" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_desktop_page_task.xml b/app/src/main/res/layout/item_desktop_page_task.xml
deleted file mode 100644
index d2401deb0f..0000000000
--- a/app/src/main/res/layout/item_desktop_page_task.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="@dimen/default_dashboard_card_height"
-    android:clickable="true"
-    app:cardBackgroundColor="@color/dashboard_card_background"
-    app:cardCornerRadius="16dp"
-    app:cardElevation="0dp">
-
-    <ImageView
-        android:id="@+id/ivCheckbox"
-        android:layout_width="18dp"
-        android:layout_height="18dp"
-        android:layout_marginStart="10dp"
-        android:layout_marginTop="16dp" />
-
-    <TextView
-        android:id="@+id/tvDocTitle"
-        style="@style/DashboardDocAlternativeTitleStyle"
-        android:hint="@string/untitled"
-        android:layout_width="match_parent"
-        android:layout_height="80dp"
-        android:layout_marginStart="36dp"
-        android:layout_marginTop="16dp"
-        android:layout_marginEnd="16dp"
-        android:maxLines="4"
-        tools:text="@string/default_text_placeholder" />
-
-    <TextView
-        android:id="@+id/tvDocTypeName"
-        style="@style/DashboardDocumentSubtitleStyle"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:layout_marginTop="98dp"
-        android:layout_marginEnd="16dp"
-        tools:text="Task" />
-
-    <com.facebook.shimmer.ShimmerFrameLayout
-        android:id="@+id/shimmer"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        app:shimmer_auto_start="false"
-        app:shimmer_duration="2000"
-        tools:visibility="gone">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <View
-                android:id="@+id/iconSkeleton"
-                android:layout_width="48dp"
-                android:layout_height="48dp"
-                android:layout_marginStart="16dp"
-                android:layout_marginTop="16dp"
-                android:background="@drawable/circle_default" />
-
-            <View
-                android:id="@+id/txtSkeleton"
-                android:layout_width="match_parent"
-                android:layout_height="22dp"
-                android:layout_marginStart="16dp"
-                android:layout_marginTop="12dp"
-                android:layout_marginEnd="16dp"
-                android:background="@drawable/rectangle_dashboard_text_skeleton" />
-
-        </LinearLayout>
-
-    </com.facebook.shimmer.ShimmerFrameLayout>
-
-    <ImageView
-        android:id="@+id/ivSelection"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="end|bottom"
-        android:paddingEnd="10dp"
-        android:paddingBottom="10dp"
-        android:src="@drawable/ic_bin_selection"
-        android:visibility="invisible" />
-
-</androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_desktop_page_without_icon.xml b/app/src/main/res/layout/item_desktop_page_without_icon.xml
deleted file mode 100644
index 84509d8ed4..0000000000
--- a/app/src/main/res/layout/item_desktop_page_without_icon.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="@dimen/default_dashboard_card_height"
-    android:clickable="true"
-    app:cardBackgroundColor="@color/dashboard_card_background"
-    app:cardCornerRadius="16dp"
-    app:cardElevation="0dp">
-
-    <TextView
-        android:id="@+id/tvDocTitle"
-        style="@style/DashboardDocAlternativeTitleStyle"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:layout_marginTop="16dp"
-        android:layout_marginEnd="16dp"
-        android:hint="@string/untitled"
-        android:maxLines="4"
-        tools:text="@string/default_text_placeholder" />
-
-    <TextView
-        android:id="@+id/tvDocTypeName"
-        style="@style/DashboardDocumentSubtitleStyle"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:layout_marginTop="98dp"
-        android:layout_marginEnd="16dp"
-        tools:text="Movies" />
-
-    <com.facebook.shimmer.ShimmerFrameLayout
-        android:id="@+id/shimmer"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        app:shimmer_auto_start="false"
-        app:shimmer_duration="2000"
-        tools:visibility="invisible">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <View
-                android:id="@+id/iconSkeleton"
-                android:layout_width="48dp"
-                android:layout_height="48dp"
-                android:layout_marginStart="16dp"
-                android:layout_marginTop="16dp"
-                android:background="@drawable/circle_default" />
-
-            <View
-                android:id="@+id/txtSkeleton"
-                android:layout_width="match_parent"
-                android:layout_height="22dp"
-                android:layout_marginStart="16dp"
-                android:layout_marginTop="12dp"
-                android:layout_marginEnd="16dp"
-                android:background="@drawable/rectangle_dashboard_text_skeleton" />
-
-        </LinearLayout>
-
-    </com.facebook.shimmer.ShimmerFrameLayout>
-
-    <ImageView
-        android:id="@+id/ivSelection"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="end|bottom"
-        android:paddingEnd="10dp"
-        android:paddingBottom="10dp"
-        android:src="@drawable/ic_bin_selection"
-        android:visibility="invisible" />
-
-</androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_desktop_set_without_icon.xml b/app/src/main/res/layout/item_desktop_set_without_icon.xml
deleted file mode 100644
index f56071ede2..0000000000
--- a/app/src/main/res/layout/item_desktop_set_without_icon.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="@dimen/default_dashboard_card_height"
-    android:clickable="true"
-    app:cardCornerRadius="16dp"
-    app:cardBackgroundColor="@color/dashboard_card_background"
-    app:cardElevation="0dp">
-
-    <TextView
-        android:id="@+id/tvSetTitle"
-        style="@style/DashboardDocAlternativeTitleStyle"
-        android:maxLines="4"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:hint="@string/untitled"
-        android:layout_marginStart="16dp"
-        android:layout_marginTop="16dp"
-        android:layout_marginEnd="16dp"
-        tools:text="@string/default_text_placeholder" />
-
-    <TextView
-        android:id="@+id/tvSetTypeName"
-        style="@style/DashboardDocumentSubtitleStyle"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:layout_marginTop="98dp"
-        android:layout_marginEnd="16dp"
-        tools:text="Movies" />
-
-    <com.facebook.shimmer.ShimmerFrameLayout
-        tools:visibility="invisible"
-        android:id="@+id/shimmer"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        app:shimmer_auto_start="false"
-        app:shimmer_duration="2000">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <View
-                android:id="@+id/iconSkeleton"
-                android:layout_width="48dp"
-                android:layout_height="48dp"
-                android:layout_marginStart="16dp"
-                android:layout_marginTop="16dp"
-                android:background="@drawable/circle_default" />
-
-            <View
-                android:id="@+id/txtSkeleton"
-                android:layout_width="match_parent"
-                android:layout_height="22dp"
-                android:layout_marginStart="16dp"
-                android:layout_marginTop="12dp"
-                android:layout_marginEnd="16dp"
-                android:background="@drawable/rectangle_dashboard_text_skeleton" />
-
-        </LinearLayout>
-
-    </com.facebook.shimmer.ShimmerFrameLayout>
-
-    <ImageView
-        android:visibility="invisible"
-        android:paddingEnd="10dp"
-        android:paddingBottom="10dp"
-        android:layout_gravity="end|bottom"
-        android:id="@+id/ivSelection"
-        android:src="@drawable/ic_bin_selection"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"/>
-
-</androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_filter.xml b/app/src/main/res/layout/item_filter.xml
deleted file mode 100644
index ecbdc78b14..0000000000
--- a/app/src/main/res/layout/item_filter.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content">
-
-    <TextView
-        android:id="@+id/name"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textColor="#ACA996"
-        android:textSize="18sp"
-        android:textStyle="bold"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:text="Team" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_filter_checked.xml b/app/src/main/res/layout/item_filter_checked.xml
deleted file mode 100644
index 5a0f4cab2c..0000000000
--- a/app/src/main/res/layout/item_filter_checked.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content">
-
-    <TextView
-        android:id="@+id/name"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textColor="@color/black"
-        android:textSize="18sp"
-        android:textStyle="bold"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:text="Team" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_profile_container.xml b/app/src/main/res/layout/item_profile_container.xml
deleted file mode 100644
index 8768d86c6c..0000000000
--- a/app/src/main/res/layout/item_profile_container.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/recyclerView"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
-</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_tag.xml b/app/src/main/res/layout/item_tag.xml
deleted file mode 100644
index 3a43b76220..0000000000
--- a/app/src/main/res/layout/item_tag.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/name"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:background="@drawable/rounded_corner"
-    android:fontFamily="@font/graphik_font"
-    android:paddingStart="5dp"
-    android:paddingTop="2dp"
-    android:paddingEnd="5dp"
-    android:paddingBottom="3dp"
-    android:textColor="@color/white"
-    android:textSize="14sp">
-
-</TextView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_test_block.xml b/app/src/main/res/layout/item_test_block.xml
deleted file mode 100755
index 19ceb22b27..0000000000
--- a/app/src/main/res/layout/item_test_block.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:orientation="vertical"
-    android:background="#F2FDE4">
-
-    <TextView
-        android:id="@+id/tvTitle"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:textSize="21sp"
-        android:padding="16dp"
-        android:text="DRAGGGGGG"
-        android:textColor="@color/black"
-        android:gravity="center" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_text_holder.xml b/app/src/main/res/layout/item_text_holder.xml
deleted file mode 100644
index 3a838d47b5..0000000000
--- a/app/src/main/res/layout/item_text_holder.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-             android:layout_width="match_parent"
-             android:layout_height="80dp">
-
-    <View android:layout_width="match_parent"
-          android:layout_height="match_parent"
-          android:layout_margin="4dp"
-          android:alpha="0.3" />
-
-</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/modal_add_view.xml b/app/src/main/res/layout/modal_add_view.xml
deleted file mode 100644
index 9e30f6fa69..0000000000
--- a/app/src/main/res/layout/modal_add_view.xml
+++ /dev/null
@@ -1,165 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:clickable="true"
-    android:focusable="true">
-
-    <ImageView
-        android:id="@+id/imageView"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/modal_rect_margin_top"
-        android:contentDescription="@string/content_description_modal_icon"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:srcCompat="@drawable/sheet_top" />
-
-    <TextView
-        android:id="@+id/name"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/modal_main_margin_start"
-        android:layout_marginTop="20dp"
-        android:text="@string/modal_view_name"
-        android:textColor="#ACA996"
-        android:textSize="12sp"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/imageView"
-        tools:text="View name" />
-
-    <EditText
-        android:id="@+id/editName"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/modal_main_margin_start"
-        android:layout_marginTop="4dp"
-        android:layout_marginEnd="@dimen/modal_main_margin_end"
-        android:background="@null"
-        android:ems="10"
-        android:hint="@string/modal_tap_to_type"
-        android:importantForAutofill="no"
-        android:inputType="textPersonName"
-        android:textColor="@color/black"
-        android:textColorHint="#ACA996"
-        android:textSize="16sp"
-        android:textStyle="bold"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/name" />
-
-    <View
-        android:id="@+id/divider1"
-        android:layout_width="0dp"
-        android:layout_height="1dp"
-        android:layout_marginStart="@dimen/modal_main_margin_start"
-        android:layout_marginTop="10dp"
-        android:layout_marginEnd="@dimen/modal_main_margin_end"
-        android:background="@color/divider"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/editName" />
-
-    <include
-        android:id="@+id/item_gallery"
-        layout="@layout/modal_item_gallery"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="16dp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/divider1" />
-
-    <View
-        android:id="@+id/divider2"
-        android:layout_width="0dp"
-        android:layout_height="1dp"
-        android:layout_marginStart="@dimen/modal_main_margin_start"
-        android:layout_marginEnd="@dimen/modal_main_margin_end"
-        android:background="@color/divider"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/item_gallery" />
-
-    <include
-        android:id="@+id/item_kanban"
-        layout="@layout/modal_item_kanban"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/divider2" />
-
-    <View
-        android:id="@+id/divider3"
-        android:layout_width="0dp"
-        android:layout_height="1dp"
-        android:layout_marginStart="@dimen/modal_main_margin_start"
-        android:layout_marginEnd="@dimen/modal_main_margin_end"
-        android:background="@color/divider"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/item_kanban" />
-
-    <include
-        android:id="@+id/item_table"
-        layout="@layout/modal_item_table"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/divider3" />
-
-    <View
-        android:id="@+id/divider4"
-        android:layout_width="0dp"
-        android:layout_height="1dp"
-        android:layout_marginStart="@dimen/modal_main_margin_start"
-        android:layout_marginEnd="@dimen/modal_main_margin_end"
-        android:background="@color/divider"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/item_table" />
-
-    <include
-        android:id="@+id/item_list"
-        layout="@layout/modal_item_list"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/divider4" />
-
-    <Button
-        android:id="@+id/buttonCancel"
-        android:layout_width="@dimen/modal_button_width"
-        android:layout_height="@dimen/modal_button_height"
-        android:layout_marginStart="@dimen/modal_main_margin_start"
-        android:layout_marginTop="@dimen/modal_button_margin_top"
-        android:layout_marginBottom="@dimen/modal_button_margin_bottom"
-        android:background="@drawable/rounded_button_cancel"
-        android:text="@string/cancel"
-        android:textAllCaps="false"
-        android:textColor="#ACA996"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/item_list" />
-
-    <Button
-        android:id="@+id/buttonAdd"
-        android:layout_width="@dimen/modal_button_width"
-        android:layout_height="@dimen/modal_button_height"
-        android:layout_marginEnd="@dimen/modal_main_margin_end"
-        android:layout_marginBottom="@dimen/modal_button_margin_bottom"
-        android:background="@drawable/rounded_button_add"
-        android:text="@string/add"
-        android:textAllCaps="false"
-        android:textColor="@color/white"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="@+id/buttonCancel" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/modal_edit_view.xml b/app/src/main/res/layout/modal_edit_view.xml
deleted file mode 100644
index 7ad84322cb..0000000000
--- a/app/src/main/res/layout/modal_edit_view.xml
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    tools:context=".ui.main.MainActivity">
-
-    <ImageView
-        android:id="@+id/imageView"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/modal_rect_margin_top"
-        android:contentDescription="@string/content_description_modal_icon"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:srcCompat="@drawable/sheet_top" />
-
-    <ImageView
-        android:id="@+id/iconBack"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:layout_marginTop="28dp"
-        android:contentDescription="@string/content_description_modal_icon"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:srcCompat="@drawable/ic_back" />
-
-    <View
-        android:id="@+id/divider1"
-        android:layout_width="0dp"
-        android:layout_height="1dp"
-        android:layout_marginStart="@dimen/modal_main_margin_start"
-        android:layout_marginTop="12dp"
-        android:layout_marginEnd="@dimen/modal_main_margin_end"
-        android:background="@color/divider"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/iconBack" />
-
-    <TextView
-        android:id="@+id/name"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/modal_main_margin_start"
-        android:layout_marginTop="14dp"
-        android:text="@string/modal_view_name"
-        android:textColor="#ACA996"
-        android:textSize="12sp"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/divider1"
-        tools:text="View name" />
-
-    <EditText
-        android:id="@+id/editName"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/modal_main_margin_start"
-        android:layout_marginTop="4dp"
-        android:layout_marginEnd="@dimen/modal_main_margin_end"
-        android:background="@null"
-        android:ems="10"
-        android:hint="@string/modal_tap_to_type"
-        android:importantForAutofill="no"
-        android:inputType="textPersonName"
-        android:textColor="@color/black"
-        android:textColorHint="#ACA996"
-        android:textSize="16sp"
-        android:textStyle="bold"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/name" />
-
-    <View
-        android:id="@+id/divider2"
-        android:layout_width="0dp"
-        android:layout_height="1dp"
-        android:layout_marginStart="@dimen/modal_main_margin_start"
-        android:layout_marginTop="10dp"
-        android:layout_marginEnd="@dimen/modal_main_margin_end"
-        android:background="@color/divider"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/editName" />
-
-    <include
-        android:id="@+id/item_duplicate"
-        layout="@layout/modal_item_duplicate"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/divider2" />
-
-    <View
-        android:id="@+id/divider3"
-        android:layout_width="0dp"
-        android:layout_height="1dp"
-        android:layout_marginStart="@dimen/modal_main_margin_start"
-        android:layout_marginEnd="@dimen/modal_main_margin_end"
-        android:background="@color/divider"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/item_duplicate" />
-
-    <include
-        android:id="@+id/item_delete"
-        layout="@layout/modal_item_delete"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/divider3" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/modal_properties.xml b/app/src/main/res/layout/modal_properties.xml
deleted file mode 100644
index 1b9b2f5b90..0000000000
--- a/app/src/main/res/layout/modal_properties.xml
+++ /dev/null
@@ -1,92 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical">
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-        <ImageView
-            android:id="@+id/imageView"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="@dimen/modal_rect_margin_top"
-            android:contentDescription="@string/content_description_modal_icon"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:srcCompat="@drawable/sheet_top" />
-
-        <TextView
-            android:id="@+id/title"
-            style="@style/ModalTitleStyle"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="18dp"
-            android:text="@string/modal_details"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/imageView" />
-
-        <View
-            android:id="@+id/divider1"
-            android:layout_width="0dp"
-            android:layout_height="1dp"
-            android:layout_marginStart="@dimen/modal_main_margin_start"
-            android:layout_marginTop="10dp"
-            android:layout_marginEnd="@dimen/modal_main_margin_end"
-            android:background="@color/divider"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/title" />
-
-        <TextView
-            android:id="@+id/reorder"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/modal_main_margin_end"
-            android:text="@string/modal_reorder"
-            android:textColor="#ACA996"
-            android:textSize="17sp"
-            app:layout_constraintBottom_toBottomOf="@+id/title"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="@+id/title" />
-
-        <TextView
-            android:id="@+id/reorderDone"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/modal_main_margin_end"
-            android:text="@string/modal_done"
-            android:textColor="#FFB522"
-            android:visibility="invisible"
-            android:textSize="17sp"
-            app:layout_constraintBottom_toBottomOf="@+id/title"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="@+id/title" />
-
-        <ImageView
-            android:id="@+id/iconBack"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
-            app:layout_constraintBottom_toBottomOf="@+id/title"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="@+id/title"
-            app:srcCompat="@drawable/ic_back" />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/recyclerProperties"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/modal_property_margin_start"
-        android:layout_marginEnd="@dimen/modal_property_margin_end"
-        android:layout_marginBottom="24dp" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/modal_properties_reorder.xml b/app/src/main/res/layout/modal_properties_reorder.xml
deleted file mode 100644
index 5c4def0be1..0000000000
--- a/app/src/main/res/layout/modal_properties_reorder.xml
+++ /dev/null
@@ -1,315 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-
-    <ImageView
-        android:id="@+id/imageView"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/modal_rect_margin_top"
-        android:contentDescription="@string/content_description_modal_icon"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:srcCompat="@drawable/sheet_top" />
-
-    <TextView
-        android:id="@+id/title"
-        style="@style/ModalTitleStyle"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="18dp"
-        android:text="@string/modal_properties"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/imageView" />
-
-    <View
-        android:id="@+id/divider1"
-        android:layout_width="0dp"
-        android:layout_height="1dp"
-        android:layout_marginStart="@dimen/modal_main_margin_start"
-        android:layout_marginTop="10dp"
-        android:layout_marginEnd="@dimen/modal_main_margin_end"
-        android:background="@color/divider"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/title" />
-
-    <ImageView
-        android:id="@+id/iconTitle"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/modal_main_margin_start"
-        android:layout_marginTop="@dimen/modal_item_divider_margin_top"
-        android:contentDescription="@string/content_description_modal_icon"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/divider1"
-        app:srcCompat="@drawable/ic_title" />
-
-    <TextView
-        android:id="@+id/propTitle"
-        style="@style/ModalRowTestStyle"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/modal_text_from_button_margin"
-        android:text="@string/detail_title"
-        app:layout_constraintBottom_toBottomOf="@+id/iconTitle"
-        app:layout_constraintStart_toEndOf="@+id/iconTitle"
-        app:layout_constraintTop_toTopOf="@+id/iconTitle" />
-
-    <ImageView
-        android:id="@+id/titleDnd"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="@dimen/modal_main_margin_end"
-        android:contentDescription="@string/content_description_modal_icon"
-        android:visibility="visible"
-        app:layout_constraintBottom_toBottomOf="@+id/propTitle"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="@+id/propTitle"
-        app:srcCompat="@drawable/ic_drag_and_drop" />
-
-    <View
-        android:id="@+id/divider2"
-        android:layout_width="0dp"
-        android:layout_height="1dp"
-        android:layout_marginStart="@dimen/modal_main_margin_start"
-        android:layout_marginTop="@dimen/modal_item_divider_margin_top"
-        android:layout_marginEnd="@dimen/modal_main_margin_end"
-        android:background="@color/divider"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/propTitle" />
-
-    <ImageView
-        android:id="@+id/iconText"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/modal_main_margin_start"
-        android:layout_marginTop="@dimen/modal_item_icon_margin_top"
-        android:contentDescription="@string/content_description_modal_icon"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/divider2"
-        app:srcCompat="@drawable/ic_text" />
-
-    <TextView
-        android:id="@+id/propText"
-        style="@style/ModalRowTestStyle"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/modal_text_from_button_margin"
-        android:text="@string/detail_text"
-        app:layout_constraintBottom_toBottomOf="@+id/iconText"
-        app:layout_constraintStart_toEndOf="@+id/iconText"
-        app:layout_constraintTop_toTopOf="@+id/iconText" />
-
-    <ImageView
-        android:id="@+id/textDnd"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="@dimen/modal_main_margin_end"
-        android:contentDescription="@string/content_description_modal_icon"
-        app:layout_constraintBottom_toBottomOf="@+id/propText"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="@+id/propText"
-        app:srcCompat="@drawable/ic_drag_and_drop" />
-
-    <View
-        android:id="@+id/divider3"
-        android:layout_width="0dp"
-        android:layout_height="1dp"
-        android:layout_marginStart="@dimen/modal_main_margin_start"
-        android:layout_marginTop="@dimen/modal_item_divider_margin_top"
-        android:layout_marginEnd="@dimen/modal_main_margin_end"
-        android:background="@color/divider"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/propText" />
-
-    <ImageView
-        android:id="@+id/iconSelect"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/modal_main_margin_start"
-        android:layout_marginTop="@dimen/modal_item_icon_margin_top"
-        android:contentDescription="@string/content_description_modal_icon"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/divider3"
-        app:srcCompat="@drawable/ic_select" />
-
-    <TextView
-        android:id="@+id/propSelect"
-        style="@style/ModalRowTestStyle"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/modal_text_from_button_margin"
-        android:text="@string/detail_select"
-        app:layout_constraintBottom_toBottomOf="@+id/iconSelect"
-        app:layout_constraintStart_toEndOf="@+id/iconSelect"
-        app:layout_constraintTop_toTopOf="@+id/iconSelect" />
-
-    <ImageView
-        android:id="@+id/selectDnd"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="@dimen/modal_main_margin_end"
-        android:contentDescription="@string/content_description_modal_icon"
-        app:layout_constraintBottom_toBottomOf="@+id/propSelect"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="@+id/propSelect"
-        app:srcCompat="@drawable/ic_drag_and_drop" />
-
-    <View
-        android:id="@+id/divider4"
-        android:layout_width="0dp"
-        android:layout_height="1dp"
-        android:layout_marginStart="@dimen/modal_main_margin_start"
-        android:layout_marginTop="@dimen/modal_item_divider_margin_top"
-        android:layout_marginEnd="@dimen/modal_main_margin_end"
-        android:background="@color/divider"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/propSelect" />
-
-    <ImageView
-        android:id="@+id/iconPerson"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/modal_main_margin_start"
-        android:layout_marginTop="@dimen/modal_item_icon_margin_top"
-        android:contentDescription="@string/content_description_modal_icon"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/divider4"
-        app:srcCompat="@drawable/ic_person" />
-
-    <TextView
-        android:id="@+id/propPerson"
-        style="@style/ModalRowTestStyle"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/modal_text_from_button_margin"
-        android:text="@string/detail_person"
-        app:layout_constraintBottom_toBottomOf="@+id/iconPerson"
-        app:layout_constraintStart_toEndOf="@+id/iconPerson"
-        app:layout_constraintTop_toTopOf="@+id/iconPerson" />
-
-    <ImageView
-        android:id="@+id/personDnd"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="@dimen/modal_main_margin_end"
-        android:contentDescription="@string/content_description_modal_icon"
-        app:layout_constraintBottom_toBottomOf="@+id/propPerson"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="@+id/propPerson"
-        app:srcCompat="@drawable/ic_drag_and_drop" />
-
-    <View
-        android:id="@+id/divider5"
-        android:layout_width="0dp"
-        android:layout_height="1dp"
-        android:layout_marginStart="@dimen/modal_main_margin_start"
-        android:layout_marginTop="@dimen/modal_item_divider_margin_top"
-        android:layout_marginEnd="@dimen/modal_main_margin_end"
-        android:background="@color/divider"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/propPerson" />
-
-    <ImageView
-        android:id="@+id/iconEmail"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/modal_main_margin_start"
-        android:layout_marginTop="@dimen/modal_item_icon_margin_top"
-        android:contentDescription="@string/content_description_modal_icon"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/divider5"
-        app:srcCompat="@drawable/ic_email" />
-
-    <TextView
-        android:id="@+id/propEmail"
-        style="@style/ModalRowTestStyle"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/modal_text_from_button_margin"
-        android:text="@string/detail_email"
-        app:layout_constraintBottom_toBottomOf="@+id/iconEmail"
-        app:layout_constraintStart_toEndOf="@+id/iconEmail"
-        app:layout_constraintTop_toTopOf="@+id/iconEmail" />
-
-    <View
-        android:id="@+id/divider6"
-        android:layout_width="0dp"
-        android:layout_height="1dp"
-        android:layout_marginStart="@dimen/modal_main_margin_start"
-        android:layout_marginTop="@dimen/modal_item_divider_margin_top"
-        android:layout_marginEnd="@dimen/modal_main_margin_end"
-        android:background="@color/divider"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/propEmail" />
-
-    <ImageView
-        android:id="@+id/emailDnd"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="@dimen/modal_main_margin_end"
-        android:contentDescription="@string/content_description_modal_icon"
-        app:layout_constraintBottom_toBottomOf="@+id/propEmail"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="@+id/propEmail"
-        app:srcCompat="@drawable/ic_drag_and_drop" />
-
-    <ImageView
-        android:id="@+id/iconPlus"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="24dp"
-        android:layout_marginTop="16dp"
-        android:layout_marginBottom="30dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/divider6"
-        app:srcCompat="@drawable/ic_plus" />
-
-    <TextView
-        android:id="@+id/addNew"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="8dp"
-        android:text="@string/add_new"
-        android:textColor="#ACA996"
-        android:textSize="15sp"
-        app:layout_constraintBottom_toBottomOf="@+id/iconPlus"
-        app:layout_constraintStart_toEndOf="@+id/iconPlus"
-        app:layout_constraintTop_toTopOf="@+id/iconPlus" />
-
-    <TextView
-        android:id="@+id/done"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="@dimen/modal_main_margin_end"
-        android:text="@string/modal_done"
-        android:textColor="#ACA996"
-        android:textSize="17sp"
-        android:textStyle="bold"
-        app:layout_constraintBottom_toBottomOf="@+id/title"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="@+id/title" />
-
-    <ImageView
-        android:id="@+id/iconBack"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        app:layout_constraintBottom_toTopOf="@+id/divider1"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="@+id/title"
-        app:srcCompat="@drawable/ic_back" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/modal_switch_view.xml b/app/src/main/res/layout/modal_switch_view.xml
deleted file mode 100644
index 5179c34eac..0000000000
--- a/app/src/main/res/layout/modal_switch_view.xml
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    xmlns:tools="http://schemas.android.com/tools">
-
-    <ImageView
-        android:id="@+id/imageView"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/modal_rect_margin_top"
-        android:contentDescription="@string/content_description_modal_icon"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:srcCompat="@drawable/sheet_top" />
-
-    <TextView
-        android:id="@+id/title"
-        style="@style/ModalTitleStyle"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="18dp"
-        android:text="@string/modal_view"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/imageView" />
-
-    <View
-        android:id="@+id/divider1"
-        android:layout_width="0dp"
-        android:layout_height="1dp"
-        android:layout_marginStart="@dimen/modal_main_margin_start"
-        android:layout_marginTop="10dp"
-        android:layout_marginEnd="@dimen/modal_main_margin_end"
-        android:background="@color/divider"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/title" />
-
-    <include
-        android:id="@+id/item_gallery"
-        layout="@layout/modal_item_gallery"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/divider1" />
-
-    <View
-        android:id="@+id/divider2"
-        android:layout_width="0dp"
-        android:layout_height="1dp"
-        android:layout_marginStart="@dimen/modal_main_margin_start"
-        android:layout_marginEnd="@dimen/modal_main_margin_end"
-        android:background="@color/divider"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/item_gallery" />
-
-    <include
-        android:id="@+id/item_kanban"
-        layout="@layout/modal_item_kanban"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/divider2" />
-
-    <View
-        android:id="@+id/divider3"
-        android:layout_width="0dp"
-        android:layout_height="1dp"
-        android:layout_marginStart="@dimen/modal_main_margin_start"
-        android:layout_marginEnd="@dimen/modal_main_margin_end"
-        android:background="@color/divider"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/item_kanban" />
-
-    <include
-        android:id="@+id/item_table"
-        layout="@layout/modal_item_table"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/divider3" />
-
-    <View
-        android:id="@+id/divider4"
-        android:layout_width="0dp"
-        android:layout_height="1dp"
-        android:layout_marginStart="@dimen/modal_main_margin_start"
-        android:layout_marginEnd="@dimen/modal_main_margin_end"
-        android:background="@color/divider"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/item_table" />
-
-    <include
-        android:id="@+id/item_list"
-        layout="@layout/modal_item_list"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/divider4" />
-
-    <ImageView
-        android:id="@+id/iconBack"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        app:layout_constraintBottom_toBottomOf="@+id/title"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="@+id/title"
-        app:srcCompat="@drawable/ic_back" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/modals_properties_edit.xml b/app/src/main/res/layout/modals_properties_edit.xml
deleted file mode 100644
index 09e77ca58f..0000000000
--- a/app/src/main/res/layout/modals_properties_edit.xml
+++ /dev/null
@@ -1,291 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-
-    <ImageView
-        android:id="@+id/imageView"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/modal_rect_margin_top"
-        android:contentDescription="@string/content_description_modal_icon"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:srcCompat="@drawable/sheet_top" />
-
-    <TextView
-        android:id="@+id/title"
-        style="@style/ModalTitleStyle"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="18dp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/imageView" />
-
-    <ImageView
-        android:id="@+id/iconBack"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:contentDescription="@string/content_description_modal_icon"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="@+id/title"
-        app:srcCompat="@drawable/ic_back" />
-
-    <View
-        android:id="@+id/divider1"
-        android:layout_width="0dp"
-        android:layout_height="1dp"
-        android:layout_marginStart="@dimen/modal_main_margin_start"
-        android:layout_marginTop="14dp"
-        android:layout_marginEnd="@dimen/modal_main_margin_end"
-        android:background="@color/divider"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.0"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/iconBack" />
-
-    <TextView
-        android:id="@+id/propNameTitle"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/modal_main_margin_start"
-        android:layout_marginTop="14dp"
-        android:text="@string/modal_detail_name"
-        android:textColor="#ACA996"
-        android:textSize="13sp"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/divider1" />
-
-    <TextView
-        android:id="@+id/propName"
-        style="@style/ModalTitleStyle"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/modal_main_margin_start"
-        android:layout_marginTop="3dp"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/propNameTitle"
-        tools:text="Description" />
-
-    <View
-        android:id="@+id/divider2"
-        android:layout_width="0dp"
-        android:layout_height="1dp"
-        android:layout_marginStart="@dimen/modal_main_margin_start"
-        android:layout_marginTop="10dp"
-        android:layout_marginEnd="@dimen/modal_main_margin_end"
-        android:background="@color/divider"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.0"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/propName" />
-
-    <TextView
-        android:id="@+id/propTypeTitle"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/modal_main_margin_start"
-        android:layout_marginTop="14dp"
-        android:text="@string/modal_detail_type"
-        android:textColor="#ACA996"
-        android:textSize="13sp"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/divider2" />
-
-    <ImageView
-        android:id="@+id/iconPropType"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:layout_marginTop="2dp"
-        android:contentDescription="@string/content_description_modal_icon"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/propTypeTitle"
-        app:srcCompat="@drawable/ic_text" />
-
-    <TextView
-        android:id="@+id/propType"
-        style="@style/ModalRowTestStyle"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="4dp"
-        app:layout_constraintBottom_toBottomOf="@+id/iconPropType"
-        app:layout_constraintStart_toEndOf="@+id/iconPropType"
-        app:layout_constraintTop_toTopOf="@+id/iconPropType"
-        tools:text="Text" />
-
-    <ImageView
-        android:id="@+id/iconForward"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="16dp"
-        android:contentDescription="@string/content_description_modal_icon"
-        app:layout_constraintBottom_toBottomOf="@+id/propType"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="@+id/propType"
-        app:srcCompat="@drawable/ic_arrow_forward_legacy" />
-
-    <View
-        android:id="@+id/divider3"
-        android:layout_width="0dp"
-        android:layout_height="1dp"
-        android:layout_marginStart="@dimen/modal_main_margin_start"
-        android:layout_marginTop="@dimen/modal_item_divider_margin_top"
-        android:layout_marginEnd="@dimen/modal_main_margin_end"
-        android:background="@color/divider"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.0"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/propType" />
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/hideContainer"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="16dp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/divider3">
-
-        <TextView
-            android:id="@+id/hide"
-            style="@style/ModalRowTestStyle"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/modal_main_margin_start"
-            android:layout_marginTop="12dp"
-            android:layout_marginBottom="12dp"
-            android:text="@string/modal_hide"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <ImageView
-            android:id="@+id/iconHide"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/modal_main_margin_end"
-            android:contentDescription="@string/content_description_modal_icon"
-            android:visibility="invisible"
-            app:layout_constraintBottom_toBottomOf="@+id/hide"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="@+id/hide"
-            app:srcCompat="@drawable/ic_hide_black" />
-
-        <ImageView
-            android:id="@+id/iconShow"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/modal_main_margin_end"
-            android:contentDescription="@string/content_description_modal_icon"
-            android:visibility="invisible"
-            app:layout_constraintBottom_toBottomOf="@+id/hide"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="@+id/hide"
-            app:srcCompat="@drawable/ic_show" />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-    <View
-        android:id="@+id/divider4"
-        android:layout_width="0dp"
-        android:layout_height="1dp"
-        android:layout_marginStart="@dimen/modal_main_margin_start"
-        android:layout_marginEnd="@dimen/modal_main_margin_end"
-        android:background="@color/divider"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.0"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/hideContainer" />
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/duplicateContainer"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/divider4">
-
-        <TextView
-            android:id="@+id/duplicate"
-            style="@style/ModalRowTestStyle"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/modal_main_margin_start"
-            android:layout_marginTop="@dimen/modal_item_divider_margin_top"
-            android:layout_marginBottom="12dp"
-            android:text="@string/duplicate"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <ImageView
-            android:id="@+id/iconDuplicate"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/modal_main_margin_end"
-            android:contentDescription="@string/content_description_modal_icon"
-            app:layout_constraintBottom_toBottomOf="@+id/duplicate"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="@+id/duplicate"
-            app:srcCompat="@drawable/ic_duplicate" />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-    <View
-        android:id="@+id/divider5"
-        android:layout_width="0dp"
-        android:layout_height="1dp"
-        android:layout_marginStart="@dimen/modal_main_margin_start"
-        android:layout_marginEnd="@dimen/modal_main_margin_end"
-        android:background="@color/divider"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.0"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/duplicateContainer" />
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/deleteContainer"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="16dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.0"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/divider5"
-        app:layout_constraintVertical_bias="0.0">
-
-        <TextView
-            android:id="@+id/delete"
-            style="@style/ModalRowTestStyle"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="@dimen/modal_main_margin_start"
-            android:layout_marginTop="12dp"
-            android:layout_marginBottom="12dp"
-            android:text="@string/toolbar_action_delete"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <ImageView
-            android:id="@+id/iconDelete"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="@dimen/modal_main_margin_end"
-            android:contentDescription="@string/content_description_modal_icon"
-            app:layout_constraintBottom_toBottomOf="@+id/delete"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toTopOf="@+id/delete"
-            app:srcCompat="@drawable/ic_delete" />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/snackbar_actionable.xml b/app/src/main/res/layout/snackbar_actionable.xml
index 265c8c34cb..da10f5bed4 100644
--- a/app/src/main/res/layout/snackbar_actionable.xml
+++ b/app/src/main/res/layout/snackbar_actionable.xml
@@ -9,7 +9,7 @@
 
     <TextView
         android:id="@+id/snackbar_text"
-        style="@style/SnackbarTextStyle"
+        style="@style/TextView.UXStyle.Captions.1.Regular"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="77dp"
@@ -43,7 +43,7 @@
 
     <TextView
         android:id="@+id/snackbar_action"
-        style="@style/SnackbarTextStyle"
+        style="@style/TextView.UXStyle.Captions.1.Regular"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="4dp"
diff --git a/app/src/main/res/layout/snackbar_message.xml b/app/src/main/res/layout/snackbar_message.xml
index e635688094..cf873a95e0 100644
--- a/app/src/main/res/layout/snackbar_message.xml
+++ b/app/src/main/res/layout/snackbar_message.xml
@@ -9,7 +9,7 @@
 
         <TextView
             android:id="@+id/snackbar_text"
-            style="@style/SnackbarTextStyle"
+            style="@style/TextView.UXStyle.Captions.1.Regular"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="97dp"
diff --git a/app/src/main/res/layout/toolbar_text.xml b/app/src/main/res/layout/toolbar_text.xml
deleted file mode 100644
index d7d3946792..0000000000
--- a/app/src/main/res/layout/toolbar_text.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:background="@android:color/darker_gray"
-    android:clickable="true"
-    android:focusable="true"
-    android:layout_height="56dp">
-
-    <TextView
-        android:id="@+id/btnBold"
-        android:layout_width="wrap_content"
-        android:layout_height="0dp"
-        android:layout_marginTop="8dp"
-        android:layout_marginBottom="8dp"
-        android:background="@color/gray_background"
-        android:gravity="center"
-        android:paddingStart="16dp"
-        android:paddingEnd="16dp"
-        android:text="Bold"
-        android:textStyle="bold"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@+id/btnItalic"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintHorizontal_chainStyle="spread"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <TextView
-        android:id="@+id/btnItalic"
-        android:layout_width="wrap_content"
-        android:layout_height="0dp"
-        android:layout_marginTop="8dp"
-        android:layout_marginBottom="8dp"
-        android:background="@color/gray_background"
-        android:gravity="center"
-        android:paddingStart="16dp"
-        android:paddingEnd="16dp"
-        android:text="Italic"
-        android:textStyle="italic"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@+id/btnStrike"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toEndOf="@+id/btnBold"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <TextView
-        android:id="@+id/btnStrike"
-        android:layout_width="wrap_content"
-        android:layout_height="0dp"
-        android:layout_marginTop="8dp"
-        android:layout_marginBottom="8dp"
-        android:background="@color/gray_background"
-        android:gravity="center"
-        android:paddingStart="16dp"
-        android:paddingEnd="16dp"
-        android:text="Strikethrough"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.5"
-        app:layout_constraintStart_toEndOf="@+id/btnItalic"
-        app:layout_constraintTop_toTopOf="parent" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/view_object_not_exist.xml b/app/src/main/res/layout/view_object_not_exist.xml
index f2a06391b1..ab09afead8 100644
--- a/app/src/main/res/layout/view_object_not_exist.xml
+++ b/app/src/main/res/layout/view_object_not_exist.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--typography, buttons 05.04-->
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
@@ -6,12 +7,10 @@
 
     <TextView
         android:id="@+id/tvObjectNotExist"
+        style="@style/TextView.ContentStyle.Headline.Heading"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:fontFamily="@font/inter_bold"
         android:text="@string/object_not_exist"
-        android:textColor="@color/black"
-        android:textSize="22sp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -27,20 +26,12 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent" />
 
-    <TextView
+    <com.anytypeio.anytype.core_ui.views.ButtonSecondarySmall
         android:id="@+id/btnToDashboard"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="27dp"
-        android:background="@drawable/bg_back_to_dashboard"
-        android:fontFamily="@font/inter_regular"
-        android:paddingStart="@dimen/dp_16"
-        android:paddingTop="@dimen/dp_10"
-        android:paddingEnd="@dimen/dp_16"
-        android:paddingBottom="@dimen/dp_10"
-        android:text="@string/back_to_dashboard"
-        android:textColor="@color/black"
-        android:textSize="17sp"
+        android:text="@string/go_back"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/tvObjectNotExist" />
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index a52d0c579b..07b9b67a1a 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -2,10 +2,6 @@
 <resources>
     <color name="defaultCanvasColor">#FFFFFF</color>
 
-    <color name="colorPrimary">#FF5722</color>
-    <color name="colorPrimaryDark">#000000</color>
-    <color name="colorAccent">#3F51B5</color>
-
     <color name="gray_background">#6a6962</color>
     <color name="button_active">#FFBB2C</color>
     <color name="button_not_active">#ACA996</color>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 6e86e2ed67..ad30b05fe6 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,4 +1,4 @@
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
 
     <string name="amplitude_api_key">1ba981d1a9afb8af8c81847ef3383a20</string>
     <string name="amplitude_api_key_debug">b9791dd64a1e9f07a330a4ac9feb1f10</string>
@@ -243,6 +243,7 @@ Do the computation of an expensive paragraph of text on a background thread:
     <string name="shared">Shared</string>
     <string name="object_not_exist">This object doesn\'t exist</string>
     <string name="back_to_dashboard">Back to dashboard</string>
+    <string name="go_back">Go back</string>
 
     <string name="snack_object_set_not_found">Set not found for this type.</string>
     <string name="create_new_set">Create</string>
@@ -340,5 +341,6 @@ Do the computation of an expensive paragraph of text on a background thread:
     <string name="empty_list_widget">This view has no objects.\nTry to create a new one.</string>
     <string name="empty_list_widget_no_view">This data view has no objects.\nTry to create a new one.</string>
     <string name="this_widget_has_no_object">This widget has no objects.\nTry to create a new one.</string>
+    <string name="emoji">Emoji</string>
 
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 4fb86edd57..30534b3a95 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,31 +1,5 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.MaterialComponents.DayNight.NoActionBar">
-        <!-- Customize your theme here. -->
-        <item name="android:windowActionBar">false</item>
-        <item name="android:windowNoTitle">true</item>
-        <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
-        <item name="android:statusBarColor">@color/colorPrimaryDark</item>
-        <item name="colorAccent">@color/orange</item>
-        <item name="bottomSheetDialogTheme">@style/AppBottomSheetDialogTheme</item>
-        <item name="searchViewStyle">@style/SearchViewStyle</item>
-    </style>
-
-    <style name="AppBottomSheetDialogTheme" parent="Theme.Design.Light.BottomSheetDialog">
-        <item name="bottomSheetStyle">@style/AppModalStyle</item>
-        <item name="android:windowIsFloating">false</item>
-        <item name="android:background">@android:color/transparent</item>
-        <item name="android:statusBarColor">@android:color/transparent</item>
-        <item name="android:windowSoftInputMode">adjustResize</item>
-        <item name="colorAccent">@color/orange</item>
-    </style>
-
-    <style name="AppModalStyle" parent="Widget.Design.BottomSheet.Modal">
-        <item name="android:background">@drawable/rounded_dialog</item>
-    </style>
-
     <style name="AuthHeaderStyle">
         <item name="android:fontFamily">@font/inter_bold</item>
         <item name="android:textColor">@color/text_primary</item>
@@ -226,19 +200,16 @@
         <item name="android:textSize">17sp</item>
     </style>
 
-    <style name="dataViewTextErrorStyle">
+    <style name="dataViewTextErrorStyle" parent="TextView.UXStyle.Captions.2.Regular">
         <item name="android:padding">32dp</item>
         <item name="android:textAlignment">center</item>
-        <item name="android:fontFamily">monospace</item>
-        <item name="android:textColor">@color/palette_dark_grey</item>
-        <item name="android:textSize">12sp</item>
+        <item name="android:textColor">@color/text_tertiary</item>
     </style>
 
-    <style name="dataViewUnsupportedViewErrorStyle">
+    <style name="dataViewUnsupportedViewErrorStyle" parent="TextView.UXStyle.Captions.2.Regular">
         <item name="android:padding">32dp</item>
         <item name="android:textAlignment">center</item>
-        <item name="android:textColor">@color/palette_dark_grey</item>
-        <item name="android:textSize">14sp</item>
+        <item name="android:textColor">@color/text_tertiary</item>
     </style>
 
     <style name="DefaultTextViewErrorStyle">
diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/ButtonPrimaryNumber.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/ButtonPrimaryNumber.kt
new file mode 100644
index 0000000000..b24708a1d9
--- /dev/null
+++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/ButtonPrimaryNumber.kt
@@ -0,0 +1,38 @@
+package com.anytypeio.anytype.core_ui.widgets
+
+import android.content.Context
+import android.util.AttributeSet
+import android.view.LayoutInflater
+import android.widget.FrameLayout
+import com.anytypeio.anytype.core_ui.R
+import com.anytypeio.anytype.core_ui.databinding.DsButtonNumberBinding
+import com.anytypeio.anytype.core_utils.ext.invisible
+import com.anytypeio.anytype.core_utils.ext.visible
+
+class ButtonPrimaryNumber @JvmOverloads constructor(
+    context: Context,
+    attrs: AttributeSet? = null,
+    defStyleAttr: Int = 0
+) : FrameLayout(context, attrs, defStyleAttr) {
+
+    val binding = DsButtonNumberBinding.inflate(LayoutInflater.from(context), this)
+
+    init {
+        context.obtainStyledAttributes(attrs, R.styleable.ButtonPrimaryNumber).use {
+            val text = it.getString(R.styleable.ButtonPrimaryNumber_buttonTitle)
+            binding.button.text = text
+        }
+    }
+
+    fun setNumber(num: String) {
+        binding.tvNumber.text = num
+    }
+
+    fun hideNumber() {
+        binding.tvNumber.invisible()
+    }
+
+    fun showNumber() {
+        binding.tvNumber.visible()
+    }
+}
\ No newline at end of file
diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/NumberButton.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/NumberButton.kt
deleted file mode 100644
index 786a2a09e1..0000000000
--- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/NumberButton.kt
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.anytypeio.anytype.core_ui.widgets
-
-import android.content.Context
-import android.util.AttributeSet
-import android.view.LayoutInflater
-import android.widget.FrameLayout
-import com.anytypeio.anytype.core_ui.databinding.DsButtonNumberBinding
-
-class NumberButton @JvmOverloads constructor(
-    context: Context,
-    attrs: AttributeSet? = null,
-    defStyleAttr: Int = 0
-) : FrameLayout(context, attrs, defStyleAttr) {
-
-    val binding = DsButtonNumberBinding.inflate(LayoutInflater.from(context), this)
-}
\ No newline at end of file
diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/text/StatusWidget.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/text/StatusWidget.kt
index 70baa263e8..5280dc2438 100644
--- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/text/StatusWidget.kt
+++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/text/StatusWidget.kt
@@ -13,6 +13,10 @@ class StatusWidget @JvmOverloads constructor(
     defStyleAttr: Int = 0
 ) : AppCompatTextView(context, attrs, defStyleAttr) {
 
+    init {
+        setTextAppearance(R.style.TextView_ContentStyle_Relations_1)
+    }
+
     fun setColor(color: String?) {
         val defaultTextColor = context.getColor(R.color.text_primary)
         val themeColor = ThemeColor.values().find { it.code == color } ?: ThemeColor.DEFAULT
diff --git a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/text/TagWidget.kt b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/text/TagWidget.kt
index cb3f57c542..f5ecc614fd 100644
--- a/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/text/TagWidget.kt
+++ b/core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/text/TagWidget.kt
@@ -22,6 +22,7 @@ class TagWidget @JvmOverloads constructor(
         val lr = context.dimen(R.dimen.dv_tag_left_right_padding).toInt()
         setPadding(lr, 0, lr, 0)
         setBackgroundResource(R.drawable.rect_dv_cell_tag_item)
+        setTextAppearance(R.style.TextView_ContentStyle_Relations_1)
         maxLines = 1
         isSingleLine = true
         ellipsize = TextUtils.TruncateAt.END
diff --git a/core-ui/src/main/res/layout/ds_button_number.xml b/core-ui/src/main/res/layout/ds_button_number.xml
index 64faa3aedb..1be7793e35 100644
--- a/core-ui/src/main/res/layout/ds_button_number.xml
+++ b/core-ui/src/main/res/layout/ds_button_number.xml
@@ -4,11 +4,10 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:clickable="true"
-    tools:context="com.anytypeio.anytype.core_ui.widgets.NumberButton">
+    tools:context="com.anytypeio.anytype.core_ui.widgets.ButtonPrimaryNumber">
 
     <com.anytypeio.anytype.core_ui.views.ButtonPrimaryLarge
         android:id="@+id/button"
-        style="?attr/primaryLargeNumberButtonStyle"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:clickable="false"
diff --git a/core-ui/src/main/res/values-night/colors.xml b/core-ui/src/main/res/values-night/colors.xml
index 5fa7b6b21d..26d3442ff1 100644
--- a/core-ui/src/main/res/values-night/colors.xml
+++ b/core-ui/src/main/res/values-night/colors.xml
@@ -87,4 +87,8 @@
     <color name="library_action_btn_text_color">#000000</color>
     <color name="set_new_btn_text">#000000</color>
 
+    <color name="colorPrimary">#FF5722</color>
+    <color name="colorPrimaryDark">#000000</color>
+    <color name="colorAccent">#3F51B5</color>
+
 </resources>
diff --git a/core-ui/src/main/res/values/colors.xml b/core-ui/src/main/res/values/colors.xml
index e45393c498..08c702814c 100644
--- a/core-ui/src/main/res/values/colors.xml
+++ b/core-ui/src/main/res/values/colors.xml
@@ -211,4 +211,8 @@
     <color name="home_screen_button">#662C2B27</color>
     <color name="set_new_btn_text">#FFFFFF</color>
 
+    <color name="colorPrimary">#FF5722</color>
+    <color name="colorPrimaryDark">#000000</color>
+    <color name="colorAccent">#3F51B5</color>
+
 </resources>
diff --git a/core-ui/src/main/res/values/design_system.xml b/core-ui/src/main/res/values/design_system.xml
index c4d30050be..2ab1075afb 100644
--- a/core-ui/src/main/res/values/design_system.xml
+++ b/core-ui/src/main/res/values/design_system.xml
@@ -406,4 +406,8 @@
     <attr name="warningSmallButtonStyle" format="reference" />
     <attr name="warningMediumButtonStyle" format="reference" />
     <attr name="warningLargeButtonStyle" format="reference" />
+
+    <declare-styleable name="ButtonPrimaryNumber">
+        <attr name="buttonTitle" format="string" />
+    </declare-styleable>
 </resources>
\ No newline at end of file
diff --git a/core-ui/src/main/res/values/strings.xml b/core-ui/src/main/res/values/strings.xml
index 95d55381ac..c336c900a8 100644
--- a/core-ui/src/main/res/values/strings.xml
+++ b/core-ui/src/main/res/values/strings.xml
@@ -628,5 +628,8 @@
     <string name="collection_widget_description">Your collections of objects</string>
     <string name="no_type_named">There is no type named \"%1$s\"</string>
     <string name="try_to_create_new_one_or_search_for_something_else">Try to create a new one or search for something else</string>
+    <string name="change_wallpaper">Change wallpaper</string>
+    <string name="change_icon">Change icon</string>
+    <string name="random">Random</string>
 
 </resources>
diff --git a/core-ui/src/main/res/values/styles.xml b/core-ui/src/main/res/values/styles.xml
index f5a1966b86..38ab64c366 100644
--- a/core-ui/src/main/res/values/styles.xml
+++ b/core-ui/src/main/res/values/styles.xml
@@ -1,6 +1,52 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
+    <!-- Base application theme. -->
+    <style name="AppTheme" parent="Theme.MaterialComponents.DayNight.NoActionBar">
+        <!-- Customize your theme here. -->
+        <item name="android:windowActionBar">false</item>
+        <item name="android:windowNoTitle">true</item>
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="android:statusBarColor">@color/colorPrimaryDark</item>
+        <item name="colorAccent">@color/orange</item>
+        <item name="bottomSheetDialogTheme">@style/AppBottomSheetDialogTheme</item>
+        <item name="searchViewStyle">@style/SearchViewStyle</item>
+
+        <item name="primaryXSmallButtonStyle">@style/Button.Primary.XSmall</item>
+        <item name="primarySmallButtonStyle">@style/Button.Primary.Small</item>
+        <item name="primaryMediumButtonStyle">@style/Button.Primary.Medium</item>
+        <item name="primaryLargeButtonStyle">@style/Button.Primary.Large</item>
+        <item name="primaryLargeNumberButtonStyle">@style/Button.Primary.Large</item>
+
+        <item name="secondaryXSmallButtonStyle">@style/Button.Secondary.XSmall</item>
+        <item name="secondarySmallButtonStyle">@style/Button.Secondary.Small</item>
+        <item name="secondaryMediumButtonStyle">@style/Button.Secondary.Medium</item>
+        <item name="secondaryLargeButtonStyle">@style/Button.Secondary.Large</item>
+
+        <item name="warningXSmallButtonStyle">@style/Button.Warning.XSmall</item>
+        <item name="warningSmallButtonStyle">@style/Button.Warning.Small</item>
+        <item name="warningMediumButtonStyle">@style/Button.Warning.Medium</item>
+        <item name="warningLargeButtonStyle">@style/Button.Warning.Large</item>
+    </style>
+
+    <style name="AppBottomSheetDialogTheme" parent="Theme.Design.Light.BottomSheetDialog">
+        <item name="bottomSheetStyle">@style/AppModalStyle</item>
+        <item name="android:windowIsFloating">false</item>
+        <item name="android:background">@android:color/transparent</item>
+        <item name="android:statusBarColor">@android:color/transparent</item>
+        <item name="android:windowSoftInputMode">adjustResize</item>
+        <item name="colorAccent">@color/orange</item>
+    </style>
+
+    <style name="AppModalStyle" parent="Widget.Design.BottomSheet.Modal">
+        <item name="android:background">@drawable/rounded_dialog</item>
+    </style>
+
+    <style name="SearchViewStyle" parent="Widget.AppCompat.SearchView">
+        <item name="android:textColorHint">@color/glyph_active</item>
+    </style>
+
     <style name="DefaultDocumentContainerStyle">
         <item name="android:layout_marginTop">@dimen/default_document_item_margin_top</item>
         <item name="android:layout_marginBottom">@dimen/default_document_item_margin_bottom</item>
@@ -729,28 +775,22 @@
         <item name="android:fontFamily">@font/inter_semibold</item>
     </style>
 
-    <style name="SyncStatusTextStyle">
+    <style name="SyncStatusTextStyle" >
         <item name="android:textSize">13sp</item>
         <item name="android:fontFamily">@font/inter_regular</item>
         <item name="android:textColor">@color/text_secondary</item>
     </style>
 
-    <style name="ObjectSetHeaderTitleStyle" parent="BlockTitleContentStyle">
+    <style name="ObjectSetHeaderTitleStyle" parent="TextView.ContentStyle.Headline.Title">
         <item name="android:background">@null</item>
-        <item name="android:fontFamily">@font/inter_bold</item>
         <item name="android:imeOptions">actionDone</item>
         <item name="android:inputType">text</item>
         <item name="android:maxLines">1</item>
         <item name="android:singleLine">true</item>
-        <item name="android:textColor">@color/text_primary</item>
         <item name="android:textColorHint">@color/text_tertiary</item>
-        <item name="android:textSize">32sp</item>
     </style>
 
-    <style name="ObjectSetToolbarTitleStyle">
-        <item name="android:textSize">15sp</item>
-        <item name="android:fontFamily">@font/inter_medium</item>
-        <item name="android:textColor">@color/text_primary</item>
+    <style name="ObjectSetToolbarTitleStyle" parent="TextView.ContentStyle.PreviewTitles.2.Regular">
         <item name="android:ellipsize">end</item>
         <item name="android:gravity">center_vertical</item>
         <item name="android:maxLines">1</item>
@@ -766,10 +806,7 @@
         <item name="cornerRadius">6dp</item>
     </style>
 
-    <style name="ViewerTitleStyle">
-        <item name="android:textSize">17sp</item>
-        <item name="android:fontFamily">@font/inter_bold</item>
-        <item name="android:textColor">@color/selector_viewer_header</item>
+    <style name="ViewerTitleStyle" parent="TextView.ContentStyle.Headline.Subheading">
         <item name="android:ellipsize">end</item>
         <item name="android:gravity">center_vertical</item>
         <item name="android:maxLines">1</item>
diff --git a/sample/src/main/res/layout/fragment_buttons.xml b/sample/src/main/res/layout/fragment_buttons.xml
index b29f33f6da..ef7bf5909c 100644
--- a/sample/src/main/res/layout/fragment_buttons.xml
+++ b/sample/src/main/res/layout/fragment_buttons.xml
@@ -144,7 +144,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/button19" />
 
-    <com.anytypeio.anytype.core_ui.widgets.NumberButton
+    <com.anytypeio.anytype.core_ui.widgets.ButtonPrimaryNumber
         android:id="@+id/btnLargeWithNumber"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"