diff --git a/app/src/debug/res/drawable/ic_launcher_background.xml b/app/src/debug/res/drawable/ic_launcher_background.xml
index 8a8b426024..8f025e7998 100644
--- a/app/src/debug/res/drawable/ic_launcher_background.xml
+++ b/app/src/debug/res/drawable/ic_launcher_background.xml
@@ -8,7 +8,7 @@
       android:scaleY="1.01"
       android:translateX="-0.54"
       android:translateY="-0.54">
-      <path android:fillColor="#FFFFFF"
+      <path android:fillColor="@color/white"
             android:pathData="M0,0h108v108h-108z"/>
   </group>
 </vector>
diff --git a/app/src/main/java/com/anytypeio/anytype/ui/splash/SplashFragment.kt b/app/src/main/java/com/anytypeio/anytype/ui/splash/SplashFragment.kt
index 757a1d1eb6..f0bf589000 100644
--- a/app/src/main/java/com/anytypeio/anytype/ui/splash/SplashFragment.kt
+++ b/app/src/main/java/com/anytypeio/anytype/ui/splash/SplashFragment.kt
@@ -21,7 +21,6 @@ import com.anytypeio.anytype.core_utils.ui.BaseFragment
 import com.anytypeio.anytype.core_utils.ui.ViewState
 import com.anytypeio.anytype.databinding.FragmentSplashBinding
 import com.anytypeio.anytype.di.common.componentManager
-import com.anytypeio.anytype.di.feature.discussions.DiscussionFragment
 import com.anytypeio.anytype.other.DefaultDeepLinkResolver
 import com.anytypeio.anytype.presentation.splash.SplashViewModel
 import com.anytypeio.anytype.presentation.splash.SplashViewModelFactory
diff --git a/app/src/main/res/anim/action_bar_enter.xml b/app/src/main/res/anim/action_bar_enter.xml
deleted file mode 100644
index 9aa55a1d53..0000000000
--- a/app/src/main/res/anim/action_bar_enter.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shareInterpolator="false" >
-    <alpha android:fromAlpha="0.0"
-        android:toAlpha="1.0"
-        android:duration="300"
-        android:interpolator="@android:anim/accelerate_interpolator" />
-</set>
\ No newline at end of file
diff --git a/app/src/main/res/anim/action_bar_exit.xml b/app/src/main/res/anim/action_bar_exit.xml
deleted file mode 100644
index c86166cf48..0000000000
--- a/app/src/main/res/anim/action_bar_exit.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shareInterpolator="false" >
-    <alpha android:fromAlpha="1.0" android:toAlpha="0.0"
-        android:interpolator="@android:anim/decelerate_interpolator"
-        android:duration="150"/>
-</set>
\ No newline at end of file
diff --git a/app/src/main/res/anim/enter_from_right.xml b/app/src/main/res/anim/enter_from_right.xml
deleted file mode 100644
index c62efe8750..0000000000
--- a/app/src/main/res/anim/enter_from_right.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<set xmlns:android="http://schemas.android.com/apk/res/android">
-    <translate
-        android:fromXDelta="100%"
-        android:toXDelta="0%"
-        android:duration="200" />
-    <alpha
-        android:fromAlpha="0.0"
-        android:toAlpha="1.0"
-        android:duration="200" />
-</set>
\ No newline at end of file
diff --git a/app/src/main/res/anim/exit_to_left.xml b/app/src/main/res/anim/exit_to_left.xml
deleted file mode 100644
index 5867904273..0000000000
--- a/app/src/main/res/anim/exit_to_left.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<set xmlns:android="http://schemas.android.com/apk/res/android">
-    <translate
-        android:fromXDelta="0%"
-        android:toXDelta="-70%"
-        android:duration="200" />
-    <alpha
-        android:fromAlpha="1.0"
-        android:toAlpha="0.0"
-        android:duration="200" />
-</set>
\ No newline at end of file
diff --git a/app/src/main/res/anim/rotation.xml b/app/src/main/res/anim/rotation.xml
deleted file mode 100644
index 374374fd2e..0000000000
--- a/app/src/main/res/anim/rotation.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<rotate xmlns:android="http://schemas.android.com/apk/res/android"
-    android:duration="1500"
-    android:fromDegrees="0"
-    android:interpolator="@android:anim/linear_interpolator"
-    android:pivotX="50%"
-    android:pivotY="50%"
-    android:repeatCount="infinite"
-    android:toDegrees="360" />
\ No newline at end of file
diff --git a/app/src/main/res/anim/shake.xml b/app/src/main/res/anim/shake.xml
deleted file mode 100644
index 72a8185e6a..0000000000
--- a/app/src/main/res/anim/shake.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<rotate xmlns:android="http://schemas.android.com/apk/res/android"
-    android:duration="100"
-    android:fromDegrees="-2"
-    android:pivotX="50%"
-    android:pivotY="50%"
-    android:repeatCount="1"
-    android:repeatMode="reverse"
-    android:toDegrees="2" />
\ No newline at end of file
diff --git a/app/src/main/res/anim/slide_in_left.xml b/app/src/main/res/anim/slide_in_left.xml
deleted file mode 100644
index 939415fd3f..0000000000
--- a/app/src/main/res/anim/slide_in_left.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (C) 2018 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<set xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <translate
-        android:duration="300"
-        android:fromXDelta="-100%"
-        android:fromYDelta="0%"
-        android:toXDelta="0%"
-        android:toYDelta="0%" />
-</set>
\ No newline at end of file
diff --git a/app/src/main/res/anim/slide_in_right.xml b/app/src/main/res/anim/slide_in_right.xml
deleted file mode 100644
index 0f571cc61e..0000000000
--- a/app/src/main/res/anim/slide_in_right.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (C) 2018 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<set xmlns:android="http://schemas.android.com/apk/res/android">
-    <translate
-        android:duration="300"
-        android:fromXDelta="100%"
-        android:fromYDelta="0%"
-        android:toXDelta="0%"
-        android:toYDelta="0%" />
-</set>
diff --git a/app/src/main/res/anim/slide_out_left.xml b/app/src/main/res/anim/slide_out_left.xml
deleted file mode 100644
index 58637e1156..0000000000
--- a/app/src/main/res/anim/slide_out_left.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (C) 2018 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<set xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <translate
-        android:duration="300"
-        android:fromXDelta="0%"
-        android:fromYDelta="0%"
-        android:toXDelta="-100%"
-        android:toYDelta="0%" />
-</set>
diff --git a/app/src/main/res/anim/slide_out_right.xml b/app/src/main/res/anim/slide_out_right.xml
deleted file mode 100644
index a134b2c730..0000000000
--- a/app/src/main/res/anim/slide_out_right.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Copyright (C) 2018 The Android Open Source Project
-  ~
-  ~ Licensed under the Apache License, Version 2.0 (the "License");
-  ~ you may not use this file except in compliance with the License.
-  ~ You may obtain a copy of the License at
-  ~
-  ~      http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the License is distributed on an "AS IS" BASIS,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  ~ See the License for the specific language governing permissions and
-  ~ limitations under the License.
-  -->
-
-<set xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <translate
-        android:duration="300"
-        android:fromXDelta="0%"
-        android:fromYDelta="0%"
-        android:toXDelta="100%"
-        android:toYDelta="0%" />
-</set>
\ No newline at end of file
diff --git a/app/src/main/res/color/button_tint.xml b/app/src/main/res/color/button_tint.xml
deleted file mode 100644
index 4d5a00de87..0000000000
--- a/app/src/main/res/color/button_tint.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="@color/button_active" android:state_selected="true"/>
-    <item android:color="@color/button_active" android:state_pressed="true"/>
-    <item android:color="@color/button_not_active"/>
-</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/anytype_logo.png b/app/src/main/res/drawable/anytype_logo.png
deleted file mode 100644
index e10588df04..0000000000
Binary files a/app/src/main/res/drawable/anytype_logo.png and /dev/null differ
diff --git a/app/src/main/res/drawable/background_dashboard_button.xml b/app/src/main/res/drawable/background_dashboard_button.xml
deleted file mode 100644
index bd6d907887..0000000000
--- a/app/src/main/res/drawable/background_dashboard_button.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ripple xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="@color/white">
-    <item>
-        <shape xmlns:android="http://schemas.android.com/apk/res/android"
-            android:shape="oval">
-            <solid android:color="@color/dashboard_background" />
-        </shape>
-    </item>
-</ripple>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/background_desktop_bottom_sheet.xml b/app/src/main/res/drawable/background_desktop_bottom_sheet.xml
deleted file mode 100644
index 2939b2db6c..0000000000
--- a/app/src/main/res/drawable/background_desktop_bottom_sheet.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <corners android:topLeftRadius="16dp" android:topRightRadius="16dp"/>
-    <solid android:color="@color/dashboard_background"/>
-</shape>
diff --git a/app/src/main/res/drawable/bg_back_to_dashboard.xml b/app/src/main/res/drawable/bg_back_to_dashboard.xml
deleted file mode 100644
index 1c08dddfe8..0000000000
--- a/app/src/main/res/drawable/bg_back_to_dashboard.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <stroke
-        android:width="1dp"
-        android:color="#DFDDD0" />
-    <corners android:radius="10dp" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_page_preview_layout.xml b/app/src/main/res/drawable/bg_page_preview_layout.xml
deleted file mode 100644
index 900232b7ce..0000000000
--- a/app/src/main/res/drawable/bg_page_preview_layout.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="@color/white" />
-    <corners android:radius="@dimen/dp_12" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_tab_layout.xml b/app/src/main/res/drawable/bg_tab_layout.xml
deleted file mode 100644
index 9697dcbd03..0000000000
--- a/app/src/main/res/drawable/bg_tab_layout.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-<solid android:color="@color/white" />
-<corners
-    android:topLeftRadius="@dimen/dp_12"
-    android:topRightRadius="@dimen/dp_12" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/circle_blue.xml b/app/src/main/res/drawable/circle_blue.xml
deleted file mode 100644
index 17d30ccc20..0000000000
--- a/app/src/main/res/drawable/circle_blue.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="oval">
-    <solid android:color="@color/blue" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/circle_default.xml b/app/src/main/res/drawable/circle_default.xml
deleted file mode 100644
index 3e842101b5..0000000000
--- a/app/src/main/res/drawable/circle_default.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="oval">
-    <solid android:color="#F7F5F0" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/circle_emoji_icon_background.xml b/app/src/main/res/drawable/circle_emoji_icon_background.xml
deleted file mode 100644
index bd9b28e5bb..0000000000
--- a/app/src/main/res/drawable/circle_emoji_icon_background.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="oval">
-    <solid android:color="@color/shape_tertiary" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/circle_empty_profile.xml b/app/src/main/res/drawable/circle_empty_profile.xml
deleted file mode 100644
index 528ead6846..0000000000
--- a/app/src/main/res/drawable/circle_empty_profile.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="oval">
-    <solid android:color="@color/shape_primary" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/circle_pin_code_dot_active.xml b/app/src/main/res/drawable/circle_pin_code_dot_active.xml
deleted file mode 100644
index 48b0b708cf..0000000000
--- a/app/src/main/res/drawable/circle_pin_code_dot_active.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="oval">
-    <solid android:color="@color/black" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/circle_pin_code_dot_empty.xml b/app/src/main/res/drawable/circle_pin_code_dot_empty.xml
deleted file mode 100644
index 609fb52def..0000000000
--- a/app/src/main/res/drawable/circle_pin_code_dot_empty.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="oval">
-    <solid android:color="@color/white" />
-    <stroke
-        android:width="1dp"
-        android:color="#E0DED2" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/circle_pin_code_keyboard_default.xml b/app/src/main/res/drawable/circle_pin_code_keyboard_default.xml
deleted file mode 100644
index 609fb52def..0000000000
--- a/app/src/main/res/drawable/circle_pin_code_keyboard_default.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="oval">
-    <solid android:color="@color/white" />
-    <stroke
-        android:width="1dp"
-        android:color="#E0DED2" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/circle_pin_code_keyboard_pressed.xml b/app/src/main/res/drawable/circle_pin_code_keyboard_pressed.xml
deleted file mode 100644
index dc7d343e9e..0000000000
--- a/app/src/main/res/drawable/circle_pin_code_keyboard_pressed.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="oval">
-    <solid android:color="#EBE9E0" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/circle_red.xml b/app/src/main/res/drawable/circle_red.xml
deleted file mode 100644
index a3e8722273..0000000000
--- a/app/src/main/res/drawable/circle_red.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="oval">
-    <solid android:color="#FF6055" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/circle_style_color.xml b/app/src/main/res/drawable/circle_style_color.xml
deleted file mode 100644
index 517444702a..0000000000
--- a/app/src/main/res/drawable/circle_style_color.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="oval">
-    <stroke
-        android:width="4dp"
-        android:color="#2AA7EE" />
-    <solid android:color="@color/black" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/default_tab_indicator.xml b/app/src/main/res/drawable/default_tab_indicator.xml
deleted file mode 100644
index f1e28f6941..0000000000
--- a/app/src/main/res/drawable/default_tab_indicator.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape android:shape="rectangle">
-            <solid android:color="#EAE9E0" />
-            <corners
-                android:topLeftRadius="@dimen/dp_12"
-                android:topRightRadius="@dimen/dp_12" />
-        </shape>
-    </item>
-    <item android:bottom="1dp">
-        <shape android:shape="rectangle">
-            <solid android:color="#FFFFFF" />
-
-            <corners
-                android:topLeftRadius="@dimen/dp_12"
-                android:topRightRadius="@dimen/dp_12" />
-        </shape>
-    </item>
-</layer-list>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/gradient_rectangle.xml b/app/src/main/res/drawable/gradient_rectangle.xml
deleted file mode 100644
index c95feffc07..0000000000
--- a/app/src/main/res/drawable/gradient_rectangle.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:aapt="http://schemas.android.com/aapt"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="360"
-    android:viewportHeight="640">
-    <path android:pathData="M0,0h360v667h-360z">
-        <aapt:attr name="android:fillColor">
-            <gradient
-                android:endX="180"
-                android:endY="667"
-                android:startX="180"
-                android:startY="0"
-                android:type="linear">
-                <item
-                    android:color="#FF91B5C1"
-                    android:offset="0" />
-                <item
-                    android:color="#FFB9D5DA"
-                    android:offset="0.506158" />
-                <item
-                    android:color="#FFCEC9BF"
-                    android:offset="0.794335" />
-                <item
-                    android:color="#FFA49D8E"
-                    android:offset="1" />
-            </gradient>
-        </aapt:attr>
-    </path>
-</vector>
diff --git a/app/src/main/res/drawable/ic_add_doc.xml b/app/src/main/res/drawable/ic_add_doc.xml
deleted file mode 100644
index 69f3876158..0000000000
--- a/app/src/main/res/drawable/ic_add_doc.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="25dp"
-    android:height="24dp"
-    android:viewportWidth="25"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="#ffffff"
-        android:pathData="M10.0625,0h4v24h-4z" />
-    <path
-        android:fillColor="#ffffff"
-        android:pathData="M24.0625,10l-0,4l-24,0l-0,-4z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_add_doc_inside_page.xml b/app/src/main/res/drawable/ic_add_doc_inside_page.xml
deleted file mode 100644
index eccfde77fe..0000000000
--- a/app/src/main/res/drawable/ic_add_doc_inside_page.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="25dp"
-    android:height="24dp"
-    android:viewportWidth="25"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="#FFBB2C"
-        android:pathData="M10.0625,0h4v24h-4z" />
-    <path
-        android:fillColor="#FFBB2C"
-        android:pathData="M24.0625,10l-0,4l-24,0l-0,-4z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_add_photo.xml b/app/src/main/res/drawable/ic_add_photo.xml
deleted file mode 100644
index ebe188d378..0000000000
--- a/app/src/main/res/drawable/ic_add_photo.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="40dp"
-    android:height="30dp"
-    android:viewportWidth="40"
-    android:viewportHeight="30">
-  <path
-      android:pathData="M3,4C1.3432,4 0,5.3432 0,7V27C0,28.6569 1.3432,30 3,30H37C38.6569,30 40,28.6569 40,27V7C40,5.3432 38.6569,4 37,4H3ZM27.5,17C27.5,21.1421 24.1421,24.5 20,24.5C15.8579,24.5 12.5,21.1421 12.5,17C12.5,12.8579 15.8579,9.5 20,9.5C24.1421,9.5 27.5,12.8579 27.5,17ZM29,17C29,21.9706 24.9706,26 20,26C15.0294,26 11,21.9706 11,17C11,12.0294 15.0294,8 20,8C24.9706,8 29,12.0294 29,17Z"
-      android:fillColor="#ffffff"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M12.4472,1.1056C12.786,0.428 13.4785,0 14.2361,0H25.7639C26.5215,0 27.214,0.428 27.5528,1.1056L29.5528,5.1056C30.2177,6.4354 29.2507,8 27.7639,8H12.2361C10.7493,8 9.7823,6.4354 10.4472,5.1056L12.4472,1.1056Z"
-      android:fillColor="#ffffff"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_add_profile.xml b/app/src/main/res/drawable/ic_add_profile.xml
deleted file mode 100644
index d3d292f14f..0000000000
--- a/app/src/main/res/drawable/ic_add_profile.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="16dp"
-    android:height="17dp"
-    android:viewportWidth="16"
-    android:viewportHeight="17">
-    <path
-        android:fillColor="#ACA996"
-        android:pathData="M7,0.0233h2v16h-2z" />
-    <path
-        android:fillColor="#ACA996"
-        android:pathData="M16,7.0233l-0,2l-16,0l-0,-2z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_check_sync.xml b/app/src/main/res/drawable/ic_check_sync.xml
deleted file mode 100644
index b660b3235e..0000000000
--- a/app/src/main/res/drawable/ic_check_sync.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="15dp"
-    android:height="16dp"
-    android:viewportWidth="15"
-    android:viewportHeight="16">
-    <path
-        android:fillColor="#80B822"
-        android:pathData="M7.5,8.4844m-7.5,0a7.5,7.5 0,1 1,15 0a7.5,7.5 0,1 1,-15 0" />
-    <path
-        android:fillColor="#ffffff"
-        android:fillType="evenOdd"
-        android:pathData="M12.4243,5.4243L6,11.8485L2.5757,8.4243L3.4243,7.5757L6,10.1515L11.5757,4.5757L12.4243,5.4243Z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_clock.xml b/app/src/main/res/drawable/ic_clock.xml
deleted file mode 100644
index a601ad874c..0000000000
--- a/app/src/main/res/drawable/ic_clock.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="23dp"
-    android:height="26dp"
-    android:viewportWidth="23"
-    android:viewportHeight="26">
-    <path
-        android:fillColor="#ACA996"
-        android:fillType="evenOdd"
-        android:pathData="M13.9477,3.5606C13.982,3.379 14,3.1916 14,3C14,1.3432 12.6569,0 11,0C9.3432,0 8,1.3432 8,3C8,3.1916 8.018,3.379 8.0523,3.5606C5.0928,4.7342 3,7.6227 3,11L3,11.0208H3V16.1224C2.9697,16.3647 2.8218,16.9599 2.1011,17.0073C2.0702,17.0058 2.0391,17.0051 2.0078,17.0051C0.8989,17.0051 0,17.9041 0,19.0129C0,20.1218 0.8989,21.0208 2.0078,21.0208H2.0078H3H3.0078H19H20C20,21.0208 20,21.0208 20,21.0208C21.1089,21.0208 22.0078,20.1218 22.0078,19.0129C22.0078,17.9041 21.1089,17.0051 20,17.0051C19.9687,17.0051 19.9376,17.0058 19.9067,17.0073C18.9999,16.9477 19,16.0208 19,16.0208V11.0208V11C19,7.6227 16.9072,4.7342 13.9477,3.5606ZM11,25.0208C12.6569,25.0208 14,23.6776 14,22.0208H8C8,23.6776 9.3432,25.0208 11,25.0208Z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_clock_loading.png b/app/src/main/res/drawable/ic_clock_loading.png
deleted file mode 100644
index 8caad6ba38..0000000000
Binary files a/app/src/main/res/drawable/ic_clock_loading.png and /dev/null differ
diff --git a/app/src/main/res/drawable/ic_congratulation.png b/app/src/main/res/drawable/ic_congratulation.png
deleted file mode 100644
index e28860a2f0..0000000000
Binary files a/app/src/main/res/drawable/ic_congratulation.png and /dev/null differ
diff --git a/app/src/main/res/drawable/ic_dashboard_add_doc.xml b/app/src/main/res/drawable/ic_dashboard_add_doc.xml
deleted file mode 100644
index c3d9b3de8c..0000000000
--- a/app/src/main/res/drawable/ic_dashboard_add_doc.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="25dp"
-    android:viewportWidth="24"
-    android:viewportHeight="25">
-  <path
-      android:pathData="M11.9375,2.5L11.9375,2.5A0.75,0.75 0,0 1,12.6875 3.25L12.6875,21.75A0.75,0.75 0,0 1,11.9375 22.5L11.9375,22.5A0.75,0.75 0,0 1,11.1875 21.75L11.1875,3.25A0.75,0.75 0,0 1,11.9375 2.5z"
-      android:fillColor="@color/glyph_selected"/>
-  <path
-      android:pathData="M1.9375,12.5L1.9375,12.5A0.75,0.75 0,0 1,2.6875 11.75L21.1875,11.75A0.75,0.75 0,0 1,21.9375 12.5L21.9375,12.5A0.75,0.75 0,0 1,21.1875 13.25L2.6875,13.25A0.75,0.75 0,0 1,1.9375 12.5z"
-      android:fillColor="@color/glyph_selected"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_dashboard_library.xml b/app/src/main/res/drawable/ic_dashboard_library.xml
deleted file mode 100644
index f42e7cb9da..0000000000
--- a/app/src/main/res/drawable/ic_dashboard_library.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="25dp"
-    android:viewportWidth="24"
-    android:viewportHeight="25">
-  <path
-      android:pathData="M17.0625,4H7.0625C5.1295,4 3.5625,5.567 3.5625,7.5V17.5C3.5625,19.433 5.1295,21 7.0625,21H17.0625C18.9955,21 20.5625,19.433 20.5625,17.5V7.5C20.5625,5.567 18.9955,4 17.0625,4ZM7.0625,2.5C4.3011,2.5 2.0625,4.7386 2.0625,7.5V17.5C2.0625,20.2614 4.3011,22.5 7.0625,22.5H17.0625C19.8239,22.5 22.0625,20.2614 22.0625,17.5V7.5C22.0625,4.7386 19.8239,2.5 17.0625,2.5H7.0625Z"
-      android:fillColor="@color/glyph_selected"
-      android:fillType="evenOdd"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_dashboard_search.xml b/app/src/main/res/drawable/ic_dashboard_search.xml
deleted file mode 100644
index 3694adf11d..0000000000
--- a/app/src/main/res/drawable/ic_dashboard_search.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="25dp"
-    android:viewportWidth="24"
-    android:viewportHeight="25">
-  <path
-      android:pathData="M3.5625,10.375C3.5625,13.9649 6.4727,16.875 10.0625,16.875C13.6524,16.875 16.5625,13.9649 16.5625,10.375C16.5625,6.7852 13.6524,3.875 10.0625,3.875C6.4727,3.875 3.5625,6.7852 3.5625,10.375ZM10.0625,2.375C5.6442,2.375 2.0625,5.9567 2.0625,10.375C2.0625,14.7933 5.6442,18.375 10.0625,18.375C14.4808,18.375 18.0625,14.7933 18.0625,10.375C18.0625,5.9567 14.4808,2.375 10.0625,2.375Z"
-      android:fillColor="@color/glyph_selected"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M20.2929,22.2071C20.6834,22.5976 21.3166,22.5976 21.7071,22.2071C22.0976,21.8166 22.0976,21.1834 21.7071,20.7929L20.2929,22.2071ZM21.7071,20.7929L15.7071,14.7929L14.2929,16.2071L20.2929,22.2071L21.7071,20.7929Z"
-      android:fillColor="@color/glyph_selected"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_dashboard_settings.xml b/app/src/main/res/drawable/ic_dashboard_settings.xml
deleted file mode 100644
index 1ba12cb630..0000000000
--- a/app/src/main/res/drawable/ic_dashboard_settings.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="25dp"
-    android:viewportWidth="24"
-    android:viewportHeight="25">
-  <path
-      android:pathData="M2,12.5L2,12.5A0.75,0.75 0,0 1,2.75 11.75L21.25,11.75A0.75,0.75 0,0 1,22 12.5L22,12.5A0.75,0.75 0,0 1,21.25 13.25L2.75,13.25A0.75,0.75 0,0 1,2 12.5z"
-      android:fillColor="#ffffff"/>
-  <path
-      android:pathData="M2,5.5L2,5.5A0.75,0.75 0,0 1,2.75 4.75L21.25,4.75A0.75,0.75 0,0 1,22 5.5L22,5.5A0.75,0.75 0,0 1,21.25 6.25L2.75,6.25A0.75,0.75 0,0 1,2 5.5z"
-      android:fillColor="#ffffff"/>
-  <path
-      android:pathData="M2,19.5L2,19.5A0.75,0.75 0,0 1,2.75 18.75L21.25,18.75A0.75,0.75 0,0 1,22 19.5L22,19.5A0.75,0.75 0,0 1,21.25 20.25L2.75,20.25A0.75,0.75 0,0 1,2 19.5z"
-      android:fillColor="#ffffff"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_data_view_viewer_delete.xml b/app/src/main/res/drawable/ic_data_view_viewer_delete.xml
deleted file mode 100644
index 52b23fcc9c..0000000000
--- a/app/src/main/res/drawable/ic_data_view_viewer_delete.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M8.75,3C8.75,2.3096 9.3096,1.75 10,1.75H14C14.6904,1.75 15.25,2.3096 15.25,3V5.25H8.75V3Z"
-        android:strokeWidth="1.5"
-        android:strokeColor="#ACA996" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M5.6577,19.5743L5.2705,5.25H18.7268L18.291,19.5836C18.2459,21.0691 17.0285,22.25 15.5423,22.25H8.4067C6.9168,22.25 5.6979,21.0636 5.6577,19.5743Z"
-        android:strokeWidth="1.5"
-        android:strokeColor="#ACA996" />
-    <path
-        android:fillColor="#ACA996"
-        android:pathData="M9.3125,8.001H10.8125V19.501H9.3125V8.001Z" />
-    <path
-        android:fillColor="#ACA996"
-        android:pathData="M13.3125,8.001H14.8125V19.501H13.3125V8.001Z" />
-    <path
-        android:fillColor="#ACA996"
-        android:pathData="M3.2485,6C2.8343,6 2.5,5.6642 2.5,5.25C2.5,4.8358 2.8358,4.5 3.25,4.5L20.75,4.5C21.1642,4.5 21.5,4.8358 21.5,5.25C21.5,5.6642 21.1668,6 20.7526,6C17.5914,6 6.2745,6 3.2485,6Z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_data_view_viewer_duplicate.xml b/app/src/main/res/drawable/ic_data_view_viewer_duplicate.xml
deleted file mode 100644
index cf72709e2a..0000000000
--- a/app/src/main/res/drawable/ic_data_view_viewer_duplicate.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="#ACA996"
-        android:fillType="evenOdd"
-        android:pathData="M19,8.5H11C9.6193,8.5 8.5,9.6193 8.5,11V19C8.5,20.3807 9.6193,21.5 11,21.5H19C20.3807,21.5 21.5,20.3807 21.5,19V11C21.5,9.6193 20.3807,8.5 19,8.5ZM11,7C8.7909,7 7,8.7909 7,11V19C7,21.2091 8.7909,23 11,23H19C21.2091,23 23,21.2091 23,19V11C23,8.7909 21.2091,7 19,7H11Z" />
-    <path
-        android:fillColor="#ACA996"
-        android:fillType="evenOdd"
-        android:pathData="M5,2.5H13C14.3807,2.5 15.5,3.6193 15.5,5V7H17V5C17,2.7909 15.2091,1 13,1H5C2.7909,1 1,2.7909 1,5V13C1,15.2091 2.7909,17 5,17H7V15.5H5C3.6193,15.5 2.5,14.3807 2.5,13V5C2.5,3.6193 3.6193,2.5 5,2.5Z" />
-    <path
-        android:fillColor="#ACA996"
-        android:pathData="M15,11L15,11A0.75,0.75 0,0 1,15.75 11.75L15.75,18.25A0.75,0.75 0,0 1,15 19L15,19A0.75,0.75 0,0 1,14.25 18.25L14.25,11.75A0.75,0.75 0,0 1,15 11z" />
-    <path
-        android:fillColor="#ACA996"
-        android:pathData="M11,15L11,15A0.75,0.75 0,0 1,11.75 14.25L18.25,14.25A0.75,0.75 0,0 1,19 15L19,15A0.75,0.75 0,0 1,18.25 15.75L11.75,15.75A0.75,0.75 0,0 1,11 15z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_data_view_viewer_edit.xml b/app/src/main/res/drawable/ic_data_view_viewer_edit.xml
deleted file mode 100644
index 307063d60a..0000000000
--- a/app/src/main/res/drawable/ic_data_view_viewer_edit.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="#ACA996"
-        android:fillType="evenOdd"
-        android:pathData="M2,21.9998L7,20.9998L21.4393,6.5604C22.0251,5.9746 22.0251,5.0249 21.4393,4.4391L19.5607,2.5604C18.9749,1.9747 18.0251,1.9747 17.4393,2.5604L3,16.9998L2,21.9998ZM4.3818,17.7393L3.9121,20.0876L6.2605,19.618L20.3787,5.4998L18.5,3.6211L4.3818,17.7393Z" />
-    <path
-        android:fillColor="#ACA996"
-        android:fillType="evenOdd"
-        android:pathData="M18,9.0607L15,6.0607L16.0607,5L19.0607,8L18,9.0607Z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_doc_menu_close.xml b/app/src/main/res/drawable/ic_doc_menu_close.xml
deleted file mode 100644
index 218a51985d..0000000000
--- a/app/src/main/res/drawable/ic_doc_menu_close.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="29dp"
-    android:height="28dp"
-    android:viewportWidth="29"
-    android:viewportHeight="28">
-    <path
-        android:fillColor="#EAE9E0"
-        android:pathData="M28.75,14C28.75,21.732 22.482,28 14.75,28C7.018,28 0.75,21.732 0.75,14C0.75,6.268 7.018,0 14.75,0C22.482,0 28.75,6.268 28.75,14Z" />
-    <path
-        android:fillColor="#ACA996"
-        android:fillType="evenOdd"
-        android:pathData="M9.5429,8.7929C9.9334,8.4024 10.5666,8.4024 10.9571,8.7929L19.9571,17.7929C20.3476,18.1834 20.3476,18.8166 19.9571,19.2071C19.5666,19.5976 18.9334,19.5976 18.5429,19.2071L9.5429,10.2071C9.1524,9.8166 9.1524,9.1834 9.5429,8.7929Z" />
-    <path
-        android:fillColor="#ACA996"
-        android:fillType="evenOdd"
-        android:pathData="M9.5429,19.2071C9.1524,18.8166 9.1524,18.1834 9.5429,17.7929L18.5429,8.7929C18.9334,8.4024 19.5666,8.4024 19.9571,8.7929C20.3476,9.1834 20.3476,9.8166 19.9571,10.2071L10.9571,19.2071C10.5666,19.5976 9.9334,19.5976 9.5429,19.2071Z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_docs.xml b/app/src/main/res/drawable/ic_docs.xml
deleted file mode 100644
index 672f228399..0000000000
--- a/app/src/main/res/drawable/ic_docs.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M19,3h-4.18C14.4,1.84 13.3,1 12,1c-1.3,0 -2.4,0.84 -2.82,2L5,3c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2L21,5c0,-1.1 -0.9,-2 -2,-2zM12,3c0.55,0 1,0.45 1,1s-0.45,1 -1,1 -1,-0.45 -1,-1 0.45,-1 1,-1zM12,7c1.66,0 3,1.34 3,3s-1.34,3 -3,3 -3,-1.34 -3,-3 1.34,-3 3,-3zM18,19L6,19v-1.4c0,-2 4,-3.1 6,-3.1s6,1.1 6,3.1L18,19z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_dv_relation_search.xml b/app/src/main/res/drawable/ic_dv_relation_search.xml
deleted file mode 100644
index ab36367703..0000000000
--- a/app/src/main/res/drawable/ic_dv_relation_search.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="#ACA996"
-        android:fillType="evenOdd"
-        android:pathData="M10.5,15.5C13.2614,15.5 15.5,13.2614 15.5,10.5C15.5,7.7386 13.2614,5.5 10.5,5.5C7.7386,5.5 5.5,7.7386 5.5,10.5C5.5,13.2614 7.7386,15.5 10.5,15.5ZM10.5,17C14.0899,17 17,14.0899 17,10.5C17,6.9102 14.0899,4 10.5,4C6.9102,4 4,6.9102 4,10.5C4,14.0899 6.9102,17 10.5,17Z" />
-    <path
-        android:fillColor="#ACA996"
-        android:fillType="evenOdd"
-        android:pathData="M14.2929,14.2929C14.6834,13.9024 15.3166,13.9024 15.7071,14.2929L19.7071,18.2929C20.0976,18.6834 20.0976,19.3166 19.7071,19.7071C19.3166,20.0976 18.6834,20.0976 18.2929,19.7071L14.2929,15.7071C13.9024,15.3166 13.9024,14.6834 14.2929,14.2929Z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_edit.xml b/app/src/main/res/drawable/ic_edit.xml
deleted file mode 100644
index 8706693a3d..0000000000
--- a/app/src/main/res/drawable/ic_edit.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="#ACA996"
-        android:pathData="M4,20L5,15L13,7L17,11L9,19L4,20Z" />
-    <path
-        android:fillColor="#ACA996"
-        android:pathData="M15.6929,4.3071L14,6L18,10L19.6929,8.3071C20.0834,7.9166 20.0834,7.2834 19.6929,6.8929L17.1071,4.3071C16.7166,3.9166 16.0834,3.9166 15.6929,4.3071Z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_invite.xml b/app/src/main/res/drawable/ic_invite.xml
deleted file mode 100644
index 916d57a085..0000000000
--- a/app/src/main/res/drawable/ic_invite.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="16dp"
-    android:viewportWidth="24"
-    android:viewportHeight="16">
-    <path
-        android:fillColor="#ACA996"
-        android:fillType="evenOdd"
-        android:pathData="M0.2263,1.0749C0.0818,1.3516 0,1.6662 0,2V14C0,14.3338 0.0818,14.6484 0.2263,14.9251L7.1514,8L0.2263,1.0749ZM1.0748,0.2264L11.01,10.1615C11.5567,10.7083 12.4432,10.7083 12.9899,10.1615L22.9251,0.2263C22.6484,0.0818 22.3338,0 22,0H11.9612H2C1.6662,0 1.3515,0.0818 1.0748,0.2264ZM23.7736,1.0749L16.8485,8L23.7737,14.9251C23.9182,14.6484 24,14.3338 24,14V2C24,1.6662 23.9182,1.3515 23.7736,1.0749ZM22.9251,15.7736L16,8.8485L13.8384,11.0101C12.8231,12.0254 11.1768,12.0254 10.1615,11.0101L7.9999,8.8485L1.0749,15.7736C1.3515,15.9182 1.6662,16 2,16H22C22.3338,16 22.6485,15.9182 22.9251,15.7736Z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_key.xml b/app/src/main/res/drawable/ic_key.xml
deleted file mode 100644
index 9e2698ce5d..0000000000
--- a/app/src/main/res/drawable/ic_key.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="28dp"
-    android:height="29dp"
-    android:viewportWidth="28"
-    android:viewportHeight="29">
-  <path
-      android:pathData="M6,0.125L22,0.125A6,6 0,0 1,28 6.125L28,22.125A6,6 0,0 1,22 28.125L6,28.125A6,6 0,0 1,0 22.125L0,6.125A6,6 0,0 1,6 0.125z"
-      android:fillColor="#2AA7EE"/>
-  <path
-      android:pathData="M17,11.125m-5,0a5,5 0,1 1,10 0a5,5 0,1 1,-10 0"
-      android:fillColor="#ffffff"/>
-  <path
-      android:pathData="M13,12.625L15.5,15.125L13,17.625H11V19.625H9V21.625L8.5,22.125H6V19.625L13,12.625Z"
-      android:fillColor="#ffffff"/>
-  <path
-      android:pathData="M20,9.5962C20,10.4246 19.3284,11.0962 18.5,11.0962C17.6716,11.0962 17,10.4246 17,9.5962C17,8.7678 17.6716,8.0962 18.5,8.0962C19.3284,8.0962 20,8.7678 20,9.5962Z"
-      android:fillColor="#2AA7EE"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml
index cb90a339b1..931c605305 100644
--- a/app/src/main/res/drawable/ic_launcher_background.xml
+++ b/app/src/main/res/drawable/ic_launcher_background.xml
@@ -8,7 +8,7 @@
       android:scaleY="1.01"
       android:translateX="-0.54"
       android:translateY="-0.54">
-      <path android:fillColor="#000000"
+      <path android:fillColor="@color/background_black_launcher"
             android:pathData="M0,0h108v108h-108z"/>
   </group>
 </vector>
diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml
index 4b0d781bc5..661f47e8ed 100644
--- a/app/src/main/res/drawable/ic_launcher_foreground.xml
+++ b/app/src/main/res/drawable/ic_launcher_foreground.xml
@@ -21,9 +21,9 @@
               android:endX="53.81"
               android:endY="78.7"
               android:type="linear">
-            <item android:offset="0.5" android:color="#FFFFFFFF"/>
-            <item android:offset="0.66" android:color="#FFFFEDBE"/>
-            <item android:offset="0.84" android:color="#FFFFBCC3"/>
+            <item android:offset="0.5" android:color="@color/gradient_white"/>
+            <item android:offset="0.66" android:color="@color/gradient_light_yellow"/>
+            <item android:offset="0.84" android:color="@color/gradient_light_pink"/>
           </gradient>
         </aapt:attr>
       </path>
diff --git a/app/src/main/res/drawable/ic_logo.xml b/app/src/main/res/drawable/ic_logo.xml
index e8321883e0..6d6abd4f88 100644
--- a/app/src/main/res/drawable/ic_logo.xml
+++ b/app/src/main/res/drawable/ic_logo.xml
@@ -5,15 +5,15 @@
     android:viewportHeight="28">
   <path
       android:pathData="M16.03,20.99V4.07H12.09V6.88H11.86C11.65,6.47 11.36,6.03 10.99,5.56C10.61,5.09 10.1,4.69 9.46,4.36C8.82,4.02 8,3.85 7.01,3.85C5.7,3.85 4.51,4.18 3.46,4.86C2.4,5.52 1.56,6.5 0.94,7.81C0.31,9.1 0,10.69 0,12.58C0,14.44 0.31,16.03 0.92,17.33C1.53,18.64 2.36,19.63 3.42,20.32C4.47,21 5.66,21.34 7,21.34C7.97,21.34 8.78,21.18 9.42,20.86C10.06,20.53 10.57,20.14 10.96,19.69C11.35,19.22 11.65,18.78 11.86,18.37H12.02V20.99H16.03ZM12.1,12.56C12.1,13.66 11.95,14.62 11.64,15.44C11.32,16.27 10.87,16.91 10.28,17.38C9.68,17.83 8.96,18.06 8.11,18.06C7.23,18.06 6.49,17.83 5.89,17.35C5.29,16.88 4.84,16.22 4.54,15.4C4.23,14.57 4.08,13.62 4.08,12.56C4.08,11.5 4.23,10.57 4.53,9.75C4.83,8.93 5.28,8.29 5.88,7.83C6.48,7.36 7.22,7.13 8.11,7.13C8.97,7.13 9.69,7.36 10.29,7.81C10.89,8.26 11.34,8.89 11.65,9.7C11.95,10.51 12.1,11.46 12.1,12.56Z"
-      android:fillColor="#DBDAD4"/>
+      android:fillColor="@color/gray_light_logo"/>
   <path
       android:pathData="M64.59,4.07V7.16H61.24V15.94C61.24,16.47 61.32,16.89 61.48,17.17C61.65,17.45 61.87,17.65 62.14,17.75C62.42,17.85 62.72,17.9 63.05,17.9C63.3,17.9 63.53,17.89 63.73,17.85C63.95,17.81 64.11,17.78 64.22,17.75L64.89,20.88C64.68,20.95 64.38,21.03 63.98,21.12C63.59,21.21 63.11,21.26 62.54,21.27C61.54,21.3 60.64,21.15 59.83,20.82C59.03,20.48 58.39,19.96 57.92,19.25C57.46,18.54 57.23,17.66 57.24,16.6V7.16V4.07V0H61.24V4.07H64.59ZM23.82,21.04V11.1C23.82,10.28 23.97,9.58 24.27,9.01C24.58,8.43 25.01,7.99 25.54,7.69C26.09,7.38 26.71,7.23 27.41,7.23C28.44,7.23 29.25,7.55 29.83,8.19C30.42,8.83 30.72,9.72 30.72,10.85V21.04H34.72V10.23C34.72,8.88 34.49,7.73 34,6.77C33.52,5.82 32.84,5.1 31.97,4.6C31.1,4.1 30.08,3.85 28.9,3.85C27.64,3.85 26.57,4.13 25.71,4.69C24.86,5.25 24.23,6 23.84,6.95H23.64V4.07H19.82V21.04H23.82ZM70.58,27.23C71.3,25.29 72.01,23.34 72.74,21.4L66.58,4.07H70.83L74.74,16.89H74.92L78.84,4.07H83.09L74.8,27.23H70.58ZM85.86,27.41V4.07H89.8V6.87H90.03C90.24,6.46 90.53,6.02 90.9,5.56C91.28,5.09 91.79,4.69 92.43,4.35C93.07,4.02 93.89,3.85 94.88,3.85C96.19,3.85 97.37,4.18 98.43,4.85C99.49,5.51 100.33,6.5 100.95,7.8C101.57,9.1 101.89,10.69 101.89,12.58C101.89,14.44 101.58,16.03 100.97,17.33C100.36,18.63 99.53,19.63 98.47,20.31C97.42,21 96.23,21.34 94.89,21.34C93.92,21.34 93.11,21.18 92.47,20.85C91.83,20.53 91.31,20.14 90.92,19.68C90.54,19.22 90.24,18.78 90.03,18.37H89.86V27.41H85.86ZM89.79,12.55C89.79,13.65 89.94,14.61 90.25,15.44C90.57,16.26 91.02,16.91 91.61,17.37C92.21,17.83 92.93,18.06 93.78,18.06C94.66,18.06 95.4,17.82 96,17.35C96.59,16.87 97.04,16.22 97.35,15.4C97.65,14.56 97.81,13.62 97.81,12.55C97.81,11.5 97.66,10.57 97.36,9.75C97.05,8.93 96.6,8.29 96.01,7.82C95.41,7.36 94.67,7.13 93.78,7.13C92.92,7.13 92.2,7.35 91.6,7.8C91,8.25 90.55,8.88 90.24,9.69C89.94,10.5 89.79,11.46 89.79,12.55ZM108.42,20.31C109.66,21.02 111.13,21.37 112.83,21.37C114.15,21.37 115.32,21.18 116.34,20.78C117.37,20.37 118.21,19.8 118.86,19.08C119.53,18.34 119.98,17.48 120.21,16.49L116.48,16.07C116.3,16.55 116.04,16.95 115.69,17.27C115.35,17.6 114.94,17.84 114.46,18.01C113.99,18.18 113.47,18.26 112.88,18.26C112.01,18.26 111.26,18.07 110.61,17.7C109.96,17.33 109.45,16.79 109.09,16.09C108.75,15.41 108.56,14.59 108.55,13.65H120.38V12.42C120.38,10.93 120.17,9.65 119.76,8.58C119.35,7.49 118.78,6.6 118.06,5.9C117.34,5.2 116.52,4.69 115.58,4.35C114.65,4.02 113.67,3.85 112.62,3.85C111,3.85 109.59,4.22 108.39,4.96C107.18,5.7 106.25,6.73 105.58,8.06C104.92,9.38 104.58,10.91 104.58,12.65C104.58,14.43 104.92,15.97 105.58,17.28C106.24,18.59 107.19,19.6 108.42,20.31ZM108.56,10.95C108.6,10.29 108.77,9.67 109.07,9.11C109.42,8.47 109.9,7.95 110.52,7.56C111.14,7.16 111.86,6.96 112.67,6.96C113.44,6.96 114.11,7.14 114.69,7.48C115.27,7.83 115.72,8.3 116.04,8.91C116.37,9.5 116.54,10.19 116.54,10.95H108.56Z"
-      android:fillColor="#DBDAD4"
+      android:fillColor="@color/gray_light_logo"
       android:fillType="evenOdd"/>
   <path
       android:pathData="M66.58,4.07L72.74,21.4C72.01,23.34 71.3,25.29 70.58,27.23H74.8L83.09,4.07H78.84L74.92,16.89H74.74L70.83,4.07H66.58Z"
-      android:fillColor="#DBDAD4"/>
+      android:fillColor="@color/gray_light_logo"/>
   <path
       android:pathData="M36.98,4.07L43.14,21.4C42.41,23.34 41.69,25.28 40.97,27.23H45.2L53.49,4.07H49.24L45.31,16.89H45.14L41.22,4.07H36.98Z"
-      android:fillColor="#DBDAD4"/>
+      android:fillColor="@color/gray_light_logo"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_onboarding_mnemonic_phrase_lock.xml b/app/src/main/res/drawable/ic_onboarding_mnemonic_phrase_lock.xml
index 0ef1810790..bb57a7d111 100644
--- a/app/src/main/res/drawable/ic_onboarding_mnemonic_phrase_lock.xml
+++ b/app/src/main/res/drawable/ic_onboarding_mnemonic_phrase_lock.xml
@@ -5,6 +5,6 @@
     android:viewportHeight="18">
   <path
       android:pathData="M6.75,7.5H11.25V5.5C11.25,4.257 10.243,3.25 9,3.25C7.757,3.25 6.75,4.257 6.75,5.5V7.5ZM12.5,7.5C13.328,7.5 14,8.172 14,9V13.5C14,14.328 13.328,15 12.5,15H5.5C4.672,15 4,14.328 4,13.5V9C4,8.172 4.672,7.5 5.5,7.5L5.5,5.5C5.5,3.567 7.067,2 9,2C10.933,2 12.5,3.567 12.5,5.5V7.5Z"
-      android:fillColor="#A7A7A7"
+      android:fillColor="@color/gray_mnemonic_lock"
       android:fillType="evenOdd"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_open.xml b/app/src/main/res/drawable/ic_open.xml
deleted file mode 100644
index fa97198da7..0000000000
--- a/app/src/main/res/drawable/ic_open.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="9dp"
-    android:height="14dp"
-    android:viewportWidth="9"
-    android:viewportHeight="14">
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M1.0911,13L7.0911,7L1.0911,1"
-        android:strokeWidth="2"
-        android:strokeColor="#ACA996" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_pin.xml b/app/src/main/res/drawable/ic_pin.xml
deleted file mode 100644
index 0a65e964ef..0000000000
--- a/app/src/main/res/drawable/ic_pin.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="20dp"
-    android:height="26dp"
-    android:viewportWidth="20"
-    android:viewportHeight="26">
-    <path
-        android:fillColor="#ACA996"
-        android:fillType="evenOdd"
-        android:pathData="M5,11.0526H15V7.9901C15,5.2287 12.7614,2.9901 10,2.9901C7.2386,2.9901 5,5.2287 5,7.9901V11.0526ZM3,11.0526H2C0.8954,11.0526 0,11.9481 0,13.0526V23.0526C0,24.1572 0.8954,25.0526 2,25.0526H18C19.1046,25.0526 20,24.1572 20,23.0526V13.0526C20,11.9481 19.1046,11.0526 18,11.0526H17V7.9901C17,4.1241 13.866,0.9901 10,0.9901C6.134,0.9901 3,4.1241 3,7.9901V11.0526Z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_pin_code.xml b/app/src/main/res/drawable/ic_pin_code.xml
deleted file mode 100644
index e3d196f31e..0000000000
--- a/app/src/main/res/drawable/ic_pin_code.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="28dp"
-    android:height="29dp"
-    android:viewportWidth="28"
-    android:viewportHeight="29">
-  <path
-      android:pathData="M6,0.125L22,0.125A6,6 0,0 1,28 6.125L28,22.125A6,6 0,0 1,22 28.125L6,28.125A6,6 0,0 1,0 22.125L0,6.125A6,6 0,0 1,6 0.125z"
-      android:fillColor="#5DD400"/>
-  <path
-      android:pathData="M8,12.125L20,12.125A1,1 0,0 1,21 13.125L21,21.125A1,1 0,0 1,20 22.125L8,22.125A1,1 0,0 1,7 21.125L7,13.125A1,1 0,0 1,8 12.125z"
-      android:fillColor="#ffffff"/>
-  <path
-      android:pathData="M14,5.875L14,5.875A3.75,3.75 0,0 1,17.75 9.625L17.75,15.625A3.75,3.75 0,0 1,14 19.375L14,19.375A3.75,3.75 0,0 1,10.25 15.625L10.25,9.625A3.75,3.75 0,0 1,14 5.875z"
-      android:strokeWidth="1.5"
-      android:fillColor="#00000000"
-      android:strokeColor="#ffffff"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_plus_white_12.xml b/app/src/main/res/drawable/ic_plus_white_12.xml
deleted file mode 100644
index 64692847c0..0000000000
--- a/app/src/main/res/drawable/ic_plus_white_12.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="12dp"
-    android:height="12dp"
-    android:viewportWidth="12"
-    android:viewportHeight="12">
-  <path
-      android:pathData="M5.999,0C5.644,0 5.356,0.288 5.356,0.643V5.356H0.643C0.288,5.356 0,5.644 0,5.999C0,6.354 0.288,6.642 0.643,6.642H5.356V11.357C5.356,11.712 5.644,12 5.999,12C6.354,12 6.642,11.712 6.642,11.357V6.642H11.357C11.712,6.642 12,6.354 12,5.999C12,5.644 11.712,5.356 11.357,5.356H6.642V0.643C6.642,0.288 6.354,0 5.999,0Z"
-      android:fillColor="#ffffff"
-      android:fillType="evenOdd"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_profile.xml b/app/src/main/res/drawable/ic_profile.xml
deleted file mode 100644
index 739bbfbca5..0000000000
--- a/app/src/main/res/drawable/ic_profile.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M9,11.75c-0.69,0 -1.25,0.56 -1.25,1.25s0.56,1.25 1.25,1.25 1.25,-0.56 1.25,-1.25 -0.56,-1.25 -1.25,-1.25zM15,11.75c-0.69,0 -1.25,0.56 -1.25,1.25s0.56,1.25 1.25,1.25 1.25,-0.56 1.25,-1.25 -0.56,-1.25 -1.25,-1.25zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8 0,-0.29 0.02,-0.58 0.05,-0.86 2.36,-1.05 4.23,-2.98 5.21,-5.37C11.07,8.33 14.05,10 17.42,10c0.78,0 1.53,-0.09 2.25,-0.26 0.21,0.71 0.33,1.47 0.33,2.26 0,4.41 -3.59,8 -8,8z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_profile_forward.xml b/app/src/main/res/drawable/ic_profile_forward.xml
deleted file mode 100644
index c48643a855..0000000000
--- a/app/src/main/res/drawable/ic_profile_forward.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="25dp"
-    android:viewportWidth="24"
-    android:viewportHeight="25">
-  <group>
-    <clip-path
-        android:pathData="M0,0.125h24v24h-24z"/>
-    <path
-        android:pathData="M9.2929,6.4179C9.6834,6.0274 10.3166,6.0274 10.7071,6.4179L16.4142,12.125L10.7071,17.8321C10.3166,18.2226 9.6834,18.2226 9.2929,17.8321C8.9024,17.4416 8.9024,16.8084 9.2929,16.4179L13.5858,12.125L9.2929,7.8321C8.9024,7.4416 8.9024,6.8084 9.2929,6.4179Z"
-        android:fillColor="@color/text_tertiary"
-        android:fillType="evenOdd"/>
-    <path
-        android:pathData="M9.4697,6.5947C9.7626,6.3018 10.2374,6.3018 10.5303,6.5947L16.0607,12.125L10.5303,17.6553C10.2374,17.9482 9.7626,17.9482 9.4697,17.6553C9.1768,17.3624 9.1768,16.8876 9.4697,16.5947L13.9393,12.125L9.4697,7.6553C9.1768,7.3624 9.1768,6.8876 9.4697,6.5947Z"
-        android:fillColor="@color/text_tertiary"
-        android:fillType="evenOdd"/>
-  </group>
-</vector>
diff --git a/app/src/main/res/drawable/ic_qr_code_arrow.xml b/app/src/main/res/drawable/ic_qr_code_arrow.xml
deleted file mode 100644
index 45b73e2552..0000000000
--- a/app/src/main/res/drawable/ic_qr_code_arrow.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="8dp"
-    android:height="12dp"
-    android:viewportWidth="8"
-    android:viewportHeight="12">
-    <path
-        android:fillColor="#ACA996"
-        android:fillType="evenOdd"
-        android:pathData="M0.2929,0.2929C0.6834,-0.0976 1.3166,-0.0976 1.7071,0.2929L7.4142,6L1.7071,11.7071C1.3166,12.0976 0.6834,12.0976 0.2929,11.7071C-0.0976,11.3166 -0.0976,10.6834 0.2929,10.2929L4.5858,6L0.2929,1.7071C-0.0976,1.3166 -0.0976,0.6834 0.2929,0.2929Z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_type_installed.xml b/app/src/main/res/drawable/ic_type_installed.xml
index d92865f651..8e78ba2db1 100644
--- a/app/src/main/res/drawable/ic_type_installed.xml
+++ b/app/src/main/res/drawable/ic_type_installed.xml
@@ -9,6 +9,6 @@
   <path
       android:pathData="M9,14L13.031,18.5L18.5,9"
       android:strokeWidth="1.5"
-      android:fillColor="#00000000"
+      android:fillColor="@color/transparent"
       android:strokeColor="@color/text_primary"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_type_not_installed.xml b/app/src/main/res/drawable/ic_type_not_installed.xml
index 7c29d96357..b1154b00f7 100644
--- a/app/src/main/res/drawable/ic_type_not_installed.xml
+++ b/app/src/main/res/drawable/ic_type_not_installed.xml
@@ -6,7 +6,7 @@
   <path
       android:strokeWidth="1"
       android:pathData="M14,0.5L14,0.5A13.5,13.5 0,0 1,27.5 14L27.5,14A13.5,13.5 0,0 1,14 27.5L14,27.5A13.5,13.5 0,0 1,0.5 14L0.5,14A13.5,13.5 0,0 1,14 0.5z"
-      android:fillColor="#00000000"
+      android:fillColor="@color/transparent"
       android:strokeColor="@color/shape_primary"/>
   <path
       android:pathData="M8.75,14.75L19.25,14.75A0.75,0.75 0,0 0,20 14L20,14A0.75,0.75 0,0 0,19.25 13.25L8.75,13.25A0.75,0.75 0,0 0,8 14L8,14A0.75,0.75 0,0 0,8.75 14.75z"
diff --git a/app/src/main/res/drawable/ic_upload_cover_image.xml b/app/src/main/res/drawable/ic_upload_cover_image.xml
deleted file mode 100644
index 8823a31c44..0000000000
--- a/app/src/main/res/drawable/ic_upload_cover_image.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="20dp"
-    android:height="20dp"
-    android:viewportWidth="20"
-    android:viewportHeight="20">
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M12.3994,8.4731C13.6969,9.7706 13.6969,11.8743 12.3994,13.1719C11.1019,14.4694 8.9982,14.4694 7.7007,13.1719C6.4032,11.8743 6.4032,9.7706 7.7007,8.4731C8.9982,7.1756 11.1019,7.1756 12.3994,8.4731"
-        android:strokeWidth="1.5"
-        android:strokeColor="#E89D00"
-        android:strokeLineCap="round"
-        android:strokeLineJoin="round" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M17.5,7.4997V14.9997C17.5,15.9205 16.7542,16.6663 15.8333,16.6663H4.1667C3.2458,16.6663 2.5,15.9205 2.5,14.9997V7.4997C2.5,6.5788 3.2458,5.833 4.1667,5.833H5.8333L7.0517,3.7463C7.2008,3.4905 7.475,3.333 7.7717,3.333H12.1917C12.4842,3.333 12.755,3.4863 12.9058,3.7363L14.1667,5.833H15.8333C16.7542,5.833 17.5,6.5788 17.5,7.4997Z"
-        android:strokeWidth="1.5"
-        android:strokeColor="#E89D00"
-        android:strokeLineCap="round"
-        android:strokeLineJoin="round" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_wallpaper.xml b/app/src/main/res/drawable/ic_wallpaper.xml
deleted file mode 100644
index e371c4fc47..0000000000
--- a/app/src/main/res/drawable/ic_wallpaper.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="28dp"
-    android:height="29dp"
-    android:viewportWidth="28"
-    android:viewportHeight="29">
-  <path
-      android:pathData="M6,0.125L22,0.125A6,6 0,0 1,28 6.125L28,22.125A6,6 0,0 1,22 28.125L6,28.125A6,6 0,0 1,0 22.125L0,6.125A6,6 0,0 1,6 0.125z"
-      android:fillColor="#AB50CC"/>
-  <path
-      android:pathData="M18,22.1289C18.5523,22.1289 19,21.6812 19,21.1289V7.1289C19,6.5766 18.5523,6.1289 18,6.1289H10C9.4477,6.1289 9,6.5766 9,7.1289L9,21.1289C9,21.6812 9.4477,22.1289 10,22.1289H18Z"
-      android:fillColor="#ffffff"/>
-  <path
-      android:pathData="M21,20.1289C21.5523,20.1289 22,19.6812 22,19.1289V9.1289C22,8.5766 21.5523,8.1289 21,8.1289H20.5V20.1289H21Z"
-      android:fillColor="#ffffff"/>
-  <path
-      android:pathData="M7,20.1289C6.4477,20.1289 6,19.6812 6,19.1289L6,9.1289C6,8.5766 6.4477,8.1289 7,8.1289H7.5L7.5,20.1289H7Z"
-      android:fillColor="#ffffff"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_white_logo.xml b/app/src/main/res/drawable/ic_white_logo.xml
deleted file mode 100644
index 8223e151b2..0000000000
--- a/app/src/main/res/drawable/ic_white_logo.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="82dp"
-    android:height="18dp"
-    android:viewportWidth="82"
-    android:viewportHeight="18">
-  <path
-      android:pathData="M11.3448,3.0043H8.2985V4.727C7.6892,3.6556 6.4077,2.7522 4.79,2.7522C3.4455,2.7522 2.2479,3.2564 1.3866,4.2018C0.5252,5.1472 0,6.5548 0,8.3826V8.5506C0,10.3784 0.5252,11.786 1.3656,12.7314C2.2269,13.7188 3.4244,14.223 4.79,14.223C6.4917,14.223 7.7312,13.3827 8.2985,12.3112V13.9905H11.3448V3.0043ZM5.5463,11.8491C3.8656,11.8491 2.9412,10.7356 2.9412,8.5717V8.4036C2.9412,6.1557 4.0337,5.0842 5.5673,5.0842C7.164,5.0842 8.2565,6.1977 8.2565,8.4036V8.5717C8.2565,10.7776 7.227,11.8491 5.5463,11.8491ZM14.2979,3.0043H17.3442V4.7481C17.9115,3.6556 19.0669,2.7522 20.9157,2.7522C22.0082,2.7522 22.9116,3.0884 23.5838,3.7606C24.2351,4.4539 24.6133,5.5464 24.6133,6.996V13.9919H21.567V7.4372C21.567,5.9246 20.9787,5.2313 19.6342,5.2313C18.3106,5.2313 17.3442,6.0296 17.3442,7.6473V13.9919H14.2979V3.0043ZM30.0164,12.8784L25.6465,3.0043H28.9239L31.592,9.6011L34.0501,3.0043H36.9703L31.0248,17.7315H28.0836L30.0164,12.8784ZM42.0965,14.202C39.7645,14.202 38.546,13.0255 38.546,10.7356V0.2292H41.5713V3.0043H44.2891V5.1682H41.5713V10.4625C41.5713,11.3238 41.9704,11.765 42.7898,11.765C43.5851,11.765 43.961,11.5736 44.2891,11.3938V13.7226C43.7139,13.9976 43.1192,14.202 42.0965,14.202ZM50.0079,12.8784L45.6381,3.0043H48.9155L51.5836,9.6011L54.0416,3.0043H56.9619L51.0164,17.7315H48.0751L50.0079,12.8784ZM58.3312,3.0043H61.3774V4.727C61.9867,3.6556 63.2682,2.7522 64.8859,2.7522C66.2305,2.7522 67.428,3.2564 68.2894,4.2018C69.1507,5.1472 69.6759,6.5548 69.6759,8.3826V8.5506C69.6759,10.3784 69.1507,11.786 68.3104,12.7314C67.449,13.7188 66.2515,14.223 64.8859,14.223C63.1842,14.223 61.9447,13.3827 61.3774,12.3112V17.7315H58.3312V3.0043ZM63.9431,11.8491C65.6238,11.8491 66.5482,10.7356 66.5482,8.5717V8.4036C66.5482,6.1557 65.4557,5.0842 63.9221,5.0842C62.3254,5.0842 61.233,6.1977 61.233,8.4036V8.5717C61.233,10.7776 62.2624,11.8491 63.9431,11.8491ZM76.7271,14.2204C75.0675,14.2204 73.639,13.7162 72.6306,12.7288C71.6012,11.7835 70.992,10.397 70.992,8.6323V8.4643C70.992,6.7207 71.6012,5.3131 72.6306,4.3048C73.639,3.3174 75.0465,2.7502 76.6431,2.7502C78.0716,2.7502 79.3951,3.1704 80.3824,4.0737C81.3698,4.977 82,6.3845 82,8.3382V9.1785H74.0801C74.1642,11.0272 75.1305,12.0566 76.8111,12.0566C78.2396,12.0566 78.9119,11.4474 79.101,10.523H81.979C81.6219,12.8969 79.7522,14.2204 76.7271,14.2204ZM79.0379,7.3089C78.9329,5.6283 78.0926,4.851 76.643,4.851C75.2775,4.851 74.3532,5.7333 74.1221,7.3089H79.0379Z"
-      android:fillColor="#ffffff"
-      android:fillType="evenOdd"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_widget_tree_expand.xml b/app/src/main/res/drawable/ic_widget_tree_expand.xml
index 2c9a0d0c1a..efb181ce6c 100644
--- a/app/src/main/res/drawable/ic_widget_tree_expand.xml
+++ b/app/src/main/res/drawable/ic_widget_tree_expand.xml
@@ -6,7 +6,7 @@
   <path
       android:pathData="M7.5,15L12.5,10L7.5,5"
       android:strokeWidth="1.5"
-      android:fillColor="#00000000"
+      android:fillColor="@color/transparent"
       android:strokeColor="@color/text_primary"
       android:strokeLineCap="round"/>
 </vector>
diff --git a/app/src/main/res/drawable/icon_back_onboarding.xml b/app/src/main/res/drawable/icon_back_onboarding.xml
deleted file mode 100644
index 7db897c156..0000000000
--- a/app/src/main/res/drawable/icon_back_onboarding.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="8dp"
-    android:height="12dp"
-    android:viewportWidth="8"
-    android:viewportHeight="12">
-  <path
-      android:pathData="M7.091,0.211C7.384,0.492 7.384,0.948 7.091,1.229L2.121,6L7.091,10.771C7.384,11.052 7.384,11.508 7.091,11.789C6.798,12.07 6.323,12.07 6.03,11.789L0,6L6.03,0.211C6.323,-0.07 6.798,-0.07 7.091,0.211Z"
-      android:fillColor="#A7A7A7"
-      android:fillType="evenOdd"/>
-</vector>
diff --git a/app/src/main/res/drawable/im_projectboard.png b/app/src/main/res/drawable/im_projectboard.png
deleted file mode 100644
index 43375b8e4a..0000000000
Binary files a/app/src/main/res/drawable/im_projectboard.png and /dev/null differ
diff --git a/app/src/main/res/drawable/rect_choose_cover_image_button_background.xml b/app/src/main/res/drawable/rect_choose_cover_image_button_background.xml
deleted file mode 100644
index b4428141a3..0000000000
--- a/app/src/main/res/drawable/rect_choose_cover_image_button_background.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <corners android:radius="18dp" />
-    <solid android:color="#FEF3C5" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/rect_create_viewer_icon_background.xml b/app/src/main/res/drawable/rect_create_viewer_icon_background.xml
deleted file mode 100644
index aa5271a785..0000000000
--- a/app/src/main/res/drawable/rect_create_viewer_icon_background.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <corners android:radius="8dp" />
-    <solid android:color="#FFEE94" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/rect_dv_search_relation.xml b/app/src/main/res/drawable/rect_dv_search_relation.xml
deleted file mode 100644
index ee97351fe7..0000000000
--- a/app/src/main/res/drawable/rect_dv_search_relation.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <corners android:radius="8dp" />
-    <solid android:color="#F3F2EC" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/rectangle_background_profile_transparent.xml b/app/src/main/res/drawable/rectangle_background_profile_transparent.xml
deleted file mode 100644
index 5117040f4d..0000000000
--- a/app/src/main/res/drawable/rectangle_background_profile_transparent.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <corners android:radius="8dp" />
-    <solid android:color="@android:color/transparent" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/rectangle_background_selected_profile.xml b/app/src/main/res/drawable/rectangle_background_selected_profile.xml
deleted file mode 100644
index 7ecc44c566..0000000000
--- a/app/src/main/res/drawable/rectangle_background_selected_profile.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <corners android:radius="8dp" />
-    <solid android:color="#F7F5F0" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/rectangle_doc_menu_bottom.xml b/app/src/main/res/drawable/rectangle_doc_menu_bottom.xml
deleted file mode 100644
index 85cd5c33dc..0000000000
--- a/app/src/main/res/drawable/rectangle_doc_menu_bottom.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <solid android:color="@color/white" />
-    <corners
-        android:bottomLeftRadius="10dp"
-        android:bottomRightRadius="10dp" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/rectangle_doc_menu_default.xml b/app/src/main/res/drawable/rectangle_doc_menu_default.xml
deleted file mode 100644
index effbe27c32..0000000000
--- a/app/src/main/res/drawable/rectangle_doc_menu_default.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <solid android:color="@color/white" />
-    <corners android:radius="10dp" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/rectangle_doc_menu_top.xml b/app/src/main/res/drawable/rectangle_doc_menu_top.xml
deleted file mode 100644
index f975a7aa12..0000000000
--- a/app/src/main/res/drawable/rectangle_doc_menu_top.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <solid android:color="@color/white" />
-    <corners
-        android:topLeftRadius="10dp"
-        android:topRightRadius="10dp" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/selector_pin_code_dot.xml b/app/src/main/res/drawable/selector_pin_code_dot.xml
deleted file mode 100644
index 6f2b78ef40..0000000000
--- a/app/src/main/res/drawable/selector_pin_code_dot.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/circle_pin_code_dot_empty" android:state_selected="false" />
-    <item android:drawable="@drawable/circle_pin_code_dot_active" android:state_selected="true" />
-</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/selector_pin_code_keyboard.xml b/app/src/main/res/drawable/selector_pin_code_keyboard.xml
deleted file mode 100644
index f4f7316707..0000000000
--- a/app/src/main/res/drawable/selector_pin_code_keyboard.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/circle_pin_code_keyboard_default" android:state_pressed="false" />
-    <item android:drawable="@drawable/circle_pin_code_keyboard_pressed" android:state_pressed="true" />
-</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/selector_profile_background.xml b/app/src/main/res/drawable/selector_profile_background.xml
deleted file mode 100644
index b05d3d6dd8..0000000000
--- a/app/src/main/res/drawable/selector_profile_background.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/rectangle_background_selected_profile" android:state_selected="true" />
-    <item android:drawable="@drawable/rectangle_background_profile_transparent" android:state_selected="false" />
-</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shimmer_circle.xml b/app/src/main/res/drawable/shimmer_circle.xml
deleted file mode 100644
index dc1aaf06d1..0000000000
--- a/app/src/main/res/drawable/shimmer_circle.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="oval">
-    <solid android:color="@color/shape_transparent" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/snackbar_check_mark.xml b/app/src/main/res/drawable/snackbar_check_mark.xml
index 863a2510ac..afdef57200 100644
--- a/app/src/main/res/drawable/snackbar_check_mark.xml
+++ b/app/src/main/res/drawable/snackbar_check_mark.xml
@@ -5,6 +5,6 @@
     android:viewportHeight="20">
   <path
       android:pathData="M16.633,4.402L9.131,16.191L3.47,10.53L4.53,9.469L8.869,13.808L15.367,3.597L16.633,4.402Z"
-      android:fillColor="#2AA7EE"
+      android:fillColor="@color/circle_accent_sky"
       android:fillType="evenOdd"/>
 </vector>
diff --git a/app/src/main/res/layout/fragment_alert.xml b/app/src/main/res/layout/fragment_alert.xml
deleted file mode 100644
index cb3a897b1e..0000000000
--- a/app/src/main/res/layout/fragment_alert.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?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"
-    android:layout_height="wrap_content">
-
-    <androidx.cardview.widget.CardView
-        android:id="@+id/container"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="bottom"
-        android:layout_marginStart="20dp"
-        android:layout_marginEnd="20dp"
-        android:layout_marginBottom="20dp"
-        app:cardCornerRadius="@dimen/auth_default_card_corner_radius"
-        app:cardElevation="0dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent">
-
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-
-            <FrameLayout
-                android:id="@+id/image"
-                android:layout_width="@dimen/auth_default_icon_circle_diameter"
-                android:layout_height="@dimen/auth_default_icon_circle_diameter"
-                android:layout_marginStart="@dimen/auth_default_margin_start"
-                android:layout_marginTop="20dp"
-                android:layout_marginBottom="16dp"
-                android:background="@drawable/circle_emoji_icon_background"
-                app:layout_constraintBottom_toTopOf="@+id/title"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent">
-
-                <ImageView
-                    android:id="@+id/icon"
-                    android:layout_width="24dp"
-                    android:layout_height="24dp"
-                    android:layout_gravity="center"
-                    android:src="@drawable/ic_update_app" />
-
-            </FrameLayout>
-
-            <com.anytypeio.anytype.core_ui.views.ButtonPrimaryLarge
-                android:id="@+id/update"
-                android:layout_width="0dp"
-                android:layout_height="@dimen/auth_default_button_height"
-                android:layout_marginStart="5dp"
-                android:layout_marginEnd="@dimen/auth_default_margin_end"
-                android:layout_marginBottom="16dp"
-                android:text="@string/update"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintHorizontal_bias="0.5"
-                app:layout_constraintStart_toEndOf="@+id/later" />
-
-            <com.anytypeio.anytype.core_ui.views.ButtonSecondaryLarge
-                android:id="@+id/later"
-                android:layout_width="0dp"
-                android:layout_height="@dimen/auth_default_button_height"
-                android:layout_marginStart="@dimen/auth_default_margin_start"
-                android:layout_marginEnd="5dp"
-                android:layout_marginBottom="16dp"
-                android:text="@string/later"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toStartOf="@+id/update"
-                app:layout_constraintHorizontal_bias="0.5"
-                app:layout_constraintStart_toStartOf="parent" />
-
-            <TextView
-                android:id="@+id/title"
-                style="@style/TextView.ContentStyle.Headline.Heading"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="20dp"
-                android:layout_marginBottom="10dp"
-                android:text="@string/time_to_update_title"
-                app:layout_constraintBottom_toTopOf="@+id/subtitle"
-                app:layout_constraintStart_toStartOf="parent" />
-
-            <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:text="@string/time_to_update_text"
-                app:layout_constraintBottom_toTopOf="@+id/update"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent" />
-
-        </androidx.constraintlayout.widget.ConstraintLayout>
-
-    </androidx.cardview.widget.CardView>
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_create_filter_flow.xml b/app/src/main/res/layout/fragment_create_filter_flow.xml
deleted file mode 100644
index beba12a857..0000000000
--- a/app/src/main/res/layout/fragment_create_filter_flow.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="match_parent">
-
-    <androidx.fragment.app.FragmentContainerView
-        android:id="@+id/container"
-        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/fragment_create_set.xml b/app/src/main/res/layout/fragment_create_set.xml
deleted file mode 100644
index e715989e97..0000000000
--- a/app/src/main/res/layout/fragment_create_set.xml
+++ /dev/null
@@ -1,10 +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" />
-</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_limit_object_type.xml b/app/src/main/res/layout/fragment_limit_object_type.xml
deleted file mode 100644
index a4e68a6112..0000000000
--- a/app/src/main/res/layout/fragment_limit_object_type.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?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"
-    android:orientation="vertical">
-
-    <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/dragger" />
-
-    <TextView
-        style="@style/TextView.UXStyle.Titles.1"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="18dp"
-        android:layout_gravity="center_horizontal"
-        android:text="@string/limit_object_types"/>
-
-    <LinearLayout
-        android:id="@+id/searchBar"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="20dp"
-        android:layout_marginTop="20dp"
-        android:layout_marginEnd="20dp"
-        android:background="@drawable/rect_dv_filter_search"
-        android:orientation="horizontal">
-
-        <ImageView
-            android:id="@+id/searchIcon"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:layout_marginStart="8dp"
-            android:layout_marginTop="6dp"
-            android:layout_marginBottom="6dp"
-            android:src="@drawable/ic_dv_filter_search" />
-
-        <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:gravity="center_vertical"
-            android:hint="@string/search"
-            android:maxLines="1"
-            android:singleLine="true"
-            android:textColorHint="@color/text_secondary" />
-
-    </LinearLayout>
-
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/recycler"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_marginTop="@dimen/dp_10"
-        android:paddingStart="20dp"
-        android:paddingEnd="20dp"
-        tools:listitem="@layout/item_document_relation_default" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_modals_nav.xml b/app/src/main/res/layout/fragment_modals_nav.xml
deleted file mode 100644
index d3fc5445e4..0000000000
--- a/app/src/main/res/layout/fragment_modals_nav.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/container"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-
-</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_turn_into.xml b/app/src/main/res/layout/fragment_turn_into.xml
deleted file mode 100644
index 27e8671fb3..0000000000
--- a/app/src/main/res/layout/fragment_turn_into.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:id="@+id/close"
-        android:layout_width="28dp"
-        android:layout_height="28dp"
-        android:layout_gravity="end"
-        android:layout_marginTop="16dp"
-        android:layout_marginEnd="16dp"
-        android:contentDescription="@string/content_description_close_button"
-        android:src="@drawable/ic_close_round" />
-
-</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
deleted file mode 100644
index ba1845cdb6..0000000000
Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png and /dev/null differ
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index 3ab573a3bd..8d3b53d3f9 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -6,22 +6,11 @@
     <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>
-
     <color name="orange">#FFBB2C</color>
     <color name="white">#FFFFFF</color>
     <color name="black">#FFFFFF</color>
     <color name="gray">#ACA996</color>
-    <color name="keychain_hint_color">#ACA996</color>
-    <color name="blue">#3F51B5</color>
-
-    <color name="auth_divider">#DFDDD0</color>
-    <color name="hint_color">#ACA996</color>
 
     <color name="default_dashboard_background_color">#0066C3</color>
 
-    <color name="library_action_btn_text_color">#000000</color>
-
 </resources>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 07b9b67a1a..501435972a 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -2,22 +2,23 @@
 <resources>
     <color name="defaultCanvasColor">#FFFFFF</color>
 
-    <color name="gray_background">#6a6962</color>
-    <color name="button_active">#FFBB2C</color>
-    <color name="button_not_active">#ACA996</color>
-
     <color name="orange">#FFBB2C</color>
     <color name="white">#FFFFFF</color>
     <color name="black">#2C2B27</color>
     <color name="gray">#ACA996</color>
-    <color name="keychain_hint_color">#ACA996</color>
-    <color name="blue">#3F51B5</color>
-
-    <color name="auth_divider">#DFDDD0</color>
-    <color name="hint_color">#ACA996</color>
 
     <color name="default_dashboard_background_color">#0066C3</color>
 
-    <color name="library_action_btn_text_color">#FFFFFF</color>
+    <color name="circle_accent_sky">#2AA7EE</color>
 
-</resources>
+    <color name="gradient_light_yellow">#FFFFEDBE</color>
+    <color name="gradient_light_pink">#FFFFBCC3</color>
+
+    <color name="transparent">#00000000</color>
+
+    <color name="background_black_launcher">#000000</color>
+
+    <color name="gray_light_logo">#DBDAD4</color>
+    <color name="gray_mnemonic_lock">#A7A7A7</color>
+
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 23c650684d..3a974fc283 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -1,45 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-
-    <dimen name="default_button_text_size">15sp</dimen>
-
-    <dimen name="button_text_size">18sp</dimen>
-    <dimen name="profile_adapter_margin_top">12dp</dimen>
-    <dimen name="dot_spacing">20dp</dimen>
-    <dimen name="num_pad_vertical_spacing">16dp</dimen>
-
-    <dimen name="auth_default_card_margin">20dp</dimen>
-    <dimen name="auth_default_card_corner_radius">12dp</dimen>
-    <dimen name="auth_default_margin_start">20dp</dimen>
-    <dimen name="auth_default_margin_end">20dp</dimen>
-    <dimen name="auth_default_margin_bottom">20dp</dimen>
     <dimen name="auth_default_button_height">48dp</dimen>
-    <dimen name="auth_default_icon_circle_diameter">64dp</dimen>
-    <dimen name="auth_default_button_text_size">15sp</dimen>
-
-
-    <dimen name="table_column_header_height">16dp</dimen>
-    <dimen name="table_row_header_width">16dp</dimen>
-
-    <dimen name="list_margin_start">20dp</dimen>
     <dimen name="editor_recycler_bottom_padding">48dp</dimen>
-    <dimen name="avatar_height_big">96dp</dimen>
-    <dimen name="avatar_width_big">96dp</dimen>
-
-    <dimen name="action_toolbar_block_padding_top">12dp</dimen>
-    <dimen name="action_toolbar_block_padding_bottom">12dp</dimen>
-    <dimen name="action_toolbar_bar_margin_bottom">16dp</dimen>
-    <dimen name="action_toolbar_bar_margin_top">8dp</dimen>
-
     <dimen name="shimmer_radius">5dp</dimen>
     <dimen name="shimmer_line_height">8dp</dimen>
     <dimen name="scroll_and_move_start_end_padding">8dp</dimen>
-    <dimen name="height_avatar_on_dashboard">80dp</dimen>
-    <dimen name="width_avatar_on_dashboard">80dp</dimen>
-    <dimen name="single_option_value_bottom_list_margin">32dp</dimen>
-    <dimen name="multiple_option_value_bottom_list_margin">68dp</dimen>
-    <dimen name="default_dashboard_card_height">126dp</dimen>
-    <dimen name="dashboard_object_icon_default_size">48dp</dimen>
-    <dimen name="default_divider_height">0.5dp</dimen>
     <dimen name="default_search_toolbar_clip_height">36dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 567b9c2c83..04b7d28ee7 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -3,13 +3,6 @@
     <style name="AuthHeaderStyle" parent="TextView.ContentStyle.Headline.Heading">
     </style>
 
-    <style name="PinCodeKeyboardNumber" parent="TextView.ContentStyle.Headline.Title">
-        <item name="android:stateListAnimator">@animator/scale_shrink</item>
-        <item name="android:clickable">true</item>
-        <item name="android:gravity">center</item>
-        <item name="android:background">@drawable/selector_pin_code_keyboard</item>
-    </style>
-
     <style name="SyncFromCloudDialog" parent="Theme.MaterialComponents.Dialog.Alert">
         <item name="android:windowNoTitle">true</item>
         <item name="android:background">#fff</item>
diff --git a/app/src/main/res/xml/collapsing_add_block_toolbar_title.xml b/app/src/main/res/xml/collapsing_add_block_toolbar_title.xml
deleted file mode 100644
index 6357078fcf..0000000000
--- a/app/src/main/res/xml/collapsing_add_block_toolbar_title.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<MotionScene xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <Transition
-        app:constraintSetEnd="@id/end"
-        app:constraintSetStart="@id/start"
-        app:duration="1000">
-        <OnSwipe
-            app:dragDirection="dragUp"
-            app:touchAnchorId="@+id/recycler"
-            app:touchAnchorSide="top" />
-    </Transition>
-
-    <ConstraintSet android:id="@+id/start">
-
-    </ConstraintSet>
-
-    <ConstraintSet android:id="@+id/end">
-        <Constraint
-            android:id="@+id/title"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="0dp" />
-    </ConstraintSet>
-
-</MotionScene>
\ No newline at end of file
diff --git a/app/src/main/res/xml/fragment_dashboard_scene.xml b/app/src/main/res/xml/fragment_dashboard_scene.xml
deleted file mode 100644
index 895090bd98..0000000000
--- a/app/src/main/res/xml/fragment_dashboard_scene.xml
+++ /dev/null
@@ -1,172 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<MotionScene xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <ConstraintSet android:id="@+id/start">
-        <Constraint
-            android:id="@+id/bottomSheet"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:layout_marginTop="58dp"
-            app:layout_constraintBottom_toTopOf="@+id/selectionBottomToolbar"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/btnLibrary" />
-        <Constraint
-            android:id="@+id/tvGreeting">
-            <CustomAttribute
-                app:attributeName="alpha"
-                app:customFloatValue="1.0" />
-        </Constraint>
-        <Constraint
-            android:id="@+id/avatarContainer">
-            <CustomAttribute
-                app:attributeName="alpha"
-                app:customFloatValue="1.0" />
-        </Constraint>
-        <Constraint
-            android:id="@+id/btnSearch"
-            android:layout_width="52dp"
-            android:layout_height="52dp"
-            android:layout_marginTop="50dp"
-            android:layout_marginEnd="20dp"
-            app:layout_constraintEnd_toStartOf="@+id/btnLibrary"
-            app:layout_constraintTop_toBottomOf="@+id/avatarContainer">
-            <CustomAttribute
-                app:attributeName="alpha"
-                app:customFloatValue="1.0" />
-        </Constraint>
-        <Constraint
-            android:id="@+id/btnLibrary"
-            android:layout_width="52dp"
-            android:layout_height="52dp"
-            android:layout_marginTop="50dp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/avatarContainer">
-            <CustomAttribute
-                app:attributeName="alpha"
-                app:customFloatValue="1.0" />
-        </Constraint>
-        <Constraint
-            android:id="@+id/btnAddDoc"
-            android:layout_width="52dp"
-            android:layout_height="52dp"
-            android:layout_marginStart="20dp"
-            android:layout_marginTop="50dp"
-            app:layout_constraintStart_toEndOf="@+id/btnLibrary"
-            app:layout_constraintTop_toBottomOf="@+id/avatarContainer">
-            <CustomAttribute
-                app:attributeName="alpha"
-                app:customFloatValue="1.0" />
-        </Constraint>
-        <Constraint
-            android:id="@+id/objectRemovalProgressBar"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:visibilityMode="ignore" />
-        <Constraint
-            android:id="@+id/widgets"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="16dp"
-            android:text="Widgets"
-            app:visibilityMode="ignore"
-            app:layout_constraintBottom_toBottomOf="@+id/ivSettings"
-            app:layout_constraintEnd_toStartOf="@+id/ivSettings"
-            app:layout_constraintTop_toTopOf="@+id/ivSettings"/>
-    </ConstraintSet>
-
-    <ConstraintSet android:id="@+id/end">
-        <Constraint
-            android:id="@+id/bottomSheet"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            android:layout_marginTop="16dp"
-            app:layout_constraintBottom_toTopOf="@+id/selectionBottomToolbar"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/ivSettings" />
-        <Constraint
-            android:id="@+id/tvGreeting">
-            <CustomAttribute
-                app:attributeName="alpha"
-                app:customFloatValue="0.0" />
-        </Constraint>
-        <Constraint
-            android:id="@+id/avatarContainer">
-            <CustomAttribute
-                app:attributeName="alpha"
-                app:customFloatValue="0.0" />
-        </Constraint>
-        <Constraint
-            android:id="@+id/btnSearch"
-            android:layout_width="52dp"
-            android:layout_height="52dp"
-            android:layout_marginTop="16dp"
-            android:layout_marginEnd="20dp"
-            app:layout_constraintEnd_toStartOf="@+id/btnLibrary"
-            app:layout_constraintTop_toBottomOf="@+id/avatarContainer">
-            <CustomAttribute
-                app:attributeName="alpha"
-                app:customFloatValue="0.0" />
-        </Constraint>
-        <Constraint
-            android:id="@+id/btnLibrary"
-            android:layout_width="52dp"
-            android:layout_height="52dp"
-            android:layout_marginTop="16dp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/avatarContainer">
-            <CustomAttribute
-                app:attributeName="alpha"
-                app:customFloatValue="0.0" />
-        </Constraint>
-        <Constraint
-            android:id="@+id/btnAddDoc"
-            android:layout_width="52dp"
-            android:layout_height="52dp"
-            android:layout_marginStart="20dp"
-            android:layout_marginTop="16dp"
-            app:layout_constraintStart_toEndOf="@+id/btnLibrary"
-            app:layout_constraintTop_toBottomOf="@+id/avatarContainer">
-            <CustomAttribute
-                app:attributeName="alpha"
-                app:customFloatValue="0.0" />
-        </Constraint>
-        <Constraint
-            android:id="@+id/objectRemovalProgressBar"
-            android:layout_width="0dp"
-            android:layout_height="0dp"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:visibilityMode="ignore" />
-        <Constraint
-            android:id="@+id/widgets"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="16dp"
-            android:text="Widgets"
-            app:visibilityMode="ignore"
-            app:layout_constraintBottom_toBottomOf="@+id/ivSettings"
-            app:layout_constraintEnd_toStartOf="@+id/ivSettings"
-            app:layout_constraintTop_toTopOf="@+id/ivSettings"/>
-    </ConstraintSet>
-
-    <Transition
-        android:id="@+id/transition1"
-        app:constraintSetEnd="@id/end"
-        app:constraintSetStart="@+id/start">
-        <OnSwipe
-            app:dragDirection="dragUp"
-            app:touchAnchorId="@id/bottomSheet"
-            app:touchAnchorSide="top" />
-    </Transition>
-</MotionScene>
diff --git a/app/src/main/res/xml/fragment_object_set_scene.xml b/app/src/main/res/xml/fragment_object_set_scene.xml
index 7cbf477726..73ee5bfe39 100644
--- a/app/src/main/res/xml/fragment_object_set_scene.xml
+++ b/app/src/main/res/xml/fragment_object_set_scene.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <MotionScene xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:motion="http://schemas.android.com/apk/res-auto"
-    xmlns:app="http://schemas.android.com/tools">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <Transition
         motion:constraintSetEnd="@+id/end"
@@ -94,14 +94,14 @@
         <Constraint
             android:id="@id/templatesWidget">
             <PropertySet
-                app:applyMotionScene="false"
-                app:visibilityMode="ignore"/>
+                tools:applyMotionScene="false"
+                tools:visibilityMode="ignore"/>
         </Constraint>
         <Constraint
             android:id="@id/syncStatusWidget">
             <PropertySet
-                app:applyMotionScene="false"
-                app:visibilityMode="ignore"/>
+                tools:applyMotionScene="false"
+                tools:visibilityMode="ignore"/>
         </Constraint>
     </ConstraintSet>
 
@@ -188,14 +188,14 @@
         <Constraint
             android:id="@id/templatesWidget">
             <PropertySet
-                app:applyMotionScene="false"
-                app:visibilityMode="ignore"/>
+                tools:applyMotionScene="false"
+                tools:visibilityMode="ignore"/>
         </Constraint>
         <Constraint
             android:id="@id/syncStatusWidget">
             <PropertySet
-                app:applyMotionScene="false"
-                app:visibilityMode="ignore"/>
+                tools:applyMotionScene="false"
+                tools:visibilityMode="ignore"/>
         </Constraint>
     </ConstraintSet>
 
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
deleted file mode 100644
index 11b11e5549..0000000000
--- a/app/src/main/res/xml/preferences.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-    <SwitchPreference
-        android:defaultValue="false"
-        android:key="@string/trouble_mode"
-        android:title="Troubleshooting mode" />
-
-</PreferenceScreen>
\ No newline at end of file
diff --git a/app/src/release/res/values/technical_strings.xml b/app/src/release/res/values/technical_strings.xml
index 1b6201765a..d986f8086e 100644
--- a/app/src/release/res/values/technical_strings.xml
+++ b/app/src/release/res/values/technical_strings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="app_name">Anytype</string>
-    <color name="ic_app_back_main">#FFFFFF</color>
+    <color name="ic_app_back_main">@color/white</color>
 </resources>
\ No newline at end of file
diff --git a/core-ui/src/main/res/color/ds_button_primary_text.xml b/core-ui/src/main/res/color/ds_button_primary_text.xml
deleted file mode 100644
index 7756f260cd..0000000000
--- a/core-ui/src/main/res/color/ds_button_primary_text.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="@color/text_tertiary" android:state_enabled="false" />
-    <item android:color="@color/button_text" android:state_enabled="true" />
-    <item android:color="@color/button_text" android:state_enabled="true" android:state_pressed="true" />
-</selector>
\ No newline at end of file
diff --git a/core-ui/src/main/res/color/selector_convert_block_chapter_text_color.xml b/core-ui/src/main/res/color/selector_convert_block_chapter_text_color.xml
deleted file mode 100644
index 24b27067c7..0000000000
--- a/core-ui/src/main/res/color/selector_convert_block_chapter_text_color.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="@color/white" android:state_selected="true" />
-    <item android:color="@color/black" android:state_selected="false" />
-</selector>
\ No newline at end of file
diff --git a/core-ui/src/main/res/color/selector_dashboard_page_tab.xml b/core-ui/src/main/res/color/selector_dashboard_page_tab.xml
deleted file mode 100644
index bab3b79d31..0000000000
--- a/core-ui/src/main/res/color/selector_dashboard_page_tab.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="#CC0066C3" android:state_selected="false" />
-    <item android:color="@color/black" android:state_selected="true" />
-</selector>
\ No newline at end of file
diff --git a/core-ui/src/main/res/color/selector_style_toolbar_tab_text_color.xml b/core-ui/src/main/res/color/selector_style_toolbar_tab_text_color.xml
deleted file mode 100644
index 0357b84224..0000000000
--- a/core-ui/src/main/res/color/selector_style_toolbar_tab_text_color.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="@color/black" android:state_selected="false" />
-    <item android:color="@color/white" android:state_selected="true" />
-</selector>
\ No newline at end of file
diff --git a/core-ui/src/main/res/color/selector_toolbar_section.xml b/core-ui/src/main/res/color/selector_toolbar_section.xml
deleted file mode 100644
index 0357b84224..0000000000
--- a/core-ui/src/main/res/color/selector_toolbar_section.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="@color/black" android:state_selected="false" />
-    <item android:color="@color/white" android:state_selected="true" />
-</selector>
\ No newline at end of file
diff --git a/core-ui/src/main/res/color/selector_viewer_header.xml b/core-ui/src/main/res/color/selector_viewer_header.xml
deleted file mode 100644
index cc4294d87e..0000000000
--- a/core-ui/src/main/res/color/selector_viewer_header.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="@color/glyph_inactive" android:state_enabled="false" />
-    <item android:color="@color/glyph_selected"/>
-</selector>
\ No newline at end of file
diff --git a/core-ui/src/main/res/color/selector_viewer_tab_text_color.xml b/core-ui/src/main/res/color/selector_viewer_tab_text_color.xml
deleted file mode 100644
index 6e0fc77e8b..0000000000
--- a/core-ui/src/main/res/color/selector_viewer_tab_text_color.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="@color/black" android:state_activated="true" />
-    <item android:color="@color/gray" android:state_activated="false" />
-</selector>
\ No newline at end of file
diff --git a/core-ui/src/main/res/drawable-hdpi/ic_mention_deafult.png b/core-ui/src/main/res/drawable-hdpi/ic_mention_deafult.png
deleted file mode 100644
index 05b9df9b47..0000000000
Binary files a/core-ui/src/main/res/drawable-hdpi/ic_mention_deafult.png and /dev/null differ
diff --git a/core-ui/src/main/res/drawable-hdpi/rectangle_default_button.xml b/core-ui/src/main/res/drawable-hdpi/rectangle_default_button.xml
deleted file mode 100644
index e149da2cbf..0000000000
--- a/core-ui/src/main/res/drawable-hdpi/rectangle_default_button.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ripple xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="?colorControlHighlight">
-    <item>
-        <shape android:shape="rectangle">
-            <solid android:color="@color/glyph_accent" />
-            <corners android:radius="10dp" />
-        </shape>
-    </item>
-
-</ripple>
\ No newline at end of file
diff --git a/core-ui/src/main/res/drawable-hdpi/rectangle_default_button_disabled.xml b/core-ui/src/main/res/drawable-hdpi/rectangle_default_button_disabled.xml
deleted file mode 100644
index 35740d534a..0000000000
--- a/core-ui/src/main/res/drawable-hdpi/rectangle_default_button_disabled.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <solid android:color="@color/shape_primary" />
-    <corners android:radius="12dp" />
-</shape>
\ No newline at end of file
diff --git a/core-ui/src/main/res/drawable-hdpi/rectangle_default_button_selector.xml b/core-ui/src/main/res/drawable-hdpi/rectangle_default_button_selector.xml
deleted file mode 100644
index 2aa94c04a3..0000000000
--- a/core-ui/src/main/res/drawable-hdpi/rectangle_default_button_selector.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/rectangle_default_button" android:state_enabled="true" />
-    <item android:drawable="@drawable/rectangle_default_button_disabled" android:state_enabled="false" />
-</selector>
\ No newline at end of file
diff --git a/core-ui/src/main/res/drawable-hdpi/rectangle_orange_button.xml b/core-ui/src/main/res/drawable-hdpi/rectangle_orange_button.xml
deleted file mode 100644
index 78d7539fce..0000000000
--- a/core-ui/src/main/res/drawable-hdpi/rectangle_orange_button.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <corners android:radius="8dp" />
-    <solid android:color="@color/orange" />
-</shape>
\ No newline at end of file
diff --git a/core-ui/src/main/res/drawable-night/rect_data_view_gallery_item.xml b/core-ui/src/main/res/drawable-night/rect_data_view_gallery_item.xml
deleted file mode 100644
index 17fd164fc6..0000000000
--- a/core-ui/src/main/res/drawable-night/rect_data_view_gallery_item.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ripple xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="@color/light_grayish">
-    <item>
-        <shape>
-            <solid android:color="#2C2B27"/>
-            <stroke
-                android:width="0.5dp"
-                android:color="#2C2B27" />
-            <corners android:radius="16dp" />
-        </shape>
-    </item>
-</ripple>
\ No newline at end of file
diff --git a/core-ui/src/main/res/drawable-xxxhdpi/cover_solid_shape_rounded.xml b/core-ui/src/main/res/drawable-xxxhdpi/cover_solid_shape_rounded.xml
deleted file mode 100644
index 92be02f116..0000000000
--- a/core-ui/src/main/res/drawable-xxxhdpi/cover_solid_shape_rounded.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <corners android:topLeftRadius="16dp" android:topRightRadius="16dp"/>
-    <solid android:color="@color/white"/>
-</shape>
\ No newline at end of file
diff --git a/core-ui/src/main/res/drawable/alpha_overlay_5.xml b/core-ui/src/main/res/drawable/alpha_overlay_5.xml
index ec4f6d886a..8c819e11ab 100644
--- a/core-ui/src/main/res/drawable/alpha_overlay_5.xml
+++ b/core-ui/src/main/res/drawable/alpha_overlay_5.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="#0D000000"/>
+    <solid android:color="@color/overlay_black_light_5"/>
 </shape>
\ No newline at end of file
diff --git a/core-ui/src/main/res/drawable/avatar_ripple.xml b/core-ui/src/main/res/drawable/avatar_ripple.xml
deleted file mode 100644
index b52ed4b53c..0000000000
--- a/core-ui/src/main/res/drawable/avatar_ripple.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ripple xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="#80F5F5F5">
-    <item>
-        <shape
-            android:shape="oval">
-            <solid android:color="@color/white" />
-        </shape>
-    </item>
-</ripple>
\ No newline at end of file
diff --git a/core-ui/src/main/res/drawable/bg_bookmark_cancel_button.xml b/core-ui/src/main/res/drawable/bg_bookmark_cancel_button.xml
deleted file mode 100644
index 44dcebe59f..0000000000
--- a/core-ui/src/main/res/drawable/bg_bookmark_cancel_button.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <stroke
-        android:width="1dp"
-        android:color="@color/shape_primary" />
-    <corners android:radius="8dp" />
-</shape>
\ No newline at end of file
diff --git a/core-ui/src/main/res/drawable/bg_bookmark_error_background.xml b/core-ui/src/main/res/drawable/bg_bookmark_error_background.xml
deleted file mode 100644
index 1257580877..0000000000
--- a/core-ui/src/main/res/drawable/bg_bookmark_error_background.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <stroke
-        android:width="1dp"
-        android:color="#DFDDD0" />
-</shape>
\ No newline at end of file
diff --git a/core-ui/src/main/res/drawable/bg_cover_default.xml b/core-ui/src/main/res/drawable/bg_cover_default.xml
deleted file mode 100644
index b34157bc82..0000000000
--- a/core-ui/src/main/res/drawable/bg_cover_default.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="36dp"
-    android:height="36dp"
-    android:viewportWidth="36"
-    android:viewportHeight="36">
-    <path
-        android:fillColor="@color/glyph_inactive"
-        android:pathData="M12.237,15.481C11.042,15.481 10.074,14.512 10.074,13.318C10.074,12.123 11.042,11.154 12.237,11.154C13.432,11.154 14.4,12.123 14.4,13.318C14.4,14.512 13.432,15.481 12.237,15.481Z" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M5.04,27L11.887,20.154C12.082,19.958 12.398,19.958 12.594,20.154L15.12,22.68L20.527,17.274C20.722,17.078 21.038,17.078 21.234,17.274L30.96,27"
-        android:strokeWidth="1.5"
-        android:strokeColor="@color/glyph_inactive" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M7.6,6.15L28.4,6.15A3.25,3.25 0,0 1,31.65 9.4L31.65,27.32A3.25,3.25 0,0 1,28.4 30.57L7.6,30.57A3.25,3.25 0,0 1,4.35 27.32L4.35,9.4A3.25,3.25 0,0 1,7.6 6.15z"
-        android:strokeWidth="1.5"
-        android:strokeColor="@color/glyph_inactive" />
-</vector>
diff --git a/core-ui/src/main/res/drawable/bg_editor_table_cell.xml b/core-ui/src/main/res/drawable/bg_editor_table_cell.xml
deleted file mode 100644
index f156edc838..0000000000
--- a/core-ui/src/main/res/drawable/bg_editor_table_cell.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-</shape>
\ No newline at end of file
diff --git a/core-ui/src/main/res/drawable/bg_editor_table_cell_selected.xml b/core-ui/src/main/res/drawable/bg_editor_table_cell_selected.xml
deleted file mode 100644
index 1a85862a2e..0000000000
--- a/core-ui/src/main/res/drawable/bg_editor_table_cell_selected.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <stroke
-        android:width="@dimen/dp_2"
-        android:color="@color/amber_80" />
-
-</shape>
\ No newline at end of file
diff --git a/core-ui/src/main/res/drawable/bg_editor_table_cell_selector.xml b/core-ui/src/main/res/drawable/bg_editor_table_cell_selector.xml
deleted file mode 100644
index c83dcc1b9e..0000000000
--- a/core-ui/src/main/res/drawable/bg_editor_table_cell_selector.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/bg_editor_table_cell_selected" android:state_selected="true" />
-    <item android:drawable="@drawable/bg_editor_table_cell" android:state_selected="false" />
-</selector>
\ No newline at end of file
diff --git a/core-ui/src/main/res/drawable/bg_featured_relation.xml b/core-ui/src/main/res/drawable/bg_featured_relation.xml
deleted file mode 100644
index a864e103e9..0000000000
--- a/core-ui/src/main/res/drawable/bg_featured_relation.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <solid
-        android:color="@color/background_highlighted"/>
-    <corners android:radius="4dp" />
-</shape>
\ No newline at end of file
diff --git a/core-ui/src/main/res/drawable/bg_menu_media_block.xml b/core-ui/src/main/res/drawable/bg_menu_media_block.xml
deleted file mode 100644
index 052c72a3d5..0000000000
--- a/core-ui/src/main/res/drawable/bg_menu_media_block.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <solid android:color="#59000000" />
-    <corners android:radius="4dp" />
-</shape>
\ No newline at end of file
diff --git a/core-ui/src/main/res/drawable/bg_page_nav_filter.xml b/core-ui/src/main/res/drawable/bg_page_nav_filter.xml
deleted file mode 100644
index ee97351fe7..0000000000
--- a/core-ui/src/main/res/drawable/bg_page_nav_filter.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <corners android:radius="8dp" />
-    <solid android:color="#F3F2EC" />
-</shape>
\ No newline at end of file
diff --git a/core-ui/src/main/res/drawable/bg_sam_hint_button.xml b/core-ui/src/main/res/drawable/bg_sam_hint_button.xml
deleted file mode 100644
index 2f6d1ad1a3..0000000000
--- a/core-ui/src/main/res/drawable/bg_sam_hint_button.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <corners android:radius="40dp" />
-    <solid android:color="#FEF3C5" />
-</shape>
\ No newline at end of file
diff --git a/core-ui/src/main/res/drawable/bg_toolbar_style_block_whole.xml b/core-ui/src/main/res/drawable/bg_toolbar_style_block_whole.xml
deleted file mode 100644
index 7d0daa3554..0000000000
--- a/core-ui/src/main/res/drawable/bg_toolbar_style_block_whole.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <corners android:radius="10dp" />
-    <solid android:color="@android:color/transparent" />
-</shape>
\ No newline at end of file
diff --git a/core-ui/src/main/res/drawable/bg_toolbar_style_set_link_active.xml b/core-ui/src/main/res/drawable/bg_toolbar_style_set_link_active.xml
index 92372c2dcf..14db7ffb19 100644
--- a/core-ui/src/main/res/drawable/bg_toolbar_style_set_link_active.xml
+++ b/core-ui/src/main/res/drawable/bg_toolbar_style_set_link_active.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <solid android:color="#FFB522" />
+    <solid android:color="@color/palette_system_amber_100" />
     <corners android:radius="10dp" />
 </shape>
\ No newline at end of file
diff --git a/core-ui/src/main/res/drawable/circle_bullet.xml b/core-ui/src/main/res/drawable/circle_bullet.xml
deleted file mode 100644
index 48b0b708cf..0000000000
--- a/core-ui/src/main/res/drawable/circle_bullet.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="oval">
-    <solid android:color="@color/black" />
-</shape>
\ No newline at end of file
diff --git a/core-ui/src/main/res/drawable/circle_cell_action.xml b/core-ui/src/main/res/drawable/circle_cell_action.xml
deleted file mode 100644
index 566c9ec303..0000000000
--- a/core-ui/src/main/res/drawable/circle_cell_action.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="oval">
-    <stroke
-        android:width="0.5dp"
-        android:color="@color/shape_primary" />
-</shape>
\ No newline at end of file
diff --git a/core-ui/src/main/res/drawable/circle_grid_cell_profile.xml b/core-ui/src/main/res/drawable/circle_grid_cell_profile.xml
deleted file mode 100644
index 513f7b680d..0000000000
--- a/core-ui/src/main/res/drawable/circle_grid_cell_profile.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="oval">
-    <solid android:color="#DFDDD0" />
-</shape>
\ No newline at end of file
diff --git a/core-ui/src/main/res/drawable/circle_markup_background_color.xml b/core-ui/src/main/res/drawable/circle_markup_background_color.xml
deleted file mode 100644
index b52ed56d09..0000000000
--- a/core-ui/src/main/res/drawable/circle_markup_background_color.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="oval">
-    <stroke
-        android:width="1dp"
-        android:color="@color/shape_primary" />
-</shape>
\ No newline at end of file
diff --git a/core-ui/src/main/res/drawable/circle_object_icon_emoji_background.xml b/core-ui/src/main/res/drawable/circle_object_icon_emoji_background.xml
index 89244856d7..39743806ed 100644
--- a/core-ui/src/main/res/drawable/circle_object_icon_emoji_background.xml
+++ b/core-ui/src/main/res/drawable/circle_object_icon_emoji_background.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="oval">
-    <solid android:color="#F3F2EC" />
+    <solid android:color="@color/background_light_gray" />
 </shape>
\ No newline at end of file
diff --git a/core-ui/src/main/res/drawable/circle_style_white_background_color.xml b/core-ui/src/main/res/drawable/circle_style_white_background_color.xml
deleted file mode 100644
index 40d21ce493..0000000000
--- a/core-ui/src/main/res/drawable/circle_style_white_background_color.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="oval">
-    <solid android:color="@color/white" />
-    <stroke
-        android:width="0.5dp"
-        android:color="#DFDDD0" />
-</shape>
\ No newline at end of file
diff --git a/core-ui/src/main/res/drawable/cursor.xml b/core-ui/src/main/res/drawable/cursor.xml
deleted file mode 100644
index 80315de519..0000000000
--- a/core-ui/src/main/res/drawable/cursor.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape>
-            <size android:width="2dp" />
-            <solid android:color="#FFBB2C" />
-        </shape>
-    </item>
-</selector>
\ No newline at end of file
diff --git a/core-ui/src/main/res/drawable/dashboard_card_ripple.xml b/core-ui/src/main/res/drawable/dashboard_card_ripple.xml
deleted file mode 100644
index caefed1872..0000000000
--- a/core-ui/src/main/res/drawable/dashboard_card_ripple.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ripple xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="@color/background_secondary">
-    <item
-        android:id="@android:id/mask"
-        android:drawable="@color/dashboard_card_background" />
-</ripple>
\ No newline at end of file
diff --git a/core-ui/src/main/res/drawable/default_bottom_sheet_background.xml b/core-ui/src/main/res/drawable/default_bottom_sheet_background.xml
deleted file mode 100644
index a294d84c44..0000000000
--- a/core-ui/src/main/res/drawable/default_bottom_sheet_background.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <solid android:color="@color/white" />
-    <corners
-        android:topLeftRadius="16dp"
-        android:topRightRadius="16dp" />
-</shape>
\ No newline at end of file
diff --git a/core-ui/src/main/res/drawable/default_ripple_circle.xml b/core-ui/src/main/res/drawable/default_ripple_circle.xml
deleted file mode 100644
index a4ade42e80..0000000000
--- a/core-ui/src/main/res/drawable/default_ripple_circle.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ripple xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="@color/light_grayish">
-    <item>
-        <shape android:shape="oval">
-            <solid android:color="#FFFFFF" />
-        </shape>
-    </item>
-</ripple>
\ No newline at end of file
diff --git a/core-ui/src/main/res/drawable/divider_featured_relations_decoration.xml b/core-ui/src/main/res/drawable/divider_featured_relations_decoration.xml
deleted file mode 100644
index 61f0411b4a..0000000000
--- a/core-ui/src/main/res/drawable/divider_featured_relations_decoration.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-<item>
-    <shape android:shape="rectangle">
-        <solid android:color="@android:color/transparent"/>
-        <size android:width="20dp" android:height="20dp"/>
-    </shape>
-</item>
-<item
-    android:top="8dp"
-    android:bottom="8dp"
-    android:left="8dp"
-    android:right="8dp">
-    <shape
-        android:shape="oval">
-        <solid android:color="#929082" />
-        <size android:width="4dp" android:height="4dp"/>
-    </shape>
-</item>
-</layer-list>
\ No newline at end of file
diff --git a/core-ui/src/main/res/drawable/divider_obj_appearance_preview_layout.xml b/core-ui/src/main/res/drawable/divider_obj_appearance_preview_layout.xml
deleted file mode 100644
index 2428bf7b86..0000000000
--- a/core-ui/src/main/res/drawable/divider_obj_appearance_preview_layout.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <size
-        android:width="0.5dp"
-        android:height="0.5dp" />
-    <solid android:color="@color/shape_primary" />
-</shape>
\ No newline at end of file
diff --git a/core-ui/src/main/res/drawable/divider_relations_edit.xml b/core-ui/src/main/res/drawable/divider_relations_edit.xml
deleted file mode 100644
index 28067b5d09..0000000000
--- a/core-ui/src/main/res/drawable/divider_relations_edit.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:drawable="@drawable/divider_relations"
-        android:left="36dp" />
-</layer-list>
\ No newline at end of file
diff --git a/core-ui/src/main/res/drawable/ic_1.xml b/core-ui/src/main/res/drawable/ic_1.xml
deleted file mode 100644
index 126eb743ea..0000000000
--- a/core-ui/src/main/res/drawable/ic_1.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:aapt="http://schemas.android.com/aapt"
-    android:width="20dp"
-    android:height="20dp"
-    android:viewportWidth="20"
-    android:viewportHeight="20">
-  <path
-      android:pathData="M10,17C13.866,17 17,13.866 17,10C17,6.134 13.866,3 10,3C6.134,3 3,6.134 3,10C3,13.866 6.134,17 10,17ZM10,20C15.5228,20 20,15.5228 20,10C20,4.4771 15.5228,0 10,0C4.4771,0 0,4.4771 0,10C0,15.5228 4.4771,20 10,20Z"
-      android:fillType="evenOdd">
-    <aapt:attr name="android:fillColor">
-      <gradient
-          android:gradientRadius="10"
-          android:centerX="10"
-          android:centerY="10"
-          android:type="radial">
-        <item
-            android:offset="0"
-            android:color="#FFACA996" />
-        <item
-            android:offset="1"
-            android:color="#00ACA996" />
-      </gradient>
-    </aapt:attr>
-  </path>
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_action_background.xml b/core-ui/src/main/res/drawable/ic_action_background.xml
index 0cd251dcc7..02b14ead05 100644
--- a/core-ui/src/main/res/drawable/ic_action_background.xml
+++ b/core-ui/src/main/res/drawable/ic_action_background.xml
@@ -5,5 +5,5 @@
     android:viewportHeight="23">
   <path
       android:pathData="M11,11.2695m-11,0a11,11 0,1 1,22 0a11,11 0,1 1,-22 0"
-      android:fillColor="#FFFFFF"/>
+      android:fillColor="@color/white"/>
 </vector>
diff --git a/core-ui/src/main/res/drawable/ic_action_color.xml b/core-ui/src/main/res/drawable/ic_action_color.xml
deleted file mode 100644
index ca19172c18..0000000000
--- a/core-ui/src/main/res/drawable/ic_action_color.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="22dp"
-    android:height="22dp"
-    android:viewportWidth="22"
-    android:viewportHeight="22">
-  <path
-      android:pathData="M11,11m-11,0a11,11 0,1 1,22 0a11,11 0,1 1,-22 0"
-      android:fillColor="#2C2B27"/>
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_action_download.xml b/core-ui/src/main/res/drawable/ic_action_download.xml
deleted file mode 100644
index 57f06541f7..0000000000
--- a/core-ui/src/main/res/drawable/ic_action_download.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="25dp"
-    android:height="24dp"
-    android:viewportWidth="25"
-    android:viewportHeight="24">
-  <path
-      android:pathData="M13.2734,3H11.7734V16H13.2734V3Z"
-      android:fillColor="#ACA996"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M6.2734,19.25C5.8592,19.25 5.5234,19.5858 5.5234,20C5.5234,20.4142 5.8592,20.75 6.2734,20.75H18.7734C19.1877,20.75 19.5234,20.4142 19.5234,20C19.5234,19.5858 19.1877,19.25 18.7734,19.25H6.2734Z"
-      android:fillColor="#ACA996"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M5.9931,10.4697C6.286,10.1768 6.7609,10.1768 7.0538,10.4697L12.5234,15.9393L17.9931,10.4697C18.286,10.1768 18.7609,10.1768 19.0538,10.4697C19.3467,10.7626 19.3467,11.2374 19.0538,11.5303L12.5234,18.0607L5.9931,11.5303C5.7002,11.2374 5.7002,10.7626 5.9931,10.4697Z"
-      android:fillColor="#ACA996"
-      android:fillType="evenOdd"/>
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_action_export.xml b/core-ui/src/main/res/drawable/ic_action_export.xml
deleted file mode 100644
index 4d28565a36..0000000000
--- a/core-ui/src/main/res/drawable/ic_action_export.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:pathData="M13.8787,2.5H6C5.1716,2.5 4.5,3.1716 4.5,4V20C4.5,20.8284 5.1716,21.5 6,21.5H18C18.8284,21.5 19.5,20.8284 19.5,20V8.1213L13.8787,2.5ZM14.5,1H6C4.3432,1 3,2.3431 3,4V20C3,21.6569 4.3432,23 6,23H18C19.6569,23 21,21.6569 21,20V7.5L14.5,1Z"
-      android:fillColor="#ACA996"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M12.5,1.5H14V8H12.5V1.5Z"
-      android:fillColor="#ACA996"/>
-  <path
-      android:pathData="M14,9.5C13.1716,9.5 12.5,8.8284 12.5,8L20,8V9.5L14,9.5Z"
-      android:fillColor="#ACA996"/>
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_action_preview.xml b/core-ui/src/main/res/drawable/ic_action_preview.xml
index d0cefa071e..13f91505fa 100644
--- a/core-ui/src/main/res/drawable/ic_action_preview.xml
+++ b/core-ui/src/main/res/drawable/ic_action_preview.xml
@@ -6,11 +6,11 @@
   <path
       android:pathData="M11.9945,3.7503L12,3.7503C15.5484,3.7503 18.3615,5.8294 20.3357,8.0199C21.3157,9.1072 22.0661,10.1976 22.5714,11.0171C22.8237,11.4261 23.0136,11.7657 23.1396,12.0009C23.1456,12.0121 23.1514,12.0231 23.1571,12.0338C23.1518,12.0437 23.1463,12.0539 23.1407,12.0643C23.0148,12.2976 22.8249,12.6344 22.5728,13.0401C22.0676,13.8531 21.3174,14.9348 20.3377,16.0135C18.3643,18.1861 15.5507,20.2502 12,20.25C8.4355,20.2498 5.6219,18.1851 3.6527,16.0136C2.6748,14.9352 1.9272,13.8538 1.4241,13.0411C1.1731,12.6355 0.9841,12.2988 0.8589,12.0656C0.8533,12.0551 0.8477,12.0447 0.8423,12.0346C0.8486,12.0228 0.855,12.0108 0.8616,11.9984C0.9883,11.7617 1.1792,11.4201 1.4325,11.0088C1.9401,10.1847 2.693,9.089 3.6747,7.9983C5.653,5.8 8.4639,3.7243 11.9945,3.7503Z"
       android:strokeWidth="1.5"
-      android:fillColor="#00000000"
+      android:fillColor="@color/transparent_black"
       android:strokeColor="@color/glyph_active"/>
   <path
       android:pathData="M12,12m-4.25,0a4.25,4.25 0,1 1,8.5 0a4.25,4.25 0,1 1,-8.5 0"
       android:strokeWidth="1.5"
-      android:fillColor="#00000000"
+      android:fillColor="@color/transparent_black"
       android:strokeColor="@color/glyph_active"/>
 </vector>
diff --git a/core-ui/src/main/res/drawable/ic_action_replace.xml b/core-ui/src/main/res/drawable/ic_action_replace.xml
deleted file mode 100644
index 7263dac11c..0000000000
--- a/core-ui/src/main/res/drawable/ic_action_replace.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:pathData="M4.135,9.5C5.194,6.166 8.315,3.75 12,3.75C15.125,3.75 17.845,5.488 19.244,8.05H15.8C15.386,8.05 15.05,8.386 15.05,8.8C15.05,9.119 15.249,9.392 15.53,9.5H21.55V8.8V3.8C21.55,3.386 21.214,3.05 20.8,3.05C20.386,3.05 20.05,3.386 20.05,3.8V6.497C18.293,3.933 15.343,2.25 12,2.25C7.479,2.25 3.677,5.327 2.573,9.5H4.135ZM8.07,14.5H2.05V15.2V20.2C2.05,20.614 2.386,20.95 2.8,20.95C3.214,20.95 3.55,20.614 3.55,20.2L3.55,16.868C5.235,19.786 8.388,21.75 12,21.75C16.52,21.75 20.322,18.674 21.426,14.5H19.864C18.805,17.834 15.685,20.25 12,20.25C8.874,20.25 6.155,18.512 4.755,15.95H7.8C8.214,15.95 8.55,15.614 8.55,15.2C8.55,14.881 8.351,14.608 8.07,14.5Z"
-      android:fillColor="@color/glyph_active"
-      android:fillType="evenOdd"/>
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_add_24.xml b/core-ui/src/main/res/drawable/ic_add_24.xml
deleted file mode 100644
index 7030a17c1c..0000000000
--- a/core-ui/src/main/res/drawable/ic_add_24.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:pathData="M12,2L12,2A0.75,0.75 0,0 1,12.75 2.75L12.75,21.25A0.75,0.75 0,0 1,12 22L12,22A0.75,0.75 0,0 1,11.25 21.25L11.25,2.75A0.75,0.75 0,0 1,12 2z"
-      android:fillColor="#ACA996"/>
-  <path
-      android:pathData="M2,12L2,12A0.75,0.75 0,0 1,2.75 11.25L21.25,11.25A0.75,0.75 0,0 1,22 12L22,12A0.75,0.75 0,0 1,21.25 12.75L2.75,12.75A0.75,0.75 0,0 1,2 12z"
-      android:fillColor="#ACA996"/>
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_add_new_object_to_set.xml b/core-ui/src/main/res/drawable/ic_add_new_object_to_set.xml
deleted file mode 100644
index 3dc0063788..0000000000
--- a/core-ui/src/main/res/drawable/ic_add_new_object_to_set.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:pathData="M12,4L12,4A0.75,0.75 0,0 1,12.75 4.75L12.75,19.25A0.75,0.75 0,0 1,12 20L12,20A0.75,0.75 0,0 1,11.25 19.25L11.25,4.75A0.75,0.75 0,0 1,12 4z"
-      android:fillColor="@color/glyph_active"/>
-  <path
-      android:pathData="M20,12L20,12A0.75,0.75 0,0 1,19.25 12.75L4.75,12.75A0.75,0.75 0,0 1,4 12L4,12A0.75,0.75 0,0 1,4.75 11.25L19.25,11.25A0.75,0.75 0,0 1,20 12z"
-      android:fillColor="@color/glyph_active"/>
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_alert_install_gallery.xml b/core-ui/src/main/res/drawable/ic_alert_install_gallery.xml
index 9e6da09225..4e3c4fa1c2 100644
--- a/core-ui/src/main/res/drawable/ic_alert_install_gallery.xml
+++ b/core-ui/src/main/res/drawable/ic_alert_install_gallery.xml
@@ -12,300 +12,300 @@
           android:centerY="52"
           android:gradientRadius="52"
           android:type="radial">
-        <item android:offset="0.26" android:color="#FFA9F496"/>
-        <item android:offset="1" android:color="#00BCF2AF"/>
+        <item android:offset="0.26" android:color="@color/gallery_gradient_start"/>
+        <item android:offset="1" android:color="@color/gallery_gradient_end"/>
       </gradient>
     </aapt:attr>
   </path>
   <path
       android:pathData="M131.09,47.13h1.47v1.38h-1.47z"
-      android:fillColor="#D9D9D9"/>
+      android:fillColor="@color/gallery_inactive_gray"/>
   <path
       android:pathData="M184.5,72.25L152.5,72.25A12,12 0,0 1,140.5 60.25L140.5,28.25A12,12 0,0 1,152.5 16.25L184.5,16.25A12,12 0,0 1,196.5 28.25L196.5,60.25A12,12 0,0 1,184.5 72.25z"
-      android:fillColor="#ffffff"/>
+      android:fillColor="@color/white"/>
   <path
       android:pathData="M176.5,80L144.5,80A12,12 0,0 1,132.5 68L132.5,36A12,12 0,0 1,144.5 24L176.5,24A12,12 0,0 1,188.5 36L188.5,68A12,12 0,0 1,176.5 80z"
-      android:fillColor="#ffffff"/>
+      android:fillColor="@color/white"/>
   <path
       android:pathData="M168.5,88L136.5,88A12,12 0,0 1,124.5 76L124.5,44A12,12 0,0 1,136.5 32L168.5,32A12,12 0,0 1,180.5 44L180.5,76A12,12 0,0 1,168.5 88z"
-      android:fillColor="#ffffff"/>
+      android:fillColor="@color/white"/>
   <path
       android:pathData="M136.5,60h2v2h-2z"
-      android:fillColor="#000000"/>
+      android:fillColor="@color/colorPrimaryDark"/>
   <path
       android:pathData="M136.5,60h2v2h-2z"
-      android:fillColor="#000000"/>
+      android:fillColor="@color/colorPrimaryDark"/>
   <path
       android:pathData="M136.5,60h2v2h-2z"
-      android:fillColor="#000000"/>
+      android:fillColor="@color/colorPrimaryDark"/>
   <path
       android:pathData="M138.5,62h2v2h-2z"
-      android:fillColor="#000000"/>
+      android:fillColor="@color/colorPrimaryDark"/>
   <path
       android:pathData="M138.5,62h2v2h-2z"
-      android:fillColor="#000000"/>
+      android:fillColor="@color/colorPrimaryDark"/>
   <path
       android:pathData="M138.5,62h2v2h-2z"
-      android:fillColor="#000000"/>
+      android:fillColor="@color/colorPrimaryDark"/>
   <path
       android:pathData="M140.5,64h2v2h-2z"
-      android:fillColor="#000000"/>
+      android:fillColor="@color/colorPrimaryDark"/>
   <path
       android:pathData="M140.5,64h2v2h-2z"
-      android:fillColor="#000000"/>
+      android:fillColor="@color/colorPrimaryDark"/>
   <path
       android:pathData="M140.5,64h2v2h-2z"
-      android:fillColor="#000000"/>
+      android:fillColor="@color/colorPrimaryDark"/>
   <path
       android:pathData="M142.5,66h2v2h-2z"
-      android:fillColor="#000000"/>
+      android:fillColor="@color/colorPrimaryDark"/>
   <path
       android:pathData="M142.5,66h2v2h-2z"
-      android:fillColor="#000000"/>
+      android:fillColor="@color/colorPrimaryDark"/>
   <path
       android:pathData="M142.5,66h2v2h-2z"
-      android:fillColor="#000000"/>
+      android:fillColor="@color/colorPrimaryDark"/>
   <path
       android:pathData="M144.5,68h2v2h-2z"
-      android:fillColor="#000000"/>
+      android:fillColor="@color/colorPrimaryDark"/>
   <path
       android:pathData="M144.5,68h2v2h-2z"
-      android:fillColor="#000000"/>
+      android:fillColor="@color/colorPrimaryDark"/>
   <path
       android:pathData="M144.5,68h2v2h-2z"
-      android:fillColor="#000000"/>
+      android:fillColor="@color/colorPrimaryDark"/>
   <path
       android:pathData="M146.5,70h2v2h-2z"
-      android:fillColor="#000000"/>
+      android:fillColor="@color/colorPrimaryDark"/>
   <path
       android:pathData="M146.5,70h2v2h-2z"
-      android:fillColor="#000000"/>
+      android:fillColor="@color/colorPrimaryDark"/>
   <path
       android:pathData="M146.5,70h2v2h-2z"
-      android:fillColor="#000000"/>
+      android:fillColor="@color/colorPrimaryDark"/>
   <path
       android:pathData="M162.5,56l-2,0l-0,2l2,0z"
-      android:fillColor="#000000"/>
+      android:fillColor="@color/colorPrimaryDark"/>
   <path
       android:pathData="M162.5,56l-2,0l-0,2l2,0z"
-      android:fillColor="#000000"/>
+      android:fillColor="@color/colorPrimaryDark"/>
   <path
       android:pathData="M162.5,56l-2,0l-0,2l2,0z"
-      android:fillColor="#000000"/>
+      android:fillColor="@color/colorPrimaryDark"/>
   <path
       android:pathData="M160.5,58l-2,0l-0,2l2,0z"
-      android:fillColor="#000000"/>
+      android:fillColor="@color/colorPrimaryDark"/>
   <path
       android:pathData="M160.5,58l-2,0l-0,2l2,0z"
-      android:fillColor="#000000"/>
+      android:fillColor="@color/colorPrimaryDark"/>
   <path
       android:pathData="M160.5,58l-2,0l-0,2l2,0z"
-      android:fillColor="#000000"/>
+      android:fillColor="@color/colorPrimaryDark"/>
   <path
       android:pathData="M158.5,60l-2,0l-0,2l2,0z"
-      android:fillColor="#000000"/>
+      android:fillColor="@color/colorPrimaryDark"/>
   <path
       android:pathData="M158.5,60l-2,0l-0,2l2,0z"
-      android:fillColor="#000000"/>
+      android:fillColor="@color/colorPrimaryDark"/>
   <path
       android:pathData="M158.5,60l-2,0l-0,2l2,0z"
-      android:fillColor="#000000"/>
+      android:fillColor="@color/colorPrimaryDark"/>
   <path
       android:pathData="M156.5,62l-2,0l-0,2l2,0z"
-      android:fillColor="#000000"/>
+      android:fillColor="@color/colorPrimaryDark"/>
   <path
       android:pathData="M156.5,62l-2,0l-0,2l2,0z"
-      android:fillColor="#000000"/>
+      android:fillColor="@color/colorPrimaryDark"/>
   <path
       android:pathData="M156.5,62l-2,0l-0,2l2,0z"
-      android:fillColor="#000000"/>
+      android:fillColor="@color/colorPrimaryDark"/>
   <path
       android:pathData="M154.5,64l-2,0l-0,2l2,0z"
-      android:fillColor="#000000"/>
+      android:fillColor="@color/colorPrimaryDark"/>
   <path
       android:pathData="M154.5,64l-2,0l-0,2l2,0z"
-      android:fillColor="#000000"/>
+      android:fillColor="@color/colorPrimaryDark"/>
   <path
       android:pathData="M154.5,64l-2,0l-0,2l2,0z"
-      android:fillColor="#000000"/>
+      android:fillColor="@color/colorPrimaryDark"/>
   <path
       android:pathData="M152.5,66l-2,0l-0,2l2,0z"
-      android:fillColor="#000000"/>
+      android:fillColor="@color/colorPrimaryDark"/>
   <path
       android:pathData="M152.5,66l-2,0l-0,2l2,0z"
-      android:fillColor="#000000"/>
+      android:fillColor="@color/colorPrimaryDark"/>
   <path
       android:pathData="M152.5,66l-2,0l-0,2l2,0z"
-      android:fillColor="#000000"/>
+      android:fillColor="@color/colorPrimaryDark"/>
   <path
       android:pathData="M150.5,68l-2,0l-0,2l2,0z"
-      android:fillColor="#000000"/>
+      android:fillColor="@color/colorPrimaryDark"/>
   <path
       android:pathData="M150.5,68l-2,0l-0,2l2,0z"
-      android:fillColor="#000000"/>
+      android:fillColor="@color/colorPrimaryDark"/>
   <path
       android:pathData="M150.5,68l-2,0l-0,2l2,0z"
-      android:fillColor="#000000"/>
+      android:fillColor="@color/colorPrimaryDark"/>
   <path
       android:pathData="M148.5,70l-2,0l-0,2l2,0z"
-      android:fillColor="#000000"/>
+      android:fillColor="@color/colorPrimaryDark"/>
   <path
       android:pathData="M148.5,70l-2,0l-0,2l2,0z"
-      android:fillColor="#000000"/>
+      android:fillColor="@color/colorPrimaryDark"/>
   <path
       android:pathData="M148.5,70l-2,0l-0,2l2,0z"
-      android:fillColor="#000000"/>
+      android:fillColor="@color/colorPrimaryDark"/>
   <path
       android:pathData="M170.5,48l-2,0l-0,2l2,0z"
-      android:fillColor="#000000"/>
+      android:fillColor="@color/colorPrimaryDark"/>
   <path
       android:pathData="M170.5,48l-2,0l-0,2l2,0z"
-      android:fillColor="#000000"/>
+      android:fillColor="@color/colorPrimaryDark"/>
   <path
       android:pathData="M170.5,48l-2,0l-0,2l2,0z"
-      android:fillColor="#000000"/>
+      android:fillColor="@color/colorPrimaryDark"/>
   <path
       android:pathData="M168.5,50l-2,0l-0,2l2,0z"
-      android:fillColor="#000000"/>
+      android:fillColor="@color/colorPrimaryDark"/>
   <path
       android:pathData="M168.5,50l-2,0l-0,2l2,0z"
-      android:fillColor="#000000"/>
+      android:fillColor="@color/colorPrimaryDark"/>
   <path
       android:pathData="M168.5,50l-2,0l-0,2l2,0z"
-      android:fillColor="#000000"/>
+      android:fillColor="@color/colorPrimaryDark"/>
   <path
       android:pathData="M166.5,52l-2,0l-0,2l2,0z"
-      android:fillColor="#000000"/>
+      android:fillColor="@color/colorPrimaryDark"/>
   <path
       android:pathData="M166.5,52l-2,0l-0,2l2,0z"
-      android:fillColor="#000000"/>
+      android:fillColor="@color/colorPrimaryDark"/>
   <path
       android:pathData="M166.5,52l-2,0l-0,2l2,0z"
-      android:fillColor="#000000"/>
+      android:fillColor="@color/colorPrimaryDark"/>
   <path
       android:pathData="M164.5,54l-2,0l-0,2l2,0z"
-      android:fillColor="#000000"/>
+      android:fillColor="@color/colorPrimaryDark"/>
   <path
       android:pathData="M164.5,54l-2,0l-0,2l2,0z"
-      android:fillColor="#000000"/>
+      android:fillColor="@color/colorPrimaryDark"/>
   <path
       android:pathData="M164.5,54l-2,0l-0,2l2,0z"
-      android:fillColor="#000000"/>
+      android:fillColor="@color/colorPrimaryDark"/>
   <path
       android:pathData="M162.5,56l-2,0l-0,2l2,0z"
-      android:fillColor="#000000"/>
+      android:fillColor="@color/colorPrimaryDark"/>
   <path
       android:pathData="M162.5,56l-2,0l-0,2l2,0z"
-      android:fillColor="#000000"/>
+      android:fillColor="@color/colorPrimaryDark"/>
   <path
       android:pathData="M162.5,56l-2,0l-0,2l2,0z"
-      android:fillColor="#000000"/>
+      android:fillColor="@color/colorPrimaryDark"/>
   <path
       android:pathData="M124.5,40h2v20h-2z"
-      android:fillColor="#000000"/>
+      android:fillColor="@color/colorPrimaryDark"/>
   <path
       android:pathData="M126.5,36h2v4h-2z"
-      android:fillColor="#000000"/>
+      android:fillColor="@color/colorPrimaryDark"/>
   <path
       android:pathData="M128.5,36l0,-2l4,-0l0,2z"
-      android:fillColor="#000000"/>
+      android:fillColor="@color/colorPrimaryDark"/>
   <path
       android:pathData="M132.5,34l0,-2l20,-0l0,2z"
-      android:fillColor="#000000"/>
+      android:fillColor="@color/colorPrimaryDark"/>
   <path
       android:pathData="M124.5,80l2,-0l0,-20l-2,-0z"
-      android:fillColor="#000000"/>
+      android:fillColor="@color/colorPrimaryDark"/>
   <path
       android:pathData="M126.5,84l2,-0l0,-4l-2,-0z"
-      android:fillColor="#000000"/>
+      android:fillColor="@color/colorPrimaryDark"/>
   <path
       android:pathData="M128.5,84l0,2l4,0l0,-2z"
-      android:fillColor="#000000"/>
+      android:fillColor="@color/colorPrimaryDark"/>
   <path
       android:pathData="M132.5,86l0,2l20,0l0,-2z"
-      android:fillColor="#000000"/>
+      android:fillColor="@color/colorPrimaryDark"/>
   <path
       android:pathData="M180.5,40l-2,0l-0,20l2,0z"
-      android:fillColor="#000000"/>
+      android:fillColor="@color/colorPrimaryDark"/>
   <path
       android:pathData="M178.5,36l-2,0l-0,4l2,0z"
-      android:fillColor="#000000"/>
+      android:fillColor="@color/colorPrimaryDark"/>
   <path
       android:pathData="M176.5,36l-0,-2l-4,-0l-0,2z"
-      android:fillColor="#000000"/>
+      android:fillColor="@color/colorPrimaryDark"/>
   <path
       android:pathData="M172.5,34l-0,-2l-20,-0l-0,2z"
-      android:fillColor="#000000"/>
+      android:fillColor="@color/colorPrimaryDark"/>
   <path
       android:pathData="M180.5,80l-2,-0l-0,-20l2,-0z"
-      android:fillColor="#000000"/>
+      android:fillColor="@color/colorPrimaryDark"/>
   <path
       android:pathData="M178.5,84l-2,-0l-0,-4l2,-0z"
-      android:fillColor="#000000"/>
+      android:fillColor="@color/colorPrimaryDark"/>
   <path
       android:pathData="M176.5,84l-0,2l-4,0l-0,-2z"
-      android:fillColor="#000000"/>
+      android:fillColor="@color/colorPrimaryDark"/>
   <path
       android:pathData="M172.5,86l-0,2l-20,0l-0,-2z"
-      android:fillColor="#000000"/>
+      android:fillColor="@color/colorPrimaryDark"/>
   <path
       android:pathData="M134.5,28h2v4h-2z"
-      android:fillColor="#000000"/>
+      android:fillColor="@color/colorPrimaryDark"/>
   <path
       android:pathData="M136.5,28l0,-2l4,-0l0,2z"
-      android:fillColor="#000000"/>
+      android:fillColor="@color/colorPrimaryDark"/>
   <path
       android:pathData="M140.5,26l0,-2l20,-0l0,2z"
-      android:fillColor="#000000"/>
+      android:fillColor="@color/colorPrimaryDark"/>
   <path
       android:pathData="M188.5,32l-2,0l-0,20l2,0z"
-      android:fillColor="#000000"/>
+      android:fillColor="@color/colorPrimaryDark"/>
   <path
       android:pathData="M186.5,28l-2,0l-0,4l2,0z"
-      android:fillColor="#000000"/>
+      android:fillColor="@color/colorPrimaryDark"/>
   <path
       android:pathData="M184.5,28l-0,-2l-4,-0l-0,2z"
-      android:fillColor="#000000"/>
+      android:fillColor="@color/colorPrimaryDark"/>
   <path
       android:pathData="M180.5,26l-0,-2l-20,-0l-0,2z"
-      android:fillColor="#000000"/>
+      android:fillColor="@color/colorPrimaryDark"/>
   <path
       android:pathData="M188.5,72l-2,-0l-0,-20l2,-0z"
-      android:fillColor="#000000"/>
+      android:fillColor="@color/colorPrimaryDark"/>
   <path
       android:pathData="M186.5,76l-2,-0l-0,-4l2,-0z"
-      android:fillColor="#000000"/>
+      android:fillColor="@color/colorPrimaryDark"/>
   <path
       android:pathData="M184.5,76l-0,2l-4,0l-0,-2z"
-      android:fillColor="#000000"/>
+      android:fillColor="@color/colorPrimaryDark"/>
   <path
       android:pathData="M142.5,20h2v4h-2z"
-      android:fillColor="#000000"/>
+      android:fillColor="@color/colorPrimaryDark"/>
   <path
       android:pathData="M144.5,20l0,-2l4,-0l0,2z"
-      android:fillColor="#000000"/>
+      android:fillColor="@color/colorPrimaryDark"/>
   <path
       android:pathData="M148.5,18l0,-2l20,-0l0,2z"
-      android:fillColor="#000000"/>
+      android:fillColor="@color/colorPrimaryDark"/>
   <path
       android:pathData="M196.5,24l-2,0l-0,20l2,0z"
-      android:fillColor="#000000"/>
+      android:fillColor="@color/colorPrimaryDark"/>
   <path
       android:pathData="M194.5,20l-2,0l-0,4l2,0z"
-      android:fillColor="#000000"/>
+      android:fillColor="@color/colorPrimaryDark"/>
   <path
       android:pathData="M192.5,20l-0,-2l-4,-0l-0,2z"
-      android:fillColor="#000000"/>
+      android:fillColor="@color/colorPrimaryDark"/>
   <path
       android:pathData="M188.5,18l-0,-2l-20,-0l-0,2z"
-      android:fillColor="#000000"/>
+      android:fillColor="@color/colorPrimaryDark"/>
   <path
       android:pathData="M196.5,64l-2,-0l-0,-20l2,-0z"
-      android:fillColor="#000000"/>
+      android:fillColor="@color/colorPrimaryDark"/>
   <path
       android:pathData="M194.5,68l-2,-0l-0,-4l2,-0z"
-      android:fillColor="#000000"/>
+      android:fillColor="@color/colorPrimaryDark"/>
   <path
       android:pathData="M192.5,68l-0,2l-4,0l-0,-2z"
-      android:fillColor="#000000"/>
+      android:fillColor="@color/colorPrimaryDark"/>
 </vector>
diff --git a/core-ui/src/main/res/drawable/ic_app_notification.xml b/core-ui/src/main/res/drawable/ic_app_notification.xml
index e9504f00d7..598220615a 100644
--- a/core-ui/src/main/res/drawable/ic_app_notification.xml
+++ b/core-ui/src/main/res/drawable/ic_app_notification.xml
@@ -5,6 +5,6 @@
     android:viewportHeight="40">
   <path
       android:pathData="M29.043,11V4H9.043V11L29,11V36H36V11L29.043,11ZM15,36C21.075,36 26,31.075 26,25C26,18.925 21.075,14 15,14C8.925,14 4,18.925 4,25C4,31.075 8.925,36 15,36Z"
-      android:fillColor="#252525"
+      android:fillColor="@color/text_primary"
       android:fillType="evenOdd"/>
 </vector>
diff --git a/core-ui/src/main/res/drawable/ic_arrow_back.xml b/core-ui/src/main/res/drawable/ic_arrow_back.xml
deleted file mode 100644
index 9880bc4947..0000000000
--- a/core-ui/src/main/res/drawable/ic_arrow_back.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="11dp"
-    android:height="19dp"
-    android:viewportWidth="11"
-    android:viewportHeight="19">
-  <path
-      android:pathData="M10.5577,1.4174C11.1435,2.0031 11.1435,2.9529 10.5577,3.5387L4.1184,9.978L10.5577,16.4174C11.1435,17.0032 11.1435,17.9529 10.5577,18.5387C9.9719,19.1245 9.0222,19.1245 8.4364,18.5387L0.0879,10.1902C-0.0293,10.073 -0.0293,9.883 0.0879,9.7659L8.4364,1.4174C9.0222,0.8316 9.9719,0.8316 10.5577,1.4174Z"
-      android:fillColor="#ACA996"
-      android:fillType="evenOdd"/>
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_arrow_down.xml b/core-ui/src/main/res/drawable/ic_arrow_down.xml
index 44b6225b76..a4928baa89 100644
--- a/core-ui/src/main/res/drawable/ic_arrow_down.xml
+++ b/core-ui/src/main/res/drawable/ic_arrow_down.xml
@@ -6,7 +6,7 @@
   <path
       android:pathData="M1.25,1L5.25,5L9.25,1"
       android:strokeWidth="1.25"
-      android:fillColor="#00000000"
+      android:fillColor="@color/transparent_black"
       android:strokeColor="@color/glyph_active"
       android:strokeLineCap="round"/>
 </vector>
diff --git a/core-ui/src/main/res/drawable/ic_arrow_down_18.xml b/core-ui/src/main/res/drawable/ic_arrow_down_18.xml
index 9c5c1867f6..d188dafbc9 100644
--- a/core-ui/src/main/res/drawable/ic_arrow_down_18.xml
+++ b/core-ui/src/main/res/drawable/ic_arrow_down_18.xml
@@ -6,7 +6,7 @@
   <path
       android:pathData="M4,7L9,12L14,7"
       android:strokeWidth="1.5"
-      android:fillColor="#00000000"
+      android:fillColor="@color/transparent_black"
       android:strokeColor="@color/text_color_button_primary_selector"
       android:strokeLineCap="round"/>
 </vector>
diff --git a/core-ui/src/main/res/drawable/ic_arrow_top_end.xml b/core-ui/src/main/res/drawable/ic_arrow_top_end.xml
index debef8774a..b900909dd7 100644
--- a/core-ui/src/main/res/drawable/ic_arrow_top_end.xml
+++ b/core-ui/src/main/res/drawable/ic_arrow_top_end.xml
@@ -6,6 +6,6 @@
   <path
       android:pathData="M3.5,1H11M11,1V8.5M11,1L1,11"
       android:strokeWidth="1.25"
-      android:fillColor="#00000000"
+      android:fillColor="@color/transparent_black"
       android:strokeColor="@color/glyph_active"/>
 </vector>
diff --git a/core-ui/src/main/res/drawable/ic_arrow_up.xml b/core-ui/src/main/res/drawable/ic_arrow_up.xml
index a5bc74362f..0733945e92 100644
--- a/core-ui/src/main/res/drawable/ic_arrow_up.xml
+++ b/core-ui/src/main/res/drawable/ic_arrow_up.xml
@@ -6,7 +6,7 @@
   <path
       android:pathData="M1,7L5,3L9,7"
       android:strokeWidth="1.25"
-      android:fillColor="#00000000"
-      android:strokeColor="#ACA996"
+      android:fillColor="@color/transparent_black"
+      android:strokeColor="@color/gray"
       android:strokeLineCap="round"/>
 </vector>
diff --git a/core-ui/src/main/res/drawable/ic_arrow_up_18.xml b/core-ui/src/main/res/drawable/ic_arrow_up_18.xml
index 06b0fdd340..5c8207adea 100644
--- a/core-ui/src/main/res/drawable/ic_arrow_up_18.xml
+++ b/core-ui/src/main/res/drawable/ic_arrow_up_18.xml
@@ -6,7 +6,7 @@
   <path
       android:pathData="M14,11L9,6L4,11"
       android:strokeWidth="1.5"
-      android:fillColor="#00000000"
+      android:fillColor="@color/transparent_black"
       android:strokeColor="@color/glyph_active"
       android:strokeLineCap="round"/>
 </vector>
diff --git a/core-ui/src/main/res/drawable/ic_auth_clock_background.xml b/core-ui/src/main/res/drawable/ic_auth_clock_background.xml
deleted file mode 100644
index dc1aaf06d1..0000000000
--- a/core-ui/src/main/res/drawable/ic_auth_clock_background.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="oval">
-    <solid android:color="@color/shape_transparent" />
-</shape>
\ No newline at end of file
diff --git a/core-ui/src/main/res/drawable/ic_back.xml b/core-ui/src/main/res/drawable/ic_back.xml
index acffa74cb8..3a52abbdee 100644
--- a/core-ui/src/main/res/drawable/ic_back.xml
+++ b/core-ui/src/main/res/drawable/ic_back.xml
@@ -6,7 +6,7 @@
   <path
       android:pathData="M12,3L6,9L12,15"
       android:strokeWidth="1.5"
-      android:fillColor="#00000000"
+      android:fillColor="@color/transparent_black"
       android:strokeColor="@color/glyph_active"
       android:strokeLineCap="round"/>
 </vector>
diff --git a/core-ui/src/main/res/drawable/ic_back_onboarding_32.xml b/core-ui/src/main/res/drawable/ic_back_onboarding_32.xml
index 473be55d65..ae2d262b0d 100644
--- a/core-ui/src/main/res/drawable/ic_back_onboarding_32.xml
+++ b/core-ui/src/main/res/drawable/ic_back_onboarding_32.xml
@@ -5,6 +5,6 @@
     android:viewportHeight="32">
   <path
       android:pathData="M20.091,10.211C20.384,10.492 20.384,10.948 20.091,11.229L15.121,16L20.091,20.771C20.384,21.052 20.384,21.508 20.091,21.789C19.798,22.07 19.323,22.07 19.03,21.789L13,16L19.03,10.211C19.323,9.93 19.798,9.93 20.091,10.211Z"
-      android:fillColor="#A7A7A7"
+      android:fillColor="@color/glyph_active"
       android:fillType="evenOdd"/>
 </vector>
diff --git a/core-ui/src/main/res/drawable/ic_bin.xml b/core-ui/src/main/res/drawable/ic_bin.xml
deleted file mode 100644
index 9ae6f0cc62..0000000000
--- a/core-ui/src/main/res/drawable/ic_bin.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:pathData="M2.0508,5.5166L2.0493,5.4997C2.0167,5.3354 2,5.1687 2,5C2,2.2386 6.4772,0 12,0C17.5229,0 22,2.2386 22,5C22,5.1687 21.9833,5.3354 21.9507,5.4997L21.9492,5.5166L18.9756,20.7979C18.6733,22.5915 15.6653,24 12,24C8.3347,24 5.3273,22.5914 5.025,20.7979L2.0508,5.5166ZM18.4003,7.1939C20.0505,6.3688 20.5,5.5065 20.5,5C20.5,4.4935 20.0505,3.6312 18.4003,2.8061C16.8398,2.0259 14.5791,1.5 12,1.5C9.421,1.5 7.1602,2.0259 5.5998,2.8061C3.9496,3.6312 3.5,4.4935 3.5,5C3.5,5.5065 3.9496,6.3688 5.5998,7.1939C7.1602,7.9741 9.421,8.5 12,8.5C14.5791,8.5 16.8398,7.9741 18.4003,7.1939Z"
-      android:fillColor="#ACA996"
-      android:fillType="evenOdd"/>
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_bin_big.xml b/core-ui/src/main/res/drawable/ic_bin_big.xml
deleted file mode 100644
index 6f96515b63..0000000000
--- a/core-ui/src/main/res/drawable/ic_bin_big.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="33dp"
-    android:height="33dp"
-    android:viewportWidth="33"
-    android:viewportHeight="33">
-  <path
-      android:pathData="M27.4456,6.7917C27.4456,7.467 26.8462,8.6167 24.646,9.7169C22.5653,10.7572 19.551,11.4583 16.1123,11.4583C12.6736,11.4583 9.6593,10.7572 7.5786,9.7169C5.3784,8.6167 4.779,7.467 4.779,6.7917C4.779,6.1164 5.3784,4.9666 7.5786,3.8665C9.6593,2.8262 12.6736,2.125 16.1123,2.125C19.551,2.125 22.5653,2.8262 24.646,3.8665C26.8462,4.9666 27.4456,6.1164 27.4456,6.7917ZM29.4456,6.7917C29.4456,7.0165 29.4234,7.2388 29.3799,7.4579L29.3779,7.4805L25.4131,27.8555L25.4123,27.8555C25.0092,30.2469 20.9994,32.125 16.1123,32.125C11.2252,32.125 7.2154,30.2469 6.8123,27.8555L6.8115,27.8555L2.8467,7.4805L2.8447,7.458C2.8012,7.2388 2.779,7.0166 2.779,6.7917C2.779,3.1098 8.7485,0.125 16.1123,0.125C23.4761,0.125 29.4456,3.1098 29.4456,6.7917Z"
-      android:fillColor="#ACA996"
-      android:fillType="evenOdd"/>
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_bin_selection.xml b/core-ui/src/main/res/drawable/ic_bin_selection.xml
deleted file mode 100644
index bb857e050c..0000000000
--- a/core-ui/src/main/res/drawable/ic_bin_selection.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="20dp"
-    android:height="20dp"
-    android:viewportWidth="20"
-    android:viewportHeight="20">
-  <path
-      android:pathData="M0,10C0,4.4771 4.4771,0 10,0C15.5228,0 20,4.4771 20,10C20,15.5228 15.5228,20 10,20C4.4771,20 0,15.5228 0,10Z"
-      android:fillColor="#000000"/>
-  <path
-      android:pathData="M6,9.5L9.5,13.5L14.5,5.5"
-      android:strokeWidth="1.35"
-      android:fillColor="#00000000"
-      android:strokeColor="#ffffff"/>
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_block_action_add_below.xml b/core-ui/src/main/res/drawable/ic_block_action_add_below.xml
index 11deb7d51e..bca0c2d746 100644
--- a/core-ui/src/main/res/drawable/ic_block_action_add_below.xml
+++ b/core-ui/src/main/res/drawable/ic_block_action_add_below.xml
@@ -6,7 +6,7 @@
   <path
       android:pathData="M8,5.7505L16,5.7505A4.25,4.25 0,0 1,20.25 10.0005L20.25,18.0005A4.25,4.25 0,0 1,16 22.2505L8,22.2505A4.25,4.25 0,0 1,3.75 18.0005L3.75,10.0005A4.25,4.25 0,0 1,8 5.7505z"
       android:strokeWidth="1.5"
-      android:fillColor="#00000000"
+      android:fillColor="@color/transparent_black"
       android:strokeColor="@color/glyph_active"/>
   <path
       android:pathData="M3.75,1.2505L20.25,1.2505A0.75,0.75 0,0 1,21 2.0005L21,2.0005A0.75,0.75 0,0 1,20.25 2.7505L3.75,2.7505A0.75,0.75 0,0 1,3 2.0005L3,2.0005A0.75,0.75 0,0 1,3.75 1.2505z"
diff --git a/core-ui/src/main/res/drawable/ic_block_action_delete.xml b/core-ui/src/main/res/drawable/ic_block_action_delete.xml
index 0a5e4ffe25..0c82f8ddf4 100644
--- a/core-ui/src/main/res/drawable/ic_block_action_delete.xml
+++ b/core-ui/src/main/res/drawable/ic_block_action_delete.xml
@@ -18,12 +18,12 @@
     <path
         android:pathData="M8.4375,2.5005C8.4375,1.534 9.221,0.7505 10.1875,0.7505H13.6875C14.654,0.7505 15.4375,1.534 15.4375,2.5005V4.7505H8.4375V2.5005Z"
         android:strokeWidth="1.5"
-        android:fillColor="#00000000"
+        android:fillColor="@color/transparent_black"
         android:strokeColor="@color/glyph_active"/>
     <path
         android:pathData="M5.5978,19.1287L5.0302,4.7505H18.9848L18.4053,19.1313C18.3351,20.874 16.902,22.2505 15.1579,22.2505H8.8452C7.1002,22.2505 5.6666,20.8724 5.5978,19.1287Z"
         android:strokeWidth="1.5"
-        android:fillColor="#00000000"
+        android:fillColor="@color/transparent_black"
         android:strokeColor="@color/glyph_active"/>
   </group>
 </vector>
diff --git a/core-ui/src/main/res/drawable/ic_block_action_move.xml b/core-ui/src/main/res/drawable/ic_block_action_move.xml
index 5039915567..5516ae59ba 100644
--- a/core-ui/src/main/res/drawable/ic_block_action_move.xml
+++ b/core-ui/src/main/res/drawable/ic_block_action_move.xml
@@ -6,13 +6,13 @@
   <path
       android:pathData="M3,16L12,22L21,16"
       android:strokeWidth="1.5"
-      android:fillColor="#00000000"
+      android:fillColor="@color/transparent_black"
       android:strokeColor="@color/glyph_active"
       android:strokeLineCap="round"/>
   <path
       android:pathData="M3,8L12,2L21,8"
       android:strokeWidth="1.5"
-      android:fillColor="#00000000"
+      android:fillColor="@color/transparent_black"
       android:strokeColor="@color/glyph_active"
       android:strokeLineCap="round"/>
 </vector>
diff --git a/core-ui/src/main/res/drawable/ic_block_empty_page.xml b/core-ui/src/main/res/drawable/ic_block_empty_page.xml
deleted file mode 100644
index 32b46edd09..0000000000
--- a/core-ui/src/main/res/drawable/ic_block_empty_page.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="#ACA996"
-        android:fillType="evenOdd"
-        android:pathData="M14,2H4.9897C4.4375,2 3.9897,2.4477 3.9897,3V21C3.9897,21.5523 4.4375,22 4.9897,22L18.9897,21.9993C19.5417,21.9993 19.9893,21.552 19.9897,21L20,8L14,2ZM18.9996,8.4139L18.9897,20.9993L4.9897,21V3H13.5857L18.9996,8.4139Z" />
-    <path
-        android:fillColor="#ACA996"
-        android:fillType="evenOdd"
-        android:pathData="M14,2H13V8C13,8.5523 13.4477,9 14,9H20V8H14V2Z" />
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_block_more.xml b/core-ui/src/main/res/drawable/ic_block_more.xml
deleted file mode 100644
index d2b60cc007..0000000000
--- a/core-ui/src/main/res/drawable/ic_block_more.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="#ACA996"
-        android:pathData="M6,14.0323C7.1046,14.0323 8,13.1369 8,12.0323C8,10.9278 7.1046,10.0323 6,10.0323C4.8954,10.0323 4,10.9278 4,12.0323C4,13.1369 4.8954,14.0323 6,14.0323Z" />
-    <path
-        android:fillColor="#ACA996"
-        android:pathData="M12,14.0323C13.1046,14.0323 14,13.1369 14,12.0323C14,10.9278 13.1046,10.0323 12,10.0323C10.8954,10.0323 10,10.9278 10,12.0323C10,13.1369 10.8954,14.0323 12,14.0323Z" />
-    <path
-        android:fillColor="#ACA996"
-        android:pathData="M18,14.0323C19.1046,14.0323 20,13.1369 20,12.0323C20,10.9278 19.1046,10.0323 18,10.0323C16.8954,10.0323 16,10.9278 16,12.0323C16,13.1369 16.8954,14.0323 18,14.0323Z" />
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_block_page_without_emoji.xml b/core-ui/src/main/res/drawable/ic_block_page_without_emoji.xml
deleted file mode 100644
index 59104e1243..0000000000
--- a/core-ui/src/main/res/drawable/ic_block_page_without_emoji.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="#ACA996"
-        android:fillType="evenOdd"
-        android:pathData="M14,2H4.9897C4.4375,2 3.9897,2.4477 3.9897,3V21C3.9897,21.5523 4.4375,22 4.9897,22L18.9897,21.9993C19.5417,21.9993 19.9893,21.552 19.9897,21L20,8L14,2ZM18.9996,8.4139L18.9897,20.9993L4.9897,21V3H13.5857L18.9996,8.4139Z" />
-    <path
-        android:fillColor="#ACA996"
-        android:fillType="evenOdd"
-        android:pathData="M14,2H13V8C13,8.5523 13.4477,9 14,9H20V8H14V2Z" />
-    <path
-        android:fillColor="#ACA996"
-        android:pathData="M8,11H16V12H8V11Z" />
-    <path
-        android:fillColor="#ACA996"
-        android:pathData="M8,14H16V15H8V14Z" />
-    <path
-        android:fillColor="#ACA996"
-        android:pathData="M8,17H16V18H8V17Z" />
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_block_relation_placeholder.xml b/core-ui/src/main/res/drawable/ic_block_relation_placeholder.xml
index f1427d87d0..f14df22dd8 100644
--- a/core-ui/src/main/res/drawable/ic_block_relation_placeholder.xml
+++ b/core-ui/src/main/res/drawable/ic_block_relation_placeholder.xml
@@ -5,32 +5,32 @@
     android:viewportHeight="40">
   <path
       android:pathData="M22.5,9.5C22.5,10.8807 21.3807,12 20,12C18.6193,12 17.5,10.8807 17.5,9.5C17.5,8.1193 18.6193,7 20,7C21.3807,7 22.5,8.1193 22.5,9.5Z"
-      android:fillColor="#ACA996"/>
+      android:fillColor="@color/gray"/>
   <path
       android:pathData="M12,28C12,29.3807 10.8807,30.5 9.5,30.5C8.1193,30.5 7,29.3807 7,28C7,26.6193 8.1193,25.5 9.5,25.5C10.8807,25.5 12,26.6193 12,28Z"
-      android:fillColor="#ACA996"/>
+      android:fillColor="@color/gray"/>
   <path
       android:pathData="M33,28C33,29.3807 31.8807,30.5 30.5,30.5C29.1193,30.5 28,29.3807 28,28C28,26.6193 29.1193,25.5 30.5,25.5C31.8807,25.5 33,26.6193 33,28Z"
-      android:fillColor="#ACA996"/>
+      android:fillColor="@color/gray"/>
   <path
       android:pathData="M15,28H25"
       android:strokeWidth="2"
-      android:fillColor="#ACA996"
-      android:strokeColor="#ACA996"
+      android:fillColor="@color/gray"
+      android:strokeColor="@color/gray"
       android:fillAlpha="0.65"
       android:strokeLineCap="round"/>
   <path
       android:pathData="M16.75,14.25L12,23"
       android:strokeWidth="2"
-      android:fillColor="#ACA996"
-      android:strokeColor="#ACA996"
+      android:fillColor="@color/gray"
+      android:strokeColor="@color/gray"
       android:fillAlpha="0.65"
       android:strokeLineCap="round"/>
   <path
       android:pathData="M23.25,14.25L28,23"
       android:strokeWidth="2"
-      android:fillColor="#ACA996"
-      android:strokeColor="#ACA996"
+      android:fillColor="@color/gray"
+      android:strokeColor="@color/gray"
       android:fillAlpha="0.65"
       android:strokeLineCap="round"/>
 </vector>
diff --git a/core-ui/src/main/res/drawable/ic_block_task_checked.xml b/core-ui/src/main/res/drawable/ic_block_task_checked.xml
deleted file mode 100644
index fa316d2963..0000000000
--- a/core-ui/src/main/res/drawable/ic_block_task_checked.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="#83CF36"
-        android:pathData="M7,3.0029L17,3.0029A4,4 0,0 1,21 7.0029L21,17.0029A4,4 0,0 1,17 21.0029L7,21.0029A4,4 0,0 1,3 17.0029L3,7.0029A4,4 0,0 1,7 3.0029z" />
-    <path
-        android:fillColor="#ffffff"
-        android:fillType="evenOdd"
-        android:pathData="M17.5364,8.5324L10.0132,16.0808L6.4741,12.5326L7.5362,11.4733L10.0128,13.9563L16.4739,7.4735L17.5364,8.5324Z" />
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_block_task_unchecked.xml b/core-ui/src/main/res/drawable/ic_block_task_unchecked.xml
deleted file mode 100644
index 78b543d8c0..0000000000
--- a/core-ui/src/main/res/drawable/ic_block_task_unchecked.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M7,4.5L17,4.5A2.5,2.5 0,0 1,19.5 7L19.5,17A2.5,2.5 0,0 1,17 19.5L7,19.5A2.5,2.5 0,0 1,4.5 17L4.5,7A2.5,2.5 0,0 1,7 4.5z"
-        android:strokeWidth="1"
-        android:strokeColor="#ACA996" />
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_block_toolbar_add_new.xml b/core-ui/src/main/res/drawable/ic_block_toolbar_add_new.xml
deleted file mode 100644
index bc928ae885..0000000000
--- a/core-ui/src/main/res/drawable/ic_block_toolbar_add_new.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:pathData="M1.5,12C1.5,17.799 6.201,22.5 12,22.5C17.799,22.5 22.5,17.799 22.5,12C22.5,6.201 17.799,1.5 12,1.5C6.201,1.5 1.5,6.201 1.5,12ZM12,0C5.3726,0 0,5.3726 0,12C0,18.6274 5.3726,24 12,24C18.6274,24 24,18.6274 24,12C24,5.3726 18.6274,0 12,0Z"
-        android:fillColor="@color/glyph_active"
-        android:fillType="evenOdd" />
-    <path
-        android:pathData="M11.25,6.75C11.25,6.3358 11.5858,6 12,6C12.4142,6 12.75,6.3358 12.75,6.75V17.25C12.75,17.6642 12.4142,18 12,18C11.5858,18 11.25,17.6642 11.25,17.25V6.75Z"
-        android:fillColor="@color/glyph_active" />
-    <path
-        android:pathData="M6.75,12.75C6.3358,12.75 6,12.4142 6,12C6,11.5858 6.3358,11.25 6.75,11.25H17.25C17.6642,11.25 18,11.5858 18,12C18,12.4142 17.6642,12.75 17.25,12.75H6.75Z"
-        android:fillColor="@color/glyph_active" />
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_block_toolbar_block_actions.xml b/core-ui/src/main/res/drawable/ic_block_toolbar_block_actions.xml
deleted file mode 100644
index d852e227a8..0000000000
--- a/core-ui/src/main/res/drawable/ic_block_toolbar_block_actions.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:pathData="M7.75,12C7.75,12.6904 7.1904,13.25 6.5,13.25C5.8096,13.25 5.25,12.6904 5.25,12C5.25,11.3096 5.8096,10.75 6.5,10.75C7.1904,10.75 7.75,11.3096 7.75,12Z"
-        android:fillColor="@color/glyph_active" />
-    <path
-        android:pathData="M12,22.5C17.799,22.5 22.5,17.799 22.5,12C22.5,6.201 17.799,1.5 12,1.5C6.201,1.5 1.5,6.201 1.5,12C1.5,17.799 6.201,22.5 12,22.5ZM12,24C18.6274,24 24,18.6274 24,12C24,5.3726 18.6274,0 12,0C5.3726,0 0,5.3726 0,12C0,18.6274 5.3726,24 12,24Z"
-        android:fillColor="@color/glyph_active"
-        android:fillType="evenOdd" />
-    <path
-        android:pathData="M13.25,12C13.25,12.6904 12.6904,13.25 12,13.25C11.3096,13.25 10.75,12.6904 10.75,12C10.75,11.3096 11.3096,10.75 12,10.75C12.6904,10.75 13.25,11.3096 13.25,12Z"
-        android:fillColor="@color/glyph_active" />
-    <path
-        android:pathData="M18.75,12C18.75,12.6904 18.1904,13.25 17.5,13.25C16.8096,13.25 16.25,12.6904 16.25,12C16.25,11.3096 16.8096,10.75 17.5,10.75C18.1904,10.75 18.75,11.3096 18.75,12Z"
-        android:fillColor="@color/glyph_active" />
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_block_toolbar_hide_keyboard.xml b/core-ui/src/main/res/drawable/ic_block_toolbar_hide_keyboard.xml
deleted file mode 100644
index 87e9d3ee2f..0000000000
--- a/core-ui/src/main/res/drawable/ic_block_toolbar_hide_keyboard.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:pathData="M12,12m-12,0a12,12 0,1 1,24 0a12,12 0,1 1,-24 0"
-        android:fillColor="#EAE9E0" />
-    <path
-        android:pathData="M6.4697,9.9697C6.7626,9.6768 7.2374,9.6768 7.5303,9.9697L12,14.4393L16.4697,9.9697C16.7626,9.6768 17.2374,9.6768 17.5303,9.9697C17.8232,10.2626 17.8232,10.7374 17.5303,11.0303L12,16.5607L6.4697,11.0303C6.1768,10.7374 6.1768,10.2626 6.4697,9.9697Z"
-        android:fillColor="#ACA996"
-        android:fillType="evenOdd" />
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_block_toolbar_move.xml b/core-ui/src/main/res/drawable/ic_block_toolbar_move.xml
deleted file mode 100644
index a085a1acfb..0000000000
--- a/core-ui/src/main/res/drawable/ic_block_toolbar_move.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:pathData="M3,16L12,22L21,16"
-      android:strokeWidth="1.5"
-      android:fillColor="#00000000"
-      android:strokeColor="#ACA996"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M3,8L12,2L21,8"
-      android:strokeWidth="1.5"
-      android:fillColor="#00000000"
-      android:strokeColor="#ACA996"
-      android:strokeLineCap="round"/>
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_block_toolbar_multi_select_mode.xml b/core-ui/src/main/res/drawable/ic_block_toolbar_multi_select_mode.xml
deleted file mode 100644
index 7e7716d9d0..0000000000
--- a/core-ui/src/main/res/drawable/ic_block_toolbar_multi_select_mode.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:pathData="M1.75,10C1.75,8.7574 2.7574,7.75 4,7.75H14C15.2426,7.75 16.25,8.7574 16.25,10V20C16.25,21.2426 15.2426,22.25 14,22.25H4C2.7574,22.25 1.75,21.2426 1.75,20V10Z"
-        android:strokeWidth="1.5"
-        android:fillColor="#00000000"
-        android:strokeColor="#ACA996" />
-    <path
-        android:pathData="M10.625,2.75C10.4214,2.75 10.2268,2.7822 10.0452,2.8412C9.6512,2.9691 9.2281,2.7534 9.1002,2.3595C8.9723,1.9655 9.188,1.5424 9.5819,1.4145C9.9113,1.3075 10.2622,1.25 10.625,1.25H11.5C11.9142,1.25 12.25,1.5858 12.25,2C12.25,2.4142 11.9142,2.75 11.5,2.75H10.625ZM13.375,2C13.375,1.5858 13.7108,1.25 14.125,1.25H15.875C16.2892,1.25 16.625,1.5858 16.625,2C16.625,2.4142 16.2892,2.75 15.875,2.75H14.125C13.7108,2.75 13.375,2.4142 13.375,2ZM17.75,2C17.75,1.5858 18.0858,1.25 18.5,1.25H19.375C19.7378,1.25 20.0887,1.3075 20.4181,1.4145C20.8121,1.5424 21.0277,1.9655 20.8998,2.3595C20.7719,2.7534 20.3488,2.9691 19.9548,2.8412C19.7732,2.7822 19.5786,2.75 19.375,2.75H18.5C18.0858,2.75 17.75,2.4142 17.75,2ZM21.6405,3.1002C22.0345,2.9723 22.4576,3.1879 22.5855,3.5819C22.6925,3.9113 22.75,4.2622 22.75,4.625V5.5C22.75,5.9142 22.4142,6.25 22,6.25C21.5858,6.25 21.25,5.9142 21.25,5.5V4.625C21.25,4.4214 21.2178,4.2268 21.1588,4.0452C21.0309,3.6512 21.2466,3.2281 21.6405,3.1002ZM8.3595,3.1002C8.7534,3.2281 8.9691,3.6512 8.8412,4.0452C8.7822,4.2268 8.75,4.4214 8.75,4.625V5.5C8.75,5.9142 8.4142,6.25 8,6.25C7.5858,6.25 7.25,5.9142 7.25,5.5V4.625C7.25,4.2622 7.3075,3.9113 7.4145,3.5819C7.5424,3.1879 7.9655,2.9723 8.3595,3.1002ZM22,7.375C22.4142,7.375 22.75,7.7108 22.75,8.125V9.875C22.75,10.2892 22.4142,10.625 22,10.625C21.5858,10.625 21.25,10.2892 21.25,9.875V8.125C21.25,7.7108 21.5858,7.375 22,7.375ZM22,11.75C22.4142,11.75 22.75,12.0858 22.75,12.5V13.375C22.75,13.7378 22.6925,14.0887 22.5855,14.4181C22.4576,14.8121 22.0345,15.0277 21.6405,14.8998C21.2466,14.7719 21.0309,14.3488 21.1588,13.9548C21.2178,13.7732 21.25,13.5786 21.25,13.375V12.5C21.25,12.0858 21.5858,11.75 22,11.75ZM20.8998,15.6405C21.0277,16.0345 20.8121,16.4576 20.4181,16.5855C20.0887,16.6925 19.7378,16.75 19.375,16.75H18.5C18.0858,16.75 17.75,16.4142 17.75,16C17.75,15.5858 18.0858,15.25 18.5,15.25H19.375C19.5786,15.25 19.7732,15.2178 19.9548,15.1588C20.3488,15.0309 20.7719,15.2466 20.8998,15.6405Z"
-        android:fillColor="#ACA996"
-        android:fillType="evenOdd" />
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_bookmark_block_error.xml b/core-ui/src/main/res/drawable/ic_bookmark_block_error.xml
deleted file mode 100644
index 998523650c..0000000000
--- a/core-ui/src/main/res/drawable/ic_bookmark_block_error.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="32dp"
-    android:height="32dp"
-    android:viewportWidth="32"
-    android:viewportHeight="32">
-  <path
-      android:pathData="M15.627,21.766L8.75,25.706V9C8.75,7.205 10.205,5.75 12,5.75H20C21.795,5.75 23.25,7.205 23.25,9V25.706L16.373,21.766L16,21.552L15.627,21.766Z"
-      android:strokeWidth="1.5"
-      android:fillColor="#00000000"
-      android:strokeColor="@color/glyph_inactive"/>
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_bookmark_inactive.xml b/core-ui/src/main/res/drawable/ic_bookmark_inactive.xml
index d45d84ab15..c3ff9fb779 100644
--- a/core-ui/src/main/res/drawable/ic_bookmark_inactive.xml
+++ b/core-ui/src/main/res/drawable/ic_bookmark_inactive.xml
@@ -6,6 +6,6 @@
     <path
         android:pathData="M11.6272,18.0496L4.75,21.9896V5.2837C4.75,3.4888 6.2051,2.0337 8,2.0337H16C17.7949,2.0337 19.25,3.4888 19.25,5.2837V21.9896L12.3728,18.0496L12,17.836L11.6272,18.0496Z"
         android:strokeWidth="1.5"
-        android:fillColor="#00000000"
+        android:fillColor="@color/transparent_black"
         android:strokeColor="@color/glyph_inactive"/>
 </vector>
diff --git a/core-ui/src/main/res/drawable/ic_bookmark_menu.xml b/core-ui/src/main/res/drawable/ic_bookmark_menu.xml
deleted file mode 100644
index 0bfd27b969..0000000000
--- a/core-ui/src/main/res/drawable/ic_bookmark_menu.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M6,14.0323C7.1046,14.0323 8,13.1369 8,12.0323C8,10.9278 7.1046,10.0323 6,10.0323C4.8954,10.0323 4,10.9278 4,12.0323C4,13.1369 4.8954,14.0323 6,14.0323Z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M12,14.0323C13.1046,14.0323 14,13.1369 14,12.0323C14,10.9278 13.1046,10.0323 12,10.0323C10.8954,10.0323 10,10.9278 10,12.0323C10,13.1369 10.8954,14.0323 12,14.0323Z" />
-    <path
-        android:fillColor="#FFFFFF"
-        android:pathData="M18,14.0323C19.1046,14.0323 20,13.1369 20,12.0323C20,10.9278 19.1046,10.0323 18,10.0323C16.8954,10.0323 16,10.9278 16,12.0323C16,13.1369 16.8954,14.0323 18,14.0323Z" />
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_bookmark_placeholder.xml b/core-ui/src/main/res/drawable/ic_bookmark_placeholder.xml
index 6bbe655f96..91537d8689 100644
--- a/core-ui/src/main/res/drawable/ic_bookmark_placeholder.xml
+++ b/core-ui/src/main/res/drawable/ic_bookmark_placeholder.xml
@@ -6,6 +6,6 @@
   <path
       android:pathData="M11.6272,18.0496L4.75,21.9896V5.2837C4.75,3.4888 6.2051,2.0337 8,2.0337H16C17.7949,2.0337 19.25,3.4888 19.25,5.2837V21.9896L12.3728,18.0496L12,17.836L11.6272,18.0496Z"
       android:strokeWidth="1.5"
-      android:fillColor="#00000000"
+      android:fillColor="@color/transparent_black"
       android:strokeColor="@color/glyph_active"/>
 </vector>
diff --git a/core-ui/src/main/res/drawable/ic_bulleted.xml b/core-ui/src/main/res/drawable/ic_bulleted.xml
index 3cc0f5c996..1dfcf19f65 100644
--- a/core-ui/src/main/res/drawable/ic_bulleted.xml
+++ b/core-ui/src/main/res/drawable/ic_bulleted.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="#2C2B27"
+        android:fillColor="@color/black"
         android:pathData="M12.0029,15C13.6598,15 15.0029,13.6569 15.0029,12C15.0029,10.3431 13.6598,9 12.0029,9C10.3461,9 9.0029,10.3431 9.0029,12C9.0029,13.6569 10.3461,15 12.0029,15Z" />
 </vector>
diff --git a/core-ui/src/main/res/drawable/ic_cell_menu.xml b/core-ui/src/main/res/drawable/ic_cell_menu.xml
deleted file mode 100644
index 758c1fc222..0000000000
--- a/core-ui/src/main/res/drawable/ic_cell_menu.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="15dp"
-    android:height="17dp"
-    android:viewportWidth="15"
-    android:viewportHeight="17">
-  <path
-      android:pathData="M7.5,2.5L7.5,2.5A1,1 0,0 1,8.5 3.5L8.5,3.5A1,1 0,0 1,7.5 4.5L7.5,4.5A1,1 0,0 1,6.5 3.5L6.5,3.5A1,1 0,0 1,7.5 2.5z"
-      android:fillColor="@color/gray"/>
-  <path
-      android:pathData="M7.5,7.5L7.5,7.5A1,1 0,0 1,8.5 8.5L8.5,8.5A1,1 0,0 1,7.5 9.5L7.5,9.5A1,1 0,0 1,6.5 8.5L6.5,8.5A1,1 0,0 1,7.5 7.5z"
-      android:fillColor="@color/gray"/>
-  <path
-      android:pathData="M7.5,12.5L7.5,12.5A1,1 0,0 1,8.5 13.5L8.5,13.5A1,1 0,0 1,7.5 14.5L7.5,14.5A1,1 0,0 1,6.5 13.5L6.5,13.5A1,1 0,0 1,7.5 12.5z"
-      android:fillColor="@color/gray"/>
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_cell_relation_call_with.xml b/core-ui/src/main/res/drawable/ic_cell_relation_call_with.xml
deleted file mode 100644
index 4606bee049..0000000000
--- a/core-ui/src/main/res/drawable/ic_cell_relation_call_with.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:pathData="M8.6256,4.8822C8.0175,3.8396 6.5873,3.6546 5.7339,4.5081L4.5824,5.6596C4.5824,5.6596 1.7423,8.4996 8.6057,15.363C15.4691,22.2264 18.3092,19.3864 18.3092,19.3864L19.4607,18.2349C20.3141,17.3814 20.1291,15.9513 19.0865,15.3431L16.1377,13.623C15.7438,13.3932 15.2443,13.4578 14.9218,13.7803L13.8125,14.8897C13.8125,14.8897 13.3391,15.363 10.9724,12.9963C8.6057,10.6296 9.0791,10.1563 9.0791,10.1563L10.1884,9.047C10.511,8.7244 10.5756,8.225 10.3457,7.831L8.6256,4.8822Z"
-      android:fillColor="@color/glyph_active"/>
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_cell_relation_go_to_link.xml b/core-ui/src/main/res/drawable/ic_cell_relation_go_to_link.xml
deleted file mode 100644
index de1767133b..0000000000
--- a/core-ui/src/main/res/drawable/ic_cell_relation_go_to_link.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="25dp"
-    android:viewportWidth="24"
-    android:viewportHeight="25">
-    <path
-        android:fillColor="@color/glyph_active"
-        android:fillType="evenOdd"
-        android:pathData="M11.4697,4.5009C11.7626,4.208 12.2374,4.208 12.5303,4.5009L20.0607,12.0313L12.5303,19.5616C12.2374,19.8545 11.7626,19.8545 11.4697,19.5616C11.1768,19.2687 11.1768,18.7938 11.4697,18.5009L17.9393,12.0313L11.4697,5.5616C11.1768,5.2687 11.1768,4.7938 11.4697,4.5009Z" />
-    <path
-        android:fillColor="@color/glyph_active"
-        android:fillType="evenOdd"
-        android:pathData="M19,12.7812H4V11.2812H19V12.7812Z" />
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_cell_relation_go_to_mail_client.xml b/core-ui/src/main/res/drawable/ic_cell_relation_go_to_mail_client.xml
deleted file mode 100644
index a13e463d87..0000000000
--- a/core-ui/src/main/res/drawable/ic_cell_relation_go_to_mail_client.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:pathData="M17.5,6.4688H6.5C5.6716,6.4688 5,7.1403 5,7.9688V15.9688C5,16.7972 5.6716,17.4688 6.5,17.4688H17.5C18.3284,17.4688 19,16.7972 19,15.9688V7.9688C19,7.1403 18.3284,6.4688 17.5,6.4688ZM6.5,4.9688C4.8432,4.9688 3.5,6.3119 3.5,7.9688V15.9688C3.5,17.6256 4.8432,18.9688 6.5,18.9688H17.5C19.1569,18.9688 20.5,17.6256 20.5,15.9688V7.9688C20.5,6.3119 19.1569,4.9688 17.5,4.9688H6.5Z"
-      android:fillColor="@color/glyph_active"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M3.5596,7.7791L4.4397,6.5644L11.9996,12.0424L19.5596,6.5644L20.4397,7.7791L11.9996,13.8948L3.5596,7.7791Z"
-      android:fillColor="@color/glyph_active"
-      android:fillType="evenOdd"/>
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_check_16.xml b/core-ui/src/main/res/drawable/ic_check_16.xml
index 134623596f..93feb06ffc 100644
--- a/core-ui/src/main/res/drawable/ic_check_16.xml
+++ b/core-ui/src/main/res/drawable/ic_check_16.xml
@@ -6,6 +6,6 @@
   <path
       android:pathData="M3,8.688L7,12.688L13,3.688"
       android:strokeWidth="1.25"
-      android:fillColor="#00000000"
+      android:fillColor="@color/transparent_black"
       android:strokeColor="@color/text_primary"/>
 </vector>
diff --git a/core-ui/src/main/res/drawable/ic_checkbox_checked.xml b/core-ui/src/main/res/drawable/ic_checkbox_checked.xml
index 89f48a7ce1..61198b0121 100644
--- a/core-ui/src/main/res/drawable/ic_checkbox_checked.xml
+++ b/core-ui/src/main/res/drawable/ic_checkbox_checked.xml
@@ -9,6 +9,6 @@
   <path
       android:pathData="M7.5,12.003L11.29,16L16.5,8"
       android:strokeWidth="1.5"
-      android:fillColor="#00000000"
-      android:strokeColor="#ffffff"/>
+      android:fillColor="@color/transparent_black"
+      android:strokeColor="@color/white"/>
 </vector>
diff --git a/core-ui/src/main/res/drawable/ic_checkbox_default.xml b/core-ui/src/main/res/drawable/ic_checkbox_default.xml
index 97d6f98ba2..af93932e5e 100644
--- a/core-ui/src/main/res/drawable/ic_checkbox_default.xml
+++ b/core-ui/src/main/res/drawable/ic_checkbox_default.xml
@@ -4,7 +4,7 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="#00000000"
+        android:fillColor="@color/transparent_black"
         android:pathData="M19.5,12C19.5,16.1421 16.1421,19.5 12,19.5C7.8579,19.5 4.5,16.1421 4.5,12C4.5,7.8579 7.8579,4.5 12,4.5C16.1421,4.5 19.5,7.8579 19.5,12Z"
         android:strokeWidth="1"
         android:strokeColor="@color/glyph_active" />
diff --git a/core-ui/src/main/res/drawable/ic_checkbox_gallery_view_checked.xml b/core-ui/src/main/res/drawable/ic_checkbox_gallery_view_checked.xml
index 3c0f62bb02..2b4ea98e4c 100644
--- a/core-ui/src/main/res/drawable/ic_checkbox_gallery_view_checked.xml
+++ b/core-ui/src/main/res/drawable/ic_checkbox_gallery_view_checked.xml
@@ -5,9 +5,9 @@
     android:viewportHeight="16">
   <path
       android:pathData="M0,8C0,3.5817 3.5817,0 8,0V0C12.4183,0 16,3.5817 16,8V8C16,12.4183 12.4183,16 8,16V16C3.5817,16 0,12.4183 0,8V8Z"
-      android:fillColor="#1BA0EB"/>
+      android:fillColor="@color/checkbox_blue"/>
   <path
       android:pathData="M12.4256,4.2607L7.6738,12.0364L4.0254,7.935L4.7726,7.2703L7.5241,10.3636L11.5723,3.7393L12.4256,4.2607Z"
-      android:fillColor="#ffffff"
+      android:fillColor="@color/white"
       android:fillType="evenOdd"/>
 </vector>
diff --git a/core-ui/src/main/res/drawable/ic_checkbox_gallery_view_unchecked.xml b/core-ui/src/main/res/drawable/ic_checkbox_gallery_view_unchecked.xml
index 49eea5f63b..22439fbba1 100644
--- a/core-ui/src/main/res/drawable/ic_checkbox_gallery_view_unchecked.xml
+++ b/core-ui/src/main/res/drawable/ic_checkbox_gallery_view_unchecked.xml
@@ -6,6 +6,6 @@
   <path
       android:strokeWidth="1"
       android:pathData="M8,8m-7.5,0a7.5,7.5 0,1 1,15 0a7.5,7.5 0,1 1,-15 0"
-      android:fillColor="#00000000"
-      android:strokeColor="#ACA996"/>
+      android:fillColor="@color/transparent_black"
+      android:strokeColor="@color/gray"/>
 </vector>
diff --git a/core-ui/src/main/res/drawable/ic_checkbox_selected.xml b/core-ui/src/main/res/drawable/ic_checkbox_selected.xml
index c4547520aa..92dd3239ad 100644
--- a/core-ui/src/main/res/drawable/ic_checkbox_selected.xml
+++ b/core-ui/src/main/res/drawable/ic_checkbox_selected.xml
@@ -7,7 +7,7 @@
         android:fillColor="@color/palette_system_sky"
         android:pathData="M12,21.0029C16.9706,21.0029 21,16.9735 21,12.0029C21,7.0324 16.9706,3.0029 12,3.0029C7.0294,3.0029 3,7.0324 3,12.0029C3,16.9735 7.0294,21.0029 12,21.0029Z" />
     <path
-        android:fillColor="#ffffff"
+        android:fillColor="@color/white"
         android:fillType="evenOdd"
         android:pathData="M17.5312,8.5324L10.008,16.0808L6.469,12.5326L7.531,11.4733L10.0076,13.9563L16.4688,7.4735L17.5312,8.5324Z" />
 </vector>
diff --git a/core-ui/src/main/res/drawable/ic_checked_24.xml b/core-ui/src/main/res/drawable/ic_checked_24.xml
index 84ae9aeb4b..6d63841daf 100644
--- a/core-ui/src/main/res/drawable/ic_checked_24.xml
+++ b/core-ui/src/main/res/drawable/ic_checked_24.xml
@@ -8,8 +8,8 @@
         android:pathData="M12,12m-12,0a12,12 0,1 1,24 0a12,12 0,1 1,-24 0" />
 
     <path
-        android:fillColor="#00000000"
+        android:fillColor="@color/transparent_black"
         android:pathData="M7.5,12.003L11.29,16L16.5,8"
         android:strokeWidth="1.5"
-        android:strokeColor="#ffffff" />
+        android:strokeColor="@color/white" />
 </vector>
diff --git a/core-ui/src/main/res/drawable/ic_chosen.xml b/core-ui/src/main/res/drawable/ic_chosen.xml
deleted file mode 100644
index 51b6e9b9a5..0000000000
--- a/core-ui/src/main/res/drawable/ic_chosen.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="16dp"
-    android:height="16dp"
-    android:viewportWidth="16"
-    android:viewportHeight="16">
-  <path
-      android:pathData="M14.7072,3.8571L6.0001,12.5642L1.293,7.8571L2.7072,6.4429L6.0001,9.7358L13.293,2.4429L14.7072,3.8571Z"
-      android:fillColor="#FFB522"
-      android:fillType="evenOdd"/>
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_circle_more.xml b/core-ui/src/main/res/drawable/ic_circle_more.xml
deleted file mode 100644
index d852e227a8..0000000000
--- a/core-ui/src/main/res/drawable/ic_circle_more.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:pathData="M7.75,12C7.75,12.6904 7.1904,13.25 6.5,13.25C5.8096,13.25 5.25,12.6904 5.25,12C5.25,11.3096 5.8096,10.75 6.5,10.75C7.1904,10.75 7.75,11.3096 7.75,12Z"
-        android:fillColor="@color/glyph_active" />
-    <path
-        android:pathData="M12,22.5C17.799,22.5 22.5,17.799 22.5,12C22.5,6.201 17.799,1.5 12,1.5C6.201,1.5 1.5,6.201 1.5,12C1.5,17.799 6.201,22.5 12,22.5ZM12,24C18.6274,24 24,18.6274 24,12C24,5.3726 18.6274,0 12,0C5.3726,0 0,5.3726 0,12C0,18.6274 5.3726,24 12,24Z"
-        android:fillColor="@color/glyph_active"
-        android:fillType="evenOdd" />
-    <path
-        android:pathData="M13.25,12C13.25,12.6904 12.6904,13.25 12,13.25C11.3096,13.25 10.75,12.6904 10.75,12C10.75,11.3096 11.3096,10.75 12,10.75C12.6904,10.75 13.25,11.3096 13.25,12Z"
-        android:fillColor="@color/glyph_active" />
-    <path
-        android:pathData="M18.75,12C18.75,12.6904 18.1904,13.25 17.5,13.25C16.8096,13.25 16.25,12.6904 16.25,12C16.25,11.3096 16.8096,10.75 17.5,10.75C18.1904,10.75 18.75,11.3096 18.75,12Z"
-        android:fillColor="@color/glyph_active" />
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_close_keyboard.xml b/core-ui/src/main/res/drawable/ic_close_keyboard.xml
deleted file mode 100644
index 67e8c87470..0000000000
--- a/core-ui/src/main/res/drawable/ic_close_keyboard.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="#ACA996"
-        android:fillType="evenOdd"
-        android:pathData="M12,22C17.5228,22 22,17.5228 22,12C22,6.4771 17.5228,2 12,2C6.4771,2 2,6.4771 2,12C2,17.5228 6.4771,22 12,22ZM12,24C18.6274,24 24,18.6274 24,12C24,5.3726 18.6274,0 12,0C5.3726,0 0,5.3726 0,12C0,18.6274 5.3726,24 12,24Z" />
-    <path
-        android:fillColor="#ACA996"
-        android:fillType="evenOdd"
-        android:pathData="M6.2929,9.7929C6.6834,9.4024 7.3166,9.4024 7.7071,9.7929L12,14.0858L16.2929,9.7929C16.6834,9.4024 17.3166,9.4024 17.7071,9.7929C18.0976,10.1834 18.0976,10.8166 17.7071,11.2071L12,16.9142L6.2929,11.2071C5.9024,10.8166 5.9024,10.1834 6.2929,9.7929Z" />
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_close_round.xml b/core-ui/src/main/res/drawable/ic_close_round.xml
index 04c28bc64f..4ace29020d 100644
--- a/core-ui/src/main/res/drawable/ic_close_round.xml
+++ b/core-ui/src/main/res/drawable/ic_close_round.xml
@@ -5,13 +5,13 @@
     android:viewportHeight="28">
   <path
       android:pathData="M28,14C28,21.732 21.732,28 14,28C6.268,28 0,21.732 0,14C0,6.268 6.268,0 14,0C21.732,0 28,6.268 28,14Z"
-      android:fillColor="#EAE9E0"/>
+      android:fillColor="@color/toolbar_keyboard_background"/>
   <path
       android:pathData="M8.7929,8.7929C9.1834,8.4024 9.8166,8.4024 10.2071,8.7929L19.2071,17.7929C19.5976,18.1834 19.5976,18.8166 19.2071,19.2071C18.8166,19.5976 18.1834,19.5976 17.7929,19.2071L8.7929,10.2071C8.4024,9.8166 8.4024,9.1834 8.7929,8.7929Z"
-      android:fillColor="#ACA996"
+      android:fillColor="@color/gray"
       android:fillType="evenOdd"/>
   <path
       android:pathData="M8.7929,19.2071C8.4024,18.8166 8.4024,18.1834 8.7929,17.7929L17.7929,8.7929C18.1834,8.4024 18.8166,8.4024 19.2071,8.7929C19.5976,9.1834 19.5976,9.8166 19.2071,10.2071L10.2071,19.2071C9.8166,19.5976 9.1834,19.5976 8.7929,19.2071Z"
-      android:fillColor="#ACA996"
+      android:fillColor="@color/gray"
       android:fillType="evenOdd"/>
 </vector>
diff --git a/core-ui/src/main/res/drawable/ic_create_viewer_gallery.xml b/core-ui/src/main/res/drawable/ic_create_viewer_gallery.xml
deleted file mode 100644
index ff08bec849..0000000000
--- a/core-ui/src/main/res/drawable/ic_create_viewer_gallery.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:pathData="M19.5039,5H15.0039C14.4516,5 14.0039,5.4477 14.0039,6V9C14.0039,9.5523 14.4516,10 15.0039,10H19.5039C20.0562,10 20.5039,9.5523 20.5039,9V6C20.5039,5.4477 20.0562,5 19.5039,5ZM15.0039,3.5C13.6232,3.5 12.5039,4.6193 12.5039,6V9C12.5039,10.3807 13.6232,11.5 15.0039,11.5H19.5039C20.8846,11.5 22.0039,10.3807 22.0039,9V6C22.0039,4.6193 20.8846,3.5 19.5039,3.5H15.0039Z"
-      android:fillColor="@color/glyph_active"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M9,5H4.5C3.9477,5 3.5,5.4477 3.5,6V9C3.5,9.5523 3.9477,10 4.5,10H9C9.5523,10 10,9.5523 10,9V6C10,5.4477 9.5523,5 9,5ZM4.5,3.5C3.1193,3.5 2,4.6193 2,6V9C2,10.3807 3.1193,11.5 4.5,11.5H9C10.3807,11.5 11.5,10.3807 11.5,9V6C11.5,4.6193 10.3807,3.5 9,3.5H4.5Z"
-      android:fillColor="@color/glyph_active"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M9,14H4.5C3.9477,14 3.5,14.4477 3.5,15V18C3.5,18.5523 3.9477,19 4.5,19H9C9.5523,19 10,18.5523 10,18V15C10,14.4477 9.5523,14 9,14ZM4.5,12.5C3.1193,12.5 2,13.6193 2,15V18C2,19.3807 3.1193,20.5 4.5,20.5H9C10.3807,20.5 11.5,19.3807 11.5,18V15C11.5,13.6193 10.3807,12.5 9,12.5H4.5Z"
-      android:fillColor="@color/glyph_active"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M19.5039,14H15.0039C14.4516,14 14.0039,14.4477 14.0039,15V18C14.0039,18.5523 14.4516,19 15.0039,19H19.5039C20.0562,19 20.5039,18.5523 20.5039,18V15C20.5039,14.4477 20.0562,14 19.5039,14ZM15.0039,12.5C13.6232,12.5 12.5039,13.6193 12.5039,15V18C12.5039,19.3807 13.6232,20.5 15.0039,20.5H19.5039C20.8846,20.5 22.0039,19.3807 22.0039,18V15C22.0039,13.6193 20.8846,12.5 19.5039,12.5H15.0039Z"
-      android:fillColor="@color/glyph_active"
-      android:fillType="evenOdd"/>
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_create_viewer_grid.xml b/core-ui/src/main/res/drawable/ic_create_viewer_grid.xml
deleted file mode 100644
index 2ab06a11f7..0000000000
--- a/core-ui/src/main/res/drawable/ic_create_viewer_grid.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:pathData="M3.5,13.5H21.5V15H3.5V13.5Z"
-      android:fillColor="@color/glyph_active"/>
-  <path
-      android:pathData="M11.25,19.3125L11.25,4.3125H12.75V19.3125H11.25Z"
-      android:fillColor="@color/glyph_active"/>
-  <path
-      android:pathData="M3.5,8.5H21.5V10H3.5V8.5Z"
-      android:fillColor="@color/glyph_active"/>
-  <path
-      android:pathData="M19.5,5H4.5C3.9477,5 3.5,5.4477 3.5,6V17.5C3.5,18.0523 3.9477,18.5 4.5,18.5H19.5C20.0523,18.5 20.5,18.0523 20.5,17.5V6C20.5,5.4477 20.0523,5 19.5,5ZM4.5,3.5C3.1193,3.5 2,4.6193 2,6V17.5C2,18.8807 3.1193,20 4.5,20H19.5C20.8807,20 22,18.8807 22,17.5V6C22,4.6193 20.8807,3.5 19.5,3.5H4.5Z"
-      android:fillColor="@color/glyph_active"
-      android:fillType="evenOdd"/>
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_create_viewer_kanban.xml b/core-ui/src/main/res/drawable/ic_create_viewer_kanban.xml
deleted file mode 100644
index fc48c45e21..0000000000
--- a/core-ui/src/main/res/drawable/ic_create_viewer_kanban.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:pathData="M9,4.9658H4.5C3.9477,4.9658 3.5,5.4135 3.5,5.9658V17.9658C3.5,18.5181 3.9477,18.9658 4.5,18.9658H9C9.5523,18.9658 10,18.5181 10,17.9658V5.9658C10,5.4135 9.5523,4.9658 9,4.9658ZM4.5,3.4658C3.1193,3.4658 2,4.5851 2,5.9658V17.9658C2,19.3465 3.1193,20.4658 4.5,20.4658H9C10.3807,20.4658 11.5,19.3465 11.5,17.9658V5.9658C11.5,4.5851 10.3807,3.4658 9,3.4658H4.5Z"
-      android:fillColor="@color/glyph_active"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M19.5039,4.9658H15.0039C14.4516,4.9658 14.0039,5.4135 14.0039,5.9658V13.9658C14.0039,14.5181 14.4516,14.9658 15.0039,14.9658H19.5039C20.0562,14.9658 20.5039,14.5181 20.5039,13.9658V5.9658C20.5039,5.4135 20.0562,4.9658 19.5039,4.9658ZM15.0039,3.4658C13.6232,3.4658 12.5039,4.5851 12.5039,5.9658V13.9658C12.5039,15.3465 13.6232,16.4658 15.0039,16.4658H19.5039C20.8846,16.4658 22.0039,15.3465 22.0039,13.9658V5.9658C22.0039,4.5851 20.8846,3.4658 19.5039,3.4658H15.0039Z"
-      android:fillColor="@color/glyph_active"
-      android:fillType="evenOdd"/>
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_create_viewer_list.xml b/core-ui/src/main/res/drawable/ic_create_viewer_list.xml
deleted file mode 100644
index cb2ade64ea..0000000000
--- a/core-ui/src/main/res/drawable/ic_create_viewer_list.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:pathData="M2,18.0011C2,17.5874 2.3354,17.252 2.7491,17.252H21.2509C21.6646,17.252 22,17.5874 22,18.0011C22,18.4148 21.6646,18.7502 21.2509,18.7502H2.7491C2.3354,18.7502 2,18.4148 2,18.0011Z"
-      android:fillColor="@color/glyph_active"/>
-  <path
-      android:pathData="M2,5.9991C2,5.5854 2.3354,5.25 2.7491,5.25H21.2509C21.6646,5.25 22,5.5854 22,5.9991C22,6.4129 21.6646,6.7483 21.2509,6.7483H2.7491C2.3354,6.7483 2,6.4129 2,5.9991Z"
-      android:fillColor="@color/glyph_active"/>
-  <path
-      android:pathData="M2,12.0001C2,11.5864 2.3354,11.251 2.7491,11.251H15.2509C15.6646,11.251 16,11.5864 16,12.0001C16,12.4139 15.6646,12.7493 15.2509,12.7493H2.7491C2.3354,12.7493 2,12.4139 2,12.0001Z"
-      android:fillColor="@color/glyph_active"/>
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_dashboard_task_checkbox_checked.xml b/core-ui/src/main/res/drawable/ic_dashboard_task_checkbox_checked.xml
deleted file mode 100644
index a3dc60a776..0000000000
--- a/core-ui/src/main/res/drawable/ic_dashboard_task_checkbox_checked.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="18dp"
-    android:height="18dp"
-    android:viewportWidth="18"
-    android:viewportHeight="18">
-  <path
-      android:pathData="M0,4.5C0,2.0147 2.0147,0 4.5,0H13.5C15.9853,0 18,2.0147 18,4.5V13.5C18,15.9853 15.9853,18 13.5,18H4.5C2.0147,18 0,15.9853 0,13.5V4.5Z"
-      android:fillColor="@color/palette_system_green"/>
-  <path
-      android:pathData="M5,8.5L8.5,12.5L13.5,4.5"
-      android:strokeWidth="1.35"
-      android:fillColor="#00000000"
-      android:strokeColor="#ffffff"/>
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_dashboard_task_checkbox_not_checked.xml b/core-ui/src/main/res/drawable/ic_dashboard_task_checkbox_not_checked.xml
index 33adbd6c22..ff6a70390e 100644
--- a/core-ui/src/main/res/drawable/ic_dashboard_task_checkbox_not_checked.xml
+++ b/core-ui/src/main/res/drawable/ic_dashboard_task_checkbox_not_checked.xml
@@ -6,6 +6,6 @@
   <path
       android:strokeWidth="1"
       android:pathData="M1.5,5C1.5,3.067 3.067,1.5 5,1.5H13C14.933,1.5 16.5,3.067 16.5,5V13C16.5,14.933 14.933,16.5 13,16.5H5C3.067,16.5 1.5,14.933 1.5,13V5Z"
-      android:fillColor="#00000000"
-      android:strokeColor="#ACA996"/>
+      android:fillColor="@color/transparent_black"
+      android:strokeColor="@color/gray"/>
 </vector>
diff --git a/core-ui/src/main/res/drawable/ic_data_view_edit_view.xml b/core-ui/src/main/res/drawable/ic_data_view_edit_view.xml
deleted file mode 100644
index 7d0160e0d5..0000000000
--- a/core-ui/src/main/res/drawable/ic_data_view_edit_view.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:pathData="M15.0303,7.0909L5.8655,16.2558L5.0012,20.0187L8.7409,19.1377L17.909,9.9696L15.0303,7.0909ZM18.9697,8.9089L16.091,6.0303L18.1464,3.9748C18.3417,3.7796 18.6583,3.7796 18.8536,3.9748L21.0251,6.1464C21.2204,6.3417 21.2204,6.6582 21.0251,6.8535L18.9697,8.9089ZM9.5,20.4999L3,22.0312L4.5,15.4999L17.0858,2.9141C17.8668,2.1331 19.1332,2.1331 19.9142,2.9142L22.0858,5.0857C22.8668,5.8668 22.8668,7.1331 22.0858,7.9142L9.5,20.4999Z"
-      android:fillColor="@color/glyph_active"
-      android:fillType="evenOdd"/>
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_data_view_grid_checkbox.xml b/core-ui/src/main/res/drawable/ic_data_view_grid_checkbox.xml
index b0893a77ca..7aec603029 100644
--- a/core-ui/src/main/res/drawable/ic_data_view_grid_checkbox.xml
+++ b/core-ui/src/main/res/drawable/ic_data_view_grid_checkbox.xml
@@ -6,6 +6,6 @@
   <path
       android:strokeWidth="1"
       android:pathData="M5.5,1.5L14.5,1.5A4,4 0,0 1,18.5 5.5L18.5,14.5A4,4 0,0 1,14.5 18.5L5.5,18.5A4,4 0,0 1,1.5 14.5L1.5,5.5A4,4 0,0 1,5.5 1.5z"
-      android:fillColor="#00000000"
+      android:fillColor="@color/transparent_black"
       android:strokeColor="@color/glyph_active"/>
 </vector>
diff --git a/core-ui/src/main/res/drawable/ic_data_view_grid_checkbox_checked.xml b/core-ui/src/main/res/drawable/ic_data_view_grid_checkbox_checked.xml
index f318c7946f..04864d42ff 100644
--- a/core-ui/src/main/res/drawable/ic_data_view_grid_checkbox_checked.xml
+++ b/core-ui/src/main/res/drawable/ic_data_view_grid_checkbox_checked.xml
@@ -5,6 +5,6 @@
     android:viewportHeight="20">
   <path
       android:pathData="M17.033,4.564L8.853,16.561L3,10.708L4.414,9.294L8.561,13.44L15.381,3.438L17.033,4.564Z"
-      android:fillColor="#5DD400"
+      android:fillColor="@color/palette_system_green"
       android:fillType="evenOdd"/>
 </vector>
diff --git a/core-ui/src/main/res/drawable/ic_delete.xml b/core-ui/src/main/res/drawable/ic_delete.xml
deleted file mode 100644
index 4d09162478..0000000000
--- a/core-ui/src/main/res/drawable/ic_delete.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="25dp"
-    android:viewportWidth="24"
-    android:viewportHeight="25">
-  <path
-      android:pathData="M4,6.9663H20V5.9663C20,5.9663 20,4.9663 18.9961,4.9663C11.6167,4.9663 5.6193,4.9663 4.9883,4.9663C4,4.9663 4,5.9663 4,5.9663V6.9663Z"
-      android:fillColor="#2C2B27"/>
-  <path
-      android:pathData="M9,4.4661C9,3.6378 9.6715,2.9663 10.4998,2.9663H13.5002C14.3285,2.9663 15,3.6378 15,4.4661V5.4665C15,6.2948 14.3285,6.9663 13.5002,6.9663H10.4998C9.6715,6.9663 9,6.2948 9,5.4665V4.4661Z"
-      android:fillColor="#2C2B27"/>
-  <path
-      android:pathData="M9,8.9663H11V18.9663H9V8.9663Z"
-      android:fillColor="#2C2B27"/>
-  <path
-      android:pathData="M13,8.9663H15V18.9663H13V8.9663Z"
-      android:fillColor="#2C2B27"/>
-  <path
-      android:pathData="M5,6.9663H7V19.9663C7,20.5186 7.4477,20.9663 8,20.9663H16C16.5523,20.9663 17,20.5186 17,19.9663V6.9663H19C19,9.435 19,16.059 19,19.9667C19,21.6235 17.6569,22.9663 16,22.9663H8C6.3432,22.9663 5,21.6232 5,19.9663V6.9663Z"
-      android:fillColor="#2C2B27"/>
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_delete_24.xml b/core-ui/src/main/res/drawable/ic_delete_24.xml
index 3832e8bce9..4a6978214f 100644
--- a/core-ui/src/main/res/drawable/ic_delete_24.xml
+++ b/core-ui/src/main/res/drawable/ic_delete_24.xml
@@ -15,11 +15,11 @@
   <path
       android:pathData="M8.4375,2.5C8.4375,1.5335 9.221,0.75 10.1875,0.75H13.6875C14.654,0.75 15.4375,1.5335 15.4375,2.5V4.75H8.4375V2.5Z"
       android:strokeWidth="1.5"
-      android:fillColor="#00000000"
+      android:fillColor="@color/transparent_black"
       android:strokeColor="@color/glyph_active"/>
   <path
       android:pathData="M5.5978,19.1282L5.0302,4.75H18.9848L18.4053,19.1309C18.3351,20.8735 16.902,22.25 15.1579,22.25H8.8452C7.1002,22.25 5.6666,20.8719 5.5978,19.1282Z"
       android:strokeWidth="1.5"
-      android:fillColor="#00000000"
+      android:fillColor="@color/transparent_black"
       android:strokeColor="@color/glyph_active"/>
 </vector>
diff --git a/core-ui/src/main/res/drawable/ic_delete_option.xml b/core-ui/src/main/res/drawable/ic_delete_option.xml
deleted file mode 100644
index ce5124473c..0000000000
--- a/core-ui/src/main/res/drawable/ic_delete_option.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="16dp"
-    android:height="16dp"
-    android:viewportWidth="16"
-    android:viewportHeight="16">
-  <path
-      android:pathData="M2.3432,2.3431L2.3432,2.3431A1,1 84.996,0 1,3.7574 2.3431L13.6569,12.2426A1,1 76.4522,0 1,13.6569 13.6568L13.6569,13.6568A1,1 0,0 1,12.2427 13.6568L2.3432,3.7573A1,1 0,0 1,2.3432 2.3431z"
-      android:fillColor="#ACA996"/>
-  <path
-      android:pathData="M2.3431,13.6569L2.3431,13.6569A1,1 115.5943,0 1,2.3431 12.2427L12.2426,2.3432A1,1 60.9454,0 1,13.6568 2.3432L13.6568,2.3432A1,1 60.9454,0 1,13.6568 3.7574L3.7573,13.6569A1,1 115.5943,0 1,2.3431 13.6569z"
-      android:fillColor="#ACA996"/>
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_dnd.xml b/core-ui/src/main/res/drawable/ic_dnd.xml
index 33fd8a4ab0..4e9ccc3c2d 100644
--- a/core-ui/src/main/res/drawable/ic_dnd.xml
+++ b/core-ui/src/main/res/drawable/ic_dnd.xml
@@ -5,11 +5,11 @@
     android:viewportHeight="25">
   <path
       android:pathData="M1.5,6.9409L22.5,6.9409A0.5,0.5 0,0 1,23 7.4409L23,7.4409A0.5,0.5 0,0 1,22.5 7.9409L1.5,7.9409A0.5,0.5 0,0 1,1 7.4409L1,7.4409A0.5,0.5 0,0 1,1.5 6.9409z"
-      android:fillColor="#CCCABB"/>
+      android:fillColor="@color/dnd_muted_gray"/>
   <path
       android:pathData="M1.5,11.9409L22.5,11.9409A0.5,0.5 0,0 1,23 12.4409L23,12.4409A0.5,0.5 0,0 1,22.5 12.9409L1.5,12.9409A0.5,0.5 0,0 1,1 12.4409L1,12.4409A0.5,0.5 0,0 1,1.5 11.9409z"
-      android:fillColor="#CCCABB"/>
+      android:fillColor="@color/dnd_muted_gray"/>
   <path
       android:pathData="M1.5,16.9409L22.5,16.9409A0.5,0.5 0,0 1,23 17.4409L23,17.4409A0.5,0.5 0,0 1,22.5 17.9409L1.5,17.9409A0.5,0.5 0,0 1,1 17.4409L1,17.4409A0.5,0.5 0,0 1,1.5 16.9409z"
-      android:fillColor="#CCCABB"/>
+      android:fillColor="@color/dnd_muted_gray"/>
 </vector>
diff --git a/core-ui/src/main/res/drawable/ic_doc_menu_doc_style.xml b/core-ui/src/main/res/drawable/ic_doc_menu_doc_style.xml
deleted file mode 100644
index 47a6220aed..0000000000
--- a/core-ui/src/main/res/drawable/ic_doc_menu_doc_style.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M20,21H4C3.448,21 3,20.552 3,20V16C3,15.448 3.448,15 4,15H20C20.552,15 21,15.448 21,16V20C21,20.552 20.552,21 20,21Z"
-        android:strokeWidth="1.5"
-        android:strokeColor="#ACA996"
-        android:strokeLineCap="round"
-        android:strokeLineJoin="round" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M20,11H14C13.448,11 13,10.552 13,10V4C13,3.448 13.448,3 14,3H20C20.552,3 21,3.448 21,4V10C21,10.552 20.552,11 20,11Z"
-        android:strokeWidth="1.5"
-        android:strokeColor="#ACA996"
-        android:strokeLineCap="round"
-        android:strokeLineJoin="round" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M9,3H3"
-        android:strokeWidth="1.5"
-        android:strokeColor="#ACA996"
-        android:strokeLineCap="round"
-        android:strokeLineJoin="round" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M9,7H3"
-        android:strokeWidth="1.5"
-        android:strokeColor="#ACA996"
-        android:strokeLineCap="round"
-        android:strokeLineJoin="round" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M9,11H3"
-        android:strokeWidth="1.5"
-        android:strokeColor="#ACA996"
-        android:strokeLineCap="round"
-        android:strokeLineJoin="round" />
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_doc_menu_move_to_bin.xml b/core-ui/src/main/res/drawable/ic_doc_menu_move_to_bin.xml
deleted file mode 100644
index 52b23fcc9c..0000000000
--- a/core-ui/src/main/res/drawable/ic_doc_menu_move_to_bin.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M8.75,3C8.75,2.3096 9.3096,1.75 10,1.75H14C14.6904,1.75 15.25,2.3096 15.25,3V5.25H8.75V3Z"
-        android:strokeWidth="1.5"
-        android:strokeColor="#ACA996" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M5.6577,19.5743L5.2705,5.25H18.7268L18.291,19.5836C18.2459,21.0691 17.0285,22.25 15.5423,22.25H8.4067C6.9168,22.25 5.6979,21.0636 5.6577,19.5743Z"
-        android:strokeWidth="1.5"
-        android:strokeColor="#ACA996" />
-    <path
-        android:fillColor="#ACA996"
-        android:pathData="M9.3125,8.001H10.8125V19.501H9.3125V8.001Z" />
-    <path
-        android:fillColor="#ACA996"
-        android:pathData="M13.3125,8.001H14.8125V19.501H13.3125V8.001Z" />
-    <path
-        android:fillColor="#ACA996"
-        android:pathData="M3.2485,6C2.8343,6 2.5,5.6642 2.5,5.25C2.5,4.8358 2.8358,4.5 3.25,4.5L20.75,4.5C21.1642,4.5 21.5,4.8358 21.5,5.25C21.5,5.6642 21.1668,6 20.7526,6C17.5914,6 6.2745,6 3.2485,6Z" />
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_doc_menu_search.xml b/core-ui/src/main/res/drawable/ic_doc_menu_search.xml
deleted file mode 100644
index f60dadb2a0..0000000000
--- a/core-ui/src/main/res/drawable/ic_doc_menu_search.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="#ACA996"
-        android:fillType="evenOdd"
-        android:pathData="M14.7929,14.7929C15.1834,14.4024 15.8166,14.4024 16.2071,14.7929L21.7071,20.2929C22.0976,20.6834 22.0976,21.3166 21.7071,21.7071C21.3166,22.0976 20.6834,22.0976 20.2929,21.7071L14.7929,16.2071C14.4024,15.8166 14.4024,15.1834 14.7929,14.7929Z" />
-    <path
-        android:fillColor="#ACA996"
-        android:fillType="evenOdd"
-        android:pathData="M10,16.5C13.5899,16.5 16.5,13.5899 16.5,10C16.5,6.4102 13.5899,3.5 10,3.5C6.4102,3.5 3.5,6.4102 3.5,10C3.5,13.5899 6.4102,16.5 10,16.5ZM10,18C14.4183,18 18,14.4183 18,10C18,5.5817 14.4183,2 10,2C5.5817,2 2,5.5817 2,10C2,14.4183 5.5817,18 10,18Z" />
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_doc_search.xml b/core-ui/src/main/res/drawable/ic_doc_search.xml
index faeb956afd..fff25bc485 100644
--- a/core-ui/src/main/res/drawable/ic_doc_search.xml
+++ b/core-ui/src/main/res/drawable/ic_doc_search.xml
@@ -5,10 +5,10 @@
     android:viewportHeight="24">
     <path
         android:pathData="M10.5,15.5C13.2614,15.5 15.5,13.2614 15.5,10.5C15.5,7.7386 13.2614,5.5 10.5,5.5C7.7386,5.5 5.5,7.7386 5.5,10.5C5.5,13.2614 7.7386,15.5 10.5,15.5ZM10.5,17C14.0899,17 17,14.0899 17,10.5C17,6.9102 14.0899,4 10.5,4C6.9102,4 4,6.9102 4,10.5C4,14.0899 6.9102,17 10.5,17Z"
-        android:fillColor="#ACA996"
+        android:fillColor="@color/gray"
         android:fillType="evenOdd" />
     <path
         android:pathData="M14.2929,14.2929C14.6834,13.9024 15.3166,13.9024 15.7071,14.2929L19.7071,18.2929C20.0976,18.6834 20.0976,19.3166 19.7071,19.7071C19.3166,20.0976 18.6834,20.0976 18.2929,19.7071L14.2929,15.7071C13.9024,15.3166 13.9024,14.6834 14.2929,14.2929Z"
-        android:fillColor="#ACA996"
+        android:fillColor="@color/gray"
         android:fillType="evenOdd" />
 </vector>
diff --git a/core-ui/src/main/res/drawable/ic_drag_and_drop.xml b/core-ui/src/main/res/drawable/ic_drag_and_drop.xml
deleted file mode 100644
index b4cd893ccd..0000000000
--- a/core-ui/src/main/res/drawable/ic_drag_and_drop.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="16dp"
-    android:height="16dp"
-    android:viewportWidth="16"
-    android:viewportHeight="16">
-  <path
-      android:pathData="M5,0.5L5,0.5A1.5,1.5 0,0 1,6.5 2L6.5,2A1.5,1.5 0,0 1,5 3.5L5,3.5A1.5,1.5 0,0 1,3.5 2L3.5,2A1.5,1.5 0,0 1,5 0.5z"
-      android:fillColor="#ACA996"/>
-  <path
-      android:pathData="M11,0.5L11,0.5A1.5,1.5 0,0 1,12.5 2L12.5,2A1.5,1.5 0,0 1,11 3.5L11,3.5A1.5,1.5 0,0 1,9.5 2L9.5,2A1.5,1.5 0,0 1,11 0.5z"
-      android:fillColor="#ACA996"/>
-  <path
-      android:pathData="M5,6.5L5,6.5A1.5,1.5 0,0 1,6.5 8L6.5,8A1.5,1.5 0,0 1,5 9.5L5,9.5A1.5,1.5 0,0 1,3.5 8L3.5,8A1.5,1.5 0,0 1,5 6.5z"
-      android:fillColor="#ACA996"/>
-  <path
-      android:pathData="M11,6.5L11,6.5A1.5,1.5 0,0 1,12.5 8L12.5,8A1.5,1.5 0,0 1,11 9.5L11,9.5A1.5,1.5 0,0 1,9.5 8L9.5,8A1.5,1.5 0,0 1,11 6.5z"
-      android:fillColor="#ACA996"/>
-  <path
-      android:pathData="M5,12.5L5,12.5A1.5,1.5 0,0 1,6.5 14L6.5,14A1.5,1.5 0,0 1,5 15.5L5,15.5A1.5,1.5 0,0 1,3.5 14L3.5,14A1.5,1.5 0,0 1,5 12.5z"
-      android:fillColor="#ACA996"/>
-  <path
-      android:pathData="M11,12.5L11,12.5A1.5,1.5 0,0 1,12.5 14L12.5,14A1.5,1.5 0,0 1,11 15.5L11,15.5A1.5,1.5 0,0 1,9.5 14L9.5,14A1.5,1.5 0,0 1,11 12.5z"
-      android:fillColor="#ACA996"/>
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_dragger_modify_relation_order.xml b/core-ui/src/main/res/drawable/ic_dragger_modify_relation_order.xml
deleted file mode 100644
index 7861d6e64d..0000000000
--- a/core-ui/src/main/res/drawable/ic_dragger_modify_relation_order.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="#ACA996"
-        android:pathData="M4,9h16v1.4983h-16z" />
-    <path
-        android:fillColor="#ACA996"
-        android:pathData="M4,13h16v1.4983h-16z" />
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_dropdown_menu_check.xml b/core-ui/src/main/res/drawable/ic_dropdown_menu_check.xml
index d08682eb04..dd7198f7ba 100644
--- a/core-ui/src/main/res/drawable/ic_dropdown_menu_check.xml
+++ b/core-ui/src/main/res/drawable/ic_dropdown_menu_check.xml
@@ -6,6 +6,6 @@
   <path
       android:pathData="M7,11.5L11,16L17,7"
       android:strokeWidth="1.2"
-      android:fillColor="#00000000"
+      android:fillColor="@color/transparent_black"
       android:strokeColor="@color/glyph_button"/>
 </vector>
diff --git a/core-ui/src/main/res/drawable/ic_duplicate.xml b/core-ui/src/main/res/drawable/ic_duplicate.xml
deleted file mode 100644
index 2f114e1e80..0000000000
--- a/core-ui/src/main/res/drawable/ic_duplicate.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:pathData="M8,2C6.8954,2 6,2.8954 6,4H20V18C21.1025,18 21.9962,17.1063 21.9962,16.0038V3.9962C21.9962,2.8937 21.1025,2 20,2H8Z"
-      android:fillColor="#2C2B27"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M16,8H4V20H16V8ZM4,6C2.8954,6 2,6.8954 2,8V20C2,21.1046 2.8954,22 4,22H16C17.1046,22 18,21.1046 18,20V8C18,6.8954 17.1046,6 16,6H4Z"
-      android:fillColor="#2C2B27"
-      android:fillType="evenOdd"/>
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_dv_add_new_view.xml b/core-ui/src/main/res/drawable/ic_dv_add_new_view.xml
deleted file mode 100644
index 8f1785b9e7..0000000000
--- a/core-ui/src/main/res/drawable/ic_dv_add_new_view.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="16dp"
-    android:height="16dp"
-    android:viewportWidth="16"
-    android:viewportHeight="16">
-    <path
-        android:fillColor="#ACA996"
-        android:pathData="M8,0L8,0A1,1 0,0 1,9 1L9,15A1,1 0,0 1,8 16L8,16A1,1 0,0 1,7 15L7,1A1,1 0,0 1,8 0z" />
-    <path
-        android:fillColor="#ACA996"
-        android:pathData="M16,8L16,8A1,1 0,0 1,15 9L1,9A1,1 0,0 1,0 8L0,8A1,1 0,0 1,1 7L15,7A1,1 0,0 1,16 8z" />
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_dv_customize_panel_group.xml b/core-ui/src/main/res/drawable/ic_dv_customize_panel_group.xml
deleted file mode 100644
index b640a37abb..0000000000
--- a/core-ui/src/main/res/drawable/ic_dv_customize_panel_group.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:pathData="M12,18C13.1046,18 14,18.8954 14,20C14,21.1046 13.1046,22 12,22C10.8954,22 10,21.1046 10,20C10,18.8954 10.8954,18 12,18ZM12,16.5C13.933,16.5 15.5,18.067 15.5,20C15.5,21.933 13.933,23.5 12,23.5C10.067,23.5 8.5,21.933 8.5,20C8.5,18.067 10.067,16.5 12,16.5Z"
-      android:fillColor="@color/glyph_active"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M12,2C13.1046,2 14,2.8954 14,4C14,5.1046 13.1046,6 12,6C10.8954,6 10,5.1046 10,4C10,2.8954 10.8954,2 12,2ZM12,0.5C13.933,0.5 15.5,2.067 15.5,4C15.5,5.933 13.933,7.5 12,7.5C10.067,7.5 8.5,5.933 8.5,4C8.5,2.067 10.067,0.5 12,0.5Z"
-      android:fillColor="@color/glyph_active"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M20,10C21.1046,10 22,10.8954 22,12C22,13.1046 21.1046,14 20,14C18.8954,14 18,13.1046 18,12C18,10.8954 18.8954,10 20,10ZM20,8.5C21.933,8.5 23.5,10.067 23.5,12C23.5,13.933 21.933,15.5 20,15.5C18.067,15.5 16.5,13.933 16.5,12C16.5,10.067 18.067,8.5 20,8.5Z"
-      android:fillColor="@color/glyph_active"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M4,10C5.1046,10 6,10.8954 6,12C6,13.1046 5.1046,14 4,14C2.8954,14 2,13.1046 2,12C2,10.8954 2.8954,10 4,10ZM4,8.5C5.933,8.5 7.5,10.067 7.5,12C7.5,13.933 5.933,15.5 4,15.5C2.067,15.5 0.5,13.933 0.5,12C0.5,10.067 2.067,8.5 4,8.5Z"
-      android:fillColor="@color/glyph_active"
-      android:fillType="evenOdd"/>
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_dv_customize_view.xml b/core-ui/src/main/res/drawable/ic_dv_customize_view.xml
deleted file mode 100644
index 7a7a9eb0bb..0000000000
--- a/core-ui/src/main/res/drawable/ic_dv_customize_view.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="@color/glyph_active"
-        android:fillType="evenOdd"
-        android:pathData="M16.5,7C16.5,7.828 15.828,8.5 15,8.5C14.172,8.5 13.5,7.828 13.5,7C13.5,6.172 14.172,5.5 15,5.5C15.828,5.5 16.5,6.172 16.5,7ZM20.25,6.25H17.906C17.573,4.956 16.398,4 15,4C13.602,4 12.427,4.956 12.094,6.25H3.75C3.336,6.25 3,6.586 3,7C3,7.414 3.336,7.75 3.75,7.75H12.094C12.427,9.044 13.602,10 15,10C16.398,10 17.573,9.044 17.906,7.75H20.25C20.664,7.75 21,7.414 21,7C21,6.586 20.664,6.25 20.25,6.25ZM7.5,17C7.5,17.828 8.172,18.5 9,18.5C9.828,18.5 10.5,17.828 10.5,17C10.5,16.172 9.828,15.5 9,15.5C8.172,15.5 7.5,16.172 7.5,17ZM6.095,17.75C6.428,19.044 7.602,20 9,20C10.398,20 11.573,19.044 11.906,17.75H20.25C20.664,17.75 21,17.414 21,17C21,16.586 20.664,16.25 20.25,16.25H11.906C11.573,14.956 10.398,14 9,14C7.602,14 6.428,14.956 6.095,16.25H3.75C3.336,16.25 3,16.586 3,17C3,17.414 3.336,17.75 3.75,17.75H6.095Z" />
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_dv_edit_view.xml b/core-ui/src/main/res/drawable/ic_dv_edit_view.xml
deleted file mode 100644
index 888a21aff1..0000000000
--- a/core-ui/src/main/res/drawable/ic_dv_edit_view.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:pathData="M4,20L5,15L13,7L17,11L9,19L4,20Z"
-        android:fillColor="#ACA996" />
-    <path
-        android:pathData="M15.6929,4.3071L14,6L18,10L19.6929,8.3071C20.0834,7.9166 20.0834,7.2834 19.6929,6.8929L17.1071,4.3071C16.7166,3.9166 16.0834,3.9166 15.6929,4.3071Z"
-        android:fillColor="#ACA996" />
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_dv_gallery_view.xml b/core-ui/src/main/res/drawable/ic_dv_gallery_view.xml
deleted file mode 100644
index 3193ef784c..0000000000
--- a/core-ui/src/main/res/drawable/ic_dv_gallery_view.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="#2C2B27"
-        android:pathData="M4,5L10,5A1,1 0,0 1,11 6L11,10A1,1 0,0 1,10 11L4,11A1,1 0,0 1,3 10L3,6A1,1 0,0 1,4 5z" />
-    <path
-        android:fillColor="#2C2B27"
-        android:pathData="M14,5L20,5A1,1 0,0 1,21 6L21,10A1,1 0,0 1,20 11L14,11A1,1 0,0 1,13 10L13,6A1,1 0,0 1,14 5z" />
-    <path
-        android:fillColor="#2C2B27"
-        android:pathData="M4,13L10,13A1,1 0,0 1,11 14L11,18A1,1 0,0 1,10 19L4,19A1,1 0,0 1,3 18L3,14A1,1 0,0 1,4 13z" />
-    <path
-        android:fillColor="#2C2B27"
-        android:pathData="M14,13L20,13A1,1 0,0 1,21 14L21,18A1,1 0,0 1,20 19L14,19A1,1 0,0 1,13 18L13,14A1,1 0,0 1,14 13z" />
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_dv_kanban_view.xml b/core-ui/src/main/res/drawable/ic_dv_kanban_view.xml
deleted file mode 100644
index ad0bd3ae6b..0000000000
--- a/core-ui/src/main/res/drawable/ic_dv_kanban_view.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="#2C2B27"
-        android:pathData="M4,5L6,5A1,1 0,0 1,7 6L7,15A1,1 0,0 1,6 16L4,16A1,1 0,0 1,3 15L3,6A1,1 0,0 1,4 5z" />
-    <path
-        android:fillColor="#2C2B27"
-        android:pathData="M11,5L13,5A1,1 0,0 1,14 6L14,18A1,1 0,0 1,13 19L11,19A1,1 0,0 1,10 18L10,6A1,1 0,0 1,11 5z" />
-    <path
-        android:fillColor="#2C2B27"
-        android:pathData="M17,6C17,5.4477 17.4477,5 18,5H20C20.5523,5 21,5.4477 21,6V12C21,12.5523 20.5523,13 20,13H18C17.4477,13 17,12.5523 17,12V6Z" />
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_dv_list_view.xml b/core-ui/src/main/res/drawable/ic_dv_list_view.xml
deleted file mode 100644
index bed9ba99e3..0000000000
--- a/core-ui/src/main/res/drawable/ic_dv_list_view.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="#2C2B27"
-        android:pathData="M4,5L20,5A1,1 0,0 1,21 6L21,6A1,1 0,0 1,20 7L4,7A1,1 0,0 1,3 6L3,6A1,1 0,0 1,4 5z" />
-    <path
-        android:fillColor="#2C2B27"
-        android:pathData="M4,9L14,9A1,1 0,0 1,15 10L15,10A1,1 0,0 1,14 11L4,11A1,1 0,0 1,3 10L3,10A1,1 0,0 1,4 9z" />
-    <path
-        android:fillColor="#2C2B27"
-        android:pathData="M4,13L20,13A1,1 0,0 1,21 14L21,14A1,1 0,0 1,20 15L4,15A1,1 0,0 1,3 14L3,14A1,1 0,0 1,4 13z" />
-    <path
-        android:fillColor="#2C2B27"
-        android:pathData="M4,17L14,17A1,1 0,0 1,15 18L15,18A1,1 0,0 1,14 19L4,19A1,1 0,0 1,3 18L3,18A1,1 0,0 1,4 17z" />
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_dv_manage_view_dnd_dragger.xml b/core-ui/src/main/res/drawable/ic_dv_manage_view_dnd_dragger.xml
deleted file mode 100644
index 36216379a9..0000000000
--- a/core-ui/src/main/res/drawable/ic_dv_manage_view_dnd_dragger.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="@color/text_tertiary"
-        android:pathData="M0,5.5h24v1h-24z" />
-    <path
-        android:fillColor="@color/text_tertiary"
-        android:pathData="M0,11.5h24v1h-24z" />
-    <path
-        android:fillColor="@color/text_tertiary"
-        android:pathData="M0,17.5h24v1h-24z" />
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_dv_modal_plus.xml b/core-ui/src/main/res/drawable/ic_dv_modal_plus.xml
deleted file mode 100644
index 14ed0b6db0..0000000000
--- a/core-ui/src/main/res/drawable/ic_dv_modal_plus.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="@color/glyph_active"
-        android:pathData="M11.25,2.75C11.25,2.3358 11.5858,2 12,2C12.4142,2 12.75,2.3358 12.75,2.75V21.25C12.75,21.6642 12.4142,22 12,22C11.5858,22 11.25,21.6642 11.25,21.25V2.75Z" />
-    <path
-        android:fillColor="@color/glyph_active"
-        android:pathData="M21.25,11.25C21.6642,11.25 22,11.5858 22,12C22,12.4142 21.6642,12.75 21.25,12.75L2.75,12.75C2.3358,12.75 2,12.4142 2,12C2,11.5858 2.3358,11.25 2.75,11.25L21.25,11.25Z" />
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_dv_plus.xml b/core-ui/src/main/res/drawable/ic_dv_plus.xml
deleted file mode 100644
index 6f903b026b..0000000000
--- a/core-ui/src/main/res/drawable/ic_dv_plus.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="16dp"
-    android:height="16dp"
-    android:viewportWidth="16"
-    android:viewportHeight="16">
-    <path
-        android:pathData="M8,0L8,0A1,1 0,0 1,9 1L9,15A1,1 0,0 1,8 16L8,16A1,1 0,0 1,7 15L7,1A1,1 0,0 1,8 0z"
-        android:fillColor="#ACA996" />
-    <path
-        android:pathData="M16,8L16,8A1,1 0,0 1,15 9L1,9A1,1 0,0 1,0 8L0,8A1,1 0,0 1,1 7L15,7A1,1 0,0 1,16 8z"
-        android:fillColor="#ACA996" />
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_dv_table_view.xml b/core-ui/src/main/res/drawable/ic_dv_table_view.xml
deleted file mode 100644
index 2067e63534..0000000000
--- a/core-ui/src/main/res/drawable/ic_dv_table_view.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M4,4.5L20,4.5A1,1 0,0 1,21 5.5L21,18.5A1,1 0,0 1,20 19.5L4,19.5A1,1 0,0 1,3 18.5L3,5.5A1,1 0,0 1,4 4.5z"
-        android:strokeWidth="2"
-        android:strokeColor="#2C2B27" />
-    <path
-        android:fillColor="#2C2B27"
-        android:pathData="M11,5.1509h2v14h-2z" />
-    <path
-        android:fillColor="#2C2B27"
-        android:pathData="M4,8.5h16v2h-16z" />
-    <path
-        android:fillColor="#2C2B27"
-        android:pathData="M4,13.5938h16v2h-16z" />
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_ellipse.xml b/core-ui/src/main/res/drawable/ic_ellipse.xml
deleted file mode 100644
index f09227362b..0000000000
--- a/core-ui/src/main/res/drawable/ic_ellipse.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="22dp"
-    android:height="23dp"
-    android:viewportWidth="22"
-    android:viewportHeight="23">
-  <path
-      android:strokeWidth="1"
-      android:pathData="M11,11.2695m-10.5,0a10.5,10.5 0,1 1,21 0a10.5,10.5 0,1 1,-21 0"
-      android:fillColor="#00000000"
-      android:strokeColor="#DFDDD0"/>
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_ellipse_small.xml b/core-ui/src/main/res/drawable/ic_ellipse_small.xml
deleted file mode 100644
index 855e57ae1c..0000000000
--- a/core-ui/src/main/res/drawable/ic_ellipse_small.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="3dp"
-    android:height="4dp"
-    android:viewportWidth="3"
-    android:viewportHeight="4">
-  <path
-      android:pathData="M1.5,2m-1.5,0a1.5,1.5 0,1 1,3 0a1.5,1.5 0,1 1,-3 0"
-      android:fillColor="#6C6A5F"/>
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_empty_state_tag.xml b/core-ui/src/main/res/drawable/ic_empty_state_tag.xml
deleted file mode 100644
index a7367e3b24..0000000000
--- a/core-ui/src/main/res/drawable/ic_empty_state_tag.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="18dp"
-    android:height="18dp"
-    android:viewportWidth="18"
-    android:viewportHeight="18">
-  <path
-      android:pathData="M2.414,10L10.414,2L13.586,2L16,4.414L16,7.586L8,15.586L2.414,10ZM1.707,9.293L9.707,1.293C9.894,1.105 10.149,1 10.414,1H13.586C13.851,1 14.105,1.105 14.293,1.293L16.707,3.707C16.895,3.895 17,4.149 17,4.414V7.586C17,7.851 16.895,8.105 16.707,8.293L8.707,16.293C8.316,16.683 7.683,16.683 7.293,16.293L1.707,10.707C1.316,10.317 1.316,9.683 1.707,9.293ZM12.5,6.5C13.052,6.5 13.5,6.052 13.5,5.5C13.5,4.948 13.052,4.5 12.5,4.5C11.948,4.5 11.5,4.948 11.5,5.5C11.5,6.052 11.948,6.5 12.5,6.5Z"
-      android:fillColor="@color/glyph_active"
-      android:fillType="evenOdd"/>
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_enter_scroll_and_move.xml b/core-ui/src/main/res/drawable/ic_enter_scroll_and_move.xml
deleted file mode 100644
index a085a1acfb..0000000000
--- a/core-ui/src/main/res/drawable/ic_enter_scroll_and_move.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:pathData="M3,16L12,22L21,16"
-      android:strokeWidth="1.5"
-      android:fillColor="#00000000"
-      android:strokeColor="#ACA996"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M3,8L12,2L21,8"
-      android:strokeWidth="1.5"
-      android:fillColor="#00000000"
-      android:strokeColor="#ACA996"
-      android:strokeLineCap="round"/>
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_enter_select_mode.xml b/core-ui/src/main/res/drawable/ic_enter_select_mode.xml
deleted file mode 100644
index b6ff33d583..0000000000
--- a/core-ui/src/main/res/drawable/ic_enter_select_mode.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="#ACA996"
-        android:pathData="M1,8.9692C1,7.8816 1.8816,7 2.9692,7H15.0308C16.1183,7 17,7.8816 17,8.9692V21.0308C17,22.1183 16.1183,23 15.0308,23H2.9692C1.8816,23 1,22.1183 1,21.0308V8.9692Z" />
-    <path
-        android:fillColor="#ACA996"
-        android:fillType="evenOdd"
-        android:pathData="M21.0308,2.9692H8.9692L8.9692,15.0308H21.0308V2.9692ZM8.9692,1C7.8816,1 7,1.8816 7,2.9692V15.0308C7,16.1183 7.8816,17 8.9692,17H21.0308C22.1183,17 23,16.1183 23,15.0308V2.9692C23,1.8816 22.1183,1 21.0308,1H8.9692Z" />
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_filter.xml b/core-ui/src/main/res/drawable/ic_filter.xml
deleted file mode 100644
index 06ef1cd1ea..0000000000
--- a/core-ui/src/main/res/drawable/ic_filter.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:pathData="M4,5L20,5A1,1 0,0 1,21 6L21,6A1,1 0,0 1,20 7L4,7A1,1 0,0 1,3 6L3,6A1,1 0,0 1,4 5z"
-      android:fillColor="#2C2B27"/>
-  <path
-      android:pathData="M8,11L16,11A1,1 0,0 1,17 12L17,12A1,1 0,0 1,16 13L8,13A1,1 0,0 1,7 12L7,12A1,1 0,0 1,8 11z"
-      android:fillColor="#2C2B27"/>
-  <path
-      android:pathData="M10.5,18C10.5,17.4477 10.9477,17 11.5,17H12.5C13.0523,17 13.5,17.4477 13.5,18C13.5,18.5523 13.0523,19 12.5,19H11.5C10.9477,19 10.5,18.5523 10.5,18Z"
-      android:fillColor="#2C2B27"/>
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_gallery_view.xml b/core-ui/src/main/res/drawable/ic_gallery_view.xml
deleted file mode 100644
index 5fd44260c2..0000000000
--- a/core-ui/src/main/res/drawable/ic_gallery_view.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:pathData="M4,5L10,5A1,1 0,0 1,11 6L11,10A1,1 0,0 1,10 11L4,11A1,1 0,0 1,3 10L3,6A1,1 0,0 1,4 5z"
-      android:fillColor="#2C2B27"/>
-  <path
-      android:pathData="M14,5L20,5A1,1 0,0 1,21 6L21,10A1,1 0,0 1,20 11L14,11A1,1 0,0 1,13 10L13,6A1,1 0,0 1,14 5z"
-      android:fillColor="#2C2B27"/>
-  <path
-      android:pathData="M4,13L10,13A1,1 0,0 1,11 14L11,18A1,1 0,0 1,10 19L4,19A1,1 0,0 1,3 18L3,14A1,1 0,0 1,4 13z"
-      android:fillColor="#2C2B27"/>
-  <path
-      android:pathData="M14,13L20,13A1,1 0,0 1,21 14L21,18A1,1 0,0 1,20 19L14,19A1,1 0,0 1,13 18L13,14A1,1 0,0 1,14 13z"
-      android:fillColor="#2C2B27"/>
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_gallery_view_task_checked.xml b/core-ui/src/main/res/drawable/ic_gallery_view_task_checked.xml
index 076e47cf19..83f51197c7 100644
--- a/core-ui/src/main/res/drawable/ic_gallery_view_task_checked.xml
+++ b/core-ui/src/main/res/drawable/ic_gallery_view_task_checked.xml
@@ -5,10 +5,10 @@
     android:viewportHeight="18">
   <path
       android:pathData="M0,4.5C0,2.0147 2.0147,0 4.5,0H13.5C15.9853,0 18,2.0147 18,4.5V13.5C18,15.9853 15.9853,18 13.5,18H4.5C2.0147,18 0,15.9853 0,13.5V4.5Z"
-      android:fillColor="#5DD400"/>
+      android:fillColor="@color/palette_system_green"/>
   <path
       android:pathData="M5,8.5L8.5,12.5L13.5,4.5"
       android:strokeWidth="1.35"
-      android:fillColor="#00000000"
-      android:strokeColor="#ffffff"/>
+      android:fillColor="@color/transparent_black"
+      android:strokeColor="@color/white"/>
 </vector>
diff --git a/core-ui/src/main/res/drawable/ic_gallery_view_task_unchecked.xml b/core-ui/src/main/res/drawable/ic_gallery_view_task_unchecked.xml
index 33adbd6c22..ff6a70390e 100644
--- a/core-ui/src/main/res/drawable/ic_gallery_view_task_unchecked.xml
+++ b/core-ui/src/main/res/drawable/ic_gallery_view_task_unchecked.xml
@@ -6,6 +6,6 @@
   <path
       android:strokeWidth="1"
       android:pathData="M1.5,5C1.5,3.067 3.067,1.5 5,1.5H13C14.933,1.5 16.5,3.067 16.5,5V13C16.5,14.933 14.933,16.5 13,16.5H5C3.067,16.5 1.5,14.933 1.5,13V5Z"
-      android:fillColor="#00000000"
-      android:strokeColor="#ACA996"/>
+      android:fillColor="@color/transparent_black"
+      android:strokeColor="@color/gray"/>
 </vector>
diff --git a/core-ui/src/main/res/drawable/ic_group.xml b/core-ui/src/main/res/drawable/ic_group.xml
deleted file mode 100644
index bf059b8e53..0000000000
--- a/core-ui/src/main/res/drawable/ic_group.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:pathData="M12,19m-3,-0a3,3 0,1 0,6 -0a3,3 0,1 0,-6 -0"
-      android:fillColor="#2C2B27"/>
-  <path
-      android:pathData="M12,5m-3,-0a3,3 0,1 0,6 -0a3,3 0,1 0,-6 -0"
-      android:fillColor="#2C2B27"/>
-  <path
-      android:pathData="M19,12m-3,-0a3,3 0,1 0,6 -0a3,3 0,1 0,-6 -0"
-      android:fillColor="#2C2B27"/>
-  <path
-      android:pathData="M5,12m-3,-0a3,3 0,1 0,6 -0a3,3 0,1 0,-6 -0"
-      android:fillColor="#2C2B27"/>
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_hide.xml b/core-ui/src/main/res/drawable/ic_hide.xml
deleted file mode 100644
index 3528d7efa0..0000000000
--- a/core-ui/src/main/res/drawable/ic_hide.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:pathData="M20.6978,3.2929C21.0884,3.6834 21.0884,4.3166 20.6978,4.7071L4.6978,20.7071C4.3073,21.0976 3.6741,21.0976 3.2836,20.7071C2.8931,20.3166 2.8931,19.6834 3.2836,19.2929L19.2836,3.2929C19.6741,2.9024 20.3073,2.9024 20.6978,3.2929Z"
-      android:fillColor="#ACA996"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M16.2247,4.9374C14.9881,4.3689 13.5778,4 12.0001,4C8.5116,4 5.8482,5.7882 4.066,7.5599C2.2827,9.3328 1.2916,11.1745 1.1226,11.5011C1.0608,11.6204 1,11.7907 1,12C1,12.2093 1.0608,12.3796 1.1226,12.4989C1.2916,12.8255 2.2827,14.6673 4.066,16.4401C4.1741,16.5475 4.2854,16.655 4.4,16.7622L5.8156,15.3466C5.7001,15.2395 5.5875,15.1313 5.4779,15.0223C4.2974,13.8488 3.5081,12.6349 3.1348,12C3.5081,11.3651 4.2974,10.1512 5.4779,8.9777C7.0548,7.4101 9.2398,6 12.0001,6C12.9675,6 13.8653,6.1751 14.6916,6.4705L16.2247,4.9374ZM18.1685,8.6505L19.5842,7.2348C19.6995,7.3424 19.8115,7.4504 19.9203,7.5582C21.7063,9.3299 22.7049,11.1706 22.8757,11.4977C22.9384,11.6179 23,11.7893 23,12C23,12.2107 22.9384,12.3821 22.8757,12.5023C22.7049,12.8294 21.7063,14.6701 19.9203,16.4418C18.1361,18.2115 15.4739,20 12.0001,20C10.4139,20 8.9983,19.6303 7.7585,19.0605L9.2917,17.5273C10.1217,17.824 11.025,18 12.0001,18C14.7441,18 16.9284,16.5913 18.51,15.0224C19.6923,13.8496 20.4864,12.6363 20.8632,12C20.4864,11.3637 19.6923,10.1504 18.51,8.9776C18.3991,8.8676 18.2853,8.7584 18.1685,8.6505ZM13.8178,7.3444C13.2518,7.1221 12.6355,7 11.9906,7C9.2292,7 6.9906,9.2386 6.9906,12C6.9906,12.6449 7.1127,13.2612 7.335,13.8272L13.8178,7.3444ZM10.1634,16.6556L16.6462,10.1728C16.8685,10.7388 16.9906,11.3551 16.9906,12C16.9906,14.7614 14.752,17 11.9906,17C11.3457,17 10.7294,16.8779 10.1634,16.6556Z"
-      android:fillColor="#ACA996"
-      android:fillType="evenOdd"/>
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_hide_black.xml b/core-ui/src/main/res/drawable/ic_hide_black.xml
deleted file mode 100644
index 98eb4be0d5..0000000000
--- a/core-ui/src/main/res/drawable/ic_hide_black.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="25dp"
-    android:viewportWidth="24"
-    android:viewportHeight="25">
-  <path
-      android:pathData="M20.6977,3.443C21.0882,3.8336 21.0882,4.4667 20.6977,4.8573L4.6977,20.8573C4.3072,21.2478 3.674,21.2478 3.2835,20.8573C2.893,20.4667 2.893,19.8336 3.2835,19.443L19.2835,3.443C19.674,3.0525 20.3072,3.0525 20.6977,3.443Z"
-      android:fillColor="#2C2B27"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M16.2247,5.0876C14.9881,4.5191 13.5778,4.1501 12.0001,4.1501C8.5116,4.1501 5.8482,5.9384 4.066,7.7101C2.2827,9.4829 1.2916,11.3247 1.1226,11.6513C1.0608,11.7706 1,11.9409 1,12.1502C1,12.3594 1.0608,12.5297 1.1226,12.649C1.2916,12.9756 2.2827,14.8174 4.066,16.5902C4.1741,16.6977 4.2854,16.8052 4.4,16.9123L5.8156,15.4967C5.7001,15.3897 5.5875,15.2815 5.4779,15.1725C4.2974,13.9989 3.5081,12.785 3.1348,12.1501C3.5081,11.5153 4.2974,10.3013 5.4779,9.1278C7.0548,7.5603 9.2398,6.1501 12.0001,6.1501C12.9675,6.1501 13.8653,6.3252 14.6916,6.6207L16.2247,5.0876ZM18.1685,8.8006L19.5842,7.385C19.6995,7.4926 19.8115,7.6005 19.9203,7.7084C21.7063,9.48 22.7049,11.3208 22.8757,11.6479C22.9384,11.768 23,11.9395 23,12.1501C23,12.3608 22.9384,12.5323 22.8757,12.6524C22.7049,12.9795 21.7063,14.8203 19.9203,16.5919C18.1361,18.3617 15.4739,20.1501 12.0001,20.1501C10.4139,20.1501 8.9983,19.7804 7.7585,19.2107L9.2917,17.6775C10.1217,17.9742 11.025,18.1501 12.0001,18.1501C14.7441,18.1501 16.9284,16.7414 18.51,15.1726C19.6923,13.9998 20.4864,12.7864 20.8632,12.1501C20.4864,11.5139 19.6923,10.3005 18.51,9.1277C18.3991,9.0178 18.2853,8.9086 18.1685,8.8006ZM13.8178,7.4945C13.2518,7.2722 12.6355,7.1501 11.9906,7.1501C9.2292,7.1501 6.9906,9.3887 6.9906,12.1501C6.9906,12.795 7.1127,13.4114 7.335,13.9773L13.8178,7.4945ZM10.1634,16.8058L16.6462,10.323C16.8685,10.8889 16.9906,11.5053 16.9906,12.1501C16.9906,14.9116 14.752,17.1501 11.9906,17.1501C11.3457,17.1501 10.7294,17.0281 10.1634,16.8058Z"
-      android:fillColor="#2C2B27"
-      android:fillType="evenOdd"/>
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_home_widget_space.xml b/core-ui/src/main/res/drawable/ic_home_widget_space.xml
index 39b9ab6c9e..22353c2988 100644
--- a/core-ui/src/main/res/drawable/ic_home_widget_space.xml
+++ b/core-ui/src/main/res/drawable/ic_home_widget_space.xml
@@ -6,7 +6,7 @@
     android:viewportHeight="24">
   <path
       android:pathData="M3,0L21,0A3,3 0,0 1,24 3L24,21A3,3 0,0 1,21 24L3,24A3,3 0,0 1,0 21L0,3A3,3 0,0 1,3 0z"
-      android:fillColor="#2C2B27"/>
+      android:fillColor="@color/black"/>
   <path
       android:pathData="M12,12m9,-0a9,9 0,1 1,-18 -0a9,9 0,1 1,18 -0">
     <aapt:attr name="android:fillColor">
@@ -15,8 +15,8 @@
           android:centerY="12"
           android:gradientRadius="9"
           android:type="radial">
-        <item android:offset="0.24" android:color="#FFEDD89A"/>
-        <item android:offset="1" android:color="#FFCA4565"/>
+        <item android:offset="0.24" android:color="@color/widget_gradient_start"/>
+        <item android:offset="1" android:color="@color/widget_gradient_end"/>
       </gradient>
     </aapt:attr>
   </path>
diff --git a/core-ui/src/main/res/drawable/ic_icon_loading.xml b/core-ui/src/main/res/drawable/ic_icon_loading.xml
index ee8a4d9418..7241764162 100644
--- a/core-ui/src/main/res/drawable/ic_icon_loading.xml
+++ b/core-ui/src/main/res/drawable/ic_icon_loading.xml
@@ -10,15 +10,15 @@
         <path
             android:pathData="M18,18m-14,0a14,14 0,1 1,28 0a14,14 0,1 1,-28 0"
             android:strokeWidth="4"
-            android:fillColor="#00000000">
+            android:fillColor="@color/transparent_black">
             <aapt:attr name="android:strokeColor">
                 <gradient
                     android:centerX="18"
                     android:centerY="18"
                     android:gradientRadius="16"
                     android:type="sweep">
-                    <item android:offset="0" android:color="#00A7A7A7"/>
-                    <item android:offset="1" android:color="#FFA7A7A7"/>
+                    <item android:offset="0" android:color="@color/loading_start_transparent"/>
+                    <item android:offset="1" android:color="@color/loading_end"/>
                 </gradient>
             </aapt:attr>
         </path>
diff --git a/core-ui/src/main/res/drawable/ic_kanban_view.xml b/core-ui/src/main/res/drawable/ic_kanban_view.xml
deleted file mode 100644
index d68e04176e..0000000000
--- a/core-ui/src/main/res/drawable/ic_kanban_view.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:pathData="M4,5L6,5A1,1 0,0 1,7 6L7,15A1,1 0,0 1,6 16L4,16A1,1 0,0 1,3 15L3,6A1,1 0,0 1,4 5z"
-      android:fillColor="#2C2B27"/>
-  <path
-      android:pathData="M11,5L13,5A1,1 0,0 1,14 6L14,18A1,1 0,0 1,13 19L11,19A1,1 0,0 1,10 18L10,6A1,1 0,0 1,11 5z"
-      android:fillColor="#2C2B27"/>
-  <path
-      android:pathData="M17,6C17,5.4477 17.4477,5 18,5H20C20.5523,5 21,5.4477 21,6V12C21,12.5523 20.5523,13 20,13H18C17.4477,13 17,12.5523 17,12V6Z"
-      android:fillColor="#2C2B27"/>
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_layout_basic.xml b/core-ui/src/main/res/drawable/ic_layout_basic.xml
index ae9deab8f6..7fa3ccaef1 100644
--- a/core-ui/src/main/res/drawable/ic_layout_basic.xml
+++ b/core-ui/src/main/res/drawable/ic_layout_basic.xml
@@ -7,22 +7,22 @@
       android:strokeWidth="1"
       android:pathData="M8,0.5L36,0.5A7.5,7.5 0,0 1,43.5 8L43.5,36A7.5,7.5 0,0 1,36 43.5L8,43.5A7.5,7.5 0,0 1,0.5 36L0.5,8A7.5,7.5 0,0 1,8 0.5z"
       android:strokeAlpha="0.4"
-      android:fillColor="#00000000"
-      android:strokeColor="#ABA99B"
+      android:fillColor="@color/transparent_black"
+      android:strokeColor="@color/border_gray"
       android:fillAlpha="0.4"/>
   <path
       android:pathData="M12,9L18,9A4,4 0,0 1,22 13L22,19A4,4 0,0 1,18 23L12,23A4,4 0,0 1,8 19L8,13A4,4 0,0 1,12 9z"
       android:strokeAlpha="0.7"
-      android:fillColor="#FFB522"
+      android:fillColor="@color/amber_100"
       android:fillAlpha="0.7"/>
   <path
       android:pathData="M8.5,27L35.5,27A0.5,0.5 0,0 1,36 27.5L36,29.5A0.5,0.5 0,0 1,35.5 30L8.5,30A0.5,0.5 0,0 1,8 29.5L8,27.5A0.5,0.5 0,0 1,8.5 27z"
       android:strokeAlpha="0.4"
-      android:fillColor="#ABA99B"
+      android:fillColor="@color/border_gray"
       android:fillAlpha="0.4"/>
   <path
       android:pathData="M8.5,33L25.5,33A0.5,0.5 0,0 1,26 33.5L26,34.5A0.5,0.5 0,0 1,25.5 35L8.5,35A0.5,0.5 0,0 1,8 34.5L8,33.5A0.5,0.5 0,0 1,8.5 33z"
       android:strokeAlpha="0.4"
-      android:fillColor="#ABA99B"
+      android:fillColor="@color/border_gray"
       android:fillAlpha="0.4"/>
 </vector>
diff --git a/core-ui/src/main/res/drawable/ic_layout_gallery.xml b/core-ui/src/main/res/drawable/ic_layout_gallery.xml
index 847bdb2db7..2df7f0b421 100644
--- a/core-ui/src/main/res/drawable/ic_layout_gallery.xml
+++ b/core-ui/src/main/res/drawable/ic_layout_gallery.xml
@@ -14,8 +14,8 @@
           android:endX="44.645"
           android:endY="30.928"
           android:type="linear">
-        <item android:offset="0" android:color="#FFE9E9E9"/>
-        <item android:offset="1" android:color="#00F2F2F2"/>
+        <item android:offset="0" android:color="@color/gallery_gradient_bg_start"/>
+        <item android:offset="1" android:color="@color/gallery_gradient_bg_end"/>
       </gradient>
     </aapt:attr>
   </path>
diff --git a/core-ui/src/main/res/drawable/ic_layout_grid.xml b/core-ui/src/main/res/drawable/ic_layout_grid.xml
index f596bef7ea..448edd7fe1 100644
--- a/core-ui/src/main/res/drawable/ic_layout_grid.xml
+++ b/core-ui/src/main/res/drawable/ic_layout_grid.xml
@@ -13,8 +13,8 @@
           android:endX="44.645"
           android:endY="30.928"
           android:type="linear">
-        <item android:offset="0" android:color="#FFE9E9E9"/>
-        <item android:offset="1" android:color="#00F2F2F2"/>
+        <item android:offset="0" android:color="@color/gallery_gradient_bg_start"/>
+        <item android:offset="1" android:color="@color/gallery_gradient_bg_end"/>
       </gradient>
     </aapt:attr>
   </path>
diff --git a/core-ui/src/main/res/drawable/ic_layout_kanban.xml b/core-ui/src/main/res/drawable/ic_layout_kanban.xml
index dd12448a90..775bd4cdfb 100644
--- a/core-ui/src/main/res/drawable/ic_layout_kanban.xml
+++ b/core-ui/src/main/res/drawable/ic_layout_kanban.xml
@@ -14,8 +14,8 @@
           android:endX="43.674"
           android:endY="30.241"
           android:type="linear">
-        <item android:offset="0" android:color="#FFE9E9E9"/>
-        <item android:offset="1" android:color="#00F2F2F2"/>
+        <item android:offset="0" android:color="@color/gallery_gradient_bg_start"/>
+        <item android:offset="1" android:color="@color/gallery_gradient_bg_end"/>
       </gradient>
     </aapt:attr>
   </path>
diff --git a/core-ui/src/main/res/drawable/ic_layout_note.xml b/core-ui/src/main/res/drawable/ic_layout_note.xml
index 3e37ef51ef..4250210c3c 100644
--- a/core-ui/src/main/res/drawable/ic_layout_note.xml
+++ b/core-ui/src/main/res/drawable/ic_layout_note.xml
@@ -7,27 +7,27 @@
       android:strokeWidth="1"
       android:pathData="M8,0.5L36,0.5A7.5,7.5 0,0 1,43.5 8L43.5,36A7.5,7.5 0,0 1,36 43.5L8,43.5A7.5,7.5 0,0 1,0.5 36L0.5,8A7.5,7.5 0,0 1,8 0.5z"
       android:strokeAlpha="0.4"
-      android:fillColor="#00000000"
-      android:strokeColor="#ABA99B"
+      android:fillColor="@color/transparent_black"
+      android:strokeColor="@color/border_gray"
       android:fillAlpha="0.4"/>
   <path
       android:pathData="M8.5,23.5L35.5,23.5A0.5,0.5 0,0 1,36 24L36,26A0.5,0.5 0,0 1,35.5 26.5L8.5,26.5A0.5,0.5 0,0 1,8 26L8,24A0.5,0.5 0,0 1,8.5 23.5z"
       android:strokeAlpha="0.4"
-      android:fillColor="#ABA99B"
+      android:fillColor="@color/border_gray"
       android:fillAlpha="0.4"/>
   <path
       android:pathData="M8.5,29.5L28.5,29.5A0.5,0.5 0,0 1,29 30L29,32A0.5,0.5 0,0 1,28.5 32.5L8.5,32.5A0.5,0.5 0,0 1,8 32L8,30A0.5,0.5 0,0 1,8.5 29.5z"
       android:strokeAlpha="0.4"
-      android:fillColor="#ABA99B"
+      android:fillColor="@color/border_gray"
       android:fillAlpha="0.4"/>
   <path
       android:pathData="M8.5,11.5L35.5,11.5A0.5,0.5 0,0 1,36 12L36,14A0.5,0.5 0,0 1,35.5 14.5L8.5,14.5A0.5,0.5 0,0 1,8 14L8,12A0.5,0.5 0,0 1,8.5 11.5z"
       android:strokeAlpha="0.4"
-      android:fillColor="#ABA99B"
+      android:fillColor="@color/border_gray"
       android:fillAlpha="0.4"/>
   <path
       android:pathData="M8.5,17.5L28.5,17.5A0.5,0.5 0,0 1,29 18L29,20A0.5,0.5 0,0 1,28.5 20.5L8.5,20.5A0.5,0.5 0,0 1,8 20L8,18A0.5,0.5 0,0 1,8.5 17.5z"
       android:strokeAlpha="0.4"
-      android:fillColor="#ABA99B"
+      android:fillColor="@color/border_gray"
       android:fillAlpha="0.4"/>
 </vector>
diff --git a/core-ui/src/main/res/drawable/ic_layout_profile.xml b/core-ui/src/main/res/drawable/ic_layout_profile.xml
index d27513c5da..d3cd49c6fc 100644
--- a/core-ui/src/main/res/drawable/ic_layout_profile.xml
+++ b/core-ui/src/main/res/drawable/ic_layout_profile.xml
@@ -7,22 +7,22 @@
       android:strokeWidth="1"
       android:pathData="M8,0.5L36,0.5A7.5,7.5 0,0 1,43.5 8L43.5,36A7.5,7.5 0,0 1,36 43.5L8,43.5A7.5,7.5 0,0 1,0.5 36L0.5,8A7.5,7.5 0,0 1,8 0.5z"
       android:strokeAlpha="0.4"
-      android:fillColor="#00000000"
-      android:strokeColor="#ABA99B"
+      android:fillColor="@color/transparent_black"
+      android:strokeColor="@color/border_gray"
       android:fillAlpha="0.4"/>
   <path
       android:pathData="M22,8L22,8A8,8 0,0 1,30 16L30,16A8,8 0,0 1,22 24L22,24A8,8 0,0 1,14 16L14,16A8,8 0,0 1,22 8z"
       android:strokeAlpha="0.5"
-      android:fillColor="#2AA7EE"
+      android:fillColor="@color/palette_system_sky"
       android:fillAlpha="0.5"/>
   <path
       android:pathData="M8.5,27L35.5,27A0.5,0.5 0,0 1,36 27.5L36,29.5A0.5,0.5 0,0 1,35.5 30L8.5,30A0.5,0.5 0,0 1,8 29.5L8,27.5A0.5,0.5 0,0 1,8.5 27z"
       android:strokeAlpha="0.4"
-      android:fillColor="#ABA99B"
+      android:fillColor="@color/border_gray"
       android:fillAlpha="0.4"/>
   <path
       android:pathData="M15.5,33L28.5,33A0.5,0.5 0,0 1,29 33.5L29,34.5A0.5,0.5 0,0 1,28.5 35L15.5,35A0.5,0.5 0,0 1,15 34.5L15,33.5A0.5,0.5 0,0 1,15.5 33z"
       android:strokeAlpha="0.4"
-      android:fillColor="#ABA99B"
+      android:fillColor="@color/border_gray"
       android:fillAlpha="0.4"/>
 </vector>
diff --git a/core-ui/src/main/res/drawable/ic_layout_set.xml b/core-ui/src/main/res/drawable/ic_layout_set.xml
deleted file mode 100644
index d2aca40489..0000000000
--- a/core-ui/src/main/res/drawable/ic_layout_set.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:pathData="M12.5,2.5H19.5C20.6046,2.5 21.5,3.3954 21.5,4.5V11.5C21.5,12.6046 20.6046,13.5 19.5,13.5H19V15H19.5C21.433,15 23,13.433 23,11.5V4.5C23,2.567 21.433,1 19.5,1H12.5C10.567,1 9,2.567 9,4.5V5H10.5V4.5C10.5,3.3954 11.3954,2.5 12.5,2.5Z"
-      android:fillColor="#ACA996"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M8.5,6.5H15.5C16.6046,6.5 17.5,7.3954 17.5,8.5V15.5C17.5,16.6046 16.6046,17.5 15.5,17.5H15V19H15.5C17.433,19 19,17.433 19,15.5V8.5C19,6.567 17.433,5 15.5,5H8.5C6.567,5 5,6.567 5,8.5V9H6.5V8.5C6.5,7.3954 7.3954,6.5 8.5,6.5Z"
-      android:fillColor="#ACA996"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M1,12.5625C1,10.6295 2.567,9.0625 4.5,9.0625H11.5C13.433,9.0625 15,10.6295 15,12.5625V19.5625C15,21.4955 13.433,23.0625 11.5,23.0625H4.5C2.567,23.0625 1,21.4955 1,19.5625V12.5625Z"
-      android:fillColor="#ffffff"/>
-  <path
-      android:pathData="M11.5,10.5H4.5C3.3954,10.5 2.5,11.3954 2.5,12.5V19.5C2.5,20.6046 3.3954,21.5 4.5,21.5H11.5C12.6046,21.5 13.5,20.6046 13.5,19.5V12.5C13.5,11.3954 12.6046,10.5 11.5,10.5ZM4.5,9C2.567,9 1,10.567 1,12.5V19.5C1,21.433 2.567,23 4.5,23H11.5C13.433,23 15,21.433 15,19.5V12.5C15,10.567 13.433,9 11.5,9H4.5Z"
-      android:fillColor="#ACA996"
-      android:fillType="evenOdd"/>
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_layout_task.xml b/core-ui/src/main/res/drawable/ic_layout_task.xml
index b2d2ed4392..f5bd3c94ff 100644
--- a/core-ui/src/main/res/drawable/ic_layout_task.xml
+++ b/core-ui/src/main/res/drawable/ic_layout_task.xml
@@ -7,29 +7,29 @@
       android:strokeWidth="1"
       android:pathData="M8,0.5L36,0.5A7.5,7.5 0,0 1,43.5 8L43.5,36A7.5,7.5 0,0 1,36 43.5L8,43.5A7.5,7.5 0,0 1,0.5 36L0.5,8A7.5,7.5 0,0 1,8 0.5z"
       android:strokeAlpha="0.4"
-      android:fillColor="#00000000"
-      android:strokeColor="#ABA99B"
+      android:fillColor="@color/transparent_black"
+      android:strokeColor="@color/border_gray"
       android:fillAlpha="0.4"/>
   <path
       android:pathData="M10.5,15L15.5,15A2.5,2.5 0,0 1,18 17.5L18,22.5A2.5,2.5 0,0 1,15.5 25L10.5,25A2.5,2.5 0,0 1,8 22.5L8,17.5A2.5,2.5 0,0 1,10.5 15z"
-      android:fillColor="#5DD400"/>
+      android:fillColor="@color/palette_system_green"/>
   <path
       android:pathData="M20.5,16L35.5,16A0.5,0.5 0,0 1,36 16.5L36,18.5A0.5,0.5 0,0 1,35.5 19L20.5,19A0.5,0.5 0,0 1,20 18.5L20,16.5A0.5,0.5 0,0 1,20.5 16z"
       android:strokeAlpha="0.4"
-      android:fillColor="#ABA99B"
+      android:fillColor="@color/border_gray"
       android:fillAlpha="0.4"/>
   <path
       android:pathData="M20.5,21L31.5,21A0.5,0.5 0,0 1,32 21.5L32,23.5A0.5,0.5 0,0 1,31.5 24L20.5,24A0.5,0.5 0,0 1,20 23.5L20,21.5A0.5,0.5 0,0 1,20.5 21z"
       android:strokeAlpha="0.4"
-      android:fillColor="#ABA99B"
+      android:fillColor="@color/border_gray"
       android:fillAlpha="0.4"/>
   <path
       android:pathData="M8.5,28L25.5,28A0.5,0.5 0,0 1,26 28.5L26,29.5A0.5,0.5 0,0 1,25.5 30L8.5,30A0.5,0.5 0,0 1,8 29.5L8,28.5A0.5,0.5 0,0 1,8.5 28z"
       android:strokeAlpha="0.4"
-      android:fillColor="#ABA99B"
+      android:fillColor="@color/border_gray"
       android:fillAlpha="0.4"/>
   <path
       android:pathData="M15.9118,17.752L12.4917,22.7267L10.1235,20.0202L10.8761,19.3617L12.3968,21.0997L15.0878,17.1855L15.9118,17.752Z"
-      android:fillColor="#ffffff"
+      android:fillColor="@color/white"
       android:fillType="evenOdd"/>
 </vector>
diff --git a/core-ui/src/main/res/drawable/ic_layout_todo.xml b/core-ui/src/main/res/drawable/ic_layout_todo.xml
deleted file mode 100644
index de5d2b9afb..0000000000
--- a/core-ui/src/main/res/drawable/ic_layout_todo.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:pathData="M17.5435,2.5H6.5435C4.3343,2.5 2.5435,4.2909 2.5435,6.5V17.5C2.5435,19.7091 4.3343,21.5 6.5435,21.5H17.5435C19.7526,21.5 21.5435,19.7091 21.5435,17.5V6.5C21.5435,4.2909 19.7526,2.5 17.5435,2.5ZM6.5435,1C3.5059,1 1.0435,3.4624 1.0435,6.5V17.5C1.0435,20.5376 3.5059,23 6.5435,23H17.5435C20.581,23 23.0435,20.5376 23.0435,17.5V6.5C23.0435,3.4624 20.581,1 17.5435,1H6.5435Z"
-      android:fillColor="#929082"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M18.1294,6.9083L11.1248,17.6845L5.9702,12.5299L7.0309,11.4692L10.8763,15.3146L16.8717,6.0908L18.1294,6.9083Z"
-      android:fillColor="#929082"
-      android:fillType="evenOdd"/>
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_list_arrow.xml b/core-ui/src/main/res/drawable/ic_list_arrow.xml
index dd9f675ee1..a89669ab9b 100644
--- a/core-ui/src/main/res/drawable/ic_list_arrow.xml
+++ b/core-ui/src/main/res/drawable/ic_list_arrow.xml
@@ -4,7 +4,7 @@
     android:viewportWidth="16"
     android:viewportHeight="16">
     <path
-        android:fillColor="#6C6A5F"
+        android:fillColor="@color/default_filter_tag_text_color"
         android:fillType="evenOdd"
         android:pathData="M3.3256,6.3261C3.56,6.0918 3.9399,6.0918 4.1742,6.3261L7.9999,10.1519L11.8256,6.3261C12.06,6.0918 12.4399,6.0918 12.6742,6.3261C12.9085,6.5604 12.9085,6.9403 12.6742,7.1747L7.9999,11.8489L3.3256,7.1747C3.0913,6.9403 3.0913,6.5604 3.3256,6.3261Z" />
 </vector>
diff --git a/core-ui/src/main/res/drawable/ic_list_arrow_18.xml b/core-ui/src/main/res/drawable/ic_list_arrow_18.xml
index 1ca7ac9448..7d28fcbd11 100644
--- a/core-ui/src/main/res/drawable/ic_list_arrow_18.xml
+++ b/core-ui/src/main/res/drawable/ic_list_arrow_18.xml
@@ -6,7 +6,7 @@
   <path
       android:pathData="M4,7L9,12L14,7"
       android:strokeWidth="1.5"
-      android:fillColor="#00000000"
+      android:fillColor="@color/transparent_black"
       android:strokeColor="@color/glyph_active"
       android:strokeLineCap="round"/>
 </vector>
diff --git a/core-ui/src/main/res/drawable/ic_list_view.xml b/core-ui/src/main/res/drawable/ic_list_view.xml
deleted file mode 100644
index c18335f25a..0000000000
--- a/core-ui/src/main/res/drawable/ic_list_view.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:pathData="M4,5L20,5A1,1 0,0 1,21 6L21,6A1,1 0,0 1,20 7L4,7A1,1 0,0 1,3 6L3,6A1,1 0,0 1,4 5z"
-      android:fillColor="#2C2B27"/>
-  <path
-      android:pathData="M4,9L14,9A1,1 0,0 1,15 10L15,10A1,1 0,0 1,14 11L4,11A1,1 0,0 1,3 10L3,10A1,1 0,0 1,4 9z"
-      android:fillColor="#2C2B27"/>
-  <path
-      android:pathData="M4,13L20,13A1,1 0,0 1,21 14L21,14A1,1 0,0 1,20 15L4,15A1,1 0,0 1,3 14L3,14A1,1 0,0 1,4 13z"
-      android:fillColor="#2C2B27"/>
-  <path
-      android:pathData="M4,17L14,17A1,1 0,0 1,15 18L15,18A1,1 0,0 1,14 19L4,19A1,1 0,0 1,3 18L3,18A1,1 0,0 1,4 17z"
-      android:fillColor="#2C2B27"/>
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_local_first_internet.xml b/core-ui/src/main/res/drawable/ic_local_first_internet.xml
index 4e824e3a0b..ef3ce23355 100644
--- a/core-ui/src/main/res/drawable/ic_local_first_internet.xml
+++ b/core-ui/src/main/res/drawable/ic_local_first_internet.xml
@@ -5,5 +5,5 @@
     android:viewportHeight="31">
   <path
       android:pathData="M0.89,30V1.45H3.5V27.66H17.1V30H0.89ZM28.22,30.45C26.37,30.45 24.74,29.98 23.32,29.04C21.9,28.1 20.8,26.8 20,25.15C19.2,23.49 18.8,21.57 18.8,19.39C18.8,17.2 19.2,15.27 20,13.61C20.8,11.94 21.9,10.64 23.32,9.71C24.74,8.77 26.37,8.3 28.22,8.3C30.07,8.3 31.7,8.77 33.11,9.71C34.53,10.64 35.63,11.95 36.43,13.61C37.24,15.27 37.64,17.2 37.64,19.39C37.64,21.57 37.24,23.49 36.45,25.15C35.65,26.8 34.54,28.1 33.11,29.04C31.7,29.98 30.07,30.45 28.22,30.45ZM28.22,28.17C29.71,28.17 30.97,27.77 32,26.98C33.03,26.18 33.81,25.11 34.34,23.78C34.88,22.45 35.15,20.99 35.15,19.39C35.15,17.79 34.88,16.33 34.34,14.99C33.81,13.65 33.03,12.58 32,11.77C30.97,10.96 29.71,10.56 28.22,10.56C26.74,10.56 25.49,10.96 24.44,11.77C23.41,12.58 22.63,13.65 22.09,14.99C21.56,16.33 21.29,17.79 21.29,19.39C21.29,20.99 21.56,22.45 22.09,23.78C22.63,25.11 23.41,26.18 24.44,26.98C25.48,27.77 26.74,28.17 28.22,28.17ZM48.9,30.45C46.99,30.45 45.32,29.97 43.9,29.01C42.49,28.05 41.39,26.74 40.61,25.08C39.83,23.42 39.44,21.52 39.44,19.39C39.44,17.25 39.83,15.34 40.62,13.66C41.42,11.99 42.53,10.68 43.94,9.73C45.35,8.78 46.99,8.3 48.86,8.3C50.29,8.3 51.59,8.58 52.75,9.13C53.91,9.68 54.87,10.46 55.62,11.46C56.38,12.46 56.86,13.62 57.06,14.95H54.55C54.29,13.74 53.66,12.71 52.67,11.85C51.68,10.99 50.43,10.56 48.9,10.56C47.54,10.56 46.33,10.93 45.28,11.67C44.23,12.41 43.41,13.43 42.81,14.75C42.23,16.06 41.93,17.58 41.93,19.31C41.93,21.05 42.22,22.58 42.8,23.92C43.37,25.25 44.18,26.29 45.22,27.05C46.27,27.8 47.5,28.17 48.9,28.17C49.85,28.17 50.71,28 51.49,27.64C52.28,27.28 52.94,26.77 53.47,26.11C54.01,25.45 54.38,24.67 54.56,23.76H57.07C56.88,25.05 56.42,26.2 55.69,27.21C54.97,28.22 54.02,29.01 52.86,29.58C51.71,30.16 50.39,30.45 48.9,30.45ZM65.82,30.49C64.52,30.49 63.34,30.24 62.28,29.74C61.21,29.22 60.36,28.49 59.72,27.53C59.09,26.57 58.78,25.4 58.78,24.02C58.78,22.96 58.98,22.07 59.38,21.34C59.78,20.62 60.34,20.02 61.08,19.56C61.81,19.1 62.68,18.73 63.68,18.46C64.69,18.19 65.79,17.98 67,17.83C68.2,17.68 69.21,17.55 70.04,17.44C70.88,17.33 71.51,17.15 71.95,16.91C72.39,16.67 72.6,16.28 72.6,15.74V15.24C72.6,13.78 72.17,12.63 71.29,11.8C70.43,10.95 69.18,10.53 67.56,10.53C66.02,10.53 64.76,10.87 63.78,11.55C62.81,12.22 62.14,13.02 61.75,13.94L59.39,13.09C59.87,11.92 60.54,10.99 61.4,10.29C62.25,9.59 63.21,9.08 64.27,8.77C65.33,8.46 66.4,8.3 67.49,8.3C68.31,8.3 69.16,8.41 70.04,8.62C70.93,8.83 71.76,9.2 72.52,9.73C73.28,10.25 73.9,10.98 74.37,11.92C74.85,12.85 75.08,14.03 75.08,15.46V30H72.6V26.61H72.45C72.15,27.24 71.71,27.86 71.13,28.45C70.54,29.05 69.81,29.54 68.92,29.92C68.04,30.3 67.01,30.49 65.82,30.49ZM66.15,28.22C67.47,28.22 68.61,27.92 69.58,27.34C70.55,26.75 71.29,25.98 71.81,25.01C72.34,24.03 72.6,22.96 72.6,21.79V18.7C72.42,18.87 72.11,19.03 71.67,19.17C71.24,19.31 70.75,19.43 70.18,19.55C69.62,19.65 69.06,19.74 68.51,19.81C67.95,19.89 67.45,19.95 67,20.01C65.79,20.16 64.76,20.39 63.91,20.7C63.05,21.02 62.4,21.46 61.94,22.01C61.49,22.56 61.26,23.27 61.26,24.13C61.26,25.43 61.72,26.44 62.65,27.16C63.58,27.86 64.75,28.22 66.15,28.22ZM81.61,1.45V30H79.13V1.45H81.61ZM102.93,8.59V10.75H92.4V8.59H102.93ZM95.69,30V5.45C95.69,4.3 95.96,3.33 96.49,2.54C97.02,1.75 97.73,1.15 98.59,0.74C99.45,0.33 100.37,0.13 101.34,0.13C101.99,0.13 102.53,0.19 102.95,0.3C103.39,0.4 103.73,0.5 103.98,0.6L103.26,2.78C103.07,2.72 102.85,2.66 102.58,2.58C102.31,2.51 101.97,2.47 101.56,2.47C100.48,2.47 99.65,2.77 99.06,3.38C98.48,3.98 98.19,4.85 98.19,5.97L98.17,30H95.69ZM105.35,30V8.59H107.85V30H105.35ZM106.62,4.91C106.11,4.91 105.67,4.74 105.31,4.4C104.95,4.04 104.77,3.62 104.77,3.13C104.77,2.63 104.95,2.22 105.31,1.87C105.67,1.52 106.11,1.34 106.62,1.34C107.13,1.34 107.57,1.52 107.93,1.87C108.29,2.22 108.47,2.63 108.47,3.13C108.47,3.62 108.29,4.04 107.93,4.4C107.57,4.74 107.13,4.91 106.62,4.91ZM111.86,30V8.59H114.27V11.88H114.45C114.88,10.8 115.62,9.93 116.68,9.27C117.75,8.6 118.96,8.27 120.3,8.27C120.51,8.27 120.74,8.27 120.99,8.28C121.24,8.29 121.45,8.3 121.61,8.31V10.84C121.5,10.82 121.31,10.79 121.03,10.75C120.75,10.71 120.45,10.7 120.12,10.7C119.01,10.7 118.01,10.93 117.14,11.41C116.28,11.87 115.59,12.52 115.09,13.34C114.59,14.17 114.34,15.11 114.34,16.17V30H111.86ZM137.68,13.29L135.41,13.93C135.19,13.29 134.87,12.71 134.46,12.19C134.05,11.67 133.52,11.25 132.86,10.95C132.21,10.64 131.4,10.49 130.43,10.49C128.98,10.49 127.79,10.83 126.86,11.52C125.94,12.21 125.47,13.09 125.47,14.18C125.47,15.1 125.79,15.85 126.42,16.42C127.06,16.99 128.04,17.44 129.37,17.78L132.61,18.57C134.4,19.01 135.74,19.7 136.64,20.65C137.54,21.6 137.99,22.78 137.99,24.22C137.99,25.42 137.65,26.5 136.98,27.44C136.32,28.37 135.38,29.11 134.18,29.65C132.99,30.18 131.61,30.45 130.04,30.45C127.95,30.45 126.23,29.98 124.87,29.04C123.51,28.09 122.65,26.72 122.27,24.94L124.65,24.35C124.96,25.63 125.56,26.59 126.45,27.24C127.35,27.89 128.53,28.22 130,28.22C131.65,28.22 132.96,27.85 133.95,27.11C134.93,26.37 135.42,25.44 135.42,24.33C135.42,23.46 135.13,22.74 134.56,22.15C133.98,21.56 133.11,21.12 131.94,20.84L128.44,20.01C126.58,19.56 125.21,18.85 124.32,17.89C123.42,16.92 122.98,15.72 122.98,14.29C122.98,13.11 123.3,12.08 123.94,11.18C124.58,10.28 125.46,9.58 126.59,9.06C127.71,8.55 128.99,8.3 130.43,8.3C132.39,8.3 133.96,8.74 135.13,9.64C136.31,10.52 137.16,11.74 137.68,13.29ZM149.3,8.59V10.75H139.09V8.59H149.3ZM142.28,3.46H144.77V24.41C144.77,25.3 144.93,26 145.23,26.52C145.54,27.02 145.94,27.38 146.43,27.59C146.92,27.79 147.45,27.9 148.01,27.9C148.33,27.9 148.61,27.88 148.84,27.84C149.07,27.79 149.28,27.75 149.46,27.7L149.99,29.94C149.74,30.04 149.45,30.12 149.09,30.2C148.74,30.28 148.3,30.32 147.78,30.32C146.87,30.32 145.99,30.12 145.15,29.72C144.31,29.32 143.62,28.73 143.09,27.94C142.55,27.15 142.28,26.17 142.28,25V3.46ZM163.99,1.45V30H161.39V1.45H163.99ZM171,16.62V30H168.52V8.59H170.93V11.95H171.15C171.65,10.85 172.43,9.98 173.49,9.32C174.56,8.65 175.88,8.31 177.45,8.31C178.89,8.31 180.16,8.61 181.24,9.22C182.34,9.81 183.19,10.69 183.79,11.85C184.41,13.01 184.71,14.44 184.71,16.13V30H182.23V16.28C182.23,14.53 181.74,13.14 180.76,12.12C179.78,11.1 178.47,10.58 176.82,10.58C175.7,10.58 174.7,10.83 173.83,11.31C172.95,11.79 172.26,12.49 171.75,13.4C171.25,14.3 171,15.37 171,16.62ZM197.13,8.59V10.75H186.91V8.59H197.13ZM190.1,3.46H192.6V24.41C192.6,25.3 192.75,26 193.06,26.52C193.37,27.02 193.76,27.38 194.26,27.59C194.75,27.79 195.27,27.9 195.83,27.9C196.16,27.9 196.44,27.88 196.67,27.84C196.9,27.79 197.1,27.75 197.28,27.7L197.81,29.94C197.57,30.04 197.27,30.12 196.92,30.2C196.57,30.28 196.13,30.32 195.61,30.32C194.7,30.32 193.82,30.12 192.98,29.72C192.14,29.32 191.45,28.73 190.91,27.94C190.37,27.15 190.1,26.17 190.1,25V3.46ZM208.64,30.45C206.64,30.45 204.91,29.98 203.45,29.05C201.99,28.11 200.87,26.82 200.07,25.16C199.28,23.5 198.88,21.59 198.88,19.42C198.88,17.27 199.28,15.35 200.07,13.68C200.87,12 201.97,10.68 203.37,9.73C204.78,8.78 206.41,8.3 208.26,8.3C209.42,8.3 210.54,8.51 211.62,8.94C212.7,9.36 213.66,10 214.52,10.88C215.38,11.74 216.07,12.83 216.57,14.15C217.07,15.46 217.32,17.01 217.32,18.81V20.03H200.6V17.85H214.78C214.78,16.47 214.51,15.23 213.95,14.14C213.4,13.03 212.63,12.16 211.65,11.52C210.67,10.88 209.54,10.56 208.26,10.56C206.9,10.56 205.71,10.92 204.68,11.64C203.65,12.37 202.84,13.33 202.25,14.51C201.68,15.7 201.38,17 201.38,18.42V19.73C201.38,21.43 201.67,22.91 202.25,24.19C202.85,25.45 203.69,26.43 204.78,27.13C205.86,27.83 207.15,28.17 208.64,28.17C209.65,28.17 210.54,28.02 211.3,27.7C212.07,27.38 212.72,26.96 213.24,26.43C213.77,25.89 214.17,25.3 214.44,24.66L216.79,25.43C216.47,26.33 215.93,27.16 215.19,27.92C214.45,28.69 213.53,29.3 212.43,29.76C211.33,30.22 210.07,30.45 208.64,30.45ZM220.24,30V8.59H222.65V11.88H222.83C223.26,10.8 224,9.93 225.06,9.27C226.13,8.6 227.34,8.27 228.68,8.27C228.89,8.27 229.12,8.27 229.37,8.28C229.62,8.29 229.83,8.3 229.99,8.31V10.84C229.88,10.82 229.69,10.79 229.41,10.75C229.13,10.71 228.83,10.7 228.5,10.7C227.39,10.7 226.39,10.93 225.52,11.41C224.65,11.87 223.97,12.52 223.47,13.34C222.97,14.17 222.72,15.11 222.72,16.17V30H220.24ZM234.16,16.62V30H231.68V8.59H234.09V11.95H234.31C234.81,10.85 235.59,9.98 236.65,9.32C237.72,8.65 239.04,8.31 240.61,8.31C242.05,8.31 243.32,8.61 244.4,9.22C245.5,9.81 246.35,10.69 246.95,11.85C247.57,13.01 247.87,14.44 247.87,16.13V30H245.39V16.28C245.39,14.53 244.9,13.14 243.91,12.12C242.94,11.1 241.63,10.58 239.98,10.58C238.86,10.58 237.86,10.83 236.99,11.31C236.11,11.79 235.42,12.49 234.91,13.4C234.41,14.3 234.16,15.37 234.16,16.62ZM260.51,30.45C258.51,30.45 256.78,29.98 255.32,29.05C253.87,28.11 252.74,26.82 251.94,25.16C251.15,23.5 250.75,21.59 250.75,19.42C250.75,17.27 251.15,15.35 251.94,13.68C252.74,12 253.84,10.68 255.24,9.73C256.65,8.78 258.29,8.3 260.13,8.3C261.3,8.3 262.42,8.51 263.49,8.94C264.57,9.36 265.54,10 266.39,10.88C267.26,11.74 267.94,12.83 268.44,14.15C268.94,15.46 269.19,17.01 269.19,18.81V20.03H252.47V17.85H266.66C266.66,16.47 266.38,15.23 265.82,14.14C265.27,13.03 264.51,12.16 263.52,11.52C262.55,10.88 261.42,10.56 260.13,10.56C258.78,10.56 257.58,10.92 256.55,11.64C255.52,12.37 254.71,13.33 254.13,14.51C253.55,15.7 253.26,17 253.25,18.42V19.73C253.25,21.43 253.54,22.91 254.13,24.19C254.72,25.45 255.56,26.43 256.65,27.13C257.74,27.83 259.02,28.17 260.51,28.17C261.52,28.17 262.41,28.02 263.17,27.7C263.94,27.38 264.59,26.96 265.11,26.43C265.64,25.89 266.04,25.3 266.31,24.66L268.66,25.43C268.34,26.33 267.8,27.16 267.06,27.92C266.33,28.69 265.41,29.3 264.3,29.76C263.2,30.22 261.94,30.45 260.51,30.45ZM280.54,8.59V10.75H270.33V8.59H280.54ZM273.52,3.46H276.01V24.41C276.01,25.3 276.17,26 276.47,26.52C276.78,27.02 277.18,27.38 277.67,27.59C278.16,27.79 278.69,27.9 279.25,27.9C279.57,27.9 279.85,27.88 280.08,27.84C280.32,27.79 280.52,27.75 280.7,27.7L281.23,29.94C280.98,30.04 280.69,30.12 280.33,30.2C279.98,30.28 279.54,30.32 279.02,30.32C278.11,30.32 277.23,30.12 276.39,29.72C275.55,29.32 274.86,28.73 274.33,27.94C273.79,27.15 273.52,26.17 273.52,25V3.46Z"
-      android:fillColor="#D4D4D4"/>
+      android:fillColor="@color/network_light_gray"/>
 </vector>
diff --git a/core-ui/src/main/res/drawable/ic_locked_object_editor_top_toolbar.xml b/core-ui/src/main/res/drawable/ic_locked_object_editor_top_toolbar.xml
index 88f9679b6e..833e06e19f 100644
--- a/core-ui/src/main/res/drawable/ic_locked_object_editor_top_toolbar.xml
+++ b/core-ui/src/main/res/drawable/ic_locked_object_editor_top_toolbar.xml
@@ -9,6 +9,6 @@
   <path
       android:pathData="M2.125,3.5C2.125,1.9122 3.4122,0.625 5,0.625C6.5878,0.625 7.875,1.9122 7.875,3.5V6.875H2.125V3.5Z"
       android:strokeWidth="1.25"
-      android:fillColor="#00000000"
+      android:fillColor="@color/transparent_black"
       android:strokeColor="@color/glyph_active"/>
 </vector>
diff --git a/core-ui/src/main/res/drawable/ic_main_toolbar_back.xml b/core-ui/src/main/res/drawable/ic_main_toolbar_back.xml
deleted file mode 100644
index 209250a15d..0000000000
--- a/core-ui/src/main/res/drawable/ic_main_toolbar_back.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:pathData="M15,3L6,12L15,21"
-      android:strokeWidth="1.5"
-      android:fillColor="#00000000"
-      android:strokeColor="@color/glyph_active"
-      android:strokeLineCap="round"/>
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_main_toolbar_home.xml b/core-ui/src/main/res/drawable/ic_main_toolbar_home.xml
deleted file mode 100644
index 6ed802c82b..0000000000
--- a/core-ui/src/main/res/drawable/ic_main_toolbar_home.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:pathData="M5,2.75L8,2.75A2.25,2.25 0,0 1,10.25 5L10.25,8A2.25,2.25 0,0 1,8 10.25L5,10.25A2.25,2.25 0,0 1,2.75 8L2.75,5A2.25,2.25 0,0 1,5 2.75z"
-      android:strokeWidth="1.5"
-      android:fillColor="#00000000"
-      android:strokeColor="@color/glyph_active"/>
-  <path
-      android:pathData="M16,2.75L19,2.75A2.25,2.25 0,0 1,21.25 5L21.25,8A2.25,2.25 0,0 1,19 10.25L16,10.25A2.25,2.25 0,0 1,13.75 8L13.75,5A2.25,2.25 0,0 1,16 2.75z"
-      android:strokeWidth="1.5"
-      android:fillColor="#00000000"
-      android:strokeColor="@color/glyph_active"/>
-  <path
-      android:pathData="M5,13.75L8,13.75A2.25,2.25 0,0 1,10.25 16L10.25,19A2.25,2.25 0,0 1,8 21.25L5,21.25A2.25,2.25 0,0 1,2.75 19L2.75,16A2.25,2.25 0,0 1,5 13.75z"
-      android:strokeWidth="1.5"
-      android:fillColor="#00000000"
-      android:strokeColor="@color/glyph_active"/>
-  <path
-      android:pathData="M16,13.75L19,13.75A2.25,2.25 0,0 1,21.25 16L21.25,19A2.25,2.25 0,0 1,19 21.25L16,21.25A2.25,2.25 0,0 1,13.75 19L13.75,16A2.25,2.25 0,0 1,16 13.75z"
-      android:strokeWidth="1.5"
-      android:fillColor="#00000000"
-      android:strokeColor="@color/glyph_active"/>
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_main_toolbar_search.xml b/core-ui/src/main/res/drawable/ic_main_toolbar_search.xml
deleted file mode 100644
index 03cc6e8b5e..0000000000
--- a/core-ui/src/main/res/drawable/ic_main_toolbar_search.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:pathData="M3.5625,9.875C3.5625,13.4649 6.4727,16.375 10.0625,16.375C13.6524,16.375 16.5625,13.4649 16.5625,9.875C16.5625,6.2852 13.6524,3.375 10.0625,3.375C6.4727,3.375 3.5625,6.2852 3.5625,9.875ZM10.0625,1.875C5.6442,1.875 2.0625,5.4567 2.0625,9.875C2.0625,14.2933 5.6442,17.875 10.0625,17.875C14.4808,17.875 18.0625,14.2933 18.0625,9.875C18.0625,5.4567 14.4808,1.875 10.0625,1.875Z"
-      android:fillColor="#ACA996"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M20.2929,21.7071C20.6834,22.0976 21.3166,22.0976 21.7071,21.7071C22.0976,21.3166 22.0976,20.6834 21.7071,20.2929L20.2929,21.7071ZM21.7071,20.2929L15.7071,14.2929L14.2929,15.7071L20.2929,21.7071L21.7071,20.2929Z"
-      android:fillColor="#ACA996"/>
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_manage_dv_viewer_grid.xml b/core-ui/src/main/res/drawable/ic_manage_dv_viewer_grid.xml
deleted file mode 100644
index eca6893186..0000000000
--- a/core-ui/src/main/res/drawable/ic_manage_dv_viewer_grid.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="#E88B00"
-        android:fillType="evenOdd"
-        android:pathData="M19,4.5H5C4.1716,4.5 3.5,5.1716 3.5,6V18C3.5,18.8284 4.1716,19.5 5,19.5H19C19.8284,19.5 20.5,18.8284 20.5,18V6C20.5,5.1716 19.8284,4.5 19,4.5ZM5,3C3.3431,3 2,4.3432 2,6V18C2,19.6569 3.3431,21 5,21H19C20.6569,21 22,19.6569 22,18V6C22,4.3432 20.6569,3 19,3H5Z" />
-    <path
-        android:fillColor="#E88B00"
-        android:pathData="M7.5,4H9V20H7.5V4Z" />
-    <path
-        android:fillColor="#E88B00"
-        android:pathData="M3,9.9375V8.4375L21,8.4375V9.9375L3,9.9375Z" />
-    <path
-        android:fillColor="#E88B00"
-        android:pathData="M3,15.4688V13.9688L21,13.9688V15.4688L3,15.4688Z" />
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_mention_loading_state.xml b/core-ui/src/main/res/drawable/ic_mention_loading_state.xml
index b853d80e62..fb206669b5 100644
--- a/core-ui/src/main/res/drawable/ic_mention_loading_state.xml
+++ b/core-ui/src/main/res/drawable/ic_mention_loading_state.xml
@@ -18,8 +18,8 @@
         <gradient
             android:centerColor="@color/shape_primary"
             android:centerY="0.50"
-            android:endColor="#00ACA996"
-            android:startColor="#ACA996"
+            android:endColor="@color/gradient_soft_gray_end_transparent"
+            android:startColor="@color/gray"
             android:type="sweep"
             android:useLevel="false" />
 
diff --git a/core-ui/src/main/res/drawable/ic_menu_arrow_left.xml b/core-ui/src/main/res/drawable/ic_menu_arrow_left.xml
deleted file mode 100644
index b805bb1e52..0000000000
--- a/core-ui/src/main/res/drawable/ic_menu_arrow_left.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:pathData="M10.6464,6.6465C10.8417,6.4512 11.1583,6.4512 11.3536,6.6465L16.7071,12L11.3536,17.3536C11.1583,17.5488 10.8417,17.5488 10.6464,17.3536C10.4512,17.1583 10.4512,16.8417 10.6464,16.6464L15.2929,12L10.6464,7.3535C10.4512,7.1583 10.4512,6.8417 10.6464,6.6465Z"
-      android:fillColor="#ffffff"
-      android:fillType="evenOdd"/>
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_menu_arrow_right.xml b/core-ui/src/main/res/drawable/ic_menu_arrow_right.xml
deleted file mode 100644
index b805bb1e52..0000000000
--- a/core-ui/src/main/res/drawable/ic_menu_arrow_right.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:pathData="M10.6464,6.6465C10.8417,6.4512 11.1583,6.4512 11.3536,6.6465L16.7071,12L11.3536,17.3536C11.1583,17.5488 10.8417,17.5488 10.6464,17.3536C10.4512,17.1583 10.4512,16.8417 10.6464,16.6464L15.2929,12L10.6464,7.3535C10.4512,7.1583 10.4512,6.8417 10.6464,6.6465Z"
-      android:fillColor="#ffffff"
-      android:fillType="evenOdd"/>
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_menu_bold.xml b/core-ui/src/main/res/drawable/ic_menu_bold.xml
index 836ef219de..bc4ed94737 100644
--- a/core-ui/src/main/res/drawable/ic_menu_bold.xml
+++ b/core-ui/src/main/res/drawable/ic_menu_bold.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="#FFFFFF"
+        android:fillColor="@color/white"
         android:pathData="M6.9968,4V20H12.4816C15.683,20 17.7426,18.5455 17.7426,15.5245V15.435C17.7426,13.3538 16.8695,12.1678 14.5412,11.6084C16.3546,10.9818 16.959,9.6839 16.959,8.2294V8.1399C16.959,4.9846 14.7875,4 11.81,4H6.9968ZM12.4369,18.4783H8.8997V12.5035H12.1682C14.7651,12.5035 15.8397,13.4434 15.8397,15.4126V15.5021C15.8397,17.4713 14.7651,18.4783 12.4369,18.4783ZM11.81,10.9818H8.8997V5.5217H11.7652C14.0039,5.5217 15.0561,6.2601 15.0561,8.0727V8.1622C15.0561,10.1315 14.1606,10.9818 11.81,10.9818Z" />
 </vector>
diff --git a/core-ui/src/main/res/drawable/ic_menu_code.xml b/core-ui/src/main/res/drawable/ic_menu_code.xml
index b6e603e146..9c393d0c17 100644
--- a/core-ui/src/main/res/drawable/ic_menu_code.xml
+++ b/core-ui/src/main/res/drawable/ic_menu_code.xml
@@ -4,11 +4,11 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="#FFFFFF"
+        android:fillColor="@color/white"
         android:fillType="evenOdd"
         android:pathData="M10.1214,5.2932C10.5119,5.6838 10.5119,6.3169 10.1213,6.7074L4.8285,12L10.1213,17.2926C10.5119,17.6831 10.5119,18.3163 10.1214,18.7068C9.7309,19.0973 9.0977,19.0974 8.7072,18.7068L2,12L8.7072,5.2932C9.0977,4.9027 9.7309,4.9027 10.1214,5.2932Z" />
     <path
-        android:fillColor="#FFFFFF"
+        android:fillColor="@color/white"
         android:fillType="evenOdd"
         android:pathData="M13.8786,5.2932C13.4881,5.6838 13.4881,6.3169 13.8787,6.7074L19.1715,12L13.8787,17.2926C13.4881,17.6831 13.4881,18.3163 13.8786,18.7068C14.2691,19.0973 14.9023,19.0974 15.2928,18.7068L22,12L15.2928,5.2932C14.9023,4.9027 14.2691,4.9027 13.8786,5.2932Z" />
 </vector>
diff --git a/core-ui/src/main/res/drawable/ic_menu_italic.xml b/core-ui/src/main/res/drawable/ic_menu_italic.xml
index f4826791de..c40eda3a92 100644
--- a/core-ui/src/main/res/drawable/ic_menu_italic.xml
+++ b/core-ui/src/main/res/drawable/ic_menu_italic.xml
@@ -4,9 +4,9 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="#FFFFFF"
+        android:fillColor="@color/white"
         android:pathData="M13.5464,8.5H11.6034L9.7142,20H11.6573L13.5464,8.5Z" />
     <path
-        android:fillColor="#FFFFFF"
+        android:fillColor="@color/white"
         android:pathData="M14.3906,4.9688C14.3906,5.6591 13.831,6.2188 13.1406,6.2188C12.4503,6.2188 11.8906,5.6591 11.8906,4.9688C11.8906,4.2784 12.4503,3.7188 13.1406,3.7188C13.831,3.7188 14.3906,4.2784 14.3906,4.9688Z" />
 </vector>
diff --git a/core-ui/src/main/res/drawable/ic_menu_link.xml b/core-ui/src/main/res/drawable/ic_menu_link.xml
index fffe2c9e0f..06a9176c36 100644
--- a/core-ui/src/main/res/drawable/ic_menu_link.xml
+++ b/core-ui/src/main/res/drawable/ic_menu_link.xml
@@ -4,9 +4,9 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="#FFFFFF"
+        android:fillColor="@color/white"
         android:pathData="M11.4364,10.5839C11.8923,10.7146 12.3224,10.9595 12.6814,11.3185C13.8104,12.4475 13.8104,14.2779 12.6814,15.4069L9.9559,18.1325C8.8269,19.2615 6.9965,19.2615 5.8675,18.1325C4.7385,17.0035 4.7385,15.1731 5.8675,14.0441L7.7773,12.1343C7.5525,11.2924 7.5209,10.4096 7.6825,9.5562C7.5256,9.6784 7.3745,9.8115 7.2303,9.9558L4.5047,12.6813C2.6231,14.5629 2.6231,17.6137 4.5047,19.4953C6.3863,21.3769 9.437,21.3769 11.3187,19.4953L14.0442,16.7697C15.9258,14.8881 15.9258,11.8374 14.0442,9.9558C13.5597,9.4713 12.9977,9.1115 12.3981,8.8765L12.0002,9.2745C11.6374,9.6372 11.4495,10.1086 11.4364,10.5839Z" />
     <path
-        android:fillColor="#FFFFFF"
+        android:fillColor="@color/white"
         android:pathData="M12.5637,13.4159C12.1078,13.2852 11.6777,13.0404 11.3186,12.6812C10.1896,11.5523 10.1896,9.7218 11.3186,8.5929L14.0441,5.8673C15.1731,4.7383 17.0035,4.7383 18.1325,5.8673C19.2615,6.9963 19.2615,8.8267 18.1325,9.9557L16.2228,11.8654C16.4476,12.7073 16.4793,13.59 16.3177,14.4434C16.4745,14.3213 16.6256,14.1882 16.7697,14.044L19.4953,11.3184C21.3769,9.4368 21.3769,6.3861 19.4953,4.5045C17.6137,2.6229 14.563,2.6229 12.6814,4.5045L9.9558,7.2301C8.0742,9.1117 8.0742,12.1624 9.9558,14.044C10.4403,14.5286 11.0024,14.8883 11.6021,15.1233L12,14.7254C12.3628,14.3627 12.5507,13.8912 12.5637,13.4159Z" />
 </vector>
diff --git a/core-ui/src/main/res/drawable/ic_menu_media_block.xml b/core-ui/src/main/res/drawable/ic_menu_media_block.xml
deleted file mode 100644
index 051751fde9..0000000000
--- a/core-ui/src/main/res/drawable/ic_menu_media_block.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="25dp"
-    android:height="24dp"
-    android:viewportWidth="25"
-    android:viewportHeight="24">
-  <path
-      android:pathData="M6.0029,14.0323C7.1075,14.0323 8.0029,13.1369 8.0029,12.0323C8.0029,10.9278 7.1075,10.0323 6.0029,10.0323C4.8984,10.0323 4.0029,10.9278 4.0029,12.0323C4.0029,13.1369 4.8984,14.0323 6.0029,14.0323Z"
-      android:fillColor="#ffffff"/>
-  <path
-      android:pathData="M12.0029,14.0323C13.1075,14.0323 14.0029,13.1369 14.0029,12.0323C14.0029,10.9278 13.1075,10.0323 12.0029,10.0323C10.8984,10.0323 10.0029,10.9278 10.0029,12.0323C10.0029,13.1369 10.8984,14.0323 12.0029,14.0323Z"
-      android:fillColor="#ffffff"/>
-  <path
-      android:pathData="M18.0029,14.0323C19.1075,14.0323 20.0029,13.1369 20.0029,12.0323C20.0029,10.9278 19.1075,10.0323 18.0029,10.0323C16.8984,10.0323 16.0029,10.9278 16.0029,12.0323C16.0029,13.1369 16.8984,14.0323 18.0029,14.0323Z"
-      android:fillColor="#ffffff"/>
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_menu_strike_through.xml b/core-ui/src/main/res/drawable/ic_menu_strike_through.xml
index 5aa986bfd5..c99f66f937 100644
--- a/core-ui/src/main/res/drawable/ic_menu_strike_through.xml
+++ b/core-ui/src/main/res/drawable/ic_menu_strike_through.xml
@@ -4,10 +4,10 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="#FFFFFF"
+        android:fillColor="@color/white"
         android:fillType="evenOdd"
         android:pathData="M12.2922,20.5C7.9993,20.5 6.4484,18.0648 6.1563,15.2353H8.0442C8.2915,17.2067 9.0781,18.8765 12.2922,18.8765C14.36,18.8765 15.9558,17.6241 15.9558,15.7456C15.9558,13.867 15.1242,13.0553 12.0674,12.5682C8.696,12.0116 6.6957,10.9679 6.6957,7.9993C6.6957,5.4714 8.8309,3.5 11.8651,3.5C15.1017,3.5 17.0571,5.1003 17.3942,8.0689H15.6411C15.259,5.9584 14.1127,5.1235 11.8651,5.1235C9.64,5.1235 8.5162,6.2367 8.5162,7.8138C8.5162,9.4141 9.1006,10.2954 12.3821,10.7824C15.9558,11.339 17.8438,12.4986 17.8438,15.6064C17.8438,18.3895 15.4838,20.5 12.2922,20.5Z" />
     <path
-        android:fillColor="#FFFFFF"
+        android:fillColor="@color/white"
         android:pathData="M4,11h16v2h-16z" />
 </vector>
diff --git a/core-ui/src/main/res/drawable/ic_more.xml b/core-ui/src/main/res/drawable/ic_more.xml
deleted file mode 100644
index 24ab2c4563..0000000000
--- a/core-ui/src/main/res/drawable/ic_more.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:pathData="M8.5,12C8.5,12.8284 7.8284,13.5 7,13.5C6.1716,13.5 5.5,12.8284 5.5,12C5.5,11.1716 6.1716,10.5 7,10.5C7.8284,10.5 8.5,11.1716 8.5,12Z"
-      android:fillColor="#ACA996"/>
-  <path
-      android:pathData="M13.5,12C13.5,12.8284 12.8284,13.5 12,13.5C11.1716,13.5 10.5,12.8284 10.5,12C10.5,11.1716 11.1716,10.5 12,10.5C12.8284,10.5 13.5,11.1716 13.5,12Z"
-      android:fillColor="#ACA996"/>
-  <path
-      android:pathData="M18.5,12C18.5,12.8284 17.8284,13.5 17,13.5C16.1716,13.5 15.5,12.8284 15.5,12C15.5,11.1716 16.1716,10.5 17,10.5C17.8284,10.5 18.5,11.1716 18.5,12Z"
-      android:fillColor="#ACA996"/>
-  <path
-      android:pathData="M12,21.5C17.2467,21.5 21.5,17.2467 21.5,12C21.5,6.7533 17.2467,2.5 12,2.5C6.7533,2.5 2.5,6.7533 2.5,12C2.5,17.2467 6.7533,21.5 12,21.5ZM12,23C18.0751,23 23,18.0751 23,12C23,5.9249 18.0751,1 12,1C5.9249,1 1,5.9249 1,12C1,18.0751 5.9249,23 12,23Z"
-      android:fillColor="#ACA996"
-      android:fillType="evenOdd"/>
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_multi_select_copy.xml b/core-ui/src/main/res/drawable/ic_multi_select_copy.xml
deleted file mode 100644
index def49cf607..0000000000
--- a/core-ui/src/main/res/drawable/ic_multi_select_copy.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:pathData="M10,6.75L19,6.75A3.25,3.25 0,0 1,22.25 10L22.25,19A3.25,3.25 0,0 1,19 22.25L10,22.25A3.25,3.25 0,0 1,6.75 19L6.75,10A3.25,3.25 0,0 1,10 6.75z"
-      android:strokeWidth="1.5"
-      android:fillColor="#00000000"
-      android:strokeColor="#ACA996" />
-  <path
-      android:pathData="M5,2.5H14C15.3807,2.5 16.5,3.6193 16.5,5V6H18V5C18,2.7909 16.2091,1 14,1H5C2.7909,1 1,2.7909 1,5V14C1,16.2091 2.7909,18 5,18H6V16.5H5C3.6193,16.5 2.5,15.3807 2.5,14V5C2.5,3.6193 3.6193,2.5 5,2.5Z"
-      android:fillColor="#ACA996"
-      android:fillType="evenOdd" />
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_multi_select_delete.xml b/core-ui/src/main/res/drawable/ic_multi_select_delete.xml
deleted file mode 100644
index 7c5e9481dd..0000000000
--- a/core-ui/src/main/res/drawable/ic_multi_select_delete.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:pathData="M8.75,3C8.75,2.3096 9.3096,1.75 10,1.75H14C14.6904,1.75 15.25,2.3096 15.25,3V5.25H8.75V3Z"
-        android:strokeWidth="1.5"
-        android:fillColor="#00000000"
-        android:strokeColor="#ACA996" />
-    <path
-        android:pathData="M5.6577,19.5743L5.2705,5.25H18.7268L18.291,19.5836C18.2459,21.0691 17.0285,22.25 15.5423,22.25H8.4067C6.9168,22.25 5.6979,21.0636 5.6577,19.5743Z"
-        android:strokeWidth="1.5"
-        android:fillColor="#00000000"
-        android:strokeColor="#ACA996" />
-    <path
-        android:pathData="M9.3125,8.001H10.8125V19.501H9.3125V8.001Z"
-        android:fillColor="#ACA996" />
-    <path
-        android:pathData="M13.3125,8.001H14.8125V19.501H13.3125V8.001Z"
-        android:fillColor="#ACA996" />
-    <path
-        android:pathData="M3.2485,6C2.8343,6 2.5,5.6642 2.5,5.25C2.5,4.8358 2.8358,4.5 3.25,4.5L20.75,4.5C21.1642,4.5 21.5,4.8358 21.5,5.25C21.5,5.6642 21.1668,6 20.7526,6C17.5914,6 6.2745,6 3.2485,6Z"
-        android:fillColor="#ACA996" />
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_multi_select_turn_into.xml b/core-ui/src/main/res/drawable/ic_multi_select_turn_into.xml
deleted file mode 100644
index 1bfeda9869..0000000000
--- a/core-ui/src/main/res/drawable/ic_multi_select_turn_into.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:pathData="M2.5331,18.7812C2.533,18.7812 2.5329,18.7812 2.5313,18.0312C2.5297,17.2813 2.5297,17.2813 2.5298,17.2813L4.853,17.2764C6.2719,17.2734 8.2056,17.2695 10.2642,17.2656C14.3811,17.2578 18.9992,17.25 21,17.25V18.75C19.0009,18.75 14.3846,18.7578 10.2671,18.7656C8.2086,18.7695 6.275,18.7734 4.8561,18.7764L2.5331,18.7812Z"
-      android:fillColor="#ACA996"
-      android:fillType="evenOdd" />
-  <path
-      android:pathData="M3,5.25H21V6.75H3V5.25Z"
-      android:fillColor="#ACA996"
-      android:fillType="evenOdd" />
-  <path
-      android:pathData="M17.1884,1.2197C17.4813,0.9268 17.9562,0.9268 18.2491,1.2197L23.0294,6L18.2491,10.7803C17.9562,11.0732 17.4813,11.0732 17.1884,10.7803C16.8955,10.4874 16.8955,10.0126 17.1884,9.7197L20.9081,6L17.1884,2.2803C16.8955,1.9874 16.8955,1.5126 17.1884,1.2197Z"
-      android:fillColor="#ACA996"
-      android:fillType="evenOdd" />
-  <path
-      android:pathData="M6.7803,22.7803C6.4874,23.0732 6.0126,23.0732 5.7197,22.7803L0.9393,18L5.7197,13.2197C6.0126,12.9268 6.4874,12.9268 6.7803,13.2197C7.0732,13.5126 7.0732,13.9874 6.7803,14.2803L3.0607,18L6.7803,21.7197C7.0732,22.0126 7.0732,22.4874 6.7803,22.7803Z"
-      android:fillColor="#ACA996"
-      android:fillType="evenOdd" />
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_nav_panel_back.xml b/core-ui/src/main/res/drawable/ic_nav_panel_back.xml
index 26caf44abc..4ded188ee9 100644
--- a/core-ui/src/main/res/drawable/ic_nav_panel_back.xml
+++ b/core-ui/src/main/res/drawable/ic_nav_panel_back.xml
@@ -6,7 +6,7 @@
   <path
       android:pathData="M20,25L11,16L20,7"
       android:strokeWidth="1.5"
-      android:fillColor="#00000000"
+      android:fillColor="@color/transparent_black"
       android:strokeColor="@color/glyph_active"
       android:strokeLineCap="round"/>
 </vector>
diff --git a/core-ui/src/main/res/drawable/ic_nav_panel_search.xml b/core-ui/src/main/res/drawable/ic_nav_panel_search.xml
index d2d6e9b8f7..be62682382 100644
--- a/core-ui/src/main/res/drawable/ic_nav_panel_search.xml
+++ b/core-ui/src/main/res/drawable/ic_nav_panel_search.xml
@@ -6,12 +6,12 @@
   <path
       android:pathData="M15,13.998m-7.25,0a7.25,7.25 0,1 1,14.5 0a7.25,7.25 0,1 1,-14.5 0"
       android:strokeWidth="1.5"
-      android:fillColor="#00000000"
+      android:fillColor="@color/transparent_black"
       android:strokeColor="@color/glyph_active"/>
   <path
       android:pathData="M26,24.998L20.5,19.5"
       android:strokeWidth="1.5"
-      android:fillColor="#00000000"
+      android:fillColor="@color/transparent_black"
       android:strokeColor="@color/glyph_active"
       android:strokeLineCap="round"/>
 </vector>
diff --git a/core-ui/src/main/res/drawable/ic_nav_panel_vault.xml b/core-ui/src/main/res/drawable/ic_nav_panel_vault.xml
index c9ab0594f3..756f778dc4 100644
--- a/core-ui/src/main/res/drawable/ic_nav_panel_vault.xml
+++ b/core-ui/src/main/res/drawable/ic_nav_panel_vault.xml
@@ -6,13 +6,13 @@
   <path
       android:pathData="M6,23.998V13.998L16,5.998L26,13.998V23.998"
       android:strokeWidth="1.5"
-      android:fillColor="#00000000"
+      android:fillColor="@color/transparent_black"
       android:strokeColor="@color/glyph_active"
       android:strokeLineCap="round"/>
   <path
       android:pathData="M13.5,23.998V18.498C13.5,17.117 14.619,15.998 16,15.998V15.998C17.381,15.998 18.5,17.117 18.5,18.498V23.998"
       android:strokeWidth="1.5"
-      android:fillColor="#00000000"
+      android:fillColor="@color/transparent_black"
       android:strokeColor="@color/glyph_active"
       android:strokeLineCap="round"/>
 </vector>
diff --git a/core-ui/src/main/res/drawable/ic_nav_profile_icon_placeholder_circle.xml b/core-ui/src/main/res/drawable/ic_nav_profile_icon_placeholder_circle.xml
deleted file mode 100644
index 528ead6846..0000000000
--- a/core-ui/src/main/res/drawable/ic_nav_profile_icon_placeholder_circle.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="oval">
-    <solid android:color="@color/shape_primary" />
-</shape>
\ No newline at end of file
diff --git a/core-ui/src/main/res/drawable/ic_navigation_close_cross.xml b/core-ui/src/main/res/drawable/ic_navigation_close_cross.xml
deleted file mode 100644
index 02ca4d5b2e..0000000000
--- a/core-ui/src/main/res/drawable/ic_navigation_close_cross.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="20dp"
-    android:height="20dp"
-    android:viewportWidth="20"
-    android:viewportHeight="20">
-  <path
-      android:pathData="M4.47,4.47C4.763,4.177 5.237,4.177 5.53,4.47L15.53,14.47C15.823,14.763 15.823,15.237 15.53,15.53C15.237,15.823 14.763,15.823 14.47,15.53L4.47,5.53C4.177,5.237 4.177,4.763 4.47,4.47Z"
-      android:fillColor="@color/glyph_active"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M15.53,4.47C15.237,4.177 14.763,4.177 14.47,4.47L4.47,14.47C4.177,14.763 4.177,15.237 4.47,15.53C4.763,15.823 5.237,15.823 5.53,15.53L15.53,5.53C15.823,5.237 15.823,4.763 15.53,4.47Z"
-      android:fillColor="@color/glyph_active"
-      android:fillType="evenOdd"/>
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_network_settings_checked.xml b/core-ui/src/main/res/drawable/ic_network_settings_checked.xml
index 6fe5f45d45..4caaf54b6f 100644
--- a/core-ui/src/main/res/drawable/ic_network_settings_checked.xml
+++ b/core-ui/src/main/res/drawable/ic_network_settings_checked.xml
@@ -5,6 +5,6 @@
     android:viewportHeight="24">
   <path
       android:pathData="M18.632,6.403L11.13,18.192L5.469,12.531L6.529,11.47L10.868,15.809L17.366,5.598L18.632,6.403Z"
-      android:fillColor="#D4D4D4"
+      android:fillColor="@color/network_light_gray"
       android:fillType="evenOdd"/>
 </vector>
diff --git a/core-ui/src/main/res/drawable/ic_new_page.xml b/core-ui/src/main/res/drawable/ic_new_page.xml
deleted file mode 100644
index a486c85252..0000000000
--- a/core-ui/src/main/res/drawable/ic_new_page.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="25dp"
-    android:viewportWidth="24"
-    android:viewportHeight="25">
-  <path
-      android:pathData="M13.5,2.625H12V8.125C12,9.2296 12.8954,10.125 14,10.125H19.5V8.625H14C13.7239,8.625 13.5,8.4011 13.5,8.125V2.625Z"
-      android:fillColor="#ACA996"/>
-  <path
-      android:pathData="M4.75,4.125C4.75,3.4346 5.3096,2.875 6,2.875H13.5858C13.6521,2.875 13.7157,2.9013 13.7626,2.9482L14.2894,2.4214L13.7626,2.9482L19.1768,8.3624C19.2237,8.4093 19.25,8.4729 19.25,8.5392V20.125C19.25,20.8154 18.6904,21.375 18,21.375H6C5.3096,21.375 4.75,20.8154 4.75,20.125V4.125Z"
-      android:strokeWidth="1.5"
-      android:fillColor="#00000000"
-      android:strokeColor="#ACA996"/>
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_object_action_archive.xml b/core-ui/src/main/res/drawable/ic_object_action_archive.xml
index e27394de2f..7f46ae133e 100644
--- a/core-ui/src/main/res/drawable/ic_object_action_archive.xml
+++ b/core-ui/src/main/res/drawable/ic_object_action_archive.xml
@@ -6,12 +6,12 @@
   <path
       android:pathData="M8.75,3C8.75,2.3096 9.3096,1.75 10,1.75H14C14.6904,1.75 15.25,2.3096 15.25,3V5.25H8.75V3Z"
       android:strokeWidth="1.5"
-      android:fillColor="#00000000"
+      android:fillColor="@color/transparent_black"
       android:strokeColor="@color/glyph_active"/>
   <path
       android:pathData="M5.6577,19.5743L5.2705,5.25H18.7268L18.291,19.5836C18.2459,21.0691 17.0285,22.25 15.5423,22.25H8.4067C6.9168,22.25 5.6979,21.0636 5.6577,19.5743Z"
       android:strokeWidth="1.5"
-      android:fillColor="#00000000"
+      android:fillColor="@color/transparent_black"
       android:strokeColor="@color/glyph_active"/>
   <path
       android:pathData="M9.3125,8.001H10.8125V19.501H9.3125V8.001Z"
diff --git a/core-ui/src/main/res/drawable/ic_object_menu_cover.xml b/core-ui/src/main/res/drawable/ic_object_menu_cover.xml
index 08d525b814..8691a5d301 100644
--- a/core-ui/src/main/res/drawable/ic_object_menu_cover.xml
+++ b/core-ui/src/main/res/drawable/ic_object_menu_cover.xml
@@ -6,10 +6,10 @@
   <path
       android:pathData="M22,0L22,0A22,22 0,0 1,44 22L44,22A22,22 0,0 1,22 44L22,44A22,22 0,0 1,0 22L0,22A22,22 0,0 1,22 0z"
       android:strokeAlpha="0.2"
-      android:fillColor="#5DD400"
+      android:fillColor="@color/palette_system_green"
       android:fillAlpha="0.2"/>
   <path
       android:pathData="M15,14H29C30.3807,14 31.5,15.1193 31.5,16.5V27.4999L24.5303,20.5302C24.2374,20.2373 23.7626,20.2373 23.4697,20.5302L20.0303,23.9696C19.7374,24.2625 19.2626,24.2625 18.9697,23.9696L18.0303,23.0302C17.7374,22.7373 17.2626,22.7373 16.9697,23.0302L12.5,27.4999V16.5C12.5,15.1193 13.6193,14 15,14ZM11,16.5C11,14.2909 12.7909,12.5 15,12.5H29C31.2091,12.5 33,14.2909 33,16.5V27.5C33,29.7091 31.2091,31.5 29,31.5H15C12.7909,31.5 11,29.7091 11,27.5V16.5ZM17.5,20.5C16.3954,20.5 15.5,19.6046 15.5,18.5C15.5,17.3954 16.3954,16.5 17.5,16.5C18.6046,16.5 19.5,17.3954 19.5,18.5C19.5,19.6046 18.6046,20.5 17.5,20.5Z"
-      android:fillColor="#5DD400"
+      android:fillColor="@color/palette_system_green"
       android:fillType="evenOdd"/>
 </vector>
diff --git a/core-ui/src/main/res/drawable/ic_object_menu_history.xml b/core-ui/src/main/res/drawable/ic_object_menu_history.xml
index 96518a670e..534e99d7c7 100644
--- a/core-ui/src/main/res/drawable/ic_object_menu_history.xml
+++ b/core-ui/src/main/res/drawable/ic_object_menu_history.xml
@@ -6,14 +6,14 @@
   <path
       android:pathData="M22,0L22,0A22,22 0,0 1,44 22L44,22A22,22 0,0 1,22 44L22,44A22,22 0,0 1,0 22L0,22A22,22 0,0 1,22 0z"
       android:strokeAlpha="0.2"
-      android:fillColor="#2AA7EE"
+      android:fillColor="@color/palette_system_sky"
       android:fillAlpha="0.2"/>
   <path
       android:pathData="M22,31.5C27.2467,31.5 31.5,27.2467 31.5,22C31.5,16.7533 27.2467,12.5 22,12.5C16.7533,12.5 12.5,16.7533 12.5,22H15.0428C15.4883,22 15.7114,22.5386 15.3964,22.8536L11.8535,26.3964C11.6582,26.5917 11.3417,26.5917 11.1464,26.3964L7.6035,22.8536C7.2885,22.5386 7.5116,22 7.9571,22H10.5C10.5,15.6487 15.6487,10.5 22,10.5C28.3512,10.5 33.5,15.6487 33.5,22C33.5,28.3513 28.3512,33.5 22,33.5C19.1839,33.5 16.6042,32.4878 14.6049,30.8074C14.1822,30.452 14.1848,29.8151 14.5753,29.4246C14.9658,29.034 15.596,29.0387 16.0252,29.3863C17.6573,30.7082 19.7361,31.5 22,31.5Z"
-      android:fillColor="#2AA7EE"
+      android:fillColor="@color/palette_system_sky"
       android:fillType="evenOdd"/>
   <path
       android:pathData="M22,14.5C22.5523,14.5 23,14.9477 23,15.5V21.5856L25.7071,24.2929C26.0976,24.6835 26.0976,25.3166 25.7071,25.7071C25.3165,26.0976 24.6834,26.0976 24.2929,25.7071L21,22.414V15.5C21,14.9477 21.4477,14.5 22,14.5Z"
-      android:fillColor="#2AA7EE"
+      android:fillColor="@color/palette_system_sky"
       android:fillType="evenOdd"/>
 </vector>
diff --git a/core-ui/src/main/res/drawable/ic_object_menu_icon.xml b/core-ui/src/main/res/drawable/ic_object_menu_icon.xml
index 1d2e3ec8a6..6d373fc6ab 100644
--- a/core-ui/src/main/res/drawable/ic_object_menu_icon.xml
+++ b/core-ui/src/main/res/drawable/ic_object_menu_icon.xml
@@ -6,10 +6,10 @@
   <path
       android:pathData="M22,0L22,0A22,22 0,0 1,44 22L44,22A22,22 0,0 1,22 44L22,44A22,22 0,0 1,0 22L0,22A22,22 0,0 1,22 0z"
       android:strokeAlpha="0.2"
-      android:fillColor="#FFB522"
+      android:fillColor="@color/palette_system_amber_100"
       android:fillAlpha="0.2"/>
   <path
       android:pathData="M22,33C28.0751,33 33,28.0751 33,22C33,15.9249 28.0751,11 22,11C15.9249,11 11,15.9249 11,22C11,28.0751 15.9249,33 22,33ZM18.554,20.9688C19.3086,20.9688 19.9204,20.1992 19.9204,19.25C19.9204,18.3008 19.3086,17.5312 18.554,17.5312C17.7993,17.5312 17.1875,18.3008 17.1875,19.25C17.1875,20.1992 17.7993,20.9688 18.554,20.9688ZM26.8125,19.25C26.8125,20.1992 26.1969,20.9688 25.4375,20.9688C24.6781,20.9688 24.0625,20.1992 24.0625,19.25C24.0625,18.3008 24.6781,17.5312 25.4375,17.5312C26.1969,17.5312 26.8125,18.3008 26.8125,19.25ZM27.8883,23.6756C28.2621,23.5766 28.6186,23.9042 28.491,24.2693C27.5538,26.9517 25.0011,28.876 21.999,28.876C19.0019,28.876 16.4527,26.9582 15.5117,24.2828C15.3826,23.9155 15.7436,23.5865 16.1193,23.6888C17.2704,24.0022 19.3515,24.4348 21.999,24.4073C24.6539,24.4073 26.7391,23.9801 27.8883,23.6756Z"
-      android:fillColor="#FFB522"
+      android:fillColor="@color/palette_system_amber_100"
       android:fillType="evenOdd"/>
 </vector>
diff --git a/core-ui/src/main/res/drawable/ic_object_menu_layout.xml b/core-ui/src/main/res/drawable/ic_object_menu_layout.xml
index 120f188ef9..717d07d6e2 100644
--- a/core-ui/src/main/res/drawable/ic_object_menu_layout.xml
+++ b/core-ui/src/main/res/drawable/ic_object_menu_layout.xml
@@ -6,10 +6,10 @@
   <path
       android:pathData="M22,0L22,0A22,22 0,0 1,44 22L44,22A22,22 0,0 1,22 44L22,44A22,22 0,0 1,0 22L0,22A22,22 0,0 1,22 0z"
       android:strokeAlpha="0.2"
-      android:fillColor="#3E58EB"
+      android:fillColor="@color/palette_system_blue"
       android:fillAlpha="0.2"/>
   <path
       android:pathData="M14.5,13C13.3954,13 12.5,13.8954 12.5,15V19C12.5,20.1046 13.3954,21 14.5,21H18.5C19.6046,21 20.5,20.1046 20.5,19V15C20.5,13.8954 19.6046,13 18.5,13H14.5ZM23.5,14.5C23.5,13.9477 23.9477,13.5 24.5,13.5H30.5C31.0523,13.5 31.5,13.9477 31.5,14.5C31.5,15.0523 31.0523,15.5 30.5,15.5H24.5C23.9477,15.5 23.5,15.0523 23.5,14.5ZM23.5,19.5C23.5,18.9477 23.9477,18.5 24.5,18.5H30.5C31.0523,18.5 31.5,18.9477 31.5,19.5C31.5,20.0523 31.0523,20.5 30.5,20.5H24.5C23.9477,20.5 23.5,20.0523 23.5,19.5ZM13.5,23.5C12.9477,23.5 12.5,23.9477 12.5,24.5C12.5,25.0523 12.9477,25.5 13.5,25.5H30.5C31.0523,25.5 31.5,25.0523 31.5,24.5C31.5,23.9477 31.0523,23.5 30.5,23.5H13.5ZM12.5,29.5C12.5,28.9477 12.9477,28.5 13.5,28.5H30.5C31.0523,28.5 31.5,28.9477 31.5,29.5C31.5,30.0523 31.0523,30.5 30.5,30.5H13.5C12.9477,30.5 12.5,30.0523 12.5,29.5Z"
-      android:fillColor="#3E58EB"
+      android:fillColor="@color/palette_system_blue"
       android:fillType="evenOdd"/>
 </vector>
diff --git a/core-ui/src/main/res/drawable/ic_object_menu_relations.xml b/core-ui/src/main/res/drawable/ic_object_menu_relations.xml
index a25a6aba87..b706f2fb15 100644
--- a/core-ui/src/main/res/drawable/ic_object_menu_relations.xml
+++ b/core-ui/src/main/res/drawable/ic_object_menu_relations.xml
@@ -6,10 +6,10 @@
   <path
       android:pathData="M22,0L22,0A22,22 0,0 1,44 22L44,22A22,22 0,0 1,22 44L22,44A22,22 0,0 1,0 22L0,22A22,22 0,0 1,22 0z"
       android:strokeAlpha="0.2"
-      android:fillColor="#AB50CC"
+      android:fillColor="@color/palette_system_purple"
       android:fillAlpha="0.2"/>
   <path
       android:pathData="M24.5,12.5C24.5,13.8807 23.3807,15 22,15C20.6193,15 19.5,13.8807 19.5,12.5C19.5,11.1193 20.6193,10 22,10C23.3807,10 24.5,11.1193 24.5,12.5ZM12.75,31C14.1307,31 15.25,29.8807 15.25,28.5C15.25,27.1193 14.1307,26 12.75,26C11.3693,26 10.25,27.1193 10.25,28.5C10.25,29.8807 11.3693,31 12.75,31ZM31.25,31C32.6307,31 33.75,29.8807 33.75,28.5C33.75,27.1193 32.6307,26 31.25,26C29.8693,26 28.75,27.1193 28.75,28.5C28.75,29.8807 29.8693,31 31.25,31ZM18.25,27.5C17.6977,27.5 17.25,27.9477 17.25,28.5C17.25,29.0523 17.6977,29.5 18.25,29.5H25.75C26.3023,29.5 26.75,29.0523 26.75,28.5C26.75,27.9477 26.3023,27.5 25.75,27.5H18.25ZM19.7525,16.4355C20.23,16.713 20.392,17.3251 20.1144,17.8026L16.3644,24.2528C16.0869,24.7302 15.4748,24.8923 14.9973,24.6147C14.5199,24.3371 14.3578,23.725 14.6354,23.2476L18.3854,16.7974C18.663,16.3199 19.2751,16.1579 19.7525,16.4355ZM23.8856,17.8026C23.608,17.3251 23.77,16.713 24.2475,16.4355C24.7249,16.1579 25.337,16.3199 25.6146,16.7974L29.3646,23.2476C29.6422,23.725 29.4801,24.3371 29.0027,24.6147C28.5252,24.8923 27.9131,24.7302 27.6356,24.2528L23.8856,17.8026Z"
-      android:fillColor="#AB50CC"
+      android:fillColor="@color/palette_system_purple"
       android:fillType="evenOdd"/>
 </vector>
diff --git a/core-ui/src/main/res/drawable/ic_object_relation_format_date.xml b/core-ui/src/main/res/drawable/ic_object_relation_format_date.xml
deleted file mode 100644
index 15dc38748a..0000000000
--- a/core-ui/src/main/res/drawable/ic_object_relation_format_date.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="oval">
-    <solid android:color="#FFC107" />
-</shape>
\ No newline at end of file
diff --git a/core-ui/src/main/res/drawable/ic_object_relation_format_emoji.xml b/core-ui/src/main/res/drawable/ic_object_relation_format_emoji.xml
deleted file mode 100644
index 5f910b9e07..0000000000
--- a/core-ui/src/main/res/drawable/ic_object_relation_format_emoji.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="oval">
-    <solid android:color="#3F51B5" />
-</shape>
\ No newline at end of file
diff --git a/core-ui/src/main/res/drawable/ic_object_relation_format_number.xml b/core-ui/src/main/res/drawable/ic_object_relation_format_number.xml
deleted file mode 100644
index bc02e01b61..0000000000
--- a/core-ui/src/main/res/drawable/ic_object_relation_format_number.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="oval">
-    <solid android:color="#FF5722" />
-</shape>
\ No newline at end of file
diff --git a/core-ui/src/main/res/drawable/ic_object_relation_format_object.xml b/core-ui/src/main/res/drawable/ic_object_relation_format_object.xml
deleted file mode 100644
index 143f223b36..0000000000
--- a/core-ui/src/main/res/drawable/ic_object_relation_format_object.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="oval">
-    <solid android:color="#FF9800" />
-</shape>
\ No newline at end of file
diff --git a/core-ui/src/main/res/drawable/ic_object_relation_format_text.xml b/core-ui/src/main/res/drawable/ic_object_relation_format_text.xml
deleted file mode 100644
index ae5691574e..0000000000
--- a/core-ui/src/main/res/drawable/ic_object_relation_format_text.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="oval">
-    <solid android:color="#03A9F4" />
-</shape>
\ No newline at end of file
diff --git a/core-ui/src/main/res/drawable/ic_object_relation_format_title.xml b/core-ui/src/main/res/drawable/ic_object_relation_format_title.xml
deleted file mode 100644
index 7f4ed3d18a..0000000000
--- a/core-ui/src/main/res/drawable/ic_object_relation_format_title.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="oval">
-    <solid android:color="#673AB7" />
-</shape>
\ No newline at end of file
diff --git a/core-ui/src/main/res/drawable/ic_onboarding_settings.xml b/core-ui/src/main/res/drawable/ic_onboarding_settings.xml
index 4870cc3376..97f690ff68 100644
--- a/core-ui/src/main/res/drawable/ic_onboarding_settings.xml
+++ b/core-ui/src/main/res/drawable/ic_onboarding_settings.xml
@@ -5,6 +5,6 @@
     android:viewportHeight="32">
   <path
       android:pathData="M15.25,5.75C15.25,5.336 15.586,5 16,5C16.414,5 16.75,5.336 16.75,5.75V7.533C17.755,7.621 18.711,7.883 19.585,8.291L20.476,6.748C20.683,6.39 21.141,6.267 21.5,6.474C21.796,6.645 21.932,6.988 21.853,7.304C21.837,7.371 21.81,7.436 21.774,7.499L20.883,9.042C21.689,9.608 22.392,10.311 22.958,11.117L24.502,10.225C24.861,10.018 25.319,10.141 25.526,10.5C25.733,10.859 25.611,11.317 25.252,11.524L23.709,12.415C24.117,13.289 24.379,14.245 24.467,15.25H26.25C26.664,15.25 27,15.586 27,16C27,16.414 26.664,16.75 26.25,16.75H24.467C24.379,17.755 24.117,18.711 23.709,19.585L25.252,20.476C25.611,20.683 25.733,21.141 25.526,21.5C25.319,21.859 24.861,21.982 24.502,21.775L22.958,20.883C22.392,21.689 21.689,22.392 20.883,22.958L21.774,24.502C21.852,24.636 21.883,24.785 21.873,24.929C21.86,25.115 21.778,25.293 21.637,25.425C21.596,25.463 21.551,25.497 21.5,25.526C21.141,25.733 20.683,25.61 20.476,25.252L19.585,23.709C18.711,24.117 17.755,24.379 16.75,24.467V26.25C16.75,26.664 16.414,27 16,27C15.586,27 15.25,26.664 15.25,26.25V24.467C14.245,24.379 13.29,24.117 12.415,23.709L11.524,25.252C11.317,25.611 10.859,25.733 10.5,25.526C10.141,25.319 10.018,24.861 10.226,24.502L11.117,22.958C10.311,22.392 9.608,21.689 9.042,20.883L7.498,21.774C7.139,21.982 6.681,21.859 6.474,21.5C6.267,21.141 6.389,20.683 6.748,20.475L8.291,19.585C7.883,18.711 7.621,17.755 7.533,16.75H5.75C5.724,16.75 5.699,16.749 5.673,16.746C5.295,16.708 5,16.388 5,16C5,15.586 5.336,15.25 5.75,15.25H7.533C7.621,14.245 7.883,13.29 8.291,12.415L6.748,11.525C6.389,11.318 6.267,10.859 6.474,10.5C6.681,10.141 7.139,10.019 7.498,10.226L9.042,11.117C9.608,10.311 10.311,9.608 11.117,9.042L10.226,7.498C10.018,7.139 10.141,6.681 10.5,6.474C10.859,6.267 11.317,6.389 11.524,6.748L12.415,8.291C13.29,7.883 14.245,7.621 15.25,7.533V5.75ZM9.04,16.75C9.414,20.263 12.387,23 16,23C17.008,23 17.966,22.787 18.831,22.404L15.567,16.75H9.04ZM15.567,15.25H9.04C9.414,11.737 12.387,9 16,9C17.008,9 17.966,9.213 18.831,9.596L15.567,15.25ZM20.13,21.653L16.866,16L20.13,10.347C21.87,11.621 23,13.678 23,16C23,18.322 21.87,20.379 20.13,21.653Z"
-      android:fillColor="#7B7A72"
+      android:fillColor="@color/settings_dark_gray"
       android:fillType="evenOdd"/>
 </vector>
diff --git a/core-ui/src/main/res/drawable/ic_open_as_page.xml b/core-ui/src/main/res/drawable/ic_open_as_page.xml
deleted file mode 100644
index 6205d26ec9..0000000000
--- a/core-ui/src/main/res/drawable/ic_open_as_page.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:pathData="M13,5.75C13,5.3358 13.3358,5 13.75,5H19V6.5H13.75C13.3358,6.5 13,6.1642 13,5.75Z"
-      android:fillColor="#ffffff"/>
-  <path
-      android:pathData="M18.25,11C17.8358,11 17.5,10.6642 17.5,10.25V5H19V10.25C19,10.6642 18.6642,11 18.25,11Z"
-      android:fillColor="#ffffff"/>
-  <path
-      android:pathData="M18.5303,6.5304L13.5303,11.5304L12.4697,10.4697L17.4697,5.4697L18.5303,6.5304Z"
-      android:fillColor="#ffffff"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M5.4697,17.4696L10.4697,12.4696L11.5303,13.5303L6.5303,18.5303L5.4697,17.4696Z"
-      android:fillColor="#ffffff"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M11,18.25C11,18.6642 10.6642,19 10.25,19H5V17.5H10.25C10.6642,17.5 11,17.8358 11,18.25Z"
-      android:fillColor="#ffffff"/>
-  <path
-      android:pathData="M5.75,13C6.1642,13 6.5,13.3358 6.5,13.75L6.5,19H5L5,13.75C5,13.3358 5.3358,13 5.75,13Z"
-      android:fillColor="#ffffff"/>
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_option_add.xml b/core-ui/src/main/res/drawable/ic_option_add.xml
deleted file mode 100644
index b6f42ed979..0000000000
--- a/core-ui/src/main/res/drawable/ic_option_add.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:pathData="M11.25,4.75C11.25,4.3358 11.5858,4 12,4C12.4142,4 12.75,4.3358 12.75,4.75V19.25C12.75,19.6642 12.4142,20 12,20C11.5858,20 11.25,19.6642 11.25,19.25V4.75Z"
-      android:fillColor="@color/glyph_active"/>
-  <path
-      android:pathData="M19.25,11.25C19.6642,11.25 20,11.5858 20,12C20,12.4142 19.6642,12.75 19.25,12.75H4.75C4.3358,12.75 4,12.4142 4,12C4,11.5858 4.3358,11.25 4.75,11.25L19.25,11.25Z"
-      android:fillColor="@color/glyph_active"/>
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_option_checked.xml b/core-ui/src/main/res/drawable/ic_option_checked.xml
index 6e3ff4c0ed..21aefc84b0 100644
--- a/core-ui/src/main/res/drawable/ic_option_checked.xml
+++ b/core-ui/src/main/res/drawable/ic_option_checked.xml
@@ -5,6 +5,6 @@
     android:viewportHeight="24">
   <path
       android:pathData="M18.6327,6.4025L11.1308,18.1913L5.4697,12.5302L6.5303,11.4695L10.8692,15.8084L17.3672,5.5972L18.6327,6.4025Z"
-      android:fillColor="#929082"
+      android:fillColor="@color/default_grey"
       android:fillType="evenOdd"/>
 </vector>
diff --git a/core-ui/src/main/res/drawable/ic_other_settings.xml b/core-ui/src/main/res/drawable/ic_other_settings.xml
deleted file mode 100644
index 1dad6d17f6..0000000000
--- a/core-ui/src/main/res/drawable/ic_other_settings.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="28dp"
-    android:height="28dp"
-    android:viewportWidth="28"
-    android:viewportHeight="28">
-  <path
-      android:pathData="M6,0L22,0A6,6 0,0 1,28 6L28,22A6,6 0,0 1,22 28L6,28A6,6 0,0 1,0 22L0,6A6,6 0,0 1,6 0z"
-      android:fillColor="#0FC8BA"/>
-  <path
-      android:pathData="M10,22C12.2091,22 14,20.2091 14,18C14,15.7909 12.2091,14 10,14C7.7909,14 6,15.7909 6,18C6,20.2091 7.7909,22 10,22Z"
-      android:fillColor="#ffffff"/>
-  <path
-      android:pathData="M18,14C20.2091,14 22,12.2091 22,10C22,7.7909 20.2091,6 18,6C15.7909,6 14,7.7909 14,10C14,12.2091 15.7909,14 18,14Z"
-      android:fillColor="#ffffff"/>
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_oval_9_copy.xml b/core-ui/src/main/res/drawable/ic_oval_9_copy.xml
deleted file mode 100644
index a60cb05eef..0000000000
--- a/core-ui/src/main/res/drawable/ic_oval_9_copy.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="7dp"
-    android:height="7dp"
-    android:viewportWidth="7"
-    android:viewportHeight="7">
-    <path
-        android:fillColor="#2C2B27"
-        android:pathData="M3.00293,6.98438C4.65978,6.98438 6.00293,5.64123 6.00293,3.98438C6.00293,2.32752 4.65978,0.98438 3.00293,0.98438C1.34608,0.98438 0.00293,2.32752 0.00293,3.98438C0.00293,5.64123 1.34608,6.98438 3.00293,6.98438Z" />
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_page_more.xml b/core-ui/src/main/res/drawable/ic_page_more.xml
deleted file mode 100644
index 14ed938218..0000000000
--- a/core-ui/src/main/res/drawable/ic_page_more.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="#ACA996"
-        android:pathData="M8,12C8,12.8284 7.3284,13.5 6.5,13.5C5.6716,13.5 5,12.8284 5,12C5,11.1716 5.6716,10.5 6.5,10.5C7.3284,10.5 8,11.1716 8,12Z" />
-    <path
-        android:fillColor="#ACA996"
-        android:pathData="M13.5,12C13.5,12.8284 12.8284,13.5 12,13.5C11.1716,13.5 10.5,12.8284 10.5,12C10.5,11.1716 11.1716,10.5 12,10.5C12.8284,10.5 13.5,11.1716 13.5,12Z" />
-    <path
-        android:fillColor="#ACA996"
-        android:pathData="M19.5,12C19.5,12.8284 18.8284,13.5 18,13.5C17.1716,13.5 16.5,12.8284 16.5,12C16.5,11.1716 17.1716,10.5 18,10.5C18.8284,10.5 19.5,11.1716 19.5,12Z" />
-    <path
-        android:fillColor="#ACA996"
-        android:fillType="evenOdd"
-        android:pathData="M12,21.5C17.2467,21.5 21.5,17.2467 21.5,12C21.5,6.7533 17.2467,2.5 12,2.5C6.7533,2.5 2.5,6.7533 2.5,12C2.5,17.2467 6.7533,21.5 12,21.5ZM12,23C18.0751,23 23,18.0751 23,12C23,5.9249 18.0751,1 12,1C5.9249,1 1,5.9249 1,12C1,18.0751 5.9249,23 12,23Z" />
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_page_toolbar_add_doc.xml b/core-ui/src/main/res/drawable/ic_page_toolbar_add_doc.xml
deleted file mode 100644
index 22e3592e19..0000000000
--- a/core-ui/src/main/res/drawable/ic_page_toolbar_add_doc.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="25dp"
-    android:height="24dp"
-    android:viewportWidth="25"
-    android:viewportHeight="24">
-  <path
-      android:pathData="M12,3L12,3A0.75,0.75 0,0 1,12.75 3.75L12.75,20.25A0.75,0.75 0,0 1,12 21L12,21A0.75,0.75 0,0 1,11.25 20.25L11.25,3.75A0.75,0.75 0,0 1,12 3z"
-      android:fillColor="@color/glyph_active"/>
-  <path
-      android:pathData="M3,12L3,12A0.75,0.75 0,0 1,3.75 11.25L20.25,11.25A0.75,0.75 0,0 1,21 12L21,12A0.75,0.75 0,0 1,20.25 12.75L3.75,12.75A0.75,0.75 0,0 1,3 12z"
-      android:fillColor="@color/glyph_active"/>
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_page_toolbar_navigation.xml b/core-ui/src/main/res/drawable/ic_page_toolbar_navigation.xml
deleted file mode 100644
index 2ae59b91b6..0000000000
--- a/core-ui/src/main/res/drawable/ic_page_toolbar_navigation.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="20dp"
-    android:height="20dp"
-    android:viewportWidth="20"
-    android:viewportHeight="20">
-  <path
-      android:pathData="M17,1.5H10C9.1716,1.5 8.5,2.1716 8.5,3V17C8.5,17.8284 9.1716,18.5 10,18.5H17C17.8284,18.5 18.5,17.8284 18.5,17V3C18.5,2.1716 17.8284,1.5 17,1.5ZM10,0C8.3432,0 7,1.3432 7,3V17C7,18.6569 8.3432,20 10,20H17C18.6569,20 20,18.6569 20,17V3C20,1.3432 18.6569,0 17,0H10Z"
-      android:fillColor="#ACA996"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M5,17V3C5,1.3432 6.3432,0 8,0H6.5C4.8432,0 3.5,1.3432 3.5,3V17C3.5,18.6569 4.8432,20 6.5,20H8C6.3432,20 5,18.6569 5,17Z"
-      android:fillColor="#ACA996"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M1.5,17V3C1.5,1.3432 2.8431,0 4.5,0H3C1.3432,0 0,1.3432 0,3V17C0,18.6569 1.3432,20 3,20H4.5C2.8431,20 1.5,18.6569 1.5,17Z"
-      android:fillColor="#ACA996"
-      android:fillType="evenOdd"/>
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_page_toolbar_search.xml b/core-ui/src/main/res/drawable/ic_page_toolbar_search.xml
deleted file mode 100644
index f053dd5bfc..0000000000
--- a/core-ui/src/main/res/drawable/ic_page_toolbar_search.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:pathData="M10,15.5C13.0376,15.5 15.5,13.0376 15.5,10C15.5,6.9624 13.0376,4.5 10,4.5C6.9624,4.5 4.5,6.9624 4.5,10C4.5,13.0376 6.9624,15.5 10,15.5ZM10,17C13.866,17 17,13.866 17,10C17,6.134 13.866,3 10,3C6.134,3 3,6.134 3,10C3,13.866 6.134,17 10,17Z"
-      android:fillColor="@color/glyph_active"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M14.4697,14.4697C14.7626,14.1768 15.2374,14.1768 15.5303,14.4697L20.5303,19.4697C20.8232,19.7626 20.8232,20.2374 20.5303,20.5303C20.2374,20.8232 19.7626,20.8232 19.4697,20.5303L14.4697,15.5303C14.1768,15.2374 14.1768,14.7626 14.4697,14.4697Z"
-      android:fillColor="@color/glyph_active"
-      android:fillType="evenOdd"/>
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_pencil_24.xml b/core-ui/src/main/res/drawable/ic_pencil_24.xml
deleted file mode 100644
index 359741c329..0000000000
--- a/core-ui/src/main/res/drawable/ic_pencil_24.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:pathData="M9.1205,19.8189L4.0006,21.025L5.1827,15.8779L17.6161,3.4445C18.1043,2.9564 18.8957,2.9564 19.3839,3.4445L21.5555,5.6161C22.0436,6.1043 22.0436,6.8957 21.5555,7.3839L9.1205,19.8189Z"
-      android:strokeWidth="1.5"
-      android:fillColor="#00000000"
-      android:strokeColor="#ACA996"/>
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_plus.xml b/core-ui/src/main/res/drawable/ic_plus.xml
index 5020cddfa4..f1cd212159 100644
--- a/core-ui/src/main/res/drawable/ic_plus.xml
+++ b/core-ui/src/main/res/drawable/ic_plus.xml
@@ -4,9 +4,9 @@
     android:viewportWidth="16"
     android:viewportHeight="17">
     <path
-        android:fillColor="#ACA996"
+        android:fillColor="@color/gray"
         android:pathData="M7,0.75h2v16h-2z" />
     <path
-        android:fillColor="#ACA996"
+        android:fillColor="@color/gray"
         android:pathData="M16,7.75l-0,2l-16,0l-0,-2z" />
 </vector>
diff --git a/core-ui/src/main/res/drawable/ic_preview_layout_card.xml b/core-ui/src/main/res/drawable/ic_preview_layout_card.xml
index 5548173f79..4219ae9de7 100644
--- a/core-ui/src/main/res/drawable/ic_preview_layout_card.xml
+++ b/core-ui/src/main/res/drawable/ic_preview_layout_card.xml
@@ -12,6 +12,6 @@
   <path
       android:pathData="M11,15.25L33,15.25A2.75,2.75 0,0 1,35.75 18L35.75,26A2.75,2.75 0,0 1,33 28.75L11,28.75A2.75,2.75 0,0 1,8.25 26L8.25,18A2.75,2.75 0,0 1,11 15.25z"
       android:strokeWidth="0.5"
-      android:fillColor="#00000000"
+      android:fillColor="@color/transparent_black"
       android:strokeColor="@color/glyph_active"/>
 </vector>
diff --git a/core-ui/src/main/res/drawable/ic_profile_back.xml b/core-ui/src/main/res/drawable/ic_profile_back.xml
deleted file mode 100644
index 712dd958ca..0000000000
--- a/core-ui/src/main/res/drawable/ic_profile_back.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:pathData="M15.7071,3.2929C16.0977,3.6834 16.0977,4.3166 15.7071,4.7071L8.4142,12L15.7071,19.2929C16.0977,19.6834 16.0977,20.3166 15.7071,20.7071C15.3166,21.0976 14.6834,21.0976 14.2929,20.7071L5.5858,12L14.2929,3.2929C14.6834,2.9024 15.3166,2.9024 15.7071,3.2929Z"
-      android:fillColor="#ffffff"
-      android:fillType="evenOdd"/>
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_properties.xml b/core-ui/src/main/res/drawable/ic_properties.xml
deleted file mode 100644
index c24d9242c2..0000000000
--- a/core-ui/src/main/res/drawable/ic_properties.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:pathData="M10,5L20,5A1,1 0,0 1,21 6L21,6A1,1 0,0 1,20 7L10,7A1,1 0,0 1,9 6L9,6A1,1 0,0 1,10 5z"
-      android:fillColor="#2C2B27"/>
-  <path
-      android:pathData="M10,11L20,11A1,1 0,0 1,21 12L21,12A1,1 0,0 1,20 13L10,13A1,1 0,0 1,9 12L9,12A1,1 0,0 1,10 11z"
-      android:fillColor="#2C2B27"/>
-  <path
-      android:pathData="M10,17L20,17A1,1 0,0 1,21 18L21,18A1,1 0,0 1,20 19L10,19A1,1 0,0 1,9 18L9,18A1,1 0,0 1,10 17z"
-      android:fillColor="#2C2B27"/>
-  <path
-      android:pathData="M5,6m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0"
-      android:fillColor="#2C2B27"/>
-  <path
-      android:pathData="M5,12m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0"
-      android:fillColor="#2C2B27"/>
-  <path
-      android:pathData="M5,18m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0"
-      android:fillColor="#2C2B27"/>
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_qr_code.xml b/core-ui/src/main/res/drawable/ic_qr_code.xml
deleted file mode 100644
index 3f5e66db74..0000000000
--- a/core-ui/src/main/res/drawable/ic_qr_code.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="29dp"
-    android:height="29dp"
-    android:viewportWidth="29"
-    android:viewportHeight="29">
-  <path
-      android:pathData="M6.875,0.5L22.875,0.5A6,6 0,0 1,28.875 6.5L28.875,22.5A6,6 0,0 1,22.875 28.5L6.875,28.5A6,6 0,0 1,0.875 22.5L0.875,6.5A6,6 0,0 1,6.875 0.5z"
-      android:fillColor="#2AA7EE"/>
-  <path
-      android:pathData="M17.875,14.5H19.375V16H17.875V14.5Z"
-      android:fillColor="#ffffff"/>
-  <path
-      android:pathData="M20.875,16H22.375V17.5H20.875V16Z"
-      android:fillColor="#ffffff"/>
-  <path
-      android:pathData="M17.875,20.5H19.375V22H17.875V20.5Z"
-      android:fillColor="#ffffff"/>
-  <path
-      android:pathData="M20.875,19H22.375V20.5H20.875V19Z"
-      android:fillColor="#ffffff"/>
-  <path
-      android:pathData="M19.375,17.5H20.875V19H19.375V17.5Z"
-      android:fillColor="#ffffff"/>
-  <path
-      android:pathData="M19.375,14.5H20.875V16H19.375V14.5Z"
-      android:fillColor="#ffffff"/>
-  <path
-      android:pathData="M19.375,20.5H20.875V22H19.375V20.5Z"
-      android:fillColor="#ffffff"/>
-  <path
-      android:pathData="M19.375,13H20.875V14.5H19.375V13Z"
-      android:fillColor="#ffffff"/>
-  <path
-      android:pathData="M13.375,16H14.875V17.5H13.375V16Z"
-      android:fillColor="#ffffff"/>
-  <path
-      android:pathData="M13.375,16H14.875V17.5H13.375V16Z"
-      android:fillColor="#ffffff"/>
-  <path
-      android:pathData="M17.875,16H19.375V17.5H17.875V16Z"
-      android:fillColor="#ffffff"/>
-  <path
-      android:pathData="M13.375,19H14.875V20.5H13.375V19Z"
-      android:fillColor="#ffffff"/>
-  <path
-      android:pathData="M16.375,17.5H17.875V19H16.375V17.5Z"
-      android:fillColor="#ffffff"/>
-  <path
-      android:pathData="M14.875,14.5H16.375V16H14.875V14.5Z"
-      android:fillColor="#ffffff"/>
-  <path
-      android:pathData="M14.875,20.5H16.375V22H14.875V20.5Z"
-      android:fillColor="#ffffff"/>
-  <path
-      android:pathData="M13.375,8.5H14.875V10H13.375V8.5Z"
-      android:fillColor="#ffffff"/>
-  <path
-      android:pathData="M13.375,8.5H14.875V10H13.375V8.5Z"
-      android:fillColor="#ffffff"/>
-  <path
-      android:pathData="M13.375,11.5H14.875V13H13.375V11.5Z"
-      android:fillColor="#ffffff"/>
-  <path
-      android:pathData="M14.875,10H16.375V11.5H14.875V10Z"
-      android:fillColor="#ffffff"/>
-  <path
-      android:pathData="M14.875,13H16.375V14.5H14.875V13Z"
-      android:fillColor="#ffffff"/>
-  <path
-      android:pathData="M11.875,13H13.375V14.5H11.875V13Z"
-      android:fillColor="#ffffff"/>
-  <path
-      android:pathData="M8.875,14.5H10.375V16H8.875V14.5Z"
-      android:fillColor="#ffffff"/>
-  <path
-      android:pathData="M10.375,14.5H11.875V16H10.375V14.5Z"
-      android:fillColor="#ffffff"/>
-  <path
-      android:pathData="M7.375,13H8.875V14.5H7.375V13Z"
-      android:fillColor="#ffffff"/>
-  <path
-      android:pathData="M11.875,8.5H8.875V11.5H11.875V8.5ZM7.375,7V13H13.375V7H7.375Z"
-      android:fillColor="#ffffff"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M20.875,8.5H17.875V11.5H20.875V8.5ZM16.375,7V13H22.375V7H16.375Z"
-      android:fillColor="#ffffff"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M11.875,17.5H8.875V20.5H11.875V17.5ZM7.375,16V22H13.375V16H7.375Z"
-      android:fillColor="#ffffff"
-      android:fillType="evenOdd"/>
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_redo.xml b/core-ui/src/main/res/drawable/ic_redo.xml
index f914b7106a..1c7ad91fd8 100644
--- a/core-ui/src/main/res/drawable/ic_redo.xml
+++ b/core-ui/src/main/res/drawable/ic_redo.xml
@@ -4,18 +4,18 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="#ACA996"
+        android:fillColor="@color/gray"
         android:fillType="evenOdd"
         android:pathData="M15.2196,2.4697C14.9267,2.7626 14.9267,3.2374 15.2196,3.5303L18.6892,7L15.2196,10.4697C14.9267,10.7626 14.9267,11.2374 15.2196,11.5303C15.5125,11.8232 15.9873,11.8232 16.2802,11.5303L20.8105,7L16.2802,2.4697C15.9873,2.1768 15.5125,2.1768 15.2196,2.4697Z" />
     <path
-        android:fillColor="#00000000"
+        android:fillColor="@color/transparent_black"
         android:pathData="M10,19C6.6863,19 4,16.3137 4,13C4,9.6863 6.6863,7 10,7"
         android:strokeWidth="1.5"
-        android:strokeColor="#ACA996" />
+        android:strokeColor="@color/gray" />
     <path
-        android:fillColor="#ACA996"
+        android:fillColor="@color/gray"
         android:pathData="M10,6.25h9v1.5h-9z" />
     <path
-        android:fillColor="#ACA996"
+        android:fillColor="@color/gray"
         android:pathData="M10,18.25h2v1.5h-2z" />
 </vector>
diff --git a/core-ui/src/main/res/drawable/ic_relation_attachment_24.xml b/core-ui/src/main/res/drawable/ic_relation_attachment_24.xml
index f224dbf61c..7b8adf3a16 100644
--- a/core-ui/src/main/res/drawable/ic_relation_attachment_24.xml
+++ b/core-ui/src/main/res/drawable/ic_relation_attachment_24.xml
@@ -5,5 +5,5 @@
     android:viewportHeight="25">
   <path
       android:pathData="M18.644,9.0875C19.913,7.8174 19.9131,5.7583 18.6439,4.4884C17.3746,3.2183 15.3168,3.2183 14.0475,4.4882L6.7997,11.7404L6.8045,11.7453C4.9276,13.8081 4.9851,17.004 6.9772,18.9973C8.9692,20.9905 12.1632,21.0481 14.2247,19.17L20.5882,12.8017L21.6489,13.863L15.2849,20.2309C12.6378,22.6935 8.4953,22.6351 5.9184,20.0566C3.3416,17.4782 3.2837,13.3337 5.7449,10.685L5.739,10.6791L12.9865,3.4272C14.8416,1.5714 17.8496,1.571 19.7045,3.4271C21.5596,5.2833 21.5596,8.2928 19.7045,10.149L12.9868,16.8701C11.9129,17.9447 10.1717,17.9447 9.0978,16.8701C8.0834,15.8551 8.0271,14.2445 8.9289,13.1634L8.921,13.1555L14.9314,7.1414L15.9921,8.2028L10.1584,14.0399C9.6703,14.5284 9.6703,15.3203 10.1584,15.8088C10.6466,16.2972 11.438,16.2972 11.9262,15.8088L18.644,9.0875Z"
-      android:fillColor="#ACA996"/>
+      android:fillColor="@color/gray"/>
 </vector>
diff --git a/core-ui/src/main/res/drawable/ic_relation_attachment_small.xml b/core-ui/src/main/res/drawable/ic_relation_attachment_small.xml
deleted file mode 100644
index 8e0c7d0ec4..0000000000
--- a/core-ui/src/main/res/drawable/ic_relation_attachment_small.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:pathData="M17.7026,9.0524C18.9716,7.7823 18.9717,5.7232 17.7025,4.4532C16.4332,3.1832 14.3754,3.1831 13.1061,4.453L5.8583,11.7053L5.8631,11.7102C3.9862,13.7729 4.0437,16.9688 6.0358,18.9621C8.0278,20.9554 11.2218,21.0129 13.2833,19.1348L19.6468,12.7666L20.7075,13.8279L14.3435,20.1957C11.6964,22.6583 7.5539,22.5999 4.977,20.0215C2.4002,17.4431 2.3423,13.2986 4.8035,10.6498L4.7976,10.644L12.0451,3.3921C13.9002,1.5362 16.9082,1.5358 18.7631,3.3919C20.6182,5.2481 20.6182,8.2576 18.7631,10.1138L12.0454,16.8349C10.9715,17.9095 9.2303,17.9095 8.1564,16.8349C7.142,15.8199 7.0857,14.2093 7.9875,13.1283L7.9796,13.1203L13.99,7.1063L15.0506,8.1676L9.217,14.0048C8.7289,14.4932 8.7289,15.2852 9.217,15.7736C9.7052,16.2621 10.4966,16.2621 10.9848,15.7736L17.7026,9.0524Z"
-      android:fillColor="#ACA996"/>
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_relation_checkbox_checked.xml b/core-ui/src/main/res/drawable/ic_relation_checkbox_checked.xml
deleted file mode 100644
index 9a31bbdcad..0000000000
--- a/core-ui/src/main/res/drawable/ic_relation_checkbox_checked.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="16dp"
-    android:height="16dp"
-    android:viewportWidth="16"
-    android:viewportHeight="16">
-  <path
-      android:pathData="M13.4972,4.3046L6.84,14.1572L2.0757,9.393L2.9243,8.5445L6.66,12.2802L12.5029,3.6328L13.4972,4.3046Z"
-      android:fillColor="#2AA7EE"
-      android:fillType="evenOdd"/>
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_relation_checkbox_unchecked.xml b/core-ui/src/main/res/drawable/ic_relation_checkbox_unchecked.xml
deleted file mode 100644
index cc6acf4018..0000000000
--- a/core-ui/src/main/res/drawable/ic_relation_checkbox_unchecked.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="oval">
-  <stroke android:color="@color/glyph_active" android:width="1dp" />
-</shape>
\ No newline at end of file
diff --git a/core-ui/src/main/res/drawable/ic_relation_desc_24.xml b/core-ui/src/main/res/drawable/ic_relation_desc_24.xml
index 3d0bebb60f..aab09dcce3 100644
--- a/core-ui/src/main/res/drawable/ic_relation_desc_24.xml
+++ b/core-ui/src/main/res/drawable/ic_relation_desc_24.xml
@@ -5,11 +5,11 @@
     android:viewportHeight="25">
   <path
       android:pathData="M3.9414,17.2852H17.9414V18.7834H3.9414V17.2852Z"
-      android:fillColor="#ACA996"/>
+      android:fillColor="@color/gray"/>
   <path
       android:pathData="M3.9414,5.2852H21.9414V6.7834H3.9414V5.2852Z"
-      android:fillColor="#ACA996"/>
+      android:fillColor="@color/gray"/>
   <path
       android:pathData="M3.9414,11.2852H21.9414V12.7834H3.9414V11.2852Z"
-      android:fillColor="#ACA996"/>
+      android:fillColor="@color/gray"/>
 </vector>
diff --git a/core-ui/src/main/res/drawable/ic_relation_format_tag_small.xml b/core-ui/src/main/res/drawable/ic_relation_format_tag_small.xml
index 7657facdc8..c999bdd5a5 100644
--- a/core-ui/src/main/res/drawable/ic_relation_format_tag_small.xml
+++ b/core-ui/src/main/res/drawable/ic_relation_format_tag_small.xml
@@ -14,8 +14,8 @@
       android:fillColor="@color/glyph_active"/>
   <path
       android:pathData="M19.5,6m-1.5,0a1.5,1.5 0,1 1,3 0a1.5,1.5 0,1 1,-3 0"
-      android:fillColor="#B6B6B6"/>
+      android:fillColor="@color/tag_icon_gray"/>
   <path
       android:pathData="M19.5,18m-1.5,0a1.5,1.5 0,1 1,3 0a1.5,1.5 0,1 1,-3 0"
-      android:fillColor="#B6B6B6"/>
+      android:fillColor="@color/tag_icon_gray"/>
 </vector>
diff --git a/core-ui/src/main/res/drawable/ic_relation_name_32.xml b/core-ui/src/main/res/drawable/ic_relation_name_32.xml
deleted file mode 100644
index b0939fb291..0000000000
--- a/core-ui/src/main/res/drawable/ic_relation_name_32.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="32dp"
-    android:height="32dp"
-    android:viewportWidth="32"
-    android:viewportHeight="32">
-  <path
-      android:pathData="M8,0L24,0A8,8 0,0 1,32 8L32,24A8,8 0,0 1,24 32L8,32A8,8 0,0 1,0 24L0,8A8,8 0,0 1,8 0z"
-      android:fillColor="#F3F2EC"/>
-  <path
-      android:pathData="M7,21.5h18v1.5h-18z"
-      android:fillColor="#ACA996"/>
-  <path
-      android:pathData="M8.8263,18.9657L9.8277,16.0787H14.089L15.0851,18.9657H16.8323L12.9065,8.0566H11.0049L7.0791,18.9657H8.8263ZM10.3071,14.6937L11.9157,10.0382H12.001L13.6096,14.6937H10.3071Z"
-      android:fillColor="#ACA996"/>
-  <path
-      android:pathData="M20.5262,19.1468C21.8792,19.1468 22.6409,18.4597 22.9445,17.8471H23.0084V18.9657H24.5638V13.5325C24.5638,11.1515 22.6888,10.6774 21.3891,10.6774C19.9083,10.6774 18.5446,11.274 18.012,12.7654L19.5088,13.1064C19.7432,12.5257 20.3397,11.9664 21.4104,11.9664C22.4385,11.9664 22.9658,12.5044 22.9658,13.4313V13.4686C22.9658,14.0492 22.3692,14.0385 20.899,14.209C19.349,14.3901 17.7616,14.7949 17.7616,16.6539C17.7616,18.2626 18.9708,19.1468 20.5262,19.1468ZM20.8724,17.8684C19.9722,17.8684 19.3223,17.4636 19.3223,16.6752C19.3223,15.823 20.0787,15.5194 21.0003,15.3968C21.5169,15.3276 22.7421,15.1891 22.9711,14.96V16.0147C22.9711,16.9842 22.1988,17.8684 20.8724,17.8684Z"
-      android:fillColor="#ACA996"/>
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_remove.xml b/core-ui/src/main/res/drawable/ic_remove.xml
deleted file mode 100644
index f40f2f2dff..0000000000
--- a/core-ui/src/main/res/drawable/ic_remove.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:pathData="M12,21.5C17.2467,21.5 21.5,17.2467 21.5,12C21.5,6.7533 17.2467,2.5 12,2.5C6.7533,2.5 2.5,6.7533 2.5,12C2.5,17.2467 6.7533,21.5 12,21.5ZM12,23C18.0751,23 23,18.0751 23,12C23,5.9249 18.0751,1 12,1C5.9249,1 1,5.9249 1,12C1,18.0751 5.9249,23 12,23Z"
-      android:fillColor="#ACA996"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M6,12C6,11.5858 6.3358,11.25 6.75,11.25H17.25C17.6642,11.25 18,11.5858 18,12C18,12.4142 17.6642,12.75 17.25,12.75H6.75C6.3358,12.75 6,12.4142 6,12Z"
-      android:fillColor="#ACA996"/>
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_remove_inactive.xml b/core-ui/src/main/res/drawable/ic_remove_inactive.xml
deleted file mode 100644
index 309ee3535a..0000000000
--- a/core-ui/src/main/res/drawable/ic_remove_inactive.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:pathData="M12,12m-11,0a11,11 0,1 1,22 0a11,11 0,1 1,-22 0"
-      android:fillColor="@color/glyph_inactive"/>
-  <path
-      android:pathData="M6,12C6,11.586 6.336,11.25 6.75,11.25H17.25C17.664,11.25 18,11.586 18,12C18,12.414 17.664,12.75 17.25,12.75H6.75C6.336,12.75 6,12.414 6,12Z"
-      android:fillColor="#ffffff"/>
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_remove_red.xml b/core-ui/src/main/res/drawable/ic_remove_red.xml
index be051e9b22..30daa0f92f 100644
--- a/core-ui/src/main/res/drawable/ic_remove_red.xml
+++ b/core-ui/src/main/res/drawable/ic_remove_red.xml
@@ -8,5 +8,5 @@
       android:fillColor="@color/palette_system_red"/>
   <path
       android:pathData="M6,12C6,11.5858 6.3358,11.25 6.75,11.25H17.25C17.6642,11.25 18,11.5858 18,12C18,12.4142 17.6642,12.75 17.25,12.75H6.75C6.3358,12.75 6,12.4142 6,12Z"
-      android:fillColor="#ffffff"/>
+      android:fillColor="@color/white"/>
 </vector>
diff --git a/core-ui/src/main/res/drawable/ic_remove_viewer_sort.xml b/core-ui/src/main/res/drawable/ic_remove_viewer_sort.xml
index 2cceb3503b..dc1261410d 100644
--- a/core-ui/src/main/res/drawable/ic_remove_viewer_sort.xml
+++ b/core-ui/src/main/res/drawable/ic_remove_viewer_sort.xml
@@ -4,9 +4,9 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="#F55522"
+        android:fillColor="@color/palette_system_red"
         android:pathData="M12,12m-11,0a11,11 0,1 1,22 0a11,11 0,1 1,-22 0" />
     <path
-        android:fillColor="#ffffff"
+        android:fillColor="@color/white"
         android:pathData="M6,12C6,11.5858 6.3358,11.25 6.75,11.25H17.25C17.6642,11.25 18,11.5858 18,12C18,12.4142 17.6642,12.75 17.25,12.75H6.75C6.3358,12.75 6,12.4142 6,12Z" />
 </vector>
diff --git a/core-ui/src/main/res/drawable/ic_remove_widget.xml b/core-ui/src/main/res/drawable/ic_remove_widget.xml
index 48c977d006..bd947bc89a 100644
--- a/core-ui/src/main/res/drawable/ic_remove_widget.xml
+++ b/core-ui/src/main/res/drawable/ic_remove_widget.xml
@@ -5,12 +5,12 @@
     android:viewportHeight="24">
   <path
       android:pathData="M0,12C0,5.373 5.373,0 12,0V0C18.627,0 24,5.373 24,12V12C24,18.627 18.627,24 12,24V24C5.373,24 0,18.627 0,12V12Z"
-      android:fillColor="#CC2C2B27"
+      android:fillColor="@color/widget_remove_dark_gray"
       android:fillAlpha="1"/>
   <path
       android:pathData="M7,12H17"
       android:strokeWidth="1.5"
-      android:fillColor="#00000000"
-      android:strokeColor="#ffffff"
+      android:fillColor="@color/transparent_black"
+      android:strokeColor="@color/white"
       android:strokeLineCap="round"/>
 </vector>
diff --git a/core-ui/src/main/res/drawable/ic_scroll_and_move.xml b/core-ui/src/main/res/drawable/ic_scroll_and_move.xml
deleted file mode 100644
index e4e69f00ff..0000000000
--- a/core-ui/src/main/res/drawable/ic_scroll_and_move.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="20dp"
-    android:height="13dp"
-    android:viewportWidth="20"
-    android:viewportHeight="13">
-    <path
-        android:pathData="M3,1.2108L17,1.2108"
-        android:strokeWidth="1"
-        android:fillColor="#00000000"
-        android:strokeColor="#ACA996"
-        android:fillType="evenOdd"
-        android:strokeLineCap="square" />
-    <path
-        android:pathData="M3,3.865L17,3.865"
-        android:strokeWidth="1"
-        android:fillColor="#00000000"
-        android:strokeColor="#ACA996"
-        android:fillType="evenOdd"
-        android:strokeLineCap="square" />
-    <path
-        android:pathData="M3,9.1734L17,9.1734"
-        android:strokeWidth="1"
-        android:fillColor="#00000000"
-        android:strokeColor="#ACA996"
-        android:fillType="evenOdd"
-        android:strokeLineCap="square" />
-    <path
-        android:pathData="M3,11.8276L17,11.8276"
-        android:strokeWidth="1"
-        android:fillColor="#00000000"
-        android:strokeColor="#ACA996"
-        android:fillType="evenOdd"
-        android:strokeLineCap="square" />
-    <path
-        android:pathData="M1,6.5192L19,6.5192"
-        android:strokeWidth="1"
-        android:fillColor="#00000000"
-        android:strokeColor="#ACA996"
-        android:fillType="evenOdd"
-        android:strokeLineCap="square" />
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_scroll_and_move_active.xml b/core-ui/src/main/res/drawable/ic_scroll_and_move_active.xml
deleted file mode 100644
index 008414eaf6..0000000000
--- a/core-ui/src/main/res/drawable/ic_scroll_and_move_active.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="20dp"
-    android:height="13dp"
-    android:viewportWidth="20"
-    android:viewportHeight="13">
-    <path
-        android:pathData="M3,1.2108L17,1.2108"
-        android:strokeWidth="1"
-        android:fillColor="#00000000"
-        android:strokeColor="#FFB522"
-        android:fillType="evenOdd"
-        android:strokeLineCap="square" />
-    <path
-        android:pathData="M3,3.865L17,3.865"
-        android:strokeWidth="1"
-        android:fillColor="#00000000"
-        android:strokeColor="#FFB522"
-        android:fillType="evenOdd"
-        android:strokeLineCap="square" />
-    <path
-        android:pathData="M3,9.1734L17,9.1734"
-        android:strokeWidth="1"
-        android:fillColor="#00000000"
-        android:strokeColor="#FFB522"
-        android:fillType="evenOdd"
-        android:strokeLineCap="square" />
-    <path
-        android:pathData="M3,11.8276L17,11.8276"
-        android:strokeWidth="1"
-        android:fillColor="#00000000"
-        android:strokeColor="#FFB522"
-        android:fillType="evenOdd"
-        android:strokeLineCap="square" />
-    <path
-        android:pathData="M1,6.5192L19,6.5192"
-        android:strokeWidth="1"
-        android:fillColor="#00000000"
-        android:strokeColor="#FFB522"
-        android:fillType="evenOdd"
-        android:strokeLineCap="square" />
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_scroll_and_move_target_anchor.xml b/core-ui/src/main/res/drawable/ic_scroll_and_move_target_anchor.xml
index 999cb03922..8750b043ed 100644
--- a/core-ui/src/main/res/drawable/ic_scroll_and_move_target_anchor.xml
+++ b/core-ui/src/main/res/drawable/ic_scroll_and_move_target_anchor.xml
@@ -5,5 +5,5 @@
     android:viewportHeight="24">
     <path
         android:pathData="M2.7736,13.0291C1.4887,12.3867 0.8463,12.0655 0.7537,11.5794C0.7302,11.4558 0.7302,11.3288 0.7537,11.2052C0.8463,10.7192 1.4887,10.3979 2.7736,9.7555L20.8516,0.7165C21.9202,0.1822 22.4545,-0.085 22.8715,0.0819C22.9788,0.1249 23.0779,0.1861 23.1643,0.2628C23.5,0.5612 23.5,1.1586 23.5,2.3533V20.4313C23.5,21.626 23.5,22.2234 23.1643,22.5218C23.0779,22.5985 22.9788,22.6598 22.8715,22.7027C22.4545,22.8696 21.9202,22.6024 20.8516,22.0681L2.7736,13.0291Z"
-        android:fillColor="#FFBB2C" />
+        android:fillColor="@color/orange" />
 </vector>
diff --git a/core-ui/src/main/res/drawable/ic_set_as_default_24.xml b/core-ui/src/main/res/drawable/ic_set_as_default_24.xml
index 3c12dddcce..f85e3cc350 100644
--- a/core-ui/src/main/res/drawable/ic_set_as_default_24.xml
+++ b/core-ui/src/main/res/drawable/ic_set_as_default_24.xml
@@ -7,7 +7,7 @@
       android:pathData="M3.707,9.807C3.317,10.197 3.317,10.83 3.707,11.221L13.779,21.293C14.17,21.683 14.803,21.683 15.193,21.293L16.27,20.216C16.483,20.003 16.588,19.706 16.557,19.406L16.17,15.673C16.136,15.344 16.266,15.02 16.518,14.807L22.172,10.012C22.618,9.633 22.646,8.955 22.232,8.542L16.458,2.768C16.045,2.354 15.367,2.382 14.988,2.828L10.192,8.482C9.978,8.734 9.654,8.864 9.326,8.83L5.594,8.443C5.294,8.412 4.997,8.517 4.784,8.73L3.707,9.807Z"
       android:strokeLineJoin="round"
       android:strokeWidth="1.5"
-      android:fillColor="#00000000"
+      android:fillColor="@color/transparent_black"
       android:strokeColor="@color/glyph_active"
       android:strokeLineCap="round"/>
   <path
diff --git a/core-ui/src/main/res/drawable/ic_set_big.xml b/core-ui/src/main/res/drawable/ic_set_big.xml
deleted file mode 100644
index 3fa3c7d2eb..0000000000
--- a/core-ui/src/main/res/drawable/ic_set_big.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="32dp"
-    android:height="32dp"
-    android:viewportWidth="32"
-    android:viewportHeight="32">
-  <path
-      android:pathData="M19,28.5V30C19,31.1046 18.1046,32 17,32H4C2.8954,32 2,31.1046 2,30V12C2,10.8954 2.8954,10 4,10H5.5V25C5.5,26.933 7.067,28.5 9,28.5H19Z"
-      android:fillColor="#B6C0CF"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M24,23.5V25C24,26.1046 23.1046,27 22,27H9C7.8954,27 7,26.1046 7,25V7C7,5.8954 7.8954,5 9,5H10.5V19C10.5,21.4853 12.5147,23.5 15,23.5H24Z"
-      android:fillColor="#CAD1DC"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M27.0312,0L14.0312,0A2,2 0,0 0,12.0312 2L12.0312,20A2,2 0,0 0,14.0312 22L27.0312,22A2,2 0,0 0,29.0312 20L29.0312,2A2,2 0,0 0,27.0312 0z"
-      android:fillColor="#DDE2E9"/>
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_settings_spaces.xml b/core-ui/src/main/res/drawable/ic_settings_spaces.xml
index 09faafbff2..511caae6c3 100644
--- a/core-ui/src/main/res/drawable/ic_settings_spaces.xml
+++ b/core-ui/src/main/res/drawable/ic_settings_spaces.xml
@@ -5,32 +5,32 @@
     android:viewportHeight="28">
   <path
       android:pathData="M6,0L22,0A6,6 0,0 1,28 6L28,22A6,6 0,0 1,22 28L6,28A6,6 0,0 1,0 22L0,6A6,6 0,0 1,6 0z"
-      android:fillColor="#AB50CC"/>
+      android:fillColor="@color/palette_system_purple"/>
   <path
       android:pathData="M14.003,13.995m-3.221,0a3.221,3.221 0,1 1,6.443 0a3.221,3.221 0,1 1,-6.443 0"
-      android:fillColor="#ffffff"/>
+      android:fillColor="@color/white"/>
   <path
       android:pathData="M14,6.304m-1.289,0a1.289,1.289 0,1 1,2.577 0a1.289,1.289 0,1 1,-2.577 0"
-      android:fillColor="#ffffff"/>
+      android:fillColor="@color/white"/>
   <path
       android:pathData="M14,21.726m-1.289,0a1.289,1.289 0,1 1,2.577 0a1.289,1.289 0,1 1,-2.577 0"
-      android:fillColor="#ffffff"/>
+      android:fillColor="@color/white"/>
   <path
       android:pathData="M6.289,14.016m0,1.289a1.289,1.289 0,1 1,0 -2.577a1.289,1.289 0,1 1,0 2.577"
-      android:fillColor="#ffffff"/>
+      android:fillColor="@color/white"/>
   <path
       android:pathData="M21.711,14.016m0,1.289a1.289,1.289 0,1 1,0 -2.577a1.289,1.289 0,1 1,0 2.577"
-      android:fillColor="#ffffff"/>
+      android:fillColor="@color/white"/>
   <path
       android:pathData="M8.549,8.564m-0.911,0.911a1.289,1.289 90,1 1,1.822 -1.822a1.289,1.289 0,1 1,-1.822 1.822"
-      android:fillColor="#ffffff"/>
+      android:fillColor="@color/white"/>
   <path
       android:pathData="M19.455,19.471m-0.911,0.911a1.289,1.289 0,1 1,1.822 -1.822a1.289,1.289 90,1 1,-1.822 1.822"
-      android:fillColor="#ffffff"/>
+      android:fillColor="@color/white"/>
   <path
       android:pathData="M19.453,8.565m-0.911,-0.911a1.289,1.289 0,1 1,1.822 1.822a1.289,1.289 90,1 1,-1.822 -1.822"
-      android:fillColor="#ffffff"/>
+      android:fillColor="@color/white"/>
   <path
       android:pathData="M8.547,19.473m-0.911,-0.911a1.289,1.289 90,1 1,1.822 1.822a1.289,1.289 0,1 1,-1.822 -1.822"
-      android:fillColor="#ffffff"/>
+      android:fillColor="@color/white"/>
 </vector>
diff --git a/core-ui/src/main/res/drawable/ic_shared_space_arrow.xml b/core-ui/src/main/res/drawable/ic_shared_space_arrow.xml
index 94dcdacb43..cfa0424e86 100644
--- a/core-ui/src/main/res/drawable/ic_shared_space_arrow.xml
+++ b/core-ui/src/main/res/drawable/ic_shared_space_arrow.xml
@@ -5,9 +5,9 @@
     android:viewportHeight="16">
   <path
       android:pathData="M8,0L8,0A8,8 0,0 1,16 8L16,8A8,8 0,0 1,8 16L8,16A8,8 0,0 1,0 8L0,8A8,8 0,0 1,8 0z"
-      android:fillColor="#B3252525"
+      android:fillColor="@color/space_arrow_overlay_black"
       android:fillAlpha="0.7"/>
   <path
       android:pathData="M11.711,10.754L10.607,10.761L10.607,6.188L4.685,12.11L3.892,11.316L9.814,5.394L5.248,5.401V4.29L11.711,4.29L11.711,10.754Z"
-      android:fillColor="#ffffff"/>
+      android:fillColor="@color/white"/>
 </vector>
diff --git a/core-ui/src/main/res/drawable/ic_show.xml b/core-ui/src/main/res/drawable/ic_show.xml
deleted file mode 100644
index 2ec9b50982..0000000000
--- a/core-ui/src/main/res/drawable/ic_show.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:pathData="M5.4779,15.0223C4.2974,13.8488 3.5081,12.6349 3.1348,12C3.5081,11.3651 4.2974,10.1512 5.4779,8.9777C7.0548,7.4101 9.2398,6 12.0001,6C14.7441,6 16.9283,7.4087 18.51,8.9776C19.6923,10.1504 20.4864,11.3637 20.8632,12C20.4864,12.6363 19.6923,13.8496 18.51,15.0224C16.9284,16.5913 14.7441,18 12.0001,18C9.2398,18 7.0548,16.5899 5.4779,15.0223ZM12.0001,4C8.5116,4 5.8482,5.7882 4.066,7.5599C2.2827,9.3328 1.2916,11.1745 1.1226,11.5011C1.0608,11.6204 1,11.7907 1,12C1,12.2093 1.0608,12.3796 1.1226,12.4989C1.2916,12.8255 2.2827,14.6673 4.066,16.4401C5.8482,18.2118 8.5116,20 12.0001,20C15.4739,20 18.1361,18.2115 19.9203,16.4418C21.7063,14.6701 22.7049,12.8294 22.8757,12.5023C22.9384,12.3821 23,12.2107 23,12C23,11.7893 22.9384,11.6179 22.8757,11.4977C22.7049,11.1706 21.7063,9.3299 19.9203,7.5582C18.1361,5.7885 15.4739,4 12.0001,4ZM16.9906,12C16.9906,14.7614 14.752,17 11.9906,17C9.2292,17 6.9906,14.7614 6.9906,12C6.9906,9.2386 9.2292,7 11.9906,7C14.752,7 16.9906,9.2386 16.9906,12Z"
-      android:fillColor="#2C2B27"
-      android:fillType="evenOdd"/>
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_slash_actions_paste.xml b/core-ui/src/main/res/drawable/ic_slash_actions_paste.xml
deleted file mode 100644
index fe0c745989..0000000000
--- a/core-ui/src/main/res/drawable/ic_slash_actions_paste.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:pathData="M16.5,6.5H7.5C5.8432,6.5 4.5,7.8432 4.5,9.5V18.5C4.5,20.1569 5.8432,21.5 7.5,21.5H16.5C18.1569,21.5 19.5,20.1569 19.5,18.5V9.5C19.5,7.8432 18.1569,6.5 16.5,6.5ZM7.5,5C5.0147,5 3,7.0147 3,9.5V18.5C3,20.9853 5.0147,23 7.5,23H16.5C18.9853,23 21,20.9853 21,18.5V9.5C21,7.0147 18.9853,5 16.5,5H7.5Z"
-      android:fillColor="#ACA996"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M3,2C3,1.5858 3.3358,1.25 3.75,1.25H20.25C20.6642,1.25 21,1.5858 21,2C21,2.4142 20.6642,2.75 20.25,2.75H3.75C3.3358,2.75 3,2.4142 3,2Z"
-      android:fillColor="#ACA996"/>
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_slash_align_center.xml b/core-ui/src/main/res/drawable/ic_slash_align_center.xml
index ac7f9e7b05..62812700eb 100644
--- a/core-ui/src/main/res/drawable/ic_slash_align_center.xml
+++ b/core-ui/src/main/res/drawable/ic_slash_align_center.xml
@@ -6,21 +6,21 @@
   <path
       android:pathData="M2.375,4.125h19.25v0.75h-19.25z"
       android:strokeWidth="0.75"
-      android:fillColor="#00000000"
+      android:fillColor="@color/transparent_black"
       android:strokeColor="@color/glyph_active"/>
   <path
       android:pathData="M6.375,19.125h11.25v0.75h-11.25z"
       android:strokeWidth="0.75"
-      android:fillColor="#00000000"
+      android:fillColor="@color/transparent_black"
       android:strokeColor="@color/glyph_active"/>
   <path
       android:pathData="M6.375,9.125h11.25v0.75h-11.25z"
       android:strokeWidth="0.75"
-      android:fillColor="#00000000"
+      android:fillColor="@color/transparent_black"
       android:strokeColor="@color/glyph_active"/>
   <path
       android:pathData="M2.375,14.125h19.25v0.75h-19.25z"
       android:strokeWidth="0.75"
-      android:fillColor="#00000000"
+      android:fillColor="@color/transparent_black"
       android:strokeColor="@color/glyph_active"/>
 </vector>
diff --git a/core-ui/src/main/res/drawable/ic_slash_align_left.xml b/core-ui/src/main/res/drawable/ic_slash_align_left.xml
index cbbfc6cee0..f32b25a038 100644
--- a/core-ui/src/main/res/drawable/ic_slash_align_left.xml
+++ b/core-ui/src/main/res/drawable/ic_slash_align_left.xml
@@ -6,21 +6,21 @@
   <path
       android:pathData="M2.375,4.125h19.25v0.75h-19.25z"
       android:strokeWidth="0.75"
-      android:fillColor="#00000000"
+      android:fillColor="@color/transparent_black"
       android:strokeColor="@color/glyph_active"/>
   <path
       android:pathData="M2.375,19.125h11.25v0.75h-11.25z"
       android:strokeWidth="0.75"
-      android:fillColor="#00000000"
+      android:fillColor="@color/transparent_black"
       android:strokeColor="@color/glyph_active"/>
   <path
       android:pathData="M2.375,9.125h11.25v0.75h-11.25z"
       android:strokeWidth="0.75"
-      android:fillColor="#00000000"
+      android:fillColor="@color/transparent_black"
       android:strokeColor="@color/glyph_active"/>
   <path
       android:pathData="M2.375,14.125h19.25v0.75h-19.25z"
       android:strokeWidth="0.75"
-      android:fillColor="#00000000"
+      android:fillColor="@color/transparent_black"
       android:strokeColor="@color/glyph_active"/>
 </vector>
diff --git a/core-ui/src/main/res/drawable/ic_slash_align_right.xml b/core-ui/src/main/res/drawable/ic_slash_align_right.xml
index 7060ae47d1..e97aa788f9 100644
--- a/core-ui/src/main/res/drawable/ic_slash_align_right.xml
+++ b/core-ui/src/main/res/drawable/ic_slash_align_right.xml
@@ -6,21 +6,21 @@
   <path
       android:pathData="M21.625,4.125l-19.25,0l-0,0.75l19.25,0z"
       android:strokeWidth="0.75"
-      android:fillColor="#00000000"
+      android:fillColor="@color/transparent_black"
       android:strokeColor="@color/glyph_active"/>
   <path
       android:pathData="M21.625,19.125l-11.25,0l-0,0.75l11.25,0z"
       android:strokeWidth="0.75"
-      android:fillColor="#00000000"
+      android:fillColor="@color/transparent_black"
       android:strokeColor="@color/glyph_active"/>
   <path
       android:pathData="M21.625,9.125l-11.25,0l-0,0.75l11.25,0z"
       android:strokeWidth="0.75"
-      android:fillColor="#00000000"
+      android:fillColor="@color/transparent_black"
       android:strokeColor="@color/glyph_active"/>
   <path
       android:pathData="M21.625,14.125l-19.25,0l-0,0.75l19.25,0z"
       android:strokeWidth="0.75"
-      android:fillColor="#00000000"
+      android:fillColor="@color/transparent_black"
       android:strokeColor="@color/glyph_active"/>
 </vector>
diff --git a/core-ui/src/main/res/drawable/ic_slash_main_alignment.xml b/core-ui/src/main/res/drawable/ic_slash_main_alignment.xml
index cbbfc6cee0..f32b25a038 100644
--- a/core-ui/src/main/res/drawable/ic_slash_main_alignment.xml
+++ b/core-ui/src/main/res/drawable/ic_slash_main_alignment.xml
@@ -6,21 +6,21 @@
   <path
       android:pathData="M2.375,4.125h19.25v0.75h-19.25z"
       android:strokeWidth="0.75"
-      android:fillColor="#00000000"
+      android:fillColor="@color/transparent_black"
       android:strokeColor="@color/glyph_active"/>
   <path
       android:pathData="M2.375,19.125h11.25v0.75h-11.25z"
       android:strokeWidth="0.75"
-      android:fillColor="#00000000"
+      android:fillColor="@color/transparent_black"
       android:strokeColor="@color/glyph_active"/>
   <path
       android:pathData="M2.375,9.125h11.25v0.75h-11.25z"
       android:strokeWidth="0.75"
-      android:fillColor="#00000000"
+      android:fillColor="@color/transparent_black"
       android:strokeColor="@color/glyph_active"/>
   <path
       android:pathData="M2.375,14.125h19.25v0.75h-19.25z"
       android:strokeWidth="0.75"
-      android:fillColor="#00000000"
+      android:fillColor="@color/transparent_black"
       android:strokeColor="@color/glyph_active"/>
 </vector>
diff --git a/core-ui/src/main/res/drawable/ic_slash_main_other.xml b/core-ui/src/main/res/drawable/ic_slash_main_other.xml
index ece866f1e1..e73077105e 100644
--- a/core-ui/src/main/res/drawable/ic_slash_main_other.xml
+++ b/core-ui/src/main/res/drawable/ic_slash_main_other.xml
@@ -5,17 +5,17 @@
     android:viewportHeight="24">
   <path
       android:pathData="M10.5,12C10.5,11.1716 11.1716,10.5 12,10.5C12.8284,10.5 13.5,11.1716 13.5,12C13.5,12.8284 12.8284,13.5 12,13.5C11.1716,13.5 10.5,12.8284 10.5,12Z"
-      android:fillColor="#F55522"/>
+      android:fillColor="@color/palette_system_red"/>
   <path
       android:pathData="M3,3.25H21V4.75H3V3.25Z"
-      android:fillColor="#F55522"/>
+      android:fillColor="@color/palette_system_red"/>
   <path
       android:pathData="M3,19.25H21V20.75H3V19.25Z"
-      android:fillColor="#F55522"/>
+      android:fillColor="@color/palette_system_red"/>
   <path
       android:pathData="M1.5,12C1.5,11.1716 2.1716,10.5 3,10.5C3.8284,10.5 4.5,11.1716 4.5,12C4.5,12.8284 3.8284,13.5 3,13.5C2.1716,13.5 1.5,12.8284 1.5,12Z"
-      android:fillColor="#F55522"/>
+      android:fillColor="@color/palette_system_red"/>
   <path
       android:pathData="M19.5,12C19.5,11.1716 20.1716,10.5 21,10.5C21.8284,10.5 22.5,11.1716 22.5,12C22.5,12.8284 21.8284,13.5 21,13.5C20.1716,13.5 19.5,12.8284 19.5,12Z"
-      android:fillColor="#F55522"/>
+      android:fillColor="@color/palette_system_red"/>
 </vector>
diff --git a/core-ui/src/main/res/drawable/ic_slash_main_rectangle.xml b/core-ui/src/main/res/drawable/ic_slash_main_rectangle.xml
index 9c11f5724a..2f431c00eb 100644
--- a/core-ui/src/main/res/drawable/ic_slash_main_rectangle.xml
+++ b/core-ui/src/main/res/drawable/ic_slash_main_rectangle.xml
@@ -6,6 +6,6 @@
   <path
       android:pathData="M11,0.25L11,0.25A10.75,10.75 0,0 1,21.75 11L21.75,11A10.75,10.75 0,0 1,11 21.75L11,21.75A10.75,10.75 0,0 1,0.25 11L0.25,11A10.75,10.75 0,0 1,11 0.25z"
       android:strokeWidth="0.5"
-      android:fillColor="#00000000"
+      android:fillColor="@color/transparent_black"
       android:strokeColor="@color/glyph_active"/>
 </vector>
diff --git a/core-ui/src/main/res/drawable/ic_slash_main_relations.xml b/core-ui/src/main/res/drawable/ic_slash_main_relations.xml
index 1f5692c530..9c543fda06 100644
--- a/core-ui/src/main/res/drawable/ic_slash_main_relations.xml
+++ b/core-ui/src/main/res/drawable/ic_slash_main_relations.xml
@@ -5,29 +5,29 @@
     android:viewportHeight="24">
   <path
       android:pathData="M14,3C14,4.1046 13.1046,5 12,5C10.8954,5 10,4.1046 10,3C10,1.8954 10.8954,1 12,1C13.1046,1 14,1.8954 14,3Z"
-      android:fillColor="#AB50CC"/>
+      android:fillColor="@color/palette_system_purple"/>
   <path
       android:pathData="M5,19C5,20.1046 4.1046,21 3,21C1.8954,21 1,20.1046 1,19C1,17.8954 1.8954,17 3,17C4.1046,17 5,17.8954 5,19Z"
-      android:fillColor="#AB50CC"/>
+      android:fillColor="@color/palette_system_purple"/>
   <path
       android:pathData="M23,19C23,20.1046 22.1046,21 21,21C19.8954,21 19,20.1046 19,19C19,17.8954 19.8954,17 21,17C22.1046,17 23,17.8954 23,19Z"
-      android:fillColor="#AB50CC"/>
+      android:fillColor="@color/palette_system_purple"/>
   <path
       android:pathData="M7.7002,19H16.2"
       android:strokeWidth="1.5"
-      android:fillColor="#00000000"
-      android:strokeColor="#AB50CC"
+      android:fillColor="@color/transparent_black"
+      android:strokeColor="@color/palette_system_purple"
       android:strokeLineCap="round"/>
   <path
       android:pathData="M9.25,7.25L5.25,14.75"
       android:strokeWidth="1.5"
-      android:fillColor="#00000000"
-      android:strokeColor="#AB50CC"
+      android:fillColor="@color/transparent_black"
+      android:strokeColor="@color/palette_system_purple"
       android:strokeLineCap="round"/>
   <path
       android:pathData="M14.75,7.25L18.75,14.75"
       android:strokeWidth="1.5"
-      android:fillColor="#00000000"
-      android:strokeColor="#AB50CC"
+      android:fillColor="@color/transparent_black"
+      android:strokeColor="@color/palette_system_purple"
       android:strokeLineCap="round"/>
 </vector>
diff --git a/core-ui/src/main/res/drawable/ic_slash_main_style.xml b/core-ui/src/main/res/drawable/ic_slash_main_style.xml
index 7f314c7c1a..3dd5360471 100644
--- a/core-ui/src/main/res/drawable/ic_slash_main_style.xml
+++ b/core-ui/src/main/res/drawable/ic_slash_main_style.xml
@@ -5,10 +5,10 @@
     android:viewportHeight="24">
   <path
       android:pathData="M11.3979,20L9.7271,15.1797H3.2729L1.6021,20H0L5.6837,4H7.3163L13,20H11.3979ZM3.7306,13.8672H9.2694L6.5,5.8984L3.7306,13.8672Z"
-      android:fillColor="#F59D08"
+      android:fillColor="@color/slash_accent_orange"
       android:fillType="evenOdd"/>
   <path
       android:pathData="M18.8031,20.2732C18.7852,20.2733 18.7672,20.2734 18.7491,20.2734C16.5915,20.2734 14.8438,18.9609 14.8438,16.6484C14.8438,14.2734 16.7229,13.5156 19.4064,13.1797C19.6322,13.1514 19.8468,13.1261 20.0497,13.1022C21.6394,12.9147 22.5152,12.8115 22.5152,12.0078V11.7266C22.5152,10.1023 21.5374,9.106 19.7695,9.0862C18.2156,9.1033 17.196,9.8487 16.7107,10.7647C16.6717,10.8407 16.6359,10.918 16.6031,10.9961L16.6011,10.9954L16.5992,11L16.4347,10.94L15.184,10.5234C15.9883,8.5625 17.8597,7.8359 19.6771,7.8359C19.6947,7.8359 19.7123,7.836 19.73,7.8362C19.7484,7.836 19.7669,7.8359 19.7853,7.8359C21.6027,7.8359 24,8.6328 24,11.8516V20H22.5152V18.1016H22.4301C22.375,18.22 22.311,18.339 22.238,18.457C21.6764,19.3976 20.6164,20.2734 18.8573,20.2734C18.8392,20.2734 18.8212,20.2733 18.8031,20.2732ZM18.9891,18.9997C17.4618,18.9806 16.3285,18.1472 16.3285,16.7109C16.3285,15.2578 17.504,14.6484 19.5147,14.3984C20.4181,14.2898 21.9729,14.0938 22.5152,13.7483V15.3984C22.5152,17.3509 21.1538,18.9729 18.9891,18.9997Z"
-      android:fillColor="#F59D08"
+      android:fillColor="@color/slash_accent_orange"
       android:fillType="evenOdd"/>
 </vector>
diff --git a/core-ui/src/main/res/drawable/ic_slash_media_bookmark.xml b/core-ui/src/main/res/drawable/ic_slash_media_bookmark.xml
index 345e81ed9c..2a3021e792 100644
--- a/core-ui/src/main/res/drawable/ic_slash_media_bookmark.xml
+++ b/core-ui/src/main/res/drawable/ic_slash_media_bookmark.xml
@@ -5,5 +5,5 @@
     android:viewportHeight="22">
   <path
       android:pathData="M0,4C0,1.7909 1.7909,0 4,0H12C14.2091,0 16,1.7909 16,4V22L8,17.4167L0,22V4Z"
-      android:fillColor="#F55522"/>
+      android:fillColor="@color/palette_system_red"/>
 </vector>
diff --git a/core-ui/src/main/res/drawable/ic_slash_media_code.xml b/core-ui/src/main/res/drawable/ic_slash_media_code.xml
index 99689ceee0..13fddcd1b2 100644
--- a/core-ui/src/main/res/drawable/ic_slash_media_code.xml
+++ b/core-ui/src/main/res/drawable/ic_slash_media_code.xml
@@ -8,18 +8,18 @@
         android:pathData="M0,0h22v22h-22z"/>
     <path
         android:pathData="M0,8C0,5.1997 0,3.7996 0.545,2.7301C1.0243,1.7892 1.7892,1.0243 2.7301,0.545C3.7996,0 5.1997,0 8,0H14C16.8003,0 18.2004,0 19.27,0.545C20.2108,1.0243 20.9757,1.7892 21.455,2.7301C22,3.7996 22,5.1997 22,8V14C22,16.8003 22,18.2004 21.455,19.27C20.9757,20.2108 20.2108,20.9757 19.27,21.455C18.2004,22 16.8003,22 14,22H8C5.1997,22 3.7996,22 2.7301,21.455C1.7892,20.9757 1.0243,20.2108 0.545,19.27C0,18.2004 0,16.8003 0,14V8Z"
-        android:fillColor="#AB50CC"/>
+        android:fillColor="@color/palette_system_purple"/>
     <path
         android:pathData="M8,7.5L4.5,10.9996L8,14.4996"
         android:strokeWidth="1.5"
-        android:fillColor="#00000000"
-        android:strokeColor="#ffffff"
+        android:fillColor="@color/transparent_black"
+        android:strokeColor="@color/white"
         android:strokeLineCap="round"/>
     <path
         android:pathData="M14,7.5002L17.5,10.9998L14,14.4998"
         android:strokeWidth="1.5"
-        android:fillColor="#00000000"
-        android:strokeColor="#ffffff"
+        android:fillColor="@color/transparent_black"
+        android:strokeColor="@color/white"
         android:strokeLineCap="round"/>
   </group>
 </vector>
diff --git a/core-ui/src/main/res/drawable/ic_slash_media_file.xml b/core-ui/src/main/res/drawable/ic_slash_media_file.xml
index b08a41b490..e57ea347de 100644
--- a/core-ui/src/main/res/drawable/ic_slash_media_file.xml
+++ b/core-ui/src/main/res/drawable/ic_slash_media_file.xml
@@ -5,23 +5,23 @@
     android:viewportHeight="22">
   <path
       android:pathData="M10.2487,1.3819L11.2208,2.354L3.1197,10.4551L2.1476,9.483L10.2487,1.3819Z"
-      android:fillColor="#1BA0EB"/>
+      android:fillColor="@color/icon_primary_blue"/>
   <path
       android:pathData="M16.7246,7.8578C18.0866,6.3281 18.0341,3.9825 16.5673,2.5157C15.1005,1.0489 12.7549,0.9965 11.2252,2.3584L10.2519,1.385C12.3196,-0.5131 15.5356,-0.4602 17.5394,1.5436C19.5432,3.5474 19.5961,6.7634 17.698,8.8311L16.7246,7.8578Z"
-      android:fillColor="#1BA0EB"/>
+      android:fillColor="@color/icon_primary_blue"/>
   <path
       android:pathData="M11.5449,18.8803C9.2183,21.2068 5.4463,21.2068 3.1197,18.8803C0.7932,16.5537 0.7932,12.7817 3.1197,10.4551L2.1476,9.483C-0.7159,12.3464 -0.7159,16.989 2.1476,19.8524C5.011,22.7159 9.6536,22.7159 12.517,19.8524L11.5449,18.8803Z"
-      android:fillColor="#1BA0EB"/>
+      android:fillColor="@color/icon_primary_blue"/>
   <path
       android:pathData="M12.193,5.2704L13.1651,6.2425L6.6842,12.7234L5.7121,11.7513L12.193,5.2704Z"
-      android:fillColor="#1BA0EB"/>
+      android:fillColor="@color/icon_primary_blue"/>
   <path
       android:pathData="M9.2766,15.3158C8.5607,16.0316 7.4001,16.0316 6.6842,15.3158C5.9683,14.5999 5.9683,13.4393 6.6842,12.7234L5.7121,11.7513C4.4593,13.004 4.4593,15.0352 5.7121,16.2879C6.9648,17.5407 8.9959,17.5407 10.2487,16.2879L9.2766,15.3158Z"
-      android:fillColor="#1BA0EB"/>
+      android:fillColor="@color/icon_primary_blue"/>
   <path
       android:pathData="M16.7296,7.8628L17.7017,8.8349L10.2487,16.2879L9.2766,15.3158L16.7296,7.8628Z"
-      android:fillColor="#1BA0EB"/>
+      android:fillColor="@color/icon_primary_blue"/>
   <path
       android:pathData="M18.6739,11.7513L19.646,12.7234L12.517,19.8524L11.5449,18.8803L18.6739,11.7513Z"
-      android:fillColor="#1BA0EB"/>
+      android:fillColor="@color/icon_primary_blue"/>
 </vector>
diff --git a/core-ui/src/main/res/drawable/ic_slash_media_picture.xml b/core-ui/src/main/res/drawable/ic_slash_media_picture.xml
index 9e4780c4ac..3231f1c7fe 100644
--- a/core-ui/src/main/res/drawable/ic_slash_media_picture.xml
+++ b/core-ui/src/main/res/drawable/ic_slash_media_picture.xml
@@ -6,12 +6,12 @@
   <path
       android:pathData="M17,0.75L5,0.75A4.25,4.25 0,0 0,0.75 5L0.75,17A4.25,4.25 0,0 0,5 21.25L17,21.25A4.25,4.25 0,0 0,21.25 17L21.25,5A4.25,4.25 0,0 0,17 0.75z"
       android:strokeWidth="1.5"
-      android:fillColor="#00000000"
-      android:strokeColor="#38C569"/>
+      android:fillColor="@color/transparent_black"
+      android:strokeColor="@color/slash_picture_green"/>
   <path
       android:pathData="M7.6563,9C6.5517,9 5.6563,8.1046 5.6563,7C5.6563,5.8954 6.5517,5 7.6563,5C8.7608,5 9.6563,5.8954 9.6563,7C9.6563,8.1046 8.7608,9 7.6563,9Z"
-      android:fillColor="#38C569"/>
+      android:fillColor="@color/slash_picture_green"/>
   <path
       android:pathData="M13.1562,9.5L20.6562,16.9576L19.6562,21H2.6563L0.6563,16.9888L5.6563,11.9963L8.1563,14.5L13.1562,9.5Z"
-      android:fillColor="#38C569"/>
+      android:fillColor="@color/slash_picture_green"/>
 </vector>
diff --git a/core-ui/src/main/res/drawable/ic_slash_media_video.xml b/core-ui/src/main/res/drawable/ic_slash_media_video.xml
index b474dc3783..6151f5ea3b 100644
--- a/core-ui/src/main/res/drawable/ic_slash_media_video.xml
+++ b/core-ui/src/main/res/drawable/ic_slash_media_video.xml
@@ -6,9 +6,9 @@
   <path
       android:pathData="M12,0.75L12,0.75A11.25,11.25 0,0 1,23.25 12L23.25,12A11.25,11.25 0,0 1,12 23.25L12,23.25A11.25,11.25 0,0 1,0.75 12L0.75,12A11.25,11.25 0,0 1,12 0.75z"
       android:strokeWidth="1.5"
-      android:fillColor="#3E58EB"
-      android:strokeColor="#3E58EB"/>
+      android:fillColor="@color/palette_system_blue"
+      android:strokeColor="@color/palette_system_blue"/>
   <path
       android:pathData="M18.5,11.9998L9,6.5V17.5L18.5,11.9998Z"
-      android:fillColor="#ffffff"/>
+      android:fillColor="@color/white"/>
 </vector>
diff --git a/core-ui/src/main/res/drawable/ic_slash_style_code.xml b/core-ui/src/main/res/drawable/ic_slash_style_code.xml
index 2d7d6a2a75..5b1e26c764 100644
--- a/core-ui/src/main/res/drawable/ic_slash_style_code.xml
+++ b/core-ui/src/main/res/drawable/ic_slash_style_code.xml
@@ -6,11 +6,11 @@
   <path
       android:pathData="M9,6L3,12L9,18"
       android:strokeWidth="1.5"
-      android:fillColor="#00000000"
+      android:fillColor="@color/transparent_black"
       android:strokeColor="@color/glyph_active"/>
   <path
       android:pathData="M15,6L21,12L15,18"
       android:strokeWidth="1.5"
-      android:fillColor="#00000000"
+      android:fillColor="@color/transparent_black"
       android:strokeColor="@color/glyph_active"/>
 </vector>
diff --git a/core-ui/src/main/res/drawable/ic_slash_style_highlighted.xml b/core-ui/src/main/res/drawable/ic_slash_style_highlighted.xml
index 36ed1ae214..24e84687a0 100644
--- a/core-ui/src/main/res/drawable/ic_slash_style_highlighted.xml
+++ b/core-ui/src/main/res/drawable/ic_slash_style_highlighted.xml
@@ -8,5 +8,5 @@
       android:fillColor="@color/glyph_active"/>
   <path
       android:pathData="M0,0h1v28h-1z"
-      android:fillColor="#FFB522"/>
+      android:fillColor="@color/palette_system_amber_100"/>
 </vector>
diff --git a/core-ui/src/main/res/drawable/ic_slash_style_toggle.xml b/core-ui/src/main/res/drawable/ic_slash_style_toggle.xml
index 6f9143fba6..634e017a97 100644
--- a/core-ui/src/main/res/drawable/ic_slash_style_toggle.xml
+++ b/core-ui/src/main/res/drawable/ic_slash_style_toggle.xml
@@ -6,7 +6,7 @@
   <path
       android:pathData="M1.5,1.5L6.5,6.4416L1.5584,11.5"
       android:strokeWidth="1.25"
-      android:fillColor="#00000000"
+      android:fillColor="@color/transparent_black"
       android:strokeColor="@color/glyph_active"
       android:strokeLineCap="round"/>
 </vector>
diff --git a/core-ui/src/main/res/drawable/ic_slash_widget.xml b/core-ui/src/main/res/drawable/ic_slash_widget.xml
index 8504cb70fb..ec52915e26 100644
--- a/core-ui/src/main/res/drawable/ic_slash_widget.xml
+++ b/core-ui/src/main/res/drawable/ic_slash_widget.xml
@@ -9,6 +9,6 @@
   <path
       android:pathData="M6,1.625L18,1.625A4.25,4.25 0,0 1,22.25 5.875L22.25,17.875A4.25,4.25 0,0 1,18 22.125L6,22.125A4.25,4.25 0,0 1,1.75 17.875L1.75,5.875A4.25,4.25 0,0 1,6 1.625z"
       android:strokeWidth="1.5"
-      android:fillColor="#00000000"
+      android:fillColor="@color/transparent_black"
       android:strokeColor="@color/glyph_active"/>
 </vector>
diff --git a/core-ui/src/main/res/drawable/ic_slash_widget_back.xml b/core-ui/src/main/res/drawable/ic_slash_widget_back.xml
deleted file mode 100644
index 5ed2fd632e..0000000000
--- a/core-ui/src/main/res/drawable/ic_slash_widget_back.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="21dp"
-    android:height="14dp"
-    android:viewportWidth="21"
-    android:viewportHeight="14">
-  <path
-      android:pathData="M18.0557,1H6.4387C6.1288,1 5.8363,1.1438 5.647,1.3892L1.3186,7L5.647,12.6108C5.8363,12.8562 6.1288,13 6.4387,13H18.0557C18.6079,13 19.0557,12.5523 19.0557,12V2C19.0557,1.4477 18.6079,1 18.0557,1ZM0.0557,7L4.8552,13.2216C5.2339,13.7125 5.8188,14 6.4387,14H18.0557C19.1602,14 20.0557,13.1046 20.0557,12V2C20.0557,0.8954 19.1602,0 18.0557,0H6.4387C5.8188,0 5.2339,0.2875 4.8552,0.7784L0.0557,7Z"
-      android:fillColor="#ACA996"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M8.6465,3.6465C8.8417,3.4512 9.1583,3.4512 9.3535,3.6465L12,6.2929L14.6464,3.6465C14.8417,3.4512 15.1583,3.4512 15.3536,3.6465C15.5488,3.8417 15.5488,4.1583 15.3536,4.3535L12.7071,7L15.3536,9.6465C15.5488,9.8417 15.5488,10.1583 15.3536,10.3536C15.1583,10.5488 14.8417,10.5488 14.6464,10.3536L12,7.7071L9.3535,10.3536C9.1583,10.5488 8.8417,10.5488 8.6465,10.3536C8.4512,10.1583 8.4512,9.8417 8.6465,9.6465L11.2929,7L8.6465,4.3535C8.4512,4.1583 8.4512,3.8417 8.6465,3.6465Z"
-      android:fillColor="#ACA996"
-      android:fillType="evenOdd"/>
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_sort.xml b/core-ui/src/main/res/drawable/ic_sort.xml
deleted file mode 100644
index f3a10459ea..0000000000
--- a/core-ui/src/main/res/drawable/ic_sort.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:pathData="M16,8C16,7.4477 16.4477,7 17,7C17.5523,7 18,7.4477 18,8V18C18,18.5523 17.5523,19 17,19C16.4477,19 16,18.5523 16,18V8Z"
-      android:fillColor="#2C2B27"/>
-  <path
-      android:pathData="M12.8536,8.1465L17,4L21.1464,8.1465C21.4614,8.4614 21.2383,9 20.7929,9H13.2071C12.7617,9 12.5386,8.4614 12.8536,8.1465Z"
-      android:fillColor="#2C2B27"/>
-  <group>
-    <clip-path android:pathData="M2.8535,15.8536L7,20L11.1464,15.8536C11.4614,15.5386 11.2383,15 10.7929,15H3.2071C2.7617,15 2.5386,15.5386 2.8535,15.8536Z M 0,0"/>
-    <path
-        android:pathData="M7,20L5.5858,21.4142L7,22.8284L8.4142,21.4142L7,20ZM11.1464,15.8536L9.7322,14.4393V14.4393L11.1464,15.8536ZM8.4142,18.5858L4.2678,14.4393L1.4393,17.2678L5.5858,21.4142L8.4142,18.5858ZM9.7322,14.4393L5.5858,18.5858L8.4142,21.4142L12.5607,17.2678L9.7322,14.4393ZM3.2071,17H10.7929V13H3.2071V17ZM12.5607,17.2678C14.1356,15.6929 13.0202,13 10.7929,13V17C9.4565,17 8.7873,15.3843 9.7322,14.4393L12.5607,17.2678ZM4.2678,14.4393C5.2127,15.3843 4.5435,17 3.2071,17V13C0.9799,13 -0.1356,15.6928 1.4393,17.2678L4.2678,14.4393Z"
-        android:fillColor="#2C2B27"/>
-  </group>
-  <path
-      android:pathData="M6,18.0625C6,18.6148 6.4477,19.0625 7,19.0625C7.5523,19.0625 8,18.6148 8,18.0625V6.0625C8,5.5102 7.5523,5.0625 7,5.0625C6.4477,5.0625 6,5.5102 6,6.0625V18.0625Z"
-      android:fillColor="#2C2B27"/>
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_sorting_descending.xml b/core-ui/src/main/res/drawable/ic_sorting_descending.xml
deleted file mode 100644
index 59fdfca79c..0000000000
--- a/core-ui/src/main/res/drawable/ic_sorting_descending.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:pathData="M4.75,6.25L19.25,6.25A0.75,0.75 0,0 1,20 7L20,7A0.75,0.75 0,0 1,19.25 7.75L4.75,7.75A0.75,0.75 0,0 1,4 7L4,7A0.75,0.75 0,0 1,4.75 6.25z"
-      android:fillColor="#ACA996"/>
-  <path
-      android:pathData="M7,12C7,11.5858 7.3358,11.25 7.75,11.25H16.25C16.6642,11.25 17,11.5858 17,12C17,12.4142 16.6642,12.75 16.25,12.75H7.75C7.3358,12.75 7,12.4142 7,12Z"
-      android:fillColor="#ACA996"/>
-  <path
-      android:pathData="M10,17C10,16.5858 10.3358,16.25 10.75,16.25H13.25C13.6642,16.25 14,16.5858 14,17C14,17.4142 13.6642,17.75 13.25,17.75H10.75C10.3358,17.75 10,17.4142 10,17Z"
-      android:fillColor="#ACA996"/>
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_space_settings.xml b/core-ui/src/main/res/drawable/ic_space_settings.xml
index 0aaeff90f8..48ce2a9dc7 100644
--- a/core-ui/src/main/res/drawable/ic_space_settings.xml
+++ b/core-ui/src/main/res/drawable/ic_space_settings.xml
@@ -5,6 +5,6 @@
     android:viewportHeight="22">
   <path
       android:pathData="M10.25,0.75C10.25,0.336 10.586,0 11,0C11.414,0 11.75,0.336 11.75,0.75V2.533C12.755,2.621 13.711,2.883 14.585,3.291L15.476,1.748C15.683,1.39 16.141,1.267 16.5,1.474C16.796,1.645 16.932,1.988 16.853,2.304C16.837,2.371 16.81,2.436 16.774,2.499L15.883,4.042C16.689,4.608 17.392,5.311 17.958,6.117L19.502,5.225C19.861,5.018 20.319,5.141 20.526,5.5C20.733,5.859 20.611,6.317 20.252,6.524L18.709,7.415C19.117,8.289 19.379,9.245 19.467,10.25H21.25C21.664,10.25 22,10.586 22,11C22,11.414 21.664,11.75 21.25,11.75H19.467C19.379,12.755 19.117,13.711 18.709,14.585L20.252,15.476C20.611,15.683 20.733,16.141 20.526,16.5C20.319,16.859 19.861,16.982 19.502,16.775L17.958,15.883C17.392,16.689 16.689,17.392 15.883,17.958L16.774,19.502C16.852,19.636 16.883,19.785 16.873,19.929C16.86,20.115 16.778,20.293 16.637,20.425C16.596,20.463 16.551,20.497 16.5,20.526C16.141,20.733 15.683,20.61 15.476,20.252L14.585,18.709C13.711,19.117 12.755,19.379 11.75,19.467V21.25C11.75,21.664 11.414,22 11,22C10.586,22 10.25,21.664 10.25,21.25V19.467C9.245,19.379 8.289,19.117 7.415,18.709L6.524,20.252C6.317,20.611 5.859,20.733 5.5,20.526C5.141,20.319 5.018,19.861 5.225,19.502L6.117,17.958C5.311,17.392 4.608,16.689 4.042,15.883L2.498,16.774C2.139,16.982 1.681,16.859 1.474,16.5C1.267,16.141 1.389,15.682 1.748,15.475L3.291,14.585C2.883,13.71 2.621,12.755 2.533,11.75H0.75C0.724,11.75 0.699,11.749 0.673,11.746C0.295,11.708 0,11.388 0,11C0,10.586 0.336,10.25 0.75,10.25H2.533C2.621,9.245 2.883,8.29 3.291,7.415L1.748,6.525C1.389,6.318 1.267,5.859 1.474,5.5C1.681,5.141 2.139,5.018 2.498,5.226L4.042,6.117C4.608,5.311 5.311,4.608 6.117,4.042L5.225,2.498C5.018,2.139 5.141,1.681 5.5,1.474C5.859,1.267 6.317,1.389 6.524,1.748L7.415,3.291C8.289,2.883 9.245,2.621 10.25,2.533V0.75ZM4.04,11.75C4.414,15.263 7.387,18 11,18C12.008,18 12.966,17.787 13.831,17.404L10.567,11.75H4.04ZM10.567,10.25H4.04C4.414,6.737 7.387,4 11,4C12.008,4 12.966,4.213 13.831,4.596L10.567,10.25ZM15.13,16.653L11.866,11L15.13,5.347C16.87,6.621 18,8.678 18,11C18,13.322 16.87,15.379 15.13,16.653Z"
-      android:fillColor="#ffffff"
+      android:fillColor="@color/white"
       android:fillType="evenOdd"/>
 </vector>
diff --git a/core-ui/src/main/res/drawable/ic_style_toolbar_main_three_dots.xml b/core-ui/src/main/res/drawable/ic_style_toolbar_main_three_dots.xml
deleted file mode 100644
index bcc6b829bf..0000000000
--- a/core-ui/src/main/res/drawable/ic_style_toolbar_main_three_dots.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:pathData="M5,12m-1.5,0a1.5,1.5 0,1 1,3 0a1.5,1.5 0,1 1,-3 0"
-      android:fillColor="#2C2B27"/>
-  <path
-      android:pathData="M12,12m-1.5,0a1.5,1.5 0,1 1,3 0a1.5,1.5 0,1 1,-3 0"
-      android:fillColor="#2C2B27"/>
-  <path
-      android:pathData="M19,12m-1.5,0a1.5,1.5 0,1 1,3 0a1.5,1.5 0,1 1,-3 0"
-      android:fillColor="#2C2B27"/>
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_sync_error_10.xml b/core-ui/src/main/res/drawable/ic_sync_error_10.xml
index 0c03839291..480f181bdf 100644
--- a/core-ui/src/main/res/drawable/ic_sync_error_10.xml
+++ b/core-ui/src/main/res/drawable/ic_sync_error_10.xml
@@ -5,5 +5,5 @@
     android:viewportHeight="10">
   <path
       android:pathData="M5,5m-5,0a5,5 0,1 1,10 0a5,5 0,1 1,-10 0"
-      android:fillColor="#F55522"/>
+      android:fillColor="@color/palette_system_red"/>
 </vector>
diff --git a/core-ui/src/main/res/drawable/ic_sync_grey_10.xml b/core-ui/src/main/res/drawable/ic_sync_grey_10.xml
index 3a3b51bf82..ea47ab2589 100644
--- a/core-ui/src/main/res/drawable/ic_sync_grey_10.xml
+++ b/core-ui/src/main/res/drawable/ic_sync_grey_10.xml
@@ -5,5 +5,5 @@
     android:viewportHeight="10">
   <path
       android:pathData="M5,5m-5,0a5,5 0,1 1,10 0a5,5 0,1 1,-10 0"
-      android:fillColor="#A7A7A7"/>
+      android:fillColor="@color/sync_icon_gray"/>
 </vector>
diff --git a/core-ui/src/main/res/drawable/ic_sync_limitations.xml b/core-ui/src/main/res/drawable/ic_sync_limitations.xml
index 93ca0cae0c..53fee06754 100644
--- a/core-ui/src/main/res/drawable/ic_sync_limitations.xml
+++ b/core-ui/src/main/res/drawable/ic_sync_limitations.xml
@@ -15,7 +15,7 @@
   <path
       android:strokeWidth="1"
       android:pathData="M16,29H32"
-      android:fillColor="#00000000"
+      android:fillColor="@color/transparent_black"
       android:strokeColor="@color/palette_dark_yellow"
       android:strokeLineCap="round"/>
 </vector>
diff --git a/core-ui/src/main/res/drawable/ic_sync_net_default.xml b/core-ui/src/main/res/drawable/ic_sync_net_default.xml
index 65b487c105..3229f6479e 100644
--- a/core-ui/src/main/res/drawable/ic_sync_net_default.xml
+++ b/core-ui/src/main/res/drawable/ic_sync_net_default.xml
@@ -15,7 +15,7 @@
   <path
       android:strokeWidth="1"
       android:pathData="M16,29H32"
-      android:fillColor="#00000000"
+      android:fillColor="@color/transparent_black"
       android:strokeColor="@color/glyph_active"
       android:strokeLineCap="round"/>
 </vector>
diff --git a/core-ui/src/main/res/drawable/ic_sync_net_error.xml b/core-ui/src/main/res/drawable/ic_sync_net_error.xml
index 038553d333..a8f5a4722d 100644
--- a/core-ui/src/main/res/drawable/ic_sync_net_error.xml
+++ b/core-ui/src/main/res/drawable/ic_sync_net_error.xml
@@ -15,7 +15,7 @@
   <path
       android:strokeWidth="1"
       android:pathData="M16,30L31.912,28.327"
-      android:fillColor="#00000000"
+      android:fillColor="@color/transparent_black"
       android:strokeColor="@color/palette_system_red"
       android:strokeLineCap="round"/>
 </vector>
diff --git a/core-ui/src/main/res/drawable/ic_sync_offline.xml b/core-ui/src/main/res/drawable/ic_sync_offline.xml
deleted file mode 100644
index 65b487c105..0000000000
--- a/core-ui/src/main/res/drawable/ic_sync_offline.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="48dp"
-    android:height="48dp"
-    android:viewportWidth="48"
-    android:viewportHeight="48">
-  <path
-      android:pathData="M24,0L24,0A24,24 0,0 1,48 24L48,24A24,24 0,0 1,24 48L24,48A24,24 0,0 1,0 24L0,24A24,24 0,0 1,24 0z"
-      android:fillColor="@color/shape_secondary"/>
-  <path
-      android:pathData="M20.5,16L20.5,16A0.5,0.5 0,0 1,21 16.5L21,19.5A0.5,0.5 0,0 1,20.5 20L20.5,20A0.5,0.5 0,0 1,20 19.5L20,16.5A0.5,0.5 0,0 1,20.5 16z"
-      android:fillColor="@color/glyph_active"/>
-  <path
-      android:pathData="M27.5,16L27.5,16A0.5,0.5 0,0 1,28 16.5L28,19.5A0.5,0.5 0,0 1,27.5 20L27.5,20A0.5,0.5 0,0 1,27 19.5L27,16.5A0.5,0.5 0,0 1,27.5 16z"
-      android:fillColor="@color/glyph_active"/>
-  <path
-      android:strokeWidth="1"
-      android:pathData="M16,29H32"
-      android:fillColor="#00000000"
-      android:strokeColor="@color/glyph_active"
-      android:strokeLineCap="round"/>
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_synced_10.xml b/core-ui/src/main/res/drawable/ic_synced_10.xml
index 33bb4d439d..a7ff702368 100644
--- a/core-ui/src/main/res/drawable/ic_synced_10.xml
+++ b/core-ui/src/main/res/drawable/ic_synced_10.xml
@@ -5,5 +5,5 @@
     android:viewportHeight="10">
   <path
       android:pathData="M5,5m-5,0a5,5 0,1 1,10 0a5,5 0,1 1,-10 0"
-      android:fillColor="#5DD400"/>
+      android:fillColor="@color/palette_system_green"/>
 </vector>
diff --git a/core-ui/src/main/res/drawable/ic_system_checkbox.xml b/core-ui/src/main/res/drawable/ic_system_checkbox.xml
deleted file mode 100644
index 55ce114410..0000000000
--- a/core-ui/src/main/res/drawable/ic_system_checkbox.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="16dp"
-    android:height="16dp"
-    android:viewportWidth="16"
-    android:viewportHeight="16">
-  <path
-      android:pathData="M0,6.4C0,4.16 0,3.04 0.436,2.184C0.819,1.431 1.431,0.819 2.184,0.436C3.04,0 4.16,0 6.4,0H9.6C11.84,0 12.96,0 13.816,0.436C14.569,0.819 15.181,1.431 15.564,2.184C16,3.04 16,4.16 16,6.4V9.6C16,11.84 16,12.96 15.564,13.816C15.181,14.569 14.569,15.181 13.816,15.564C12.96,16 11.84,16 9.6,16H6.4C4.16,16 3.04,16 2.184,15.564C1.431,15.181 0.819,14.569 0.436,13.816C0,12.96 0,11.84 0,9.6V6.4Z"
-      android:fillColor="@color/text_primary"/>
-  <path
-      android:strokeWidth="1"
-      android:pathData="M4,7.5L7.531,11L12,4"
-      android:fillColor="#00000000"
-      android:strokeColor="@color/text_button_label"/>
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_system_checkbox_empty.xml b/core-ui/src/main/res/drawable/ic_system_checkbox_empty.xml
deleted file mode 100644
index 685909f034..0000000000
--- a/core-ui/src/main/res/drawable/ic_system_checkbox_empty.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="16dp"
-    android:height="16dp"
-    android:viewportWidth="16"
-    android:viewportHeight="16">
-  <path
-      android:strokeWidth="1"
-      android:pathData="M0.5,4C0.5,2.067 2.067,0.5 4,0.5H12C13.933,0.5 15.5,2.067 15.5,4V12C15.5,13.933 13.933,15.5 12,15.5H4C2.067,15.5 0.5,13.933 0.5,12V4Z"
-      android:fillColor="#00000000"
-      android:strokeColor="@color/shape_primary"/>
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_system_relation.xml b/core-ui/src/main/res/drawable/ic_system_relation.xml
index b10e9ca2cc..ca6491eef7 100644
--- a/core-ui/src/main/res/drawable/ic_system_relation.xml
+++ b/core-ui/src/main/res/drawable/ic_system_relation.xml
@@ -5,6 +5,6 @@
     android:viewportHeight="13">
   <path
       android:pathData="M2.75,5.5H7.25V3.5C7.25,2.257 6.243,1.25 5,1.25C3.757,1.25 2.75,2.257 2.75,3.5V5.5ZM8.5,5.5C9.328,5.5 10,6.172 10,7V11.5C10,12.328 9.328,13 8.5,13H1.5C0.672,13 0,12.328 0,11.5V7C0,6.172 0.672,5.5 1.5,5.5L1.5,3.5C1.5,1.567 3.067,0 5,0C6.933,0 8.5,1.567 8.5,3.5V5.5Z"
-      android:fillColor="#A7A7A7"
+      android:fillColor="@color/sync_icon_gray"
       android:fillType="evenOdd"/>
 </vector>
diff --git a/core-ui/src/main/res/drawable/ic_table_view.xml b/core-ui/src/main/res/drawable/ic_table_view.xml
deleted file mode 100644
index 75f3de5048..0000000000
--- a/core-ui/src/main/res/drawable/ic_table_view.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:pathData="M4,4.5L20,4.5A1,1 0,0 1,21 5.5L21,18.5A1,1 0,0 1,20 19.5L4,19.5A1,1 0,0 1,3 18.5L3,5.5A1,1 0,0 1,4 4.5z"
-      android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="#2C2B27"/>
-  <path
-      android:pathData="M11,5.1509h2v14h-2z"
-      android:fillColor="#2C2B27"/>
-  <path
-      android:pathData="M4,8.5h16v2h-16z"
-      android:fillColor="#2C2B27"/>
-  <path
-      android:pathData="M4,13.5938h16v2h-16z"
-      android:fillColor="#2C2B27"/>
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_tag_not_selected.xml b/core-ui/src/main/res/drawable/ic_tag_not_selected.xml
index 4d5d6bd42a..59c744bc02 100644
--- a/core-ui/src/main/res/drawable/ic_tag_not_selected.xml
+++ b/core-ui/src/main/res/drawable/ic_tag_not_selected.xml
@@ -4,7 +4,7 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="#00000000"
+        android:fillColor="@color/transparent_black"
         android:pathData="M12,12m-11.25,0a11.25,11.25 0,1 1,22.5 0a11.25,11.25 0,1 1,-22.5 0"
         android:strokeWidth="1.5"
         android:strokeColor="@color/shape_primary" />
diff --git a/core-ui/src/main/res/drawable/ic_tag_selected.xml b/core-ui/src/main/res/drawable/ic_tag_selected.xml
index 8a2d83f6af..746eabcfc9 100644
--- a/core-ui/src/main/res/drawable/ic_tag_selected.xml
+++ b/core-ui/src/main/res/drawable/ic_tag_selected.xml
@@ -7,7 +7,7 @@
       android:fillColor="@color/glyph_selected"
       android:pathData="M12,12m-12,0a12,12 0,1 1,24 0a12,12 0,1 1,-24 0" />
   <path
-      android:fillColor="#00000000"
+      android:fillColor="@color/transparent_black"
       android:pathData="M6,12L11,17L18,6"
       android:strokeWidth="1.5"
       android:strokeColor="@color/text_button_label" />
diff --git a/core-ui/src/main/res/drawable/ic_task_0_h1.xml b/core-ui/src/main/res/drawable/ic_task_0_h1.xml
index b49169232f..59544bf5f6 100644
--- a/core-ui/src/main/res/drawable/ic_task_0_h1.xml
+++ b/core-ui/src/main/res/drawable/ic_task_0_h1.xml
@@ -6,6 +6,6 @@
   <path
       android:strokeWidth="1"
       android:pathData="M7.5,1.5L20.5,1.5A6,6 0,0 1,26.5 7.5L26.5,20.5A6,6 0,0 1,20.5 26.5L7.5,26.5A6,6 0,0 1,1.5 20.5L1.5,7.5A6,6 0,0 1,7.5 1.5z"
-      android:fillColor="#00000000"
-      android:strokeColor="#ACA996"/>
+      android:fillColor="@color/transparent_black"
+      android:strokeColor="@color/gray"/>
 </vector>
diff --git a/core-ui/src/main/res/drawable/ic_task_0_h2.xml b/core-ui/src/main/res/drawable/ic_task_0_h2.xml
index 7f0b3b5165..8b67d723b6 100644
--- a/core-ui/src/main/res/drawable/ic_task_0_h2.xml
+++ b/core-ui/src/main/res/drawable/ic_task_0_h2.xml
@@ -6,6 +6,6 @@
   <path
       android:strokeWidth="1"
       android:pathData="M6.5,1.5L17.5,1.5A5,5 0,0 1,22.5 6.5L22.5,17.5A5,5 0,0 1,17.5 22.5L6.5,22.5A5,5 0,0 1,1.5 17.5L1.5,6.5A5,5 0,0 1,6.5 1.5z"
-      android:fillColor="#00000000"
-      android:strokeColor="#ACA996"/>
+      android:fillColor="@color/transparent_black"
+      android:strokeColor="@color/gray"/>
 </vector>
diff --git a/core-ui/src/main/res/drawable/ic_task_0_text_14.xml b/core-ui/src/main/res/drawable/ic_task_0_text_14.xml
deleted file mode 100644
index 33adbd6c22..0000000000
--- a/core-ui/src/main/res/drawable/ic_task_0_text_14.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="18dp"
-    android:height="18dp"
-    android:viewportWidth="18"
-    android:viewportHeight="18">
-  <path
-      android:strokeWidth="1"
-      android:pathData="M1.5,5C1.5,3.067 3.067,1.5 5,1.5H13C14.933,1.5 16.5,3.067 16.5,5V13C16.5,14.933 14.933,16.5 13,16.5H5C3.067,16.5 1.5,14.933 1.5,13V5Z"
-      android:fillColor="#00000000"
-      android:strokeColor="#ACA996"/>
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_task_0_text_16.xml b/core-ui/src/main/res/drawable/ic_task_0_text_16.xml
index 85f0641896..b289e2bca6 100644
--- a/core-ui/src/main/res/drawable/ic_task_0_text_16.xml
+++ b/core-ui/src/main/res/drawable/ic_task_0_text_16.xml
@@ -6,6 +6,6 @@
   <path
       android:strokeWidth="1"
       android:pathData="M5.5,1.5L14.5,1.5A4,4 0,0 1,18.5 5.5L18.5,14.5A4,4 0,0 1,14.5 18.5L5.5,18.5A4,4 0,0 1,1.5 14.5L1.5,5.5A4,4 0,0 1,5.5 1.5z"
-      android:fillColor="#00000000"
-      android:strokeColor="#ACA996"/>
+      android:fillColor="@color/transparent_black"
+      android:strokeColor="@color/gray"/>
 </vector>
diff --git a/core-ui/src/main/res/drawable/ic_task_0_text_17.xml b/core-ui/src/main/res/drawable/ic_task_0_text_17.xml
index 85f0641896..b289e2bca6 100644
--- a/core-ui/src/main/res/drawable/ic_task_0_text_17.xml
+++ b/core-ui/src/main/res/drawable/ic_task_0_text_17.xml
@@ -6,6 +6,6 @@
   <path
       android:strokeWidth="1"
       android:pathData="M5.5,1.5L14.5,1.5A4,4 0,0 1,18.5 5.5L18.5,14.5A4,4 0,0 1,14.5 18.5L5.5,18.5A4,4 0,0 1,1.5 14.5L1.5,5.5A4,4 0,0 1,5.5 1.5z"
-      android:fillColor="#00000000"
-      android:strokeColor="#ACA996"/>
+      android:fillColor="@color/transparent_black"
+      android:strokeColor="@color/gray"/>
 </vector>
diff --git a/core-ui/src/main/res/drawable/ic_task_1_h1.xml b/core-ui/src/main/res/drawable/ic_task_1_h1.xml
index 9ab0530e37..2431bf3860 100644
--- a/core-ui/src/main/res/drawable/ic_task_1_h1.xml
+++ b/core-ui/src/main/res/drawable/ic_task_1_h1.xml
@@ -5,10 +5,10 @@
     android:viewportHeight="28">
   <path
       android:pathData="M0,7C0,3.134 3.134,0 7,0H21C24.866,0 28,3.134 28,7V21C28,24.866 24.866,28 21,28H7C3.134,28 0,24.866 0,21V7Z"
-      android:fillColor="#57C600"/>
+      android:fillColor="@color/success_green"/>
   <path
       android:pathData="M8,13L13.5,19.5L21.0001,7"
       android:strokeWidth="2.5"
-      android:fillColor="#00000000"
-      android:strokeColor="#ffffff"/>
+      android:fillColor="@color/transparent_black"
+      android:strokeColor="@color/white"/>
 </vector>
diff --git a/core-ui/src/main/res/drawable/ic_task_1_h2.xml b/core-ui/src/main/res/drawable/ic_task_1_h2.xml
index f123159545..87f69a35c1 100644
--- a/core-ui/src/main/res/drawable/ic_task_1_h2.xml
+++ b/core-ui/src/main/res/drawable/ic_task_1_h2.xml
@@ -5,10 +5,10 @@
     android:viewportHeight="24">
   <path
       android:pathData="M0,6C0,2.6863 2.6863,0 6,0H18C21.3137,0 24,2.6863 24,6V18C24,21.3137 21.3137,24 18,24H6C2.6863,24 0,21.3137 0,18V6Z"
-      android:fillColor="#57C600"/>
+      android:fillColor="@color/success_green"/>
   <path
       android:pathData="M6.5,11.5L11.5,17L17.9998,6"
       android:strokeWidth="2.5"
-      android:fillColor="#00000000"
-      android:strokeColor="#ffffff"/>
+      android:fillColor="@color/transparent_black"
+      android:strokeColor="@color/white"/>
 </vector>
diff --git a/core-ui/src/main/res/drawable/ic_task_1_text_14.xml b/core-ui/src/main/res/drawable/ic_task_1_text_14.xml
deleted file mode 100644
index 702a216b28..0000000000
--- a/core-ui/src/main/res/drawable/ic_task_1_text_14.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="18dp"
-    android:height="18dp"
-    android:viewportWidth="18"
-    android:viewportHeight="18">
-  <path
-      android:pathData="M0,4.5C0,2.0147 2.0147,0 4.5,0H13.5C15.9853,0 18,2.0147 18,4.5V13.5C18,15.9853 15.9853,18 13.5,18H4.5C2.0147,18 0,15.9853 0,13.5V4.5Z"
-      android:fillColor="#57C600"/>
-  <path
-      android:pathData="M5,8.5L8.5,12.5L13.5,4.5"
-      android:strokeWidth="1.35"
-      android:fillColor="#00000000"
-      android:strokeColor="#ffffff"/>
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_task_1_text_16.xml b/core-ui/src/main/res/drawable/ic_task_1_text_16.xml
index f4b74077bc..18e7ca1fae 100644
--- a/core-ui/src/main/res/drawable/ic_task_1_text_16.xml
+++ b/core-ui/src/main/res/drawable/ic_task_1_text_16.xml
@@ -6,14 +6,14 @@
   <path
       android:pathData="M2.2222,9.4449L8.3333,16.6671L17.7777,2.2227"
       android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="#57C600"/>
+      android:fillColor="@color/transparent_black"
+      android:strokeColor="@color/success_green"/>
   <path
       android:pathData="M0,5C0,2.2386 2.2386,0 5,0H15C17.7614,0 20,2.2386 20,5V15C20,17.7614 17.7614,20 15,20H5C2.2386,20 0,17.7614 0,15V5Z"
-      android:fillColor="#57C600"/>
+      android:fillColor="@color/success_green"/>
   <path
       android:pathData="M5.5,9.5034L9.5,14L15,5"
       android:strokeWidth="1.5"
-      android:fillColor="#00000000"
-      android:strokeColor="#ffffff"/>
+      android:fillColor="@color/transparent_black"
+      android:strokeColor="@color/white"/>
 </vector>
diff --git a/core-ui/src/main/res/drawable/ic_task_1_text_17.xml b/core-ui/src/main/res/drawable/ic_task_1_text_17.xml
index f4b74077bc..18e7ca1fae 100644
--- a/core-ui/src/main/res/drawable/ic_task_1_text_17.xml
+++ b/core-ui/src/main/res/drawable/ic_task_1_text_17.xml
@@ -6,14 +6,14 @@
   <path
       android:pathData="M2.2222,9.4449L8.3333,16.6671L17.7777,2.2227"
       android:strokeWidth="2"
-      android:fillColor="#00000000"
-      android:strokeColor="#57C600"/>
+      android:fillColor="@color/transparent_black"
+      android:strokeColor="@color/success_green"/>
   <path
       android:pathData="M0,5C0,2.2386 2.2386,0 5,0H15C17.7614,0 20,2.2386 20,5V15C20,17.7614 17.7614,20 15,20H5C2.2386,20 0,17.7614 0,15V5Z"
-      android:fillColor="#57C600"/>
+      android:fillColor="@color/success_green"/>
   <path
       android:pathData="M5.5,9.5034L9.5,14L15,5"
       android:strokeWidth="1.5"
-      android:fillColor="#00000000"
-      android:strokeColor="#ffffff"/>
+      android:fillColor="@color/transparent_black"
+      android:strokeColor="@color/white"/>
 </vector>
diff --git a/core-ui/src/main/res/drawable/ic_templates_expand.xml b/core-ui/src/main/res/drawable/ic_templates_expand.xml
index 910fc6a691..d159b10e65 100644
--- a/core-ui/src/main/res/drawable/ic_templates_expand.xml
+++ b/core-ui/src/main/res/drawable/ic_templates_expand.xml
@@ -6,7 +6,7 @@
   <path
       android:pathData="M5,7L9,11L13,7"
       android:strokeWidth="1.5"
-      android:fillColor="#00000000"
+      android:fillColor="@color/transparent_black"
       android:strokeColor="@color/text_primary"
       android:strokeLineCap="round"/>
 </vector>
diff --git a/core-ui/src/main/res/drawable/ic_title.xml b/core-ui/src/main/res/drawable/ic_title.xml
deleted file mode 100644
index 41efa886ae..0000000000
--- a/core-ui/src/main/res/drawable/ic_title.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="25dp"
-    android:viewportWidth="24"
-    android:viewportHeight="25">
-  <path
-      android:pathData="M5.5,18.2739L18.5,18.2739A0.5,0.5 0,0 1,19 18.7739L19,19.477A0.5,0.5 0,0 1,18.5 19.977L5.5,19.977A0.5,0.5 0,0 1,5 19.477L5,18.7739A0.5,0.5 0,0 1,5.5 18.2739z"
-      android:fillColor="#2C2B27"/>
-  <path
-      android:pathData="M7.7351,15.3088C7.6205,15.6347 7.8629,15.9759 8.2084,15.9748L9.1391,15.9718C9.3546,15.9711 9.5454,15.8324 9.6126,15.6277L12.5652,6.633C12.6713,6.3096 12.4305,5.977 12.0901,5.977H11.3729C11.1607,5.977 10.9717,6.1109 10.9013,6.3111L7.7351,15.3088Z"
-      android:fillColor="#2C2B27"/>
-  <path
-      android:pathData="M16.2649,15.3088C16.3795,15.6347 16.137,15.9759 15.7916,15.9748L14.8609,15.9718C14.6454,15.9711 14.4546,15.8324 14.3874,15.6277L11.4348,6.633C11.3287,6.3096 11.5695,5.977 11.9099,5.977H12.6271C12.8393,5.977 13.0283,6.1109 13.0987,6.3111L16.2649,15.3088Z"
-      android:fillColor="#2C2B27"/>
-  <path
-      android:pathData="M10,12.4727h4v1.5002h-4z"
-      android:fillColor="#2C2B27"/>
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_todo_title_checkbox.xml b/core-ui/src/main/res/drawable/ic_todo_title_checkbox.xml
index 8d84ddfdf0..ecf8eb24b3 100644
--- a/core-ui/src/main/res/drawable/ic_todo_title_checkbox.xml
+++ b/core-ui/src/main/res/drawable/ic_todo_title_checkbox.xml
@@ -6,6 +6,6 @@
   <path
       android:strokeWidth="1"
       android:pathData="M7.563,1.5L20.563,1.5A6,6 0,0 1,26.563 7.5L26.563,20.5A6,6 0,0 1,20.563 26.5L7.563,26.5A6,6 0,0 1,1.563 20.5L1.563,7.5A6,6 0,0 1,7.563 1.5z"
-      android:fillColor="#00000000"
-      android:strokeColor="#ACA996"/>
+      android:fillColor="@color/transparent_black"
+      android:strokeColor="@color/gray"/>
 </vector>
diff --git a/core-ui/src/main/res/drawable/ic_todo_title_checkbox_active.xml b/core-ui/src/main/res/drawable/ic_todo_title_checkbox_active.xml
index 38aebd9e44..5853962ae8 100644
--- a/core-ui/src/main/res/drawable/ic_todo_title_checkbox_active.xml
+++ b/core-ui/src/main/res/drawable/ic_todo_title_checkbox_active.xml
@@ -9,6 +9,6 @@
   <path
       android:pathData="M8,13L13.5,19.5L21.0001,7"
       android:strokeWidth="2.5"
-      android:fillColor="#00000000"
-      android:strokeColor="#ffffff"/>
+      android:fillColor="@color/transparent_black"
+      android:strokeColor="@color/white"/>
 </vector>
diff --git a/core-ui/src/main/res/drawable/ic_toolbar_action_delete.xml b/core-ui/src/main/res/drawable/ic_toolbar_action_delete.xml
deleted file mode 100644
index 0f77ed5de0..0000000000
--- a/core-ui/src/main/res/drawable/ic_toolbar_action_delete.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="#2C2B27"
-        android:pathData="M4,6H20V5C20,5 20,4 18.9961,4C11.6167,4 5.6193,4 4.9883,4C4,4 4,5 4,5V6Z" />
-    <path
-        android:fillColor="#2C2B27"
-        android:pathData="M9,3.4998C9,2.6715 9.6715,2 10.4998,2H13.5002C14.3285,2 15,2.6715 15,3.4998V4.5002C15,5.3285 14.3285,6 13.5002,6H10.4998C9.6715,6 9,5.3285 9,4.5002V3.4998Z" />
-    <path
-        android:fillColor="#2C2B27"
-        android:pathData="M9,8H11V18H9V8Z" />
-    <path
-        android:fillColor="#2C2B27"
-        android:pathData="M13,8H15V18H13V8Z" />
-    <path
-        android:fillColor="#2C2B27"
-        android:pathData="M5,6H7V19C7,19.5523 7.4477,20 8,20H16C16.5523,20 17,19.5523 17,19V6H19C19,8.4687 19,15.0927 19,19.0004C19,20.6572 17.6569,22 16,22H8C6.3432,22 5,20.6569 5,19V6Z" />
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_toolbar_action_duplicate.xml b/core-ui/src/main/res/drawable/ic_toolbar_action_duplicate.xml
deleted file mode 100644
index 4df4f35eea..0000000000
--- a/core-ui/src/main/res/drawable/ic_toolbar_action_duplicate.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="#2C2B27"
-        android:fillType="evenOdd"
-        android:pathData="M8,2C6.8954,2 6,2.8954 6,4H20V18C21.1025,18 21.9962,17.1063 21.9962,16.0038V3.9962C21.9962,2.8937 21.1025,2 20,2H8Z" />
-    <path
-        android:fillColor="#2C2B27"
-        android:fillType="evenOdd"
-        android:pathData="M16,8H4V20H16V8ZM4,6C2.8954,6 2,6.8954 2,8V20C2,21.1046 2.8954,22 4,22H16C17.1046,22 18,21.1046 18,20V8C18,6.8954 17.1046,6 16,6H4Z" />
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_toolbar_action_mention.xml b/core-ui/src/main/res/drawable/ic_toolbar_action_mention.xml
deleted file mode 100644
index af2b6fb941..0000000000
--- a/core-ui/src/main/res/drawable/ic_toolbar_action_mention.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="#2C2B27"
-        android:pathData="M11.8868,8.9672C13.4139,8.9672 14.3913,10.1416 14.3913,12.0349C14.3913,13.9283 13.4139,15.1266 11.8623,15.1266C10.384,15.1266 9.4799,13.9642 9.4799,12.0349C9.4799,10.1056 10.3718,8.9672 11.8868,8.9672ZM12.3022,1.969C6.2667,1.969 2.125,6.0433 2.125,11.975C2.125,18.0505 6.1812,21.969 12.5098,21.969C13.9637,21.969 15.3565,21.7773 16.4072,21.4417V19.7401C15.6742,20.0397 14.1348,20.2434 12.5954,20.2434C7.3785,20.2434 4.0309,17.0439 4.0309,12.0349C4.0309,7.1338 7.4152,3.6706 12.1678,3.6706C16.9692,3.6706 20.2191,6.5705 20.2191,10.9085C20.2191,13.6287 19.3028,15.3782 17.8611,15.3782C17.0303,15.3782 16.5661,14.8749 16.5661,14.0361V7.3015H14.4891V8.7515H14.2814C13.8049,7.697 12.7175,7.0499 11.4347,7.0499C8.9424,7.0499 7.2319,9.0751 7.2319,11.987C7.2319,15.0187 8.9301,17.0559 11.4714,17.0559C12.9008,17.0559 13.9637,16.3968 14.4769,15.1865H14.6846C14.88,16.3489 15.9918,17.1278 17.4579,17.1278C20.3168,17.1278 22.125,14.6952 22.125,10.8366C22.125,5.5879 18.1055,1.969 12.3022,1.969Z" />
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_toolbar_action_redo.xml b/core-ui/src/main/res/drawable/ic_toolbar_action_redo.xml
deleted file mode 100644
index f97ae2a071..0000000000
--- a/core-ui/src/main/res/drawable/ic_toolbar_action_redo.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="25dp"
-    android:height="24dp"
-    android:viewportWidth="25"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="#2C2B27"
-        android:fillType="evenOdd"
-        android:pathData="M14.4172,2.2929C14.8069,1.9024 15.4386,1.9024 15.8282,2.2929L20.525,7.0004L15.8282,11.7078C15.4386,12.0984 14.8069,12.0984 14.4172,11.7078C14.0276,11.3173 14.0276,10.6842 14.4172,10.2936L17.703,7.0004L14.4172,3.7071C14.0276,3.3166 14.0276,2.6834 14.4172,2.2929Z" />
-    <path
-        android:fillColor="#2C2B27"
-        android:pathData="M10.1254,8l0,-2l7.9996,-0l0,2z" />
-    <path
-        android:fillColor="#2C2B27"
-        android:pathData="M10.1254,20V18H14.125C14.6773,18 15.125,18.4477 15.125,19C15.125,19.5523 14.6773,20 14.125,20H10.1254Z" />
-    <path
-        android:fillColor="#2C2B27"
-        android:fillType="evenOdd"
-        android:pathData="M10.125,20C6.259,20 3.125,16.866 3.125,13C3.125,9.134 6.259,6 10.125,6V8C7.3636,8 5.125,10.2386 5.125,13C5.125,15.7614 7.3636,18 10.125,18V20Z" />
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_toolbar_action_share.xml b/core-ui/src/main/res/drawable/ic_toolbar_action_share.xml
deleted file mode 100644
index a119a96360..0000000000
--- a/core-ui/src/main/res/drawable/ic_toolbar_action_share.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="#2C2B27"
-        android:fillType="evenOdd"
-        android:pathData="M20,18V12H21C21.5523,12 22,12.4477 22,13V18C22,20.2092 20.2091,22 18,22H6C3.7909,22 2,20.2092 2,18V13C2,12.4477 2.4477,12 3,12H4V18C4,19.1046 4.8954,20 6,20H18C19.1046,20 20,19.1046 20,18Z" />
-    <path
-        android:fillColor="#2C2B27"
-        android:pathData="M12,3L12,3A1,1 0,0 1,13 4L13,15A1,1 0,0 1,12 16L12,16A1,1 0,0 1,11 15L11,4A1,1 0,0 1,12 3z" />
-    <path
-        android:fillColor="#2C2B27"
-        android:fillType="evenOdd"
-        android:pathData="M12,1.0858L16.7071,5.7929C17.0976,6.1835 17.0976,6.8166 16.7071,7.2071C16.3166,7.5977 15.6834,7.5977 15.2929,7.2071L12,3.9142L8.7071,7.2071C8.3166,7.5977 7.6834,7.5977 7.2929,7.2071C6.9024,6.8166 6.9024,6.1835 7.2929,5.7929L12,1.0858Z" />
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_toolbar_action_undo.xml b/core-ui/src/main/res/drawable/ic_toolbar_action_undo.xml
deleted file mode 100644
index 1a04bfda7b..0000000000
--- a/core-ui/src/main/res/drawable/ic_toolbar_action_undo.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="#2C2B27"
-        android:fillType="evenOdd"
-        android:pathData="M9.7078,2.2929C9.3181,1.9024 8.6864,1.9024 8.2968,2.2929L3.6,7.0004L8.2968,11.7078C8.6864,12.0984 9.3181,12.0984 9.7078,11.7078C10.0974,11.3173 10.0974,10.6842 9.7078,10.2936L6.422,7.0004L9.7078,3.7071C10.0974,3.3166 10.0974,2.6834 9.7078,2.2929Z" />
-    <path
-        android:fillColor="#2C2B27"
-        android:pathData="M13.9996,8l-0,-2l-7.9996,-0l-0,2z" />
-    <path
-        android:fillColor="#2C2B27"
-        android:pathData="M13.9996,20V18H10C9.4477,18 9,18.4477 9,19C9,19.5523 9.4477,20 10,20H13.9996Z" />
-    <path
-        android:fillColor="#2C2B27"
-        android:fillType="evenOdd"
-        android:pathData="M14,20C17.866,20 21,16.866 21,13C21,9.134 17.866,6 14,6V8C16.7614,8 19,10.2386 19,13C19,15.7614 16.7614,18 14,18V20Z" />
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_toolbar_actions.xml b/core-ui/src/main/res/drawable/ic_toolbar_actions.xml
deleted file mode 100644
index 2ed50e09fc..0000000000
--- a/core-ui/src/main/res/drawable/ic_toolbar_actions.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="#ACA996"
-        android:fillType="evenOdd"
-        android:pathData="M19,5H15V9H19V5ZM15,3C13.8954,3 13,3.8954 13,5V9C13,10.1046 13.8954,11 15,11H19C20.1046,11 21,10.1046 21,9V5C21,3.8954 20.1046,3 19,3H15Z" />
-    <path
-        android:fillColor="#ACA996"
-        android:fillType="evenOdd"
-        android:pathData="M9,5H5V9H9V5ZM5,3C3.8954,3 3,3.8954 3,5V9C3,10.1046 3.8954,11 5,11H9C10.1046,11 11,10.1046 11,9V5C11,3.8954 10.1046,3 9,3H5Z" />
-    <path
-        android:fillColor="#ACA996"
-        android:fillType="evenOdd"
-        android:pathData="M19,15.0115H15V19.0115H19V15.0115ZM15,13.0115C13.8954,13.0115 13,13.9069 13,15.0115V19.0115C13,20.116 13.8954,21.0115 15,21.0115H19C20.1046,21.0115 21,20.116 21,19.0115V15.0115C21,13.9069 20.1046,13.0115 19,13.0115H15Z" />
-    <path
-        android:fillColor="#ACA996"
-        android:fillType="evenOdd"
-        android:pathData="M9,15.0115H5V19.0115H9V15.0115ZM5,13.0115C3.8954,13.0115 3,13.9069 3,15.0115V19.0115C3,20.116 3.8954,21.0115 5,21.0115H9C10.1046,21.0115 11,20.116 11,19.0115V15.0115C11,13.9069 10.1046,13.0115 9,13.0115H5Z" />
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_toolbar_actions_selected.xml b/core-ui/src/main/res/drawable/ic_toolbar_actions_selected.xml
deleted file mode 100644
index 36724353a4..0000000000
--- a/core-ui/src/main/res/drawable/ic_toolbar_actions_selected.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="#000000"
-        android:fillType="evenOdd"
-        android:pathData="M19,5H15V9H19V5ZM15,3C13.8954,3 13,3.8954 13,5V9C13,10.1046 13.8954,11 15,11H19C20.1046,11 21,10.1046 21,9V5C21,3.8954 20.1046,3 19,3H15Z" />
-    <path
-        android:fillColor="#000000"
-        android:fillType="evenOdd"
-        android:pathData="M9,5H5V9H9V5ZM5,3C3.8954,3 3,3.8954 3,5V9C3,10.1046 3.8954,11 5,11H9C10.1046,11 11,10.1046 11,9V5C11,3.8954 10.1046,3 9,3H5Z" />
-    <path
-        android:fillColor="#000000"
-        android:fillType="evenOdd"
-        android:pathData="M19,15.0115H15V19.0115H19V15.0115ZM15,13.0115C13.8954,13.0115 13,13.9069 13,15.0115V19.0115C13,20.116 13.8954,21.0115 15,21.0115H19C20.1046,21.0115 21,20.116 21,19.0115V15.0115C21,13.9069 20.1046,13.0115 19,13.0115H15Z" />
-    <path
-        android:fillColor="#000000"
-        android:fillType="evenOdd"
-        android:pathData="M9,15.0115H5V19.0115H9V15.0115ZM5,13.0115C3.8954,13.0115 3,13.9069 3,15.0115V19.0115C3,20.116 3.8954,21.0115 5,21.0115H9C10.1046,21.0115 11,20.116 11,19.0115V15.0115C11,13.9069 10.1046,13.0115 9,13.0115H5Z" />
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_toolbar_actions_selector.xml b/core-ui/src/main/res/drawable/ic_toolbar_actions_selector.xml
deleted file mode 100644
index 2b9a645c1f..0000000000
--- a/core-ui/src/main/res/drawable/ic_toolbar_actions_selector.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/ic_toolbar_actions" android:state_selected="false" />
-    <item android:drawable="@drawable/ic_toolbar_actions_selected" android:state_selected="true" />
-</selector>
\ No newline at end of file
diff --git a/core-ui/src/main/res/drawable/ic_toolbar_add_block.xml b/core-ui/src/main/res/drawable/ic_toolbar_add_block.xml
deleted file mode 100644
index 1a252b19b2..0000000000
--- a/core-ui/src/main/res/drawable/ic_toolbar_add_block.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="#ACA996"
-        android:fillType="evenOdd"
-        android:pathData="M12,0C5.3726,0 0,5.3726 0,12C0,18.6274 5.3726,24 12,24C18.6274,24 24,18.6274 24,12C24,5.3726 18.6274,0 12,0ZM11,11V6H13V11H18V13H13V18H11V13H6V11H11Z" />
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_toolbar_add_block_selected.xml b/core-ui/src/main/res/drawable/ic_toolbar_add_block_selected.xml
deleted file mode 100644
index 42fce09c8c..0000000000
--- a/core-ui/src/main/res/drawable/ic_toolbar_add_block_selected.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="#2C2B27"
-        android:fillType="evenOdd"
-        android:pathData="M12,0C5.3726,0 0,5.3726 0,12C0,18.6274 5.3726,24 12,24C18.6274,24 24,18.6274 24,12C24,5.3726 18.6274,0 12,0ZM11,11V6H13V11H18V13H13V18H11V13H6V11H11Z" />
-</vector>
\ No newline at end of file
diff --git a/core-ui/src/main/res/drawable/ic_toolbar_add_block_selector.xml b/core-ui/src/main/res/drawable/ic_toolbar_add_block_selector.xml
deleted file mode 100644
index fa2d9c637f..0000000000
--- a/core-ui/src/main/res/drawable/ic_toolbar_add_block_selector.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/ic_toolbar_add_block" android:state_selected="false" />
-    <item android:drawable="@drawable/ic_toolbar_add_block_selected" android:state_selected="true" />
-</selector>
\ No newline at end of file
diff --git a/core-ui/src/main/res/drawable/ic_toolbar_add_doc.xml b/core-ui/src/main/res/drawable/ic_toolbar_add_doc.xml
deleted file mode 100644
index 1b254715be..0000000000
--- a/core-ui/src/main/res/drawable/ic_toolbar_add_doc.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="25dp"
-    android:height="24dp"
-    android:viewportWidth="25"
-    android:viewportHeight="24">
-  <path
-      android:pathData="M12,3L12,3A0.75,0.75 0,0 1,12.75 3.75L12.75,20.25A0.75,0.75 0,0 1,12 21L12,21A0.75,0.75 0,0 1,11.25 20.25L11.25,3.75A0.75,0.75 0,0 1,12 3z"
-      android:fillColor="#ffffff"/>
-  <path
-      android:pathData="M3,12L3,12A0.75,0.75 0,0 1,3.75 11.25L20.25,11.25A0.75,0.75 0,0 1,21 12L21,12A0.75,0.75 0,0 1,20.25 12.75L3.75,12.75A0.75,0.75 0,0 1,3 12z"
-      android:fillColor="#ffffff"/>
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_toolbar_color.xml b/core-ui/src/main/res/drawable/ic_toolbar_color.xml
deleted file mode 100644
index 77bc25e101..0000000000
--- a/core-ui/src/main/res/drawable/ic_toolbar_color.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="#ACA996"
-        android:fillType="evenOdd"
-        android:pathData="M5,5H19V5.2188L5.2188,19H5L5,5ZM3,5C3,3.8954 3.8954,3 5,3H19C20.1046,3 21,3.8954 21,5V19C21,20.1046 20.1046,21 19,21H5C3.8954,21 3,20.1046 3,19V5Z" />
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_toolbar_color_selected.xml b/core-ui/src/main/res/drawable/ic_toolbar_color_selected.xml
deleted file mode 100644
index e4f442dbf9..0000000000
--- a/core-ui/src/main/res/drawable/ic_toolbar_color_selected.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="#2C2B27"
-        android:fillType="evenOdd"
-        android:pathData="M5,5H19V5.2188L5.2188,19H5L5,5ZM3,5C3,3.8954 3.8954,3 5,3H19C20.1046,3 21,3.8954 21,5V19C21,20.1046 20.1046,21 19,21H5C3.8954,21 3,20.1046 3,19V5Z" />
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_toolbar_color_selector.xml b/core-ui/src/main/res/drawable/ic_toolbar_color_selector.xml
deleted file mode 100644
index 62eca91bab..0000000000
--- a/core-ui/src/main/res/drawable/ic_toolbar_color_selector.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/ic_toolbar_color" android:state_selected="false" />
-    <item android:drawable="@drawable/ic_toolbar_color_selected" android:state_selected="true" />
-</selector>
\ No newline at end of file
diff --git a/core-ui/src/main/res/drawable/ic_toolbar_keyboard.xml b/core-ui/src/main/res/drawable/ic_toolbar_keyboard.xml
deleted file mode 100644
index b8026ed15a..0000000000
--- a/core-ui/src/main/res/drawable/ic_toolbar_keyboard.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="#ACA996"
-        android:fillType="evenOdd"
-        android:pathData="M4,5.0001V15.0009H20V5.0001H4ZM3,3C2.4477,3 2,3.4478 2,4.0001V16.0009C2,16.5532 2.4477,17.001 3,17.001H21C21.5523,17.001 22,16.5532 22,16.0009V4.0001C22,3.4478 21.5523,3 21,3H3Z" />
-    <path
-        android:fillColor="#ACA996"
-        android:pathData="M8,9.0005H10V11.0006H8V9.0005Z" />
-    <path
-        android:fillColor="#ACA996"
-        android:pathData="M5,9.0005H7V11.0006H5V9.0005Z" />
-    <path
-        android:fillColor="#ACA996"
-        android:pathData="M7,12.0005H17V14.0007H7V12.0005Z" />
-    <path
-        android:fillColor="#ACA996"
-        android:pathData="M14,9.0005H16V11.0006H14V9.0005Z" />
-    <path
-        android:fillColor="#ACA996"
-        android:pathData="M17,9.0005H19V11.0006H17V9.0005Z" />
-    <path
-        android:fillColor="#ACA996"
-        android:pathData="M11,9.0005H13V11.0006H11V9.0005Z" />
-    <path
-        android:fillColor="#ACA996"
-        android:pathData="M8,6.0002H10V8.0004H8V6.0002Z" />
-    <path
-        android:fillColor="#ACA996"
-        android:pathData="M5,6.0002H7V8.0004H5V6.0002Z" />
-    <path
-        android:fillColor="#ACA996"
-        android:pathData="M14,6.0002H16V8.0004H14V6.0002Z" />
-    <path
-        android:fillColor="#ACA996"
-        android:pathData="M17,6.0002H19V8.0004H17V6.0002Z" />
-    <path
-        android:fillColor="#ACA996"
-        android:pathData="M11,6.0002H13V8.0004H11V6.0002Z" />
-    <path
-        android:fillColor="#ACA996"
-        android:fillType="evenOdd"
-        android:pathData="M8.2197,19.2208C8.5126,18.9279 8.9874,18.9279 9.2803,19.2208L11.8586,21.7992C11.9367,21.8773 12.0633,21.8773 12.1414,21.7992L14.7197,19.2208C15.0126,18.9279 15.4874,18.9279 15.7803,19.2208C16.0732,19.5137 16.0732,19.9886 15.7803,20.2815L12.1061,23.956C12.0475,24.0146 11.9525,24.0146 11.8939,23.956L8.2197,20.2815C7.9268,19.9886 7.9268,19.5137 8.2197,19.2208Z" />
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_toolbar_markup_code.xml b/core-ui/src/main/res/drawable/ic_toolbar_markup_code.xml
index 2d7d6a2a75..5b1e26c764 100644
--- a/core-ui/src/main/res/drawable/ic_toolbar_markup_code.xml
+++ b/core-ui/src/main/res/drawable/ic_toolbar_markup_code.xml
@@ -6,11 +6,11 @@
   <path
       android:pathData="M9,6L3,12L9,18"
       android:strokeWidth="1.5"
-      android:fillColor="#00000000"
+      android:fillColor="@color/transparent_black"
       android:strokeColor="@color/glyph_active"/>
   <path
       android:pathData="M15,6L21,12L15,18"
       android:strokeWidth="1.5"
-      android:fillColor="#00000000"
+      android:fillColor="@color/transparent_black"
       android:strokeColor="@color/glyph_active"/>
 </vector>
diff --git a/core-ui/src/main/res/drawable/ic_toolbar_markup_code_active.xml b/core-ui/src/main/res/drawable/ic_toolbar_markup_code_active.xml
index 62cc92661e..e23b18cf65 100644
--- a/core-ui/src/main/res/drawable/ic_toolbar_markup_code_active.xml
+++ b/core-ui/src/main/res/drawable/ic_toolbar_markup_code_active.xml
@@ -6,11 +6,11 @@
   <path
       android:pathData="M9,6L3,12L9,18"
       android:strokeWidth="1.5"
-      android:fillColor="#00000000"
+      android:fillColor="@color/transparent_black"
       android:strokeColor="@color/glyph_selected"/>
   <path
       android:pathData="M15,6L21,12L15,18"
       android:strokeWidth="1.5"
-      android:fillColor="#00000000"
+      android:fillColor="@color/transparent_black"
       android:strokeColor="@color/glyph_selected"/>
 </vector>
diff --git a/core-ui/src/main/res/drawable/ic_toolbar_markup_code_disabled.xml b/core-ui/src/main/res/drawable/ic_toolbar_markup_code_disabled.xml
index 50f82ce270..10c22ff9c5 100644
--- a/core-ui/src/main/res/drawable/ic_toolbar_markup_code_disabled.xml
+++ b/core-ui/src/main/res/drawable/ic_toolbar_markup_code_disabled.xml
@@ -6,11 +6,11 @@
   <path
       android:pathData="M9,6L3,12L9,18"
       android:strokeWidth="1.5"
-      android:fillColor="#00000000"
+      android:fillColor="@color/transparent_black"
       android:strokeColor="@color/glyph_inactive"/>
   <path
       android:pathData="M15,6L21,12L15,18"
       android:strokeWidth="1.5"
-      android:fillColor="#00000000"
+      android:fillColor="@color/transparent_black"
       android:strokeColor="@color/glyph_inactive"/>
 </vector>
diff --git a/core-ui/src/main/res/drawable/ic_toolbar_markup_strike_through_disabled.xml b/core-ui/src/main/res/drawable/ic_toolbar_markup_strike_through_disabled.xml
index 47464145ee..16c433608c 100644
--- a/core-ui/src/main/res/drawable/ic_toolbar_markup_strike_through_disabled.xml
+++ b/core-ui/src/main/res/drawable/ic_toolbar_markup_strike_through_disabled.xml
@@ -9,6 +9,6 @@
   <path
       android:pathData="M4.375,11.832h15.25v0.75h-15.25z"
       android:strokeWidth="0.75"
-      android:fillColor="#ACA996"
+      android:fillColor="@color/gray"
       android:strokeColor="@color/glyph_inactive"/>
 </vector>
diff --git a/core-ui/src/main/res/drawable/ic_toolbar_navigation.xml b/core-ui/src/main/res/drawable/ic_toolbar_navigation.xml
deleted file mode 100644
index 3779dd83b2..0000000000
--- a/core-ui/src/main/res/drawable/ic_toolbar_navigation.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="20dp"
-    android:height="20dp"
-    android:viewportWidth="20"
-    android:viewportHeight="20">
-  <path
-      android:pathData="M17,1.5H10C9.1716,1.5 8.5,2.1716 8.5,3V17C8.5,17.8284 9.1716,18.5 10,18.5H17C17.8284,18.5 18.5,17.8284 18.5,17V3C18.5,2.1716 17.8284,1.5 17,1.5ZM10,0C8.3432,0 7,1.3432 7,3V17C7,18.6569 8.3432,20 10,20H17C18.6569,20 20,18.6569 20,17V3C20,1.3432 18.6569,0 17,0H10Z"
-      android:fillColor="#ffffff"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M5,17V3C5,1.3432 6.3432,0 8,0H6.5C4.8432,0 3.5,1.3432 3.5,3V17C3.5,18.6569 4.8432,20 6.5,20H8C6.3432,20 5,18.6569 5,17Z"
-      android:fillColor="#ffffff"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M1.5,17V3C1.5,1.3432 2.8431,0 4.5,0H3C1.3432,0 0,1.3432 0,3V17C0,18.6569 1.3432,20 3,20H4.5C2.8431,20 1.5,18.6569 1.5,17Z"
-      android:fillColor="#ffffff"
-      android:fillType="evenOdd"/>
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_toolbar_option_bookmark.xml b/core-ui/src/main/res/drawable/ic_toolbar_option_bookmark.xml
deleted file mode 100644
index f28e2c7037..0000000000
--- a/core-ui/src/main/res/drawable/ic_toolbar_option_bookmark.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="#F55522"
-        android:fillType="evenOdd"
-        android:pathData="M12,18L20,22V4C20,2.8954 19.1046,2 18,2H6C4.8954,2 4,2.8954 4,4V22L12,18ZM6,18.7639L12,15.7639L18,18.7639V4H6V18.7639Z" />
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_toolbar_option_bulleted.xml b/core-ui/src/main/res/drawable/ic_toolbar_option_bulleted.xml
deleted file mode 100644
index c60ee69736..0000000000
--- a/core-ui/src/main/res/drawable/ic_toolbar_option_bulleted.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="#FFB522"
-        android:pathData="M8.9158,4.978h12v2h-12z" />
-    <path
-        android:fillColor="#FFB522"
-        android:pathData="M8.9158,10.978h12v2h-12z" />
-    <path
-        android:fillColor="#FFB522"
-        android:pathData="M8.9158,16.978h12v2h-12z" />
-    <path
-        android:fillColor="#FFB522"
-        android:pathData="M5.0403,13.978C6.1448,13.978 7.0403,13.0826 7.0403,11.978C7.0403,10.8735 6.1448,9.978 5.0403,9.978C3.9357,9.978 3.0403,10.8735 3.0403,11.978C3.0403,13.0826 3.9357,13.978 5.0403,13.978Z" />
-    <path
-        android:fillColor="#FFB522"
-        android:pathData="M5.0403,19.978C6.1448,19.978 7.0403,19.0826 7.0403,17.978C7.0403,16.8735 6.1448,15.978 5.0403,15.978C3.9357,15.978 3.0403,16.8735 3.0403,17.978C3.0403,19.0826 3.9357,19.978 5.0403,19.978Z" />
-    <path
-        android:fillColor="#FFB522"
-        android:pathData="M5.0403,7.978C6.1448,7.978 7.0403,7.0826 7.0403,5.978C7.0403,4.8735 6.1448,3.978 5.0403,3.978C3.9357,3.978 3.0403,4.8735 3.0403,5.978C3.0403,7.0826 3.9357,7.978 5.0403,7.978Z" />
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_toolbar_option_code.xml b/core-ui/src/main/res/drawable/ic_toolbar_option_code.xml
deleted file mode 100644
index d7270e78a4..0000000000
--- a/core-ui/src/main/res/drawable/ic_toolbar_option_code.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="#F55522"
-        android:fillType="evenOdd"
-        android:pathData="M9.1973,5.2932C9.5878,5.6838 9.5878,6.3169 9.1973,6.7074L3.9044,12L9.1973,17.2926C9.5878,17.6831 9.5878,18.3163 9.1973,18.7068C8.8068,19.0973 8.1736,19.0974 7.7831,18.7068L1.0759,12L7.7831,5.2932C8.1736,4.9027 8.8068,4.9027 9.1973,5.2932Z" />
-    <path
-        android:fillColor="#F55522"
-        android:fillType="evenOdd"
-        android:pathData="M14.8335,5.2932C14.4429,5.6838 14.443,6.3169 14.8335,6.7074L20.1263,12L14.8335,17.2926C14.443,17.6831 14.4429,18.3163 14.8335,18.7068C15.224,19.0973 15.8571,19.0974 16.2477,18.7068L22.9548,12L16.2477,5.2932C15.8571,4.9027 15.224,4.9027 14.8335,5.2932Z" />
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_toolbar_option_contact.xml b/core-ui/src/main/res/drawable/ic_toolbar_option_contact.xml
deleted file mode 100644
index cfa251dc38..0000000000
--- a/core-ui/src/main/res/drawable/ic_toolbar_option_contact.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="#2AA7EE"
-        android:fillType="evenOdd"
-        android:pathData="M12,21C16.9706,21 21,16.9706 21,12C21,7.0294 16.9706,3 12,3C7.0294,3 3,7.0294 3,12C3,16.9706 7.0294,21 12,21ZM12,23C18.0751,23 23,18.0751 23,12C23,5.9249 18.0751,1 12,1C5.9249,1 1,5.9249 1,12C1,18.0751 5.9249,23 12,23Z" />
-    <path
-        android:fillColor="#2AA7EE"
-        android:pathData="M12,9m-3,0a3,3 0,1 1,6 0a3,3 0,1 1,-6 0" />
-    <path
-        android:fillColor="#2AA7EE"
-        android:fillType="evenOdd"
-        android:pathData="M6.1921,16C7.4571,14.1865 9.5587,13 11.9374,13C14.3162,13 16.4178,14.1865 17.6828,16C16.4178,17.8135 14.3162,19 11.9374,19C9.5587,19 7.4571,17.8135 6.1921,16Z" />
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_toolbar_option_divider.xml b/core-ui/src/main/res/drawable/ic_toolbar_option_divider.xml
deleted file mode 100644
index a91bf9a24f..0000000000
--- a/core-ui/src/main/res/drawable/ic_toolbar_option_divider.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="#A646C9"
-        android:pathData="M6,5h11.9688v2h-11.9688z" />
-    <path
-        android:fillColor="#A646C9"
-        android:pathData="M3,11h18v2h-18z" />
-    <path
-        android:fillColor="#A646C9"
-        android:pathData="M6,17h11.9688v2h-11.9688z" />
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_toolbar_option_existing_tool.xml b/core-ui/src/main/res/drawable/ic_toolbar_option_existing_tool.xml
deleted file mode 100644
index 3094b2c32b..0000000000
--- a/core-ui/src/main/res/drawable/ic_toolbar_option_existing_tool.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="#2AA7EE"
-        android:pathData="M4,13.9794H12.99V14.9794H4V13.9794Z" />
-    <path
-        android:fillColor="#2AA7EE"
-        android:pathData="M12.7853,14.4957L10.3439,12.0386C10.1497,11.8431 10.1504,11.5273 10.3455,11.3328C10.5411,11.1377 10.8579,11.1384 11.0526,11.3344L14.1952,14.4973L11.0526,17.6458C10.8574,17.8413 10.5406,17.8413 10.3455,17.6458C10.1508,17.4508 10.1508,17.135 10.3455,16.94L12.7853,14.4957Z" />
-    <path
-        android:fillColor="#2AA7EE"
-        android:fillType="evenOdd"
-        android:pathData="M20,8.15L13.85,2H6C4.8954,2 4,2.8954 4,4V12H6L6,4H13V8C13,8.5523 13.4477,9 14,9H18V20H6V17H4V20C4,21.1046 4.8954,22 6,22H18C19.1046,22 20,21.1046 20,20V8.15Z" />
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_toolbar_option_file.xml b/core-ui/src/main/res/drawable/ic_toolbar_option_file.xml
deleted file mode 100644
index 33aafbd18c..0000000000
--- a/core-ui/src/main/res/drawable/ic_toolbar_option_file.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="#F55522"
-        android:pathData="M13.0006,6C13.0006,4.3432 11.6574,3 10.0006,3C8.3437,3 7.0005,4.3432 7.0005,6L7.0005,16C7.0005,18.7614 9.2386,21 12,21C14.7614,21 17,18.7614 17,16L16.9999,7H18.9999V16C18.9999,19.866 15.866,23 12,23C8.134,23 5,19.866 5,16L5.0005,6C5.0005,3.2386 7.2391,1 10.0006,1C12.762,1 15.0006,3.2386 15.0006,6L15.0006,15C15.0006,16.6569 13.6574,18 12.0006,18C10.3437,18 9.0006,16.6569 9.0006,15L9.0006,7H11.0006V15C11.0006,15.5523 11.4483,16 12.0006,16C12.5528,16 13.0006,15.5523 13.0006,15L13.0006,6Z" />
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_toolbar_option_header_one.xml b/core-ui/src/main/res/drawable/ic_toolbar_option_header_one.xml
deleted file mode 100644
index b4a8a960cd..0000000000
--- a/core-ui/src/main/res/drawable/ic_toolbar_option_header_one.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="#ECD91B"
-        android:fillType="evenOdd"
-        android:pathData="M19.8893,12.2378L18,13.5664V11.6364L20.1498,10H22V20H19.8893V12.2378Z" />
-    <path
-        android:fillColor="#ECD91B"
-        android:pathData="M3,10H13V12.5H3V10Z" />
-    <path
-        android:fillColor="#ECD91B"
-        android:pathData="M2,4h3.3v16h-3.3z" />
-    <path
-        android:fillColor="#ECD91B"
-        android:pathData="M14.9952,4H11.7V20H14.9952V4Z" />
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_toolbar_option_header_three.xml b/core-ui/src/main/res/drawable/ic_toolbar_option_header_three.xml
deleted file mode 100644
index 72e0cfd17c..0000000000
--- a/core-ui/src/main/res/drawable/ic_toolbar_option_header_three.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="#ECD91B"
-        android:pathData="M4,11h6v2h-6z" />
-    <path
-        android:fillColor="#ECD91B"
-        android:pathData="M3,6h2.5v12h-2.5z" />
-    <path
-        android:fillColor="#ECD91B"
-        android:pathData="M10,6h2.5v12h-2.5z" />
-    <path
-        android:fillColor="#ECD91B"
-        android:fillType="evenOdd"
-        android:pathData="M18.0233,18C15.5437,18 14.3107,16.7399 14.2158,14.7752H16.1941C16.2889,15.7101 16.7632,16.3876 17.942,16.3876C19.0395,16.3876 19.5544,15.8592 19.5544,14.992C19.5544,14.0571 19.0395,13.5964 17.9962,13.5964H17.2374V12.133H17.942C18.9717,12.133 19.4189,11.6723 19.4189,10.8458C19.4189,10.1548 18.9853,9.6399 18.0775,9.6399C17.1561,9.6399 16.587,10.1819 16.4786,11.1032H14.541C14.5952,10.2225 14.934,9.4502 15.5437,8.8946C16.1399,8.3527 17.0206,8.0275 18.1181,8.0275C19.1885,8.0275 20.0151,8.2985 20.5977,8.7727C21.1803,9.2469 21.492,9.8973 21.492,10.6561C21.492,11.7401 20.8687,12.4175 19.8931,12.7563C21.0313,13.0137 21.7765,13.7861 21.7765,15.0326C21.7765,16.8618 20.3945,18 18.0233,18Z" />
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_toolbar_option_header_two.xml b/core-ui/src/main/res/drawable/ic_toolbar_option_header_two.xml
deleted file mode 100644
index d7cd5f0f9a..0000000000
--- a/core-ui/src/main/res/drawable/ic_toolbar_option_header_two.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="#ECD91B"
-        android:fillType="evenOdd"
-        android:pathData="M15,18.6414L18.3963,14.8207C19.2907,13.8138 19.8611,12.9448 19.8611,12.0483C19.8611,11.2207 19.4463,10.7103 18.6296,10.7103C17.8,10.7103 17.2944,11.2069 17.1519,12.5172H15.2463C15.35,10.2138 16.6333,9 18.7204,9C19.7444,9 20.5481,9.3172 21.1056,9.8276C21.637,10.3655 21.9352,11.1103 21.9352,11.9931C21.9352,13.3034 21.2222,14.3793 20.1463,15.4828L18.3963,17.3034H22V19H15V18.6414Z" />
-    <path
-        android:fillColor="#ECD91B"
-        android:pathData="M4,10.6h8v2.4h-8z" />
-    <path
-        android:fillColor="#ECD91B"
-        android:pathData="M2,5h2.9v14h-2.9z" />
-    <path
-        android:fillColor="#ECD91B"
-        android:pathData="M10.1404,5h2.9v14h-2.9z" />
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_toolbar_option_highlight.xml b/core-ui/src/main/res/drawable/ic_toolbar_option_highlight.xml
deleted file mode 100644
index f55c8ad870..0000000000
--- a/core-ui/src/main/res/drawable/ic_toolbar_option_highlight.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="#ECD91B"
-        android:pathData="M8,5h12v2h-12z" />
-    <path
-        android:fillColor="#ECD91B"
-        android:pathData="M8,11h12v2h-12z" />
-    <path
-        android:fillColor="#ECD91B"
-        android:pathData="M8,17h12v2h-12z" />
-    <path
-        android:fillColor="#ECD91B"
-        android:pathData="M3,3h1v18h-1z" />
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_toolbar_option_numbered.xml b/core-ui/src/main/res/drawable/ic_toolbar_option_numbered.xml
deleted file mode 100644
index 454005b2a4..0000000000
--- a/core-ui/src/main/res/drawable/ic_toolbar_option_numbered.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="#FFB522"
-        android:fillType="evenOdd"
-        android:pathData="M3.0403,20.8354L5.265,18.4833C5.8509,17.8634 6.2245,17.3284 6.2245,16.7765C6.2245,16.267 5.9528,15.9528 5.4179,15.9528C4.8744,15.9528 4.5433,16.2585 4.4499,17.0652H3.2016C3.2696,15.6471 4.1102,14.8999 5.4773,14.8999C6.1481,14.8999 6.6746,15.0952 7.0397,15.4094C7.3879,15.7405 7.5832,16.1991 7.5832,16.7425C7.5832,17.5492 7.1161,18.2115 6.4114,18.8909L5.265,20.0117H7.6256V21.0562H3.0403V20.8354Z" />
-    <path
-        android:fillColor="#FFB522"
-        android:pathData="M10.0525,4.978h11.9688v2h-11.9688z" />
-    <path
-        android:fillColor="#FFB522"
-        android:pathData="M10.0525,16.978h11.9688v2h-11.9688z" />
-    <path
-        android:fillColor="#FFB522"
-        android:pathData="M10.0525,10.978h9v2h-9z" />
-    <path
-        android:fillColor="#FFB522"
-        android:fillType="evenOdd"
-        android:pathData="M4.9582,4.3164L3.7383,5.1157V3.9546L5.1265,2.9702H6.3212V8.9858H4.9582V4.3164Z" />
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_toolbar_option_page_or_database.xml b/core-ui/src/main/res/drawable/ic_toolbar_option_page_or_database.xml
deleted file mode 100644
index 9379705b7c..0000000000
--- a/core-ui/src/main/res/drawable/ic_toolbar_option_page_or_database.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="#2AA7EE"
-        android:fillType="evenOdd"
-        android:pathData="M13.85,2L20,8.15V20C20,21.1046 19.1046,22 18,22H6C4.8954,22 4,21.1046 4,20V4C4,2.8954 4.8954,2 6,2H13.85ZM18,9V20H6L6,4H13V8C13,8.5523 13.4476,9 13.9998,9H18Z" />
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_toolbar_option_picture.xml b/core-ui/src/main/res/drawable/ic_toolbar_option_picture.xml
deleted file mode 100644
index 28e04f325c..0000000000
--- a/core-ui/src/main/res/drawable/ic_toolbar_option_picture.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="#F55522"
-        android:fillType="evenOdd"
-        android:pathData="M20,4H4V20H20V4ZM4,2C2.8954,2 2,2.8954 2,4V20C2,21.1046 2.8954,22 4,22H20C21.1046,22 22,21.1046 22,20V4C22,2.8954 21.1046,2 20,2H4Z" />
-    <path
-        android:fillColor="#F55522"
-        android:pathData="M15,10C16.1046,10 17,9.1046 17,8C17,6.8954 16.1046,6 15,6C13.8954,6 13,6.8954 13,8C13,9.1046 13.8954,10 15,10Z" />
-    <path
-        android:fillColor="#F55522"
-        android:pathData="M5.5,18L10.4805,10L15.5,18H5.5Z" />
-    <path
-        android:fillColor="#F55522"
-        android:pathData="M12.5,18L15.5,13L18.5,18H12.5Z" />
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_toolbar_option_set.xml b/core-ui/src/main/res/drawable/ic_toolbar_option_set.xml
deleted file mode 100644
index 37e5be8a91..0000000000
--- a/core-ui/src/main/res/drawable/ic_toolbar_option_set.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="#2AA7EE"
-        android:pathData="M8,13C8,12.4477 8.4477,12 9,12C9.5523,12 10,12.4477 10,13C10,13.5523 9.5523,14 9,14C8.4477,14 8,13.5523 8,13Z" />
-    <path
-        android:fillColor="#2AA7EE"
-        android:pathData="M11,13C11,12.4477 11.4477,12 12,12C12.5523,12 13,12.4477 13,13C13,13.5523 12.5523,14 12,14C11.4477,14 11,13.5523 11,13Z" />
-    <path
-        android:fillColor="#2AA7EE"
-        android:pathData="M14,13C14,12.4477 14.4477,12 15,12C15.5523,12 16,12.4477 16,13C16,13.5523 15.5523,14 15,14C14.4477,14 14,13.5523 14,13Z" />
-    <path
-        android:fillColor="#2AA7EE"
-        android:pathData="M8,15.9967C8,15.4444 8.4477,14.9967 9,14.9967C9.5523,14.9967 10,15.4444 10,15.9967C10,16.549 9.5523,16.9967 9,16.9967C8.4477,16.9967 8,16.549 8,15.9967Z" />
-    <path
-        android:fillColor="#2AA7EE"
-        android:pathData="M11,15.9967C11,15.4444 11.4477,14.9967 12,14.9967C12.5523,14.9967 13,15.4444 13,15.9967C13,16.549 12.5523,16.9967 12,16.9967C11.4477,16.9967 11,16.549 11,15.9967Z" />
-    <path
-        android:fillColor="#2AA7EE"
-        android:pathData="M14,15.9967C14,15.4444 14.4477,14.9967 15,14.9967C15.5523,14.9967 16,15.4444 16,15.9967C16,16.549 15.5523,16.9967 15,16.9967C14.4477,16.9967 14,16.549 14,15.9967Z" />
-    <path
-        android:fillColor="#2AA7EE"
-        android:fillType="evenOdd"
-        android:pathData="M13.85,2L20,8.15V20C20,21.1046 19.1046,22 18,22H6C4.8954,22 4,21.1046 4,20V4C4,2.8954 4.8954,2 6,2H13.85ZM18,9V20H6L6,4H13V8C13,8.5523 13.4476,9 13.9998,9H18Z" />
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_toolbar_option_task.xml b/core-ui/src/main/res/drawable/ic_toolbar_option_task.xml
deleted file mode 100644
index a4bb37659e..0000000000
--- a/core-ui/src/main/res/drawable/ic_toolbar_option_task.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="#2AA7EE"
-        android:fillType="evenOdd"
-        android:pathData="M18,4H6C4.8954,4 4,4.8954 4,6V18C4,19.1046 4.8954,20 6,20H18C19.1046,20 20,19.1046 20,18V6C20,4.8954 19.1046,4 18,4ZM6,2C3.7909,2 2,3.7909 2,6V18C2,20.2091 3.7909,22 6,22H18C20.2091,22 22,20.2091 22,18V6C22,3.7909 20.2091,2 18,2H6Z" />
-    <path
-        android:fillColor="#2AA7EE"
-        android:fillType="evenOdd"
-        android:pathData="M16.9572,9.4571L10.5001,15.9142L7.043,12.4571L8.4572,11.0429L10.5001,13.0858L15.543,8.0429L16.9572,9.4571Z" />
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_toolbar_option_text.xml b/core-ui/src/main/res/drawable/ic_toolbar_option_text.xml
deleted file mode 100644
index e11dc5c7f2..0000000000
--- a/core-ui/src/main/res/drawable/ic_toolbar_option_text.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="#ECD91B"
-        android:fillType="evenOdd"
-        android:pathData="M18.125,4H6.125V5.6976H11.125V20H13.125V5.6976H18.125V4Z" />
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_toolbar_option_toggle.xml b/core-ui/src/main/res/drawable/ic_toolbar_option_toggle.xml
deleted file mode 100644
index ae8ae964ea..0000000000
--- a/core-ui/src/main/res/drawable/ic_toolbar_option_toggle.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="#FFB522"
-        android:pathData="M10.0715,4.9741h11.9688v2h-11.9688z" />
-    <path
-        android:fillColor="#FFB522"
-        android:pathData="M10.0715,10.9741h9v2h-9z" />
-    <path
-        android:fillColor="#FFB522"
-        android:pathData="M10.0715,16.9741h12v2h-12z" />
-    <path
-        android:fillColor="#FFB522"
-        android:pathData="M5.0376,5.9627L3.0409,3.9686L4.0302,2.978L7.0175,5.9614L4.0309,8.9519L3.0403,7.9626L5.0376,5.9627Z" />
-    <path
-        android:fillColor="#FFB522"
-        android:pathData="M5.0376,17.9627L3.0409,15.9686L4.0302,14.978L7.0175,17.9614L4.0309,20.9519L3.0403,19.9626L5.0376,17.9627Z" />
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_toolbar_option_video.xml b/core-ui/src/main/res/drawable/ic_toolbar_option_video.xml
deleted file mode 100644
index f8828e462d..0000000000
--- a/core-ui/src/main/res/drawable/ic_toolbar_option_video.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-    <path
-        android:fillColor="#F55522"
-        android:fillType="evenOdd"
-        android:pathData="M20,4H4V20H20V4ZM4,2C2.8954,2 2,2.8954 2,4V20C2,21.1046 2.8954,22 4,22H20C21.1046,22 22,21.1046 22,20V4C22,2.8954 21.1046,2 20,2H4Z" />
-    <path
-        android:fillColor="#F55522"
-        android:pathData="M16.9688,11.9696L9.5469,7.6846V16.2546L16.9688,11.9696Z" />
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_toolbar_search.xml b/core-ui/src/main/res/drawable/ic_toolbar_search.xml
deleted file mode 100644
index ef98e45f04..0000000000
--- a/core-ui/src/main/res/drawable/ic_toolbar_search.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:pathData="M10,15.5C13.0376,15.5 15.5,13.0376 15.5,10C15.5,6.9624 13.0376,4.5 10,4.5C6.9624,4.5 4.5,6.9624 4.5,10C4.5,13.0376 6.9624,15.5 10,15.5ZM10,17C13.866,17 17,13.866 17,10C17,6.134 13.866,3 10,3C6.134,3 3,6.134 3,10C3,13.866 6.134,17 10,17Z"
-      android:fillColor="#ffffff"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M14.4697,14.4697C14.7626,14.1768 15.2374,14.1768 15.5303,14.4697L20.5303,19.4697C20.8232,19.7626 20.8232,20.2374 20.5303,20.5303C20.2374,20.8232 19.7626,20.8232 19.4697,20.5303L14.4697,15.5303C14.1768,15.2374 14.1768,14.7626 14.4697,14.4697Z"
-      android:fillColor="#ffffff"
-      android:fillType="evenOdd"/>
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_toolbar_style_align_center.xml b/core-ui/src/main/res/drawable/ic_toolbar_style_align_center.xml
index b130eee368..86085ad107 100644
--- a/core-ui/src/main/res/drawable/ic_toolbar_style_align_center.xml
+++ b/core-ui/src/main/res/drawable/ic_toolbar_style_align_center.xml
@@ -6,21 +6,21 @@
   <path
       android:pathData="M3.375,5.625h17.25v0.75h-17.25z"
       android:strokeWidth="0.75"
-      android:fillColor="#00000000"
+      android:fillColor="@color/transparent_black"
       android:strokeColor="@color/glyph_selected"/>
   <path
       android:pathData="M6.375,17.625h11.25v0.75h-11.25z"
       android:strokeWidth="0.75"
-      android:fillColor="#00000000"
+      android:fillColor="@color/transparent_black"
       android:strokeColor="@color/glyph_selected"/>
   <path
       android:pathData="M6.375,9.625h11.25v0.75h-11.25z"
       android:strokeWidth="0.75"
-      android:fillColor="#00000000"
+      android:fillColor="@color/transparent_black"
       android:strokeColor="@color/glyph_selected"/>
   <path
       android:pathData="M3.375,13.625h17.25v0.75h-17.25z"
       android:strokeWidth="0.75"
-      android:fillColor="#00000000"
+      android:fillColor="@color/transparent_black"
       android:strokeColor="@color/glyph_selected"/>
 </vector>
diff --git a/core-ui/src/main/res/drawable/ic_toolbar_style_align_center_disabled.xml b/core-ui/src/main/res/drawable/ic_toolbar_style_align_center_disabled.xml
index e19a50cb37..a8a1f2545b 100644
--- a/core-ui/src/main/res/drawable/ic_toolbar_style_align_center_disabled.xml
+++ b/core-ui/src/main/res/drawable/ic_toolbar_style_align_center_disabled.xml
@@ -6,21 +6,21 @@
   <path
       android:pathData="M3.375,5.625h17.25v0.75h-17.25z"
       android:strokeWidth="0.75"
-      android:fillColor="#00000000"
+      android:fillColor="@color/transparent_black"
       android:strokeColor="@color/glyph_inactive"/>
   <path
       android:pathData="M6.375,17.625h11.25v0.75h-11.25z"
       android:strokeWidth="0.75"
-      android:fillColor="#00000000"
+      android:fillColor="@color/transparent_black"
       android:strokeColor="@color/glyph_inactive"/>
   <path
       android:pathData="M6.375,9.625h11.25v0.75h-11.25z"
       android:strokeWidth="0.75"
-      android:fillColor="#00000000"
+      android:fillColor="@color/transparent_black"
       android:strokeColor="@color/glyph_inactive"/>
   <path
       android:pathData="M3.375,13.625h17.25v0.75h-17.25z"
       android:strokeWidth="0.75"
-      android:fillColor="#00000000"
+      android:fillColor="@color/transparent_black"
       android:strokeColor="@color/glyph_inactive"/>
 </vector>
diff --git a/core-ui/src/main/res/drawable/ic_toolbar_style_align_left.xml b/core-ui/src/main/res/drawable/ic_toolbar_style_align_left.xml
index db5efe47cb..2a8db607e9 100644
--- a/core-ui/src/main/res/drawable/ic_toolbar_style_align_left.xml
+++ b/core-ui/src/main/res/drawable/ic_toolbar_style_align_left.xml
@@ -6,21 +6,21 @@
   <path
       android:pathData="M3.375,5.625h17.25v0.75h-17.25z"
       android:strokeWidth="0.75"
-      android:fillColor="#00000000"
+      android:fillColor="@color/transparent_black"
       android:strokeColor="@color/glyph_selected"/>
   <path
       android:pathData="M3.375,17.625h11.25v0.75h-11.25z"
       android:strokeWidth="0.75"
-      android:fillColor="#00000000"
+      android:fillColor="@color/transparent_black"
       android:strokeColor="@color/glyph_selected"/>
   <path
       android:pathData="M3.375,9.625h11.25v0.75h-11.25z"
       android:strokeWidth="0.75"
-      android:fillColor="#00000000"
+      android:fillColor="@color/transparent_black"
       android:strokeColor="@color/glyph_selected"/>
   <path
       android:pathData="M3.375,13.625h17.25v0.75h-17.25z"
       android:strokeWidth="0.75"
-      android:fillColor="#00000000"
+      android:fillColor="@color/transparent_black"
       android:strokeColor="@color/glyph_selected"/>
 </vector>
diff --git a/core-ui/src/main/res/drawable/ic_toolbar_style_align_left_disabled.xml b/core-ui/src/main/res/drawable/ic_toolbar_style_align_left_disabled.xml
index 06d14b982f..37f46c192d 100644
--- a/core-ui/src/main/res/drawable/ic_toolbar_style_align_left_disabled.xml
+++ b/core-ui/src/main/res/drawable/ic_toolbar_style_align_left_disabled.xml
@@ -6,21 +6,21 @@
   <path
       android:pathData="M3.375,5.625h17.25v0.75h-17.25z"
       android:strokeWidth="0.75"
-      android:fillColor="#00000000"
+      android:fillColor="@color/transparent_black"
       android:strokeColor="@color/glyph_inactive"/>
   <path
       android:pathData="M3.375,17.625h11.25v0.75h-11.25z"
       android:strokeWidth="0.75"
-      android:fillColor="#00000000"
+      android:fillColor="@color/transparent_black"
       android:strokeColor="@color/glyph_inactive"/>
   <path
       android:pathData="M3.375,9.625h11.25v0.75h-11.25z"
       android:strokeWidth="0.75"
-      android:fillColor="#00000000"
+      android:fillColor="@color/transparent_black"
       android:strokeColor="@color/glyph_inactive"/>
   <path
       android:pathData="M3.375,13.625h17.25v0.75h-17.25z"
       android:strokeWidth="0.75"
-      android:fillColor="#00000000"
+      android:fillColor="@color/transparent_black"
       android:strokeColor="@color/glyph_inactive"/>
 </vector>
diff --git a/core-ui/src/main/res/drawable/ic_toolbar_style_align_right.xml b/core-ui/src/main/res/drawable/ic_toolbar_style_align_right.xml
index 5ba5554dff..d8ea1682ea 100644
--- a/core-ui/src/main/res/drawable/ic_toolbar_style_align_right.xml
+++ b/core-ui/src/main/res/drawable/ic_toolbar_style_align_right.xml
@@ -6,21 +6,21 @@
   <path
       android:pathData="M20.625,5.625l-17.25,0l-0,0.75l17.25,0z"
       android:strokeWidth="0.75"
-      android:fillColor="#00000000"
+      android:fillColor="@color/transparent_black"
       android:strokeColor="@color/glyph_selected"/>
   <path
       android:pathData="M20.625,17.625l-11.25,0l-0,0.75l11.25,0z"
       android:strokeWidth="0.75"
-      android:fillColor="#00000000"
+      android:fillColor="@color/transparent_black"
       android:strokeColor="@color/glyph_selected"/>
   <path
       android:pathData="M20.625,9.625l-11.25,0l-0,0.75l11.25,0z"
       android:strokeWidth="0.75"
-      android:fillColor="#00000000"
+      android:fillColor="@color/transparent_black"
       android:strokeColor="@color/glyph_selected"/>
   <path
       android:pathData="M20.625,13.625l-17.25,0l-0,0.75l17.25,0z"
       android:strokeWidth="0.75"
-      android:fillColor="#00000000"
+      android:fillColor="@color/transparent_black"
       android:strokeColor="@color/glyph_selected"/>
 </vector>
diff --git a/core-ui/src/main/res/drawable/ic_toolbar_style_align_right_disabled.xml b/core-ui/src/main/res/drawable/ic_toolbar_style_align_right_disabled.xml
index 88fd687d4a..8e01b8096c 100644
--- a/core-ui/src/main/res/drawable/ic_toolbar_style_align_right_disabled.xml
+++ b/core-ui/src/main/res/drawable/ic_toolbar_style_align_right_disabled.xml
@@ -6,21 +6,21 @@
   <path
       android:pathData="M20.625,5.625l-17.25,0l-0,0.75l17.25,0z"
       android:strokeWidth="0.75"
-      android:fillColor="#00000000"
+      android:fillColor="@color/transparent_black"
       android:strokeColor="@color/glyph_inactive"/>
   <path
       android:pathData="M20.625,17.625l-11.25,0l-0,0.75l11.25,0z"
       android:strokeWidth="0.75"
-      android:fillColor="#00000000"
+      android:fillColor="@color/transparent_black"
       android:strokeColor="@color/glyph_inactive"/>
   <path
       android:pathData="M20.625,9.625l-11.25,0l-0,0.75l11.25,0z"
       android:strokeWidth="0.75"
-      android:fillColor="#00000000"
+      android:fillColor="@color/transparent_black"
       android:strokeColor="@color/glyph_inactive"/>
   <path
       android:pathData="M20.625,13.625l-17.25,0l-0,0.75l17.25,0z"
       android:strokeWidth="0.75"
-      android:fillColor="#00000000"
+      android:fillColor="@color/transparent_black"
       android:strokeColor="@color/glyph_inactive"/>
 </vector>
diff --git a/core-ui/src/main/res/drawable/ic_toolbar_style_code.xml b/core-ui/src/main/res/drawable/ic_toolbar_style_code.xml
index 62cc92661e..e23b18cf65 100644
--- a/core-ui/src/main/res/drawable/ic_toolbar_style_code.xml
+++ b/core-ui/src/main/res/drawable/ic_toolbar_style_code.xml
@@ -6,11 +6,11 @@
   <path
       android:pathData="M9,6L3,12L9,18"
       android:strokeWidth="1.5"
-      android:fillColor="#00000000"
+      android:fillColor="@color/transparent_black"
       android:strokeColor="@color/glyph_selected"/>
   <path
       android:pathData="M15,6L21,12L15,18"
       android:strokeWidth="1.5"
-      android:fillColor="#00000000"
+      android:fillColor="@color/transparent_black"
       android:strokeColor="@color/glyph_selected"/>
 </vector>
diff --git a/core-ui/src/main/res/drawable/ic_toolbar_style_code_disabled.xml b/core-ui/src/main/res/drawable/ic_toolbar_style_code_disabled.xml
index 50f82ce270..10c22ff9c5 100644
--- a/core-ui/src/main/res/drawable/ic_toolbar_style_code_disabled.xml
+++ b/core-ui/src/main/res/drawable/ic_toolbar_style_code_disabled.xml
@@ -6,11 +6,11 @@
   <path
       android:pathData="M9,6L3,12L9,18"
       android:strokeWidth="1.5"
-      android:fillColor="#00000000"
+      android:fillColor="@color/transparent_black"
       android:strokeColor="@color/glyph_inactive"/>
   <path
       android:pathData="M15,6L21,12L15,18"
       android:strokeWidth="1.5"
-      android:fillColor="#00000000"
+      android:fillColor="@color/transparent_black"
       android:strokeColor="@color/glyph_inactive"/>
 </vector>
diff --git a/core-ui/src/main/res/drawable/ic_turn_into_arrow.xml b/core-ui/src/main/res/drawable/ic_turn_into_arrow.xml
index 1a9ab8e5ee..7abda56b36 100644
--- a/core-ui/src/main/res/drawable/ic_turn_into_arrow.xml
+++ b/core-ui/src/main/res/drawable/ic_turn_into_arrow.xml
@@ -5,6 +5,6 @@
     android:viewportHeight="9">
   <path
       android:pathData="M7.78033,2.71967C7.48744,2.42678 7.01256,2.42678 6.71967,2.71967L4.10607,5.33327C4.04749,5.39185 3.95251,5.39185 3.89393,5.33327L1.28033,2.71967C0.98744,2.42678 0.51256,2.42678 0.21967,2.71967C-0.07322,3.01256 -0.07322,3.48744 0.21967,3.78033L3.89393,7.45459C3.95251,7.51317 4.04749,7.51317 4.10607,7.45459L7.78033,3.78033C8.07322,3.48744 8.07322,3.01256 7.78033,2.71967Z"
-      android:fillColor="#ACA996"
+      android:fillColor="@color/gray"
       android:fillType="evenOdd"/>
 </vector>
diff --git a/core-ui/src/main/res/drawable/ic_undo.xml b/core-ui/src/main/res/drawable/ic_undo.xml
index cf364b711b..9ed4556f79 100644
--- a/core-ui/src/main/res/drawable/ic_undo.xml
+++ b/core-ui/src/main/res/drawable/ic_undo.xml
@@ -4,18 +4,18 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="#ACA996"
+        android:fillColor="@color/gray"
         android:fillType="evenOdd"
         android:pathData="M8.7804,2.4697C9.0733,2.7626 9.0733,3.2374 8.7804,3.5303L5.3108,7L8.7804,10.4697C9.0733,10.7626 9.0733,11.2374 8.7804,11.5303C8.4875,11.8232 8.0127,11.8232 7.7198,11.5303L3.1895,7L7.7198,2.4697C8.0127,2.1768 8.4875,2.1768 8.7804,2.4697Z" />
     <path
-        android:fillColor="#00000000"
+        android:fillColor="@color/transparent_black"
         android:pathData="M14,19C17.3137,19 20,16.3137 20,13C20,9.6863 17.3137,7 14,7"
         android:strokeWidth="1.5"
-        android:strokeColor="#ACA996" />
+        android:strokeColor="@color/gray"/>
     <path
-        android:fillColor="#ACA996"
+        android:fillColor="@color/gray"
         android:pathData="M14,6.25l-9,0l-0,1.5l9,0z" />
     <path
-        android:fillColor="#ACA996"
+        android:fillColor="@color/gray"
         android:pathData="M14,18.25l-2,0l-0,1.5l2,0z" />
 </vector>
diff --git a/core-ui/src/main/res/drawable/ic_unsupported_block.xml b/core-ui/src/main/res/drawable/ic_unsupported_block.xml
index 6209cf5cfb..d20e416e53 100644
--- a/core-ui/src/main/res/drawable/ic_unsupported_block.xml
+++ b/core-ui/src/main/res/drawable/ic_unsupported_block.xml
@@ -5,8 +5,8 @@
     android:viewportHeight="18">
   <path
       android:pathData="M9,9m-9,0a9,9 0,1 1,18 0a9,9 0,1 1,-18 0"
-      android:fillColor="#DFDDD0"/>
+      android:fillColor="@color/background_soft_beige"/>
   <path
       android:pathData="M8.0225,11.2807H9.3428V11.193C9.3612,10.1312 9.6659,9.6557 10.4507,9.171C11.2771,8.6724 11.7849,7.9707 11.7849,6.932C11.7849,5.4316 10.6492,4.416 8.955,4.416C7.3992,4.416 6.1528,5.3255 6.0928,6.9874H7.4962C7.5516,6.0087 8.2487,5.5794 8.955,5.5794C9.7398,5.5794 10.3769,6.101 10.3769,6.9181C10.3769,7.606 9.9475,8.0907 9.3982,8.4324C8.5395,8.9586 8.0317,9.4803 8.0225,11.193V11.2807ZM8.7196,14.0875C9.2227,14.0875 9.6428,13.6767 9.6428,13.1642C9.6428,12.661 9.2227,12.2456 8.7196,12.2456C8.2117,12.2456 7.7962,12.661 7.7962,13.1642C7.7962,13.6767 8.2117,14.0875 8.7196,14.0875Z"
-      android:fillColor="#ffffff"/>
+      android:fillColor="@color/white"/>
 </vector>
diff --git a/core-ui/src/main/res/drawable/ic_update_app.xml b/core-ui/src/main/res/drawable/ic_update_app.xml
deleted file mode 100644
index b6fe78d13e..0000000000
--- a/core-ui/src/main/res/drawable/ic_update_app.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="32dp"
-    android:height="32dp"
-    android:viewportWidth="32"
-    android:viewportHeight="32">
-  <path
-      android:pathData="M0,6C0,2.6863 2.6863,0 6,0H26C29.3137,0 32,2.6863 32,6V26C32,29.3137 29.3137,32 26,32H6C2.6863,32 0,29.3137 0,26V6Z"
-      android:fillColor="#57C600"/>
-  <path
-      android:pathData="M15,7C15,6.4477 15.4477,6 16,6C16.5523,6 17,6.4477 17,7V24C17,24.5523 16.5523,25 16,25C15.4477,25 15,24.5523 15,24V7Z"
-      android:fillColor="#ffffff"/>
-  <path
-      android:pathData="M6.2929,15.2929C6.6834,14.9024 7.3166,14.9024 7.7071,15.2929L16,23.5858L24.2929,15.2929C24.6834,14.9024 25.3166,14.9024 25.7071,15.2929C26.0976,15.6834 26.0976,16.3166 25.7071,16.7071L16,26.4142L6.2929,16.7071C5.9024,16.3166 5.9024,15.6834 6.2929,15.2929Z"
-      android:fillColor="#ffffff"
-      android:fillType="evenOdd"/>
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_variant_empty.xml b/core-ui/src/main/res/drawable/ic_variant_empty.xml
deleted file mode 100644
index 36ba938af2..0000000000
--- a/core-ui/src/main/res/drawable/ic_variant_empty.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:pathData="M12,12m-11.25,0a11.25,11.25 0,1 1,22.5 0a11.25,11.25 0,1 1,-22.5 0"
-      android:strokeWidth="1.5"
-      android:fillColor="#00000000"
-      android:strokeColor="@color/glyph_inactive"/>
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_variant_selected.xml b/core-ui/src/main/res/drawable/ic_variant_selected.xml
deleted file mode 100644
index 448333efac..0000000000
--- a/core-ui/src/main/res/drawable/ic_variant_selected.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:pathData="M12,12m-12,0a12,12 0,1 1,24 0a12,12 0,1 1,-24 0"
-      android:fillColor="@color/glyph_button"/>
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_variant_selector.xml b/core-ui/src/main/res/drawable/ic_variant_selector.xml
deleted file mode 100644
index 296b3c085b..0000000000
--- a/core-ui/src/main/res/drawable/ic_variant_selector.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/ic_variant_empty" android:state_selected="false" />
-    <item android:drawable="@drawable/ic_variant_selected" android:state_selected="true" />
-</selector>
\ No newline at end of file
diff --git a/core-ui/src/main/res/drawable/ic_video.xml b/core-ui/src/main/res/drawable/ic_video.xml
index 5ba47d1a01..9a9b14b8c3 100644
--- a/core-ui/src/main/res/drawable/ic_video.xml
+++ b/core-ui/src/main/res/drawable/ic_video.xml
@@ -9,7 +9,7 @@
     <path
         android:pathData="M12,1.0337L12,1.0337A11.25,11.25 0,0 1,23.25 12.2837L23.25,12.2837A11.25,11.25 0,0 1,12 23.5337L12,23.5337A11.25,11.25 0,0 1,0.75 12.2837L0.75,12.2837A11.25,11.25 0,0 1,12 1.0337z"
         android:strokeWidth="1.5"
-        android:fillColor="#00000000"
+        android:fillColor="@color/transparent_black"
         android:strokeColor="@color/glyph_active"/>
     <path
         android:pathData="M17.7526,12.7162C18.0852,12.5236 18.0852,12.0434 17.7526,11.8508L9.7505,7.2182C9.4172,7.0252 9,7.2657 9,7.6509V16.9165C9,17.3016 9.4172,17.5422 9.7505,17.3492L17.7526,12.7162Z"
diff --git a/core-ui/src/main/res/drawable/ic_video_inactive.xml b/core-ui/src/main/res/drawable/ic_video_inactive.xml
index 67d153e441..8ae893ce6b 100644
--- a/core-ui/src/main/res/drawable/ic_video_inactive.xml
+++ b/core-ui/src/main/res/drawable/ic_video_inactive.xml
@@ -9,7 +9,7 @@
         <path
             android:pathData="M12,1.0337L12,1.0337A11.25,11.25 0,0 1,23.25 12.2837L23.25,12.2837A11.25,11.25 0,0 1,12 23.5337L12,23.5337A11.25,11.25 0,0 1,0.75 12.2837L0.75,12.2837A11.25,11.25 0,0 1,12 1.0337z"
             android:strokeWidth="1.5"
-            android:fillColor="#00000000"
+            android:fillColor="@color/transparent_black"
             android:strokeColor="@color/glyph_inactive"/>
         <path
             android:pathData="M17.7526,12.7162C18.0852,12.5236 18.0852,12.0434 17.7526,11.8508L9.7505,7.2182C9.4172,7.0252 9,7.2657 9,7.6509V16.9165C9,17.3016 9.4172,17.5422 9.7505,17.3492L17.7526,12.7162Z"
diff --git a/core-ui/src/main/res/drawable/ic_view_drag_24.xml b/core-ui/src/main/res/drawable/ic_view_drag_24.xml
deleted file mode 100644
index 92c39bdac6..0000000000
--- a/core-ui/src/main/res/drawable/ic_view_drag_24.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:pathData="M1.5,6.5C1.224,6.5 1,6.724 1,7C1,7.276 1.224,7.5 1.5,7.5H22.5C22.776,7.5 23,7.276 23,7C23,6.724 22.776,6.5 22.5,6.5H1.5ZM1,12C1,11.724 1.224,11.5 1.5,11.5H22.5C22.776,11.5 23,11.724 23,12C23,12.276 22.776,12.5 22.5,12.5H1.5C1.224,12.5 1,12.276 1,12ZM1,17C1,16.724 1.224,16.5 1.5,16.5H22.5C22.776,16.5 23,16.724 23,17C23,17.276 22.776,17.5 22.5,17.5H1.5C1.224,17.5 1,17.276 1,17Z"
-      android:fillColor="@color/glyph_active"
-      android:fillType="evenOdd"/>
-</vector>
diff --git a/core-ui/src/main/res/drawable/ic_viewer_chosen.xml b/core-ui/src/main/res/drawable/ic_viewer_chosen.xml
index fe4aac8ead..a44e3bb1b6 100644
--- a/core-ui/src/main/res/drawable/ic_viewer_chosen.xml
+++ b/core-ui/src/main/res/drawable/ic_viewer_chosen.xml
@@ -4,7 +4,7 @@
     android:viewportWidth="16"
     android:viewportHeight="16">
     <path
-        android:fillColor="#FFB522"
+        android:fillColor="@color/palette_system_amber_100"
         android:fillType="evenOdd"
         android:pathData="M14.7072,3.8571L6.0001,12.5642L1.293,7.8571L2.7072,6.4429L6.0001,9.7358L13.293,2.4429L14.7072,3.8571Z" />
 </vector>
diff --git a/core-ui/src/main/res/drawable/ic_viewer_sort_arrow.xml b/core-ui/src/main/res/drawable/ic_viewer_sort_arrow.xml
index 34eaae0909..7bf1feede8 100644
--- a/core-ui/src/main/res/drawable/ic_viewer_sort_arrow.xml
+++ b/core-ui/src/main/res/drawable/ic_viewer_sort_arrow.xml
@@ -4,7 +4,7 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="#ACA996"
+        android:fillColor="@color/gray"
         android:fillType="evenOdd"
         android:pathData="M8.4697,18.0303C8.1768,17.7374 8.1768,17.2626 8.4697,16.9697L13.4393,12L8.4697,7.0303C8.1768,6.7374 8.1768,6.2626 8.4697,5.9697C8.7626,5.6768 9.2374,5.6768 9.5303,5.9697L15.5607,12L9.5303,18.0303C9.2374,18.3232 8.7626,18.3232 8.4697,18.0303Z" />
 </vector>
diff --git a/core-ui/src/main/res/drawable/ic_web_link.xml b/core-ui/src/main/res/drawable/ic_web_link.xml
index 2f2e3309df..2e166121f5 100644
--- a/core-ui/src/main/res/drawable/ic_web_link.xml
+++ b/core-ui/src/main/res/drawable/ic_web_link.xml
@@ -6,6 +6,6 @@
   <path
       android:pathData="M6.5,4H14M14,4V11.5M14,4L4,14"
       android:strokeWidth="1.25"
-      android:fillColor="#00000000"
+      android:fillColor="@color/transparent_black"
       android:strokeColor="@color/text_tertiary"/>
 </vector>
diff --git a/core-ui/src/main/res/drawable/ic_widget_bundled_source_collection.xml b/core-ui/src/main/res/drawable/ic_widget_bundled_source_collection.xml
index a62b91dc57..66fea85dba 100644
--- a/core-ui/src/main/res/drawable/ic_widget_bundled_source_collection.xml
+++ b/core-ui/src/main/res/drawable/ic_widget_bundled_source_collection.xml
@@ -14,8 +14,8 @@
           android:endX="15"
           android:endY="27"
           android:type="linear">
-        <item android:offset="0" android:color="#7FA7A7A7"/>
-        <item android:offset="1" android:color="#FFB6B6B6"/>
+        <item android:offset="0" android:color="@color/collection_grey_gradient_start"/>
+        <item android:offset="1" android:color="@color/collection_grey_gradient_end"/>
       </gradient>
     </aapt:attr>
   </path>
diff --git a/core-ui/src/main/res/drawable/ic_widget_bundled_source_favorites.xml b/core-ui/src/main/res/drawable/ic_widget_bundled_source_favorites.xml
index a279ef657f..1be7809c4f 100644
--- a/core-ui/src/main/res/drawable/ic_widget_bundled_source_favorites.xml
+++ b/core-ui/src/main/res/drawable/ic_widget_bundled_source_favorites.xml
@@ -16,8 +16,8 @@
             android:endX="15"
             android:endY="25.969"
             android:type="linear">
-          <item android:offset="0" android:color="#7FA7A7A7"/>
-          <item android:offset="1" android:color="#FFA7A7A7"/>
+          <item android:offset="0" android:color="@color/collection_grey_gradient_start"/>
+          <item android:offset="1" android:color="@color/loading_end"/>
         </gradient>
       </aapt:attr>
     </path>
diff --git a/core-ui/src/main/res/drawable/ic_widget_bundled_source_recently_edited.xml b/core-ui/src/main/res/drawable/ic_widget_bundled_source_recently_edited.xml
index 60e4f5ff90..ff3edb408a 100644
--- a/core-ui/src/main/res/drawable/ic_widget_bundled_source_recently_edited.xml
+++ b/core-ui/src/main/res/drawable/ic_widget_bundled_source_recently_edited.xml
@@ -14,8 +14,8 @@
           android:endX="14.482"
           android:endY="28.5"
           android:type="linear">
-        <item android:offset="0" android:color="#7FA7A7A7"/>
-        <item android:offset="1" android:color="#FFA7A7A7"/>
+        <item android:offset="0" android:color="@color/collection_grey_gradient_start"/>
+        <item android:offset="1" android:color="@color/loading_end"/>
       </gradient>
     </aapt:attr>
   </path>
diff --git a/core-ui/src/main/res/drawable/ic_widget_bundled_source_recently_opened.xml b/core-ui/src/main/res/drawable/ic_widget_bundled_source_recently_opened.xml
index d1844756e4..30cec8dd22 100644
--- a/core-ui/src/main/res/drawable/ic_widget_bundled_source_recently_opened.xml
+++ b/core-ui/src/main/res/drawable/ic_widget_bundled_source_recently_opened.xml
@@ -14,8 +14,8 @@
           android:endX="15"
           android:endY="24"
           android:type="linear">
-        <item android:offset="0" android:color="#7FA7A7A7"/>
-        <item android:offset="1" android:color="#FFB6B6B6"/>
+        <item android:offset="0" android:color="@color/collection_grey_gradient_start"/>
+        <item android:offset="1" android:color="@color/collection_grey_gradient_end"/>
       </gradient>
     </aapt:attr>
   </path>
diff --git a/core-ui/src/main/res/drawable/ic_widget_bundled_source_sets.xml b/core-ui/src/main/res/drawable/ic_widget_bundled_source_sets.xml
index 6304172eac..f859539ec1 100644
--- a/core-ui/src/main/res/drawable/ic_widget_bundled_source_sets.xml
+++ b/core-ui/src/main/res/drawable/ic_widget_bundled_source_sets.xml
@@ -14,8 +14,8 @@
           android:endX="15.063"
           android:endY="27"
           android:type="linear">
-        <item android:offset="0" android:color="#7FA7A7A7"/>
-        <item android:offset="1" android:color="#FFA7A7A7"/>
+        <item android:offset="0" android:color="@color/collection_grey_gradient_start"/>
+        <item android:offset="1" android:color="@color/loading_end"/>
       </gradient>
     </aapt:attr>
   </path>
diff --git a/core-ui/src/main/res/drawable/ic_widget_type_compact_list.xml b/core-ui/src/main/res/drawable/ic_widget_type_compact_list.xml
index 688c7162e1..bc3de3733e 100644
--- a/core-ui/src/main/res/drawable/ic_widget_type_compact_list.xml
+++ b/core-ui/src/main/res/drawable/ic_widget_type_compact_list.xml
@@ -6,7 +6,7 @@
   <path
       android:strokeWidth="1"
       android:pathData="M6,0.5L34,0.5A5.5,5.5 0,0 1,39.5 6L39.5,34A5.5,5.5 0,0 1,34 39.5L6,39.5A5.5,5.5 0,0 1,0.5 34L0.5,6A5.5,5.5 0,0 1,6 0.5z"
-      android:fillColor="#00000000"
+      android:fillColor="@color/transparent_black"
       android:strokeColor="@color/shape_primary"/>
   <path
       android:pathData="M10.75,6.313L33.25,6.313A0.75,0.75 0,0 1,34 7.063L34,7.063A0.75,0.75 0,0 1,33.25 7.813L10.75,7.813A0.75,0.75 0,0 1,10 7.063L10,7.063A0.75,0.75 0,0 1,10.75 6.313z"
diff --git a/core-ui/src/main/res/drawable/ic_widget_type_link.xml b/core-ui/src/main/res/drawable/ic_widget_type_link.xml
index dc0e8f0bb4..bdf315487f 100644
--- a/core-ui/src/main/res/drawable/ic_widget_type_link.xml
+++ b/core-ui/src/main/res/drawable/ic_widget_type_link.xml
@@ -6,7 +6,7 @@
   <path
       android:strokeWidth="1"
       android:pathData="M4,12.5L36,12.5A3.5,3.5 0,0 1,39.5 16L39.5,24A3.5,3.5 0,0 1,36 27.5L4,27.5A3.5,3.5 0,0 1,0.5 24L0.5,16A3.5,3.5 0,0 1,4 12.5z"
-      android:fillColor="#00000000"
+      android:fillColor="@color/transparent_black"
       android:strokeColor="@color/shape_primary"/>
   <path
       android:pathData="M6.75,19.25L33.25,19.25A0.75,0.75 0,0 1,34 20L34,20A0.75,0.75 0,0 1,33.25 20.75L6.75,20.75A0.75,0.75 0,0 1,6 20L6,20A0.75,0.75 0,0 1,6.75 19.25z"
diff --git a/core-ui/src/main/res/drawable/ic_widget_type_list.xml b/core-ui/src/main/res/drawable/ic_widget_type_list.xml
index a0f61b5314..6b4d9f7026 100644
--- a/core-ui/src/main/res/drawable/ic_widget_type_list.xml
+++ b/core-ui/src/main/res/drawable/ic_widget_type_list.xml
@@ -6,7 +6,7 @@
   <path
       android:strokeWidth="1"
       android:pathData="M6,0.5L34,0.5A5.5,5.5 0,0 1,39.5 6L39.5,34A5.5,5.5 0,0 1,34 39.5L6,39.5A5.5,5.5 0,0 1,0.5 34L0.5,6A5.5,5.5 0,0 1,6 0.5z"
-      android:fillColor="#00000000"
+      android:fillColor="@color/transparent_black"
       android:strokeColor="@color/shape_primary"/>
   <path
       android:pathData="M17.75,7.25L33.25,7.25A0.75,0.75 0,0 1,34 8L34,8A0.75,0.75 0,0 1,33.25 8.75L17.75,8.75A0.75,0.75 0,0 1,17 8L17,8A0.75,0.75 0,0 1,17.75 7.25z"
diff --git a/core-ui/src/main/res/drawable/ic_widget_type_tree.xml b/core-ui/src/main/res/drawable/ic_widget_type_tree.xml
index 50dd690155..f0752d8eb8 100644
--- a/core-ui/src/main/res/drawable/ic_widget_type_tree.xml
+++ b/core-ui/src/main/res/drawable/ic_widget_type_tree.xml
@@ -9,7 +9,7 @@
     <path
         android:strokeWidth="1"
         android:pathData="M6,0.5L34,0.5A5.5,5.5 0,0 1,39.5 6L39.5,34A5.5,5.5 0,0 1,34 39.5L6,39.5A5.5,5.5 0,0 1,0.5 34L0.5,6A5.5,5.5 0,0 1,6 0.5z"
-        android:fillColor="#00000000"
+        android:fillColor="@color/transparent_black"
         android:strokeColor="@color/shape_primary"/>
     <path
         android:pathData="M10.75,6.25L33.25,6.25A0.75,0.75 0,0 1,34 7L34,7A0.75,0.75 0,0 1,33.25 7.75L10.75,7.75A0.75,0.75 0,0 1,10 7L10,7A0.75,0.75 0,0 1,10.75 6.25z"
diff --git a/core-ui/src/main/res/drawable/icon_migration_card_arrow.xml b/core-ui/src/main/res/drawable/icon_migration_card_arrow.xml
index cd8c11eb7a..b5667e5076 100644
--- a/core-ui/src/main/res/drawable/icon_migration_card_arrow.xml
+++ b/core-ui/src/main/res/drawable/icon_migration_card_arrow.xml
@@ -6,7 +6,7 @@
   <path
       android:pathData="M5,7.5L10,12.5L15,7.5"
       android:strokeWidth="1.5"
-      android:fillColor="#00000000"
+      android:fillColor="@color/transparent_black"
       android:strokeColor="@color/glyph_button"
       android:strokeLineCap="round"/>
 </vector>
diff --git a/core-ui/src/main/res/drawable/item_block_code_multi_select_unselected.xml b/core-ui/src/main/res/drawable/item_block_code_multi_select_unselected.xml
deleted file mode 100644
index 9153b67ddb..0000000000
--- a/core-ui/src/main/res/drawable/item_block_code_multi_select_unselected.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <corners android:radius="10dp" />
-    <solid android:color="@color/shape_tertiary" />
-</shape>
\ No newline at end of file
diff --git a/core-ui/src/main/res/drawable/item_block_multi_select_selected.xml b/core-ui/src/main/res/drawable/item_block_multi_select_selected.xml
index 2b565834f6..4d744365c1 100644
--- a/core-ui/src/main/res/drawable/item_block_multi_select_selected.xml
+++ b/core-ui/src/main/res/drawable/item_block_multi_select_selected.xml
@@ -5,5 +5,5 @@
     <stroke
         android:width="1dp"
         android:color="@color/amber_100" />
-    <solid android:color="#33FFB522" />
+    <solid android:color="@color/multi_select_highlight" />
 </shape>
\ No newline at end of file
diff --git a/core-ui/src/main/res/drawable/item_viewer_item_selected_background.xml b/core-ui/src/main/res/drawable/item_viewer_item_selected_background.xml
deleted file mode 100644
index ee97351fe7..0000000000
--- a/core-ui/src/main/res/drawable/item_viewer_item_selected_background.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <corners android:radius="8dp" />
-    <solid android:color="#F3F2EC" />
-</shape>
\ No newline at end of file
diff --git a/core-ui/src/main/res/drawable/item_viewer_list_selected.xml b/core-ui/src/main/res/drawable/item_viewer_list_selected.xml
deleted file mode 100644
index 6a8ddd2a7d..0000000000
--- a/core-ui/src/main/res/drawable/item_viewer_list_selected.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/item_viewer_item_selected_background" android:state_selected="true" />
-</selector>
\ No newline at end of file
diff --git a/core-ui/src/main/res/drawable/logo_builder_64.xml b/core-ui/src/main/res/drawable/logo_builder_64.xml
index e1ff20d02f..0fe046258b 100644
--- a/core-ui/src/main/res/drawable/logo_builder_64.xml
+++ b/core-ui/src/main/res/drawable/logo_builder_64.xml
@@ -12,8 +12,8 @@
           android:centerY="17"
           android:gradientRadius="17"
           android:type="radial">
-        <item android:offset="0.41" android:color="#00A5AEFF"/>
-        <item android:offset="1" android:color="#FFA5AEFF"/>
+        <item android:offset="0.41" android:color="@color/logo_gradient_start"/>
+        <item android:offset="1" android:color="@color/logo_gradient_end"/>
       </gradient>
     </aapt:attr>
   </path>
@@ -25,8 +25,8 @@
           android:centerY="43"
           android:gradientRadius="17"
           android:type="radial">
-        <item android:offset="0.41" android:color="#00A5AEFF"/>
-        <item android:offset="1" android:color="#FFA5AEFF"/>
+        <item android:offset="0.41" android:color="@color/logo_gradient_start"/>
+        <item android:offset="1" android:color="@color/logo_gradient_end"/>
       </gradient>
     </aapt:attr>
   </path>
@@ -38,8 +38,8 @@
           android:centerY="17"
           android:gradientRadius="17"
           android:type="radial">
-        <item android:offset="0.41" android:color="#00A5AEFF"/>
-        <item android:offset="1" android:color="#FFA5AEFF"/>
+        <item android:offset="0.41" android:color="@color/logo_gradient_start"/>
+        <item android:offset="1" android:color="@color/logo_gradient_end"/>
       </gradient>
     </aapt:attr>
   </path>
@@ -51,8 +51,8 @@
           android:centerY="43"
           android:gradientRadius="17"
           android:type="radial">
-        <item android:offset="0.41" android:color="#00A5AEFF"/>
-        <item android:offset="1" android:color="#FFA5AEFF"/>
+        <item android:offset="0.41" android:color="@color/logo_gradient_start"/>
+        <item android:offset="1" android:color="@color/logo_gradient_end"/>
       </gradient>
     </aapt:attr>
   </path>
diff --git a/core-ui/src/main/res/drawable/logo_builder_96.xml b/core-ui/src/main/res/drawable/logo_builder_96.xml
index 1d4a9e788e..040388c573 100644
--- a/core-ui/src/main/res/drawable/logo_builder_96.xml
+++ b/core-ui/src/main/res/drawable/logo_builder_96.xml
@@ -12,8 +12,8 @@
           android:centerY="27.353"
           android:gradientRadius="26.4"
           android:type="radial">
-        <item android:offset="0.41" android:color="#00A5AEFF"/>
-        <item android:offset="1" android:color="#FFA5AEFF"/>
+        <item android:offset="0.41" android:color="@color/logo_gradient_start"/>
+        <item android:offset="1" android:color="@color/logo_gradient_end"/>
       </gradient>
     </aapt:attr>
   </path>
@@ -25,8 +25,8 @@
           android:centerY="70.553"
           android:gradientRadius="26.4"
           android:type="radial">
-        <item android:offset="0.41" android:color="#00A5AEFF"/>
-        <item android:offset="1" android:color="#FFA5AEFF"/>
+        <item android:offset="0.41" android:color="@color/logo_gradient_start"/>
+        <item android:offset="1" android:color="@color/logo_gradient_end"/>
       </gradient>
     </aapt:attr>
   </path>
@@ -38,8 +38,8 @@
           android:centerY="27.353"
           android:gradientRadius="26.4"
           android:type="radial">
-        <item android:offset="0.41" android:color="#00A5AEFF"/>
-        <item android:offset="1" android:color="#FFA5AEFF"/>
+        <item android:offset="0.41" android:color="@color/logo_gradient_start"/>
+        <item android:offset="1" android:color="@color/logo_gradient_end"/>
       </gradient>
     </aapt:attr>
   </path>
@@ -51,8 +51,8 @@
           android:centerY="70.553"
           android:gradientRadius="26.4"
           android:type="radial">
-        <item android:offset="0.41" android:color="#00A5AEFF"/>
-        <item android:offset="1" android:color="#FFA5AEFF"/>
+        <item android:offset="0.41" android:color="@color/logo_gradient_start"/>
+        <item android:offset="1" android:color="@color/logo_gradient_end"/>
       </gradient>
     </aapt:attr>
   </path>
diff --git a/core-ui/src/main/res/drawable/logo_co_creator_64.xml b/core-ui/src/main/res/drawable/logo_co_creator_64.xml
index a37c1555e3..7afd3515df 100644
--- a/core-ui/src/main/res/drawable/logo_co_creator_64.xml
+++ b/core-ui/src/main/res/drawable/logo_co_creator_64.xml
@@ -17,8 +17,8 @@
             android:centerY="13.335"
             android:gradientRadius="13.333"
             android:type="radial">
-          <item android:offset="0.41" android:color="#00F05F5F"/>
-          <item android:offset="1" android:color="#FFF05F5F"/>
+          <item android:offset="0.41" android:color="@color/gradient_light_red_gray_start"/>
+          <item android:offset="1" android:color="@color/gradient_light_red_gray_end"/>
         </gradient>
       </aapt:attr>
     </path>
@@ -32,8 +32,8 @@
             android:centerY="50.667"
             android:gradientRadius="13.333"
             android:type="radial">
-          <item android:offset="0.41" android:color="#00F05F5F"/>
-          <item android:offset="1" android:color="#FFF05F5F"/>
+          <item android:offset="0.41" android:color="@color/gradient_light_red_gray_start"/>
+          <item android:offset="1" android:color="@color/gradient_light_red_gray_end"/>
         </gradient>
       </aapt:attr>
     </path>
@@ -47,8 +47,8 @@
             android:centerY="31.999"
             android:gradientRadius="13.333"
             android:type="radial">
-          <item android:offset="0.41" android:color="#00F05F5F"/>
-          <item android:offset="1" android:color="#FFF05F5F"/>
+          <item android:offset="0.41" android:color="@color/gradient_light_red_gray_start"/>
+          <item android:offset="1" android:color="@color/gradient_light_red_gray_end"/>
         </gradient>
       </aapt:attr>
     </path>
@@ -62,8 +62,8 @@
             android:centerY="31.999"
             android:gradientRadius="13.333"
             android:type="radial">
-          <item android:offset="0.41" android:color="#00F05F5F"/>
-          <item android:offset="1" android:color="#FFF05F5F"/>
+          <item android:offset="0.41" android:color="@color/gradient_light_red_gray_start"/>
+          <item android:offset="1" android:color="@color/gradient_light_red_gray_end"/>
         </gradient>
       </aapt:attr>
     </path>
@@ -77,8 +77,8 @@
             android:centerY="18.8"
             android:gradientRadius="13.333"
             android:type="radial">
-          <item android:offset="0.41" android:color="#00F05F5F"/>
-          <item android:offset="1" android:color="#FFF05F5F"/>
+          <item android:offset="0.41" android:color="@color/gradient_light_red_gray_start"/>
+          <item android:offset="1" android:color="@color/gradient_light_red_gray_end"/>
         </gradient>
       </aapt:attr>
     </path>
@@ -92,8 +92,8 @@
             android:centerY="45.199"
             android:gradientRadius="13.333"
             android:type="radial">
-          <item android:offset="0.41" android:color="#00F05F5F"/>
-          <item android:offset="1" android:color="#FFF05F5F"/>
+          <item android:offset="0.41" android:color="@color/gradient_light_red_gray_start"/>
+          <item android:offset="1" android:color="@color/gradient_light_red_gray_end"/>
         </gradient>
       </aapt:attr>
     </path>
@@ -107,8 +107,8 @@
             android:centerY="45.199"
             android:gradientRadius="13.333"
             android:type="radial">
-          <item android:offset="0.41" android:color="#00F05F5F"/>
-          <item android:offset="1" android:color="#FFF05F5F"/>
+          <item android:offset="0.41" android:color="@color/gradient_light_red_gray_start"/>
+          <item android:offset="1" android:color="@color/gradient_light_red_gray_end"/>
         </gradient>
       </aapt:attr>
     </path>
@@ -122,8 +122,8 @@
             android:centerY="18.801"
             android:gradientRadius="13.333"
             android:type="radial">
-          <item android:offset="0.41" android:color="#00F05F5F"/>
-          <item android:offset="1" android:color="#FFF05F5F"/>
+          <item android:offset="0.41" android:color="@color/gradient_light_red_gray_start"/>
+          <item android:offset="1" android:color="@color/gradient_light_red_gray_end"/>
         </gradient>
       </aapt:attr>
     </path>
diff --git a/core-ui/src/main/res/drawable/logo_co_creator_96.xml b/core-ui/src/main/res/drawable/logo_co_creator_96.xml
index b346a14829..0f93088257 100644
--- a/core-ui/src/main/res/drawable/logo_co_creator_96.xml
+++ b/core-ui/src/main/res/drawable/logo_co_creator_96.xml
@@ -17,8 +17,8 @@
             android:centerY="20.123"
             android:gradientRadius="20"
             android:type="radial">
-          <item android:offset="0.41" android:color="#00F05F5F"/>
-          <item android:offset="1" android:color="#FFF05F5F"/>
+          <item android:offset="0.41" android:color="@color/gradient_light_red_gray_start"/>
+          <item android:offset="1" android:color="@color/gradient_light_red_gray_end"/>
         </gradient>
       </aapt:attr>
     </path>
@@ -32,8 +32,8 @@
             android:centerY="76.126"
             android:gradientRadius="20"
             android:type="radial">
-          <item android:offset="0.41" android:color="#00F05F5F"/>
-          <item android:offset="1" android:color="#FFF05F5F"/>
+          <item android:offset="0.41" android:color="@color/gradient_light_red_gray_start"/>
+          <item android:offset="1" android:color="@color/gradient_light_red_gray_end"/>
         </gradient>
       </aapt:attr>
     </path>
@@ -47,8 +47,8 @@
             android:centerY="48.12"
             android:gradientRadius="20"
             android:type="radial">
-          <item android:offset="0.41" android:color="#00F05F5F"/>
-          <item android:offset="1" android:color="#FFF05F5F"/>
+          <item android:offset="0.41" android:color="@color/gradient_light_red_gray_start"/>
+          <item android:offset="1" android:color="@color/gradient_light_red_gray_end"/>
         </gradient>
       </aapt:attr>
     </path>
@@ -62,8 +62,8 @@
             android:centerY="48.12"
             android:gradientRadius="20"
             android:type="radial">
-          <item android:offset="0.41" android:color="#00F05F5F"/>
-          <item android:offset="1" android:color="#FFF05F5F"/>
+          <item android:offset="0.41" android:color="@color/gradient_light_red_gray_start"/>
+          <item android:offset="1" android:color="@color/gradient_light_red_gray_end"/>
         </gradient>
       </aapt:attr>
     </path>
@@ -77,8 +77,8 @@
             android:centerY="28.322"
             android:gradientRadius="20"
             android:type="radial">
-          <item android:offset="0.41" android:color="#00F05F5F"/>
-          <item android:offset="1" android:color="#FFF05F5F"/>
+          <item android:offset="0.41" android:color="@color/gradient_light_red_gray_start"/>
+          <item android:offset="1" android:color="@color/gradient_light_red_gray_end"/>
         </gradient>
       </aapt:attr>
     </path>
@@ -92,8 +92,8 @@
             android:centerY="67.923"
             android:gradientRadius="20"
             android:type="radial">
-          <item android:offset="0.41" android:color="#00F05F5F"/>
-          <item android:offset="1" android:color="#FFF05F5F"/>
+          <item android:offset="0.41" android:color="@color/gradient_light_red_gray_start"/>
+          <item android:offset="1" android:color="@color/gradient_light_red_gray_end"/>
         </gradient>
       </aapt:attr>
     </path>
@@ -107,8 +107,8 @@
             android:centerY="67.92"
             android:gradientRadius="20"
             android:type="radial">
-          <item android:offset="0.41" android:color="#00F05F5F"/>
-          <item android:offset="1" android:color="#FFF05F5F"/>
+          <item android:offset="0.41" android:color="@color/gradient_light_red_gray_start"/>
+          <item android:offset="1" android:color="@color/gradient_light_red_gray_end"/>
         </gradient>
       </aapt:attr>
     </path>
@@ -122,8 +122,8 @@
             android:centerY="28.322"
             android:gradientRadius="20"
             android:type="radial">
-          <item android:offset="0.41" android:color="#00F05F5F"/>
-          <item android:offset="1" android:color="#FFF05F5F"/>
+          <item android:offset="0.41" android:color="@color/gradient_light_red_gray_start"/>
+          <item android:offset="1" android:color="@color/gradient_light_red_gray_end"/>
         </gradient>
       </aapt:attr>
     </path>
diff --git a/core-ui/src/main/res/drawable/logo_custom_64.xml b/core-ui/src/main/res/drawable/logo_custom_64.xml
index 96de90a70b..26c822cce7 100644
--- a/core-ui/src/main/res/drawable/logo_custom_64.xml
+++ b/core-ui/src/main/res/drawable/logo_custom_64.xml
@@ -14,8 +14,8 @@
           android:centerY="32.063"
           android:gradientRadius="32"
           android:type="radial">
-        <item android:offset="0.41" android:color="#00E86DE3"/>
-        <item android:offset="1" android:color="#FFE86DE3"/>
+        <item android:offset="0.41" android:color="@color/custom_logo_gradient_start"/>
+        <item android:offset="1" android:color="@color/custom_logo_gradient_end"/>
       </gradient>
     </aapt:attr>
   </path>
@@ -29,8 +29,8 @@
           android:centerY="40.063"
           android:gradientRadius="22"
           android:type="radial">
-        <item android:offset="0.41" android:color="#00E86DE3"/>
-        <item android:offset="1" android:color="#FFE86DE3"/>
+        <item android:offset="0.41" android:color="@color/custom_logo_gradient_start"/>
+        <item android:offset="1" android:color="@color/custom_logo_gradient_end"/>
       </gradient>
     </aapt:attr>
   </path>
@@ -44,8 +44,8 @@
           android:centerY="48.063"
           android:gradientRadius="12"
           android:type="radial">
-        <item android:offset="0.41" android:color="#00E86DE3"/>
-        <item android:offset="1" android:color="#FFE86DE3"/>
+        <item android:offset="0.41" android:color="@color/custom_logo_gradient_start"/>
+        <item android:offset="1" android:color="@color/custom_logo_gradient_end"/>
       </gradient>
     </aapt:attr>
   </path>
diff --git a/core-ui/src/main/res/drawable/logo_explorer_64.xml b/core-ui/src/main/res/drawable/logo_explorer_64.xml
index c167d2f364..d4d20066c2 100644
--- a/core-ui/src/main/res/drawable/logo_explorer_64.xml
+++ b/core-ui/src/main/res/drawable/logo_explorer_64.xml
@@ -14,8 +14,8 @@
           android:centerY="32"
           android:gradientRadius="32"
           android:type="radial">
-        <item android:offset="0.41" android:color="#0024BFD4"/>
-        <item android:offset="1" android:color="#FF24BFD4"/>
+        <item android:offset="0.41" android:color="@color/explorer_gradient_outer_start"/>
+        <item android:offset="1" android:color="@color/explorer_gradient_outer_end"/>
       </gradient>
     </aapt:attr>
   </path>
@@ -29,8 +29,8 @@
           android:centerY="32"
           android:gradientRadius="18"
           android:type="radial">
-        <item android:offset="0.41" android:color="#0024BFD4"/>
-        <item android:offset="1" android:color="#FF24BFD4"/>
+        <item android:offset="0.41" android:color="@color/explorer_gradient_outer_start"/>
+        <item android:offset="1" android:color="@color/explorer_gradient_outer_end"/>
       </gradient>
     </aapt:attr>
   </path>
@@ -44,8 +44,8 @@
           android:centerY="32"
           android:gradientRadius="4"
           android:type="radial">
-        <item android:offset="0.285" android:color="#002AAFC1"/>
-        <item android:offset="1" android:color="#FF2AAFC1"/>
+        <item android:offset="0.285" android:color="@color/explorer_gradient_inner_start"/>
+        <item android:offset="1" android:color="@color/explorer_gradient_inner_end"/>
       </gradient>
     </aapt:attr>
   </path>
diff --git a/core-ui/src/main/res/drawable/logo_explorer_96.xml b/core-ui/src/main/res/drawable/logo_explorer_96.xml
index 9458d138b1..b58b02eb91 100644
--- a/core-ui/src/main/res/drawable/logo_explorer_96.xml
+++ b/core-ui/src/main/res/drawable/logo_explorer_96.xml
@@ -14,8 +14,8 @@
           android:centerY="48"
           android:gradientRadius="48"
           android:type="radial">
-        <item android:offset="0.41" android:color="#0024BFD4"/>
-        <item android:offset="1" android:color="#FF24BFD4"/>
+        <item android:offset="0.41" android:color="@color/explorer_gradient_outer_start"/>
+        <item android:offset="1" android:color="@color/explorer_gradient_outer_end"/>
       </gradient>
     </aapt:attr>
   </path>
@@ -29,8 +29,8 @@
           android:centerY="48.262"
           android:gradientRadius="26.4"
           android:type="radial">
-        <item android:offset="0.41" android:color="#0024BFD4"/>
-        <item android:offset="1" android:color="#FF24BFD4"/>
+        <item android:offset="0.41" android:color="@color/explorer_gradient_outer_start"/>
+        <item android:offset="1" android:color="@color/explorer_gradient_outer_end"/>
       </gradient>
     </aapt:attr>
   </path>
@@ -44,8 +44,8 @@
           android:centerY="48.263"
           android:gradientRadius="6"
           android:type="radial">
-        <item android:offset="0.285" android:color="#002AAFC1"/>
-        <item android:offset="1" android:color="#FF2AAFC1"/>
+        <item android:offset="0.285" android:color="@color/explorer_gradient_inner_start"/>
+        <item android:offset="1" android:color="@color/explorer_gradient_inner_end"/>
       </gradient>
     </aapt:attr>
   </path>
diff --git a/core-ui/src/main/res/drawable/object_in_list_background_basic_initial.xml b/core-ui/src/main/res/drawable/object_in_list_background_basic_initial.xml
deleted file mode 100644
index 0ad90f7207..0000000000
--- a/core-ui/src/main/res/drawable/object_in_list_background_basic_initial.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <corners android:radius="12dp"/>
-    <solid android:color="@color/shape_transparent" />
-</shape>
\ No newline at end of file
diff --git a/core-ui/src/main/res/drawable/page_icon_picker_dragger_background.xml b/core-ui/src/main/res/drawable/page_icon_picker_dragger_background.xml
index 6595b134b3..2e8a5a82fa 100644
--- a/core-ui/src/main/res/drawable/page_icon_picker_dragger_background.xml
+++ b/core-ui/src/main/res/drawable/page_icon_picker_dragger_background.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="#DFDDD0" />
+    <solid android:color="@color/background_soft_beige" />
     <corners android:radius="6dp" />
 </shape>
\ No newline at end of file
diff --git a/core-ui/src/main/res/drawable/progressbar.xml b/core-ui/src/main/res/drawable/progressbar.xml
index 3fe8597faa..6f5330fbeb 100644
--- a/core-ui/src/main/res/drawable/progressbar.xml
+++ b/core-ui/src/main/res/drawable/progressbar.xml
@@ -4,10 +4,10 @@
         <shape>
             <corners android:radius="5dip" />
             <gradient
-                android:startColor="#bdc3c7"
-                android:centerColor="#bdc3c7"
+                android:startColor="@color/progressbar_background"
+                android:centerColor="@color/progressbar_background"
                 android:centerY="0.75"
-                android:endColor="#bdc3c7"
+                android:endColor="@color/progressbar_background"
                 android:angle="270"
                 />
         </shape>
@@ -18,10 +18,10 @@
             <shape>
                 <corners android:radius="5dip" />
                 <gradient
-                    android:startColor="#3397da"
-                    android:centerColor="#3397da"
+                    android:startColor="@color/progressbar_secondary_progress"
+                    android:centerColor="@color/progressbar_secondary_progress"
                     android:centerY="0.75"
-                    android:endColor="#3397da"
+                    android:endColor="@color/progressbar_secondary_progress"
                     android:angle="270"
                     />
             </shape>
@@ -35,8 +35,8 @@
                 <corners
                     android:radius="5dip" />
                 <gradient
-                    android:startColor="#3397da"
-                    android:endColor="#3397da"
+                    android:startColor="@color/progressbar_secondary_progress"
+                    android:endColor="@color/progressbar_secondary_progress"
                     android:angle="270" />
             </shape>
         </clip>
diff --git a/core-ui/src/main/res/drawable/rect_congratulation_icon.xml b/core-ui/src/main/res/drawable/rect_congratulation_icon.xml
deleted file mode 100644
index 86663ca9d9..0000000000
--- a/core-ui/src/main/res/drawable/rect_congratulation_icon.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="#F3F2EC" />
-    <corners android:radius="14dp" />
-</shape>
\ No newline at end of file
diff --git a/core-ui/src/main/res/drawable/rect_data_view_gallery_item.xml b/core-ui/src/main/res/drawable/rect_data_view_gallery_item.xml
deleted file mode 100644
index 96ffa23251..0000000000
--- a/core-ui/src/main/res/drawable/rect_data_view_gallery_item.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ripple xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="@color/light_grayish">
-    <item>
-        <shape>
-            <solid android:color="@color/white"/>
-            <stroke
-                android:width="0.5dp"
-                android:color="#DFDDD0" />
-            <corners android:radius="16dp" />
-        </shape>
-    </item>
-</ripple>
\ No newline at end of file
diff --git a/core-ui/src/main/res/drawable/rect_default_dragged_block_background.xml b/core-ui/src/main/res/drawable/rect_default_dragged_block_background.xml
deleted file mode 100644
index df93339f67..0000000000
--- a/core-ui/src/main/res/drawable/rect_default_dragged_block_background.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <solid android:color="@color/white"/>
-    <stroke android:color="#332AA7EE" android:width="1.5dp" android:dashGap="1.5dp" android:dashWidth="1.5dp"/>
-    <corners android:radius="10dp"/>
-</shape>
\ No newline at end of file
diff --git a/core-ui/src/main/res/drawable/rect_dv_cell_tag_item.xml b/core-ui/src/main/res/drawable/rect_dv_cell_tag_item.xml
index 8342fe3f13..c048ae2280 100644
--- a/core-ui/src/main/res/drawable/rect_dv_cell_tag_item.xml
+++ b/core-ui/src/main/res/drawable/rect_dv_cell_tag_item.xml
@@ -3,9 +3,9 @@
     android:shape="rectangle">
     <stroke
         android:width="1dp"
-        android:color="#DFDDD0" />
+        android:color="@color/background_soft_beige" />
     <corners android:radius="3dp" />
-    <solid android:color="#DFDDD0" />
+    <solid android:color="@color/background_soft_beige" />
     <padding android:left="5dp"
         android:right="5dp"/>
 </shape>
\ No newline at end of file
diff --git a/core-ui/src/main/res/drawable/rect_dv_manage_viewer_background_active.xml b/core-ui/src/main/res/drawable/rect_dv_manage_viewer_background_active.xml
deleted file mode 100644
index 21c7b6c315..0000000000
--- a/core-ui/src/main/res/drawable/rect_dv_manage_viewer_background_active.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <solid android:color="#26ACA996" />
-    <corners android:radius="10dp" />
-</shape>
\ No newline at end of file
diff --git a/core-ui/src/main/res/drawable/rect_dv_manage_viewer_background_selector.xml b/core-ui/src/main/res/drawable/rect_dv_manage_viewer_background_selector.xml
deleted file mode 100644
index a10949eabf..0000000000
--- a/core-ui/src/main/res/drawable/rect_dv_manage_viewer_background_selector.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/rect_dv_manage_viewer_background_active" android:state_selected="true" />
-</selector>
\ No newline at end of file
diff --git a/core-ui/src/main/res/drawable/rect_dv_manage_viewers.xml b/core-ui/src/main/res/drawable/rect_dv_manage_viewers.xml
deleted file mode 100644
index a39329dfcb..0000000000
--- a/core-ui/src/main/res/drawable/rect_dv_manage_viewers.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <solid android:color="#FFEE94" />
-    <corners android:radius="10dp" />
-</shape>
\ No newline at end of file
diff --git a/core-ui/src/main/res/drawable/rect_layouts_end_active.xml b/core-ui/src/main/res/drawable/rect_layouts_end_active.xml
deleted file mode 100644
index 7cdb464e6f..0000000000
--- a/core-ui/src/main/res/drawable/rect_layouts_end_active.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <solid android:color="#F3F2EC" />
-    <corners android:topRightRadius="8dp" android:bottomRightRadius="8dp" />
-</shape>
\ No newline at end of file
diff --git a/core-ui/src/main/res/drawable/rect_layouts_end_selector.xml b/core-ui/src/main/res/drawable/rect_layouts_end_selector.xml
deleted file mode 100644
index 76c42dc758..0000000000
--- a/core-ui/src/main/res/drawable/rect_layouts_end_selector.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/rect_layouts_end_active" android:state_selected="true" />
-</selector>
\ No newline at end of file
diff --git a/core-ui/src/main/res/drawable/rect_layouts_middle_active.xml b/core-ui/src/main/res/drawable/rect_layouts_middle_active.xml
deleted file mode 100644
index aadf6bc04d..0000000000
--- a/core-ui/src/main/res/drawable/rect_layouts_middle_active.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <solid android:color="#F3F2EC" />
-</shape>
\ No newline at end of file
diff --git a/core-ui/src/main/res/drawable/rect_layouts_middle_selector.xml b/core-ui/src/main/res/drawable/rect_layouts_middle_selector.xml
deleted file mode 100644
index 817e9c5084..0000000000
--- a/core-ui/src/main/res/drawable/rect_layouts_middle_selector.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/rect_layouts_middle_active" android:state_selected="true" />
-</selector>
\ No newline at end of file
diff --git a/core-ui/src/main/res/drawable/rect_layouts_start_active.xml b/core-ui/src/main/res/drawable/rect_layouts_start_active.xml
deleted file mode 100644
index 59648c117d..0000000000
--- a/core-ui/src/main/res/drawable/rect_layouts_start_active.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <solid android:color="#F3F2EC" />
-    <corners android:topLeftRadius="8dp" android:bottomLeftRadius="8dp" />
-</shape>
\ No newline at end of file
diff --git a/core-ui/src/main/res/drawable/rect_layouts_start_selector.xml b/core-ui/src/main/res/drawable/rect_layouts_start_selector.xml
deleted file mode 100644
index 0a82df0daf..0000000000
--- a/core-ui/src/main/res/drawable/rect_layouts_start_selector.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/rect_layouts_start_active" android:state_selected="true" />
-</selector>
\ No newline at end of file
diff --git a/core-ui/src/main/res/drawable/rect_object_menu_button_default.xml b/core-ui/src/main/res/drawable/rect_object_menu_button_default.xml
index 8433ad689e..9659eadfcc 100644
--- a/core-ui/src/main/res/drawable/rect_object_menu_button_default.xml
+++ b/core-ui/src/main/res/drawable/rect_object_menu_button_default.xml
@@ -5,7 +5,7 @@
         <shape
             android:shape="rectangle">
             <corners android:radius="7dp" />
-            <solid android:color="#26000000" />
+            <solid android:color="@color/object_menu_button_default_black_transparent" />
         </shape>
     </item>
 </ripple>
\ No newline at end of file
diff --git a/core-ui/src/main/res/drawable/rect_orange_action_button.xml b/core-ui/src/main/res/drawable/rect_orange_action_button.xml
deleted file mode 100644
index e433a5631c..0000000000
--- a/core-ui/src/main/res/drawable/rect_orange_action_button.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <solid android:color="#FFB522" />
-    <corners android:radius="12dp" />
-</shape>
\ No newline at end of file
diff --git a/core-ui/src/main/res/drawable/rect_tab_layouts.xml b/core-ui/src/main/res/drawable/rect_tab_layouts.xml
deleted file mode 100644
index ff283f7683..0000000000
--- a/core-ui/src/main/res/drawable/rect_tab_layouts.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <stroke android:color="#D4D2C5" android:width="0.5dp" />
-    <corners android:radius="8dp" />
-</shape>
\ No newline at end of file
diff --git a/core-ui/src/main/res/drawable/rect_white_radius_12.xml b/core-ui/src/main/res/drawable/rect_white_radius_12.xml
deleted file mode 100644
index e45f33af4c..0000000000
--- a/core-ui/src/main/res/drawable/rect_white_radius_12.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <solid android:color="@color/background_secondary"/>
-    <corners android:radius="12dp" />
-</shape>
\ No newline at end of file
diff --git a/core-ui/src/main/res/drawable/rectangle_avatar_initial_background.xml b/core-ui/src/main/res/drawable/rectangle_avatar_initial_background.xml
index 89244856d7..39743806ed 100644
--- a/core-ui/src/main/res/drawable/rectangle_avatar_initial_background.xml
+++ b/core-ui/src/main/res/drawable/rectangle_avatar_initial_background.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="oval">
-    <solid android:color="#F3F2EC" />
+    <solid android:color="@color/background_light_gray" />
 </shape>
\ No newline at end of file
diff --git a/core-ui/src/main/res/drawable/rectangle_bookmark.xml b/core-ui/src/main/res/drawable/rectangle_bookmark.xml
deleted file mode 100644
index ce028d52ce..0000000000
--- a/core-ui/src/main/res/drawable/rectangle_bookmark.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <stroke
-        android:width="1dp"
-        android:color="#DFDDD0" />
-    <corners android:radius="8dp" />
-</shape>
\ No newline at end of file
diff --git a/core-ui/src/main/res/drawable/rectangle_color_toolbar_horizontal_divider.xml b/core-ui/src/main/res/drawable/rectangle_color_toolbar_horizontal_divider.xml
deleted file mode 100644
index 459266413d..0000000000
--- a/core-ui/src/main/res/drawable/rectangle_color_toolbar_horizontal_divider.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <size android:width="@dimen/default_toolbar_color_item_divider_width" />
-    <solid android:color="#F3F2EC" />
-</shape>
\ No newline at end of file
diff --git a/core-ui/src/main/res/drawable/rectangle_dashboard_text_skeleton.xml b/core-ui/src/main/res/drawable/rectangle_dashboard_text_skeleton.xml
deleted file mode 100644
index 209e3811d9..0000000000
--- a/core-ui/src/main/res/drawable/rectangle_dashboard_text_skeleton.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <solid android:color="@color/shape_transparent" />
-    <corners android:radius="8dp" />
-</shape>
\ No newline at end of file
diff --git a/core-ui/src/main/res/drawable/rectangle_debug_background.xml b/core-ui/src/main/res/drawable/rectangle_debug_background.xml
deleted file mode 100644
index 704384b860..0000000000
--- a/core-ui/src/main/res/drawable/rectangle_debug_background.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <solid android:color="@color/white" />
-    <corners
-        android:topLeftRadius="8dp"
-        android:topRightRadius="8dp" />
-</shape>
\ No newline at end of file
diff --git a/core-ui/src/main/res/drawable/rectangle_default_bottom_toolbar_action_background.xml b/core-ui/src/main/res/drawable/rectangle_default_bottom_toolbar_action_background.xml
deleted file mode 100644
index 66202c6050..0000000000
--- a/core-ui/src/main/res/drawable/rectangle_default_bottom_toolbar_action_background.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <corners android:radius="@dimen/default_toolbar_action_corner_radius" />
-    <solid android:color="@color/white" />
-</shape>
\ No newline at end of file
diff --git a/core-ui/src/main/res/drawable/rectangle_default_bottom_toolbar_option_background.xml b/core-ui/src/main/res/drawable/rectangle_default_bottom_toolbar_option_background.xml
deleted file mode 100644
index c3a8e0211c..0000000000
--- a/core-ui/src/main/res/drawable/rectangle_default_bottom_toolbar_option_background.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <corners android:radius="@dimen/default_toolbar_option_corner_radius" />
-    <solid android:color="@color/white" />
-</shape>
\ No newline at end of file
diff --git a/core-ui/src/main/res/drawable/rectangle_default_page_logo_background.xml b/core-ui/src/main/res/drawable/rectangle_default_page_logo_background.xml
index 3e842101b5..e78a657ee0 100644
--- a/core-ui/src/main/res/drawable/rectangle_default_page_logo_background.xml
+++ b/core-ui/src/main/res/drawable/rectangle_default_page_logo_background.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="oval">
-    <solid android:color="#F7F5F0" />
+    <solid android:color="@color/page_logo_background" />
 </shape>
\ No newline at end of file
diff --git a/core-ui/src/main/res/drawable/rectangle_doc_menu_background.xml b/core-ui/src/main/res/drawable/rectangle_doc_menu_background.xml
deleted file mode 100644
index 45ebe3bf81..0000000000
--- a/core-ui/src/main/res/drawable/rectangle_doc_menu_background.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <solid android:color="#F3F2EC" />
-    <corners
-        android:topLeftRadius="8dp"
-        android:topRightRadius="8dp" />
-</shape>
\ No newline at end of file
diff --git a/core-ui/src/main/res/drawable/rectangle_item_relation_format_selected.xml b/core-ui/src/main/res/drawable/rectangle_item_relation_format_selected.xml
index 1ad78ed125..be45d789d0 100644
--- a/core-ui/src/main/res/drawable/rectangle_item_relation_format_selected.xml
+++ b/core-ui/src/main/res/drawable/rectangle_item_relation_format_selected.xml
@@ -3,7 +3,7 @@
     android:shape="rectangle">
     <stroke
         android:width="2dp"
-        android:color="#F3F2EC"
+        android:color="@color/background_light_gray"
         android:dashWidth="2dp" />
     <corners android:radius="8dp" />
 </shape>
\ No newline at end of file
diff --git a/core-ui/src/main/res/drawable/rectangle_media_block_placeholder.xml b/core-ui/src/main/res/drawable/rectangle_media_block_placeholder.xml
deleted file mode 100644
index caad9697cd..0000000000
--- a/core-ui/src/main/res/drawable/rectangle_media_block_placeholder.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <stroke
-        android:width="0.5dp"
-        android:color="@color/shape_primary" />
-    <corners android:radius="16dp" />
-</shape>
\ No newline at end of file
diff --git a/core-ui/src/main/res/drawable/rectangle_modifier_viewer_relation_order_divider.xml b/core-ui/src/main/res/drawable/rectangle_modifier_viewer_relation_order_divider.xml
deleted file mode 100644
index 80c7286e54..0000000000
--- a/core-ui/src/main/res/drawable/rectangle_modifier_viewer_relation_order_divider.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <size android:height="1dp" />
-    <solid android:color="#EAE9E0" />
-</shape>
\ No newline at end of file
diff --git a/core-ui/src/main/res/drawable/rectangle_object_icon_emoji_background.xml b/core-ui/src/main/res/drawable/rectangle_object_icon_emoji_background.xml
deleted file mode 100644
index 3c7c5286ff..0000000000
--- a/core-ui/src/main/res/drawable/rectangle_object_icon_emoji_background.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <corners android:radius="@dimen/dp_12" />
-    <solid android:color="#F3F2EC" />
-</shape>
\ No newline at end of file
diff --git a/core-ui/src/main/res/drawable/rectangle_object_menu_action.xml b/core-ui/src/main/res/drawable/rectangle_object_menu_action.xml
deleted file mode 100644
index 9098bc0872..0000000000
--- a/core-ui/src/main/res/drawable/rectangle_object_menu_action.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <corners android:radius="10dp" />
-    <solid android:color="#F3F2EC" />
-</shape>
\ No newline at end of file
diff --git a/core-ui/src/main/res/drawable/rectangle_red_button.xml b/core-ui/src/main/res/drawable/rectangle_red_button.xml
deleted file mode 100644
index 252cb4ac92..0000000000
--- a/core-ui/src/main/res/drawable/rectangle_red_button.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ripple xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="?colorControlHighlight">
-    <item>
-        <shape android:shape="rectangle">
-            <solid android:color="#F55522" />
-            <corners android:radius="12dp" />
-        </shape>
-    </item>
-
-</ripple>
\ No newline at end of file
diff --git a/core-ui/src/main/res/drawable/rectangle_relation_icon_container_background.xml b/core-ui/src/main/res/drawable/rectangle_relation_icon_container_background.xml
deleted file mode 100644
index 9098bc0872..0000000000
--- a/core-ui/src/main/res/drawable/rectangle_relation_icon_container_background.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <corners android:radius="10dp" />
-    <solid android:color="#F3F2EC" />
-</shape>
\ No newline at end of file
diff --git a/core-ui/src/main/res/drawable/rectangle_stroke_button.xml b/core-ui/src/main/res/drawable/rectangle_stroke_button.xml
deleted file mode 100644
index 078fe1ec5e..0000000000
--- a/core-ui/src/main/res/drawable/rectangle_stroke_button.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ripple xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="?colorControlHighlight">
-    <item>
-        <shape android:shape="rectangle">
-            <stroke
-                android:width="1dp"
-                android:color="@color/shape_transparent" />
-            <corners android:radius="10dp" />
-            <solid android:color="@color/background_primary" />
-        </shape>
-    </item>
-
-</ripple>
\ No newline at end of file
diff --git a/core-ui/src/main/res/drawable/rectangle_toolbar_color_background_color.xml b/core-ui/src/main/res/drawable/rectangle_toolbar_color_background_color.xml
deleted file mode 100644
index f4a2f7636f..0000000000
--- a/core-ui/src/main/res/drawable/rectangle_toolbar_color_background_color.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <corners android:radius="@dimen/default_toolbar_background_color_content_radius" />
-    <solid android:color="@color/white" />
-</shape>
\ No newline at end of file
diff --git a/core-ui/src/main/res/drawable/rectangle_toolbar_color_default_item.xml b/core-ui/src/main/res/drawable/rectangle_toolbar_color_default_item.xml
deleted file mode 100644
index 297aa2cb12..0000000000
--- a/core-ui/src/main/res/drawable/rectangle_toolbar_color_default_item.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <solid android:color="@color/white" />
-</shape>
\ No newline at end of file
diff --git a/core-ui/src/main/res/drawable/rectangle_toolbar_color_first_item.xml b/core-ui/src/main/res/drawable/rectangle_toolbar_color_first_item.xml
deleted file mode 100644
index 5420eb6dfd..0000000000
--- a/core-ui/src/main/res/drawable/rectangle_toolbar_color_first_item.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <corners
-        android:bottomLeftRadius="@dimen/default_toolbar_background_color_container_radius"
-        android:topLeftRadius="@dimen/default_toolbar_background_color_container_radius" />
-    <solid android:color="@color/white" />
-</shape>
\ No newline at end of file
diff --git a/core-ui/src/main/res/drawable/rectangle_toolbar_color_last_item.xml b/core-ui/src/main/res/drawable/rectangle_toolbar_color_last_item.xml
deleted file mode 100644
index 772c708073..0000000000
--- a/core-ui/src/main/res/drawable/rectangle_toolbar_color_last_item.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <corners
-        android:bottomRightRadius="@dimen/default_toolbar_background_color_container_radius"
-        android:topRightRadius="@dimen/default_toolbar_background_color_container_radius" />
-    <solid android:color="@color/white" />
-</shape>
\ No newline at end of file
diff --git a/core-ui/src/main/res/drawable/rectangle_toolbar_convert_block_chapter.xml b/core-ui/src/main/res/drawable/rectangle_toolbar_convert_block_chapter.xml
deleted file mode 100644
index 30f08737dc..0000000000
--- a/core-ui/src/main/res/drawable/rectangle_toolbar_convert_block_chapter.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <solid android:color="@color/chapter_yellow" />
-    <corners android:radius="@dimen/default_toolbar_section_radius" />
-</shape>
\ No newline at end of file
diff --git a/core-ui/src/main/res/drawable/rectangle_toolbar_default_chapter.xml b/core-ui/src/main/res/drawable/rectangle_toolbar_default_chapter.xml
deleted file mode 100644
index 429b48fb4b..0000000000
--- a/core-ui/src/main/res/drawable/rectangle_toolbar_default_chapter.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <solid android:color="@color/white" />
-    <corners android:radius="@dimen/default_toolbar_section_radius" />
-</shape>
\ No newline at end of file
diff --git a/core-ui/src/main/res/drawable/ripple_dashboard_card.xml b/core-ui/src/main/res/drawable/ripple_dashboard_card.xml
deleted file mode 100644
index 3497301de2..0000000000
--- a/core-ui/src/main/res/drawable/ripple_dashboard_card.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ripple xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="@color/light_grayish">
-    <item
-        android:id="@android:id/mask"
-        android:drawable="@android:color/white" />
-</ripple>
\ No newline at end of file
diff --git a/core-ui/src/main/res/drawable/rounded_button_add.xml b/core-ui/src/main/res/drawable/rounded_button_add.xml
deleted file mode 100644
index 4c59450770..0000000000
--- a/core-ui/src/main/res/drawable/rounded_button_add.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <corners android:radius="8dp" />
-    <solid android:color="#FFB522" />
-    <stroke
-        android:width="1dp"
-        android:color="#FFB522" />
-
-</shape>
\ No newline at end of file
diff --git a/core-ui/src/main/res/drawable/rounded_button_cancel.xml b/core-ui/src/main/res/drawable/rounded_button_cancel.xml
deleted file mode 100644
index 6ce89697c4..0000000000
--- a/core-ui/src/main/res/drawable/rounded_button_cancel.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <corners android:radius="8dp" />
-    <solid android:color="@color/white" />
-    <stroke
-        android:width="1dp"
-        android:color="@color/shape_transparent" />
-
-</shape>
\ No newline at end of file
diff --git a/core-ui/src/main/res/drawable/rounded_button_nav_open.xml b/core-ui/src/main/res/drawable/rounded_button_nav_open.xml
deleted file mode 100644
index 4c59450770..0000000000
--- a/core-ui/src/main/res/drawable/rounded_button_nav_open.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <corners android:radius="8dp" />
-    <solid android:color="#FFB522" />
-    <stroke
-        android:width="1dp"
-        android:color="#FFB522" />
-
-</shape>
\ No newline at end of file
diff --git a/core-ui/src/main/res/drawable/rounded_corner.xml b/core-ui/src/main/res/drawable/rounded_corner.xml
deleted file mode 100644
index ba38a4d1b6..0000000000
--- a/core-ui/src/main/res/drawable/rounded_corner.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <stroke
-        android:width="1dp"
-        android:color="#FEF3C5" />
-
-    <solid android:color="#FEF3C5" />
-
-    <padding
-        android:bottom="1dp"
-        android:left="1dp"
-        android:right="1dp"
-        android:top="1dp" />
-
-    <corners android:radius="5dp" />
-</shape>
\ No newline at end of file
diff --git a/core-ui/src/main/res/drawable/rounded_dialog_network_settings.xml b/core-ui/src/main/res/drawable/rounded_dialog_network_settings.xml
index 9447dd2944..aa279877c0 100644
--- a/core-ui/src/main/res/drawable/rounded_dialog_network_settings.xml
+++ b/core-ui/src/main/res/drawable/rounded_dialog_network_settings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <solid android:color="#171717" />
+    <solid android:color="@color/dialog_network_background" />
     <corners
         android:topLeftRadius="16dp"
         android:topRightRadius="16dp" />
diff --git a/core-ui/src/main/res/drawable/rounded_text_action_bg.xml b/core-ui/src/main/res/drawable/rounded_text_action_bg.xml
deleted file mode 100644
index 0a96504f3a..0000000000
--- a/core-ui/src/main/res/drawable/rounded_text_action_bg.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <corners android:radius="10dp" />
-    <stroke
-        android:width="1dp"
-        android:color="@color/white" />
-    <solid android:color="@color/white" />
-</shape>
\ No newline at end of file
diff --git a/core-ui/src/main/res/drawable/scroll_and_move_disabled.xml b/core-ui/src/main/res/drawable/scroll_and_move_disabled.xml
index 847ca04b41..c8221d5b8c 100644
--- a/core-ui/src/main/res/drawable/scroll_and_move_disabled.xml
+++ b/core-ui/src/main/res/drawable/scroll_and_move_disabled.xml
@@ -5,6 +5,6 @@
         android:height="4dp" />
     <corners android:radius="8dp" />
     <stroke
-        android:color="#DFDDD0"
+        android:color="@color/background_soft_beige"
         android:width="1.5dp" />
 </shape>
\ No newline at end of file
diff --git a/core-ui/src/main/res/drawable/scroll_and_move_line.xml b/core-ui/src/main/res/drawable/scroll_and_move_line.xml
index 366ea423e0..c5a593149f 100644
--- a/core-ui/src/main/res/drawable/scroll_and_move_line.xml
+++ b/core-ui/src/main/res/drawable/scroll_and_move_line.xml
@@ -4,5 +4,5 @@
         android:width="1dp"
         android:height="4dp" />
     <corners android:radius="8dp" />
-    <solid android:color="#FFB522" />
+    <solid android:color="@color/palette_system_amber_100" />
 </shape>
\ No newline at end of file
diff --git a/core-ui/src/main/res/drawable/scroll_and_move_rectangle.xml b/core-ui/src/main/res/drawable/scroll_and_move_rectangle.xml
index 8bfd1977ef..a6b5459b26 100644
--- a/core-ui/src/main/res/drawable/scroll_and_move_rectangle.xml
+++ b/core-ui/src/main/res/drawable/scroll_and_move_rectangle.xml
@@ -5,7 +5,7 @@
         android:height="4dp" />
     <corners android:radius="8dp" />
     <stroke
-        android:color="#FFB522"
+        android:color="@color/palette_system_amber_100"
         android:width="1.5dp" />
-    <solid android:color="#33FFB522" />
+    <solid android:color="@color/multi_select_highlight" />
 </shape>
\ No newline at end of file
diff --git a/core-ui/src/main/res/drawable/selector_block_task.xml b/core-ui/src/main/res/drawable/selector_block_task.xml
deleted file mode 100644
index 37a0f2c338..0000000000
--- a/core-ui/src/main/res/drawable/selector_block_task.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/ic_block_task_unchecked" android:state_selected="false" />
-    <item android:drawable="@drawable/ic_block_task_checked" android:state_selected="true" />
-</selector>
\ No newline at end of file
diff --git a/core-ui/src/main/res/drawable/sheet_bottom.xml b/core-ui/src/main/res/drawable/sheet_bottom.xml
index 6b3e5a4e2e..f2d815d247 100644
--- a/core-ui/src/main/res/drawable/sheet_bottom.xml
+++ b/core-ui/src/main/res/drawable/sheet_bottom.xml
@@ -5,5 +5,5 @@
     android:viewportHeight="5">
   <path
       android:pathData="M2.5,0L132.5,0A2.5,2.5 0,0 1,135 2.5L135,2.5A2.5,2.5 0,0 1,132.5 5L2.5,5A2.5,2.5 0,0 1,0 2.5L0,2.5A2.5,2.5 0,0 1,2.5 0z"
-      android:fillColor="#DFDDD0"/>
+      android:fillColor="@color/background_soft_beige"/>
 </vector>
diff --git a/core-ui/src/main/res/drawable/sort_divider.xml b/core-ui/src/main/res/drawable/sort_divider.xml
deleted file mode 100644
index c48b02541a..0000000000
--- a/core-ui/src/main/res/drawable/sort_divider.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <size
-        android:width="1dp"
-        android:height="1dp" />
-    <solid android:color="#DFDDD0" />
-</shape>
\ No newline at end of file
diff --git a/core-ui/src/main/res/drawable/vertical_line.xml b/core-ui/src/main/res/drawable/vertical_line.xml
deleted file mode 100644
index 3022646416..0000000000
--- a/core-ui/src/main/res/drawable/vertical_line.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:bottom="-100dp"
-        android:end="-100dp"
-        android:top="-100dp">
-        <shape android:shape="rectangle">
-            <stroke
-                android:width="2dp"
-                android:color="@color/block_highlight_divider" />
-        </shape>
-    </item>
-
-</layer-list>
diff --git a/core-ui/src/main/res/drawable/viewer_relation_switch_track.xml b/core-ui/src/main/res/drawable/viewer_relation_switch_track.xml
index b790715e43..80800ec8d0 100644
--- a/core-ui/src/main/res/drawable/viewer_relation_switch_track.xml
+++ b/core-ui/src/main/res/drawable/viewer_relation_switch_track.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:color="@color/palette_system_amber_50" android:state_checked="true" />
-    <item android:color="#EAE9E0" />
+    <item android:color="@color/toolbar_keyboard_background" />
 </selector>
\ No newline at end of file
diff --git a/core-ui/src/main/res/drawable/wallpaper_gradient_1.xml b/core-ui/src/main/res/drawable/wallpaper_gradient_1.xml
index fbcb68cb1e..24e565a380 100644
--- a/core-ui/src/main/res/drawable/wallpaper_gradient_1.xml
+++ b/core-ui/src/main/res/drawable/wallpaper_gradient_1.xml
@@ -3,7 +3,7 @@
     android:shape="rectangle">
     <gradient
         android:angle="-90"
-        android:centerColor="#FDD0CD"
-        android:endColor="#FFCC81"
-        android:startColor="#D8A4E1" />
+        android:centerColor="@color/wallpaper_gradient_1_center"
+        android:endColor="@color/wallpaper_gradient_1_end"
+        android:startColor="@color/wallpaper_gradient_1_start" />
 </shape>
\ No newline at end of file
diff --git a/core-ui/src/main/res/drawable/wallpaper_gradient_2.xml b/core-ui/src/main/res/drawable/wallpaper_gradient_2.xml
index 80109c6768..4f07f4f5a8 100644
--- a/core-ui/src/main/res/drawable/wallpaper_gradient_2.xml
+++ b/core-ui/src/main/res/drawable/wallpaper_gradient_2.xml
@@ -3,7 +3,7 @@
     android:shape="rectangle">
     <gradient
         android:angle="-90"
-        android:centerColor="#ABB6ED"
-        android:endColor="#F3BFAC"
-        android:startColor="#73B7F0" />
+        android:centerColor="@color/wallpaper_gradient_2_center"
+        android:endColor="@color/wallpaper_gradient_2_end"
+        android:startColor="@color/wallpaper_gradient_2_start" />
 </shape>
\ No newline at end of file
diff --git a/core-ui/src/main/res/drawable/wallpaper_gradient_3.xml b/core-ui/src/main/res/drawable/wallpaper_gradient_3.xml
index 4e6cf98c1a..9f494337d2 100644
--- a/core-ui/src/main/res/drawable/wallpaper_gradient_3.xml
+++ b/core-ui/src/main/res/drawable/wallpaper_gradient_3.xml
@@ -3,7 +3,7 @@
     android:shape="rectangle">
     <gradient
         android:angle="-90"
-        android:centerColor="#C5D3AC"
-        android:endColor="#F6C47A"
-        android:startColor="#63B3CB" />
+        android:centerColor="@color/wallpaper_gradient_3_center"
+        android:endColor="@color/wallpaper_gradient_3_end"
+        android:startColor="@color/wallpaper_gradient_3_start" />
 </shape>
\ No newline at end of file
diff --git a/core-ui/src/main/res/drawable/wallpaper_gradient_4.xml b/core-ui/src/main/res/drawable/wallpaper_gradient_4.xml
index 3a57d7f755..c9f9a3a01c 100644
--- a/core-ui/src/main/res/drawable/wallpaper_gradient_4.xml
+++ b/core-ui/src/main/res/drawable/wallpaper_gradient_4.xml
@@ -3,7 +3,7 @@
     android:shape="rectangle">
     <gradient
         android:angle="-90"
-        android:centerColor="#A4CFEC"
-        android:endColor="#DAEAF3"
-        android:startColor="#6EB6E4" />
+        android:centerColor="@color/wallpaper_gradient_4_center"
+        android:endColor="@color/wallpaper_gradient_4_end"
+        android:startColor="@color/wallpaper_gradient_4_start" />
 </shape>
\ No newline at end of file
diff --git a/core-ui/src/main/res/font/inter_font.xml b/core-ui/src/main/res/font/inter_font.xml
deleted file mode 100644
index dc84b89f6a..0000000000
--- a/core-ui/src/main/res/font/inter_font.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<font-family xmlns:android="http://schemas.android.com/apk/res/android">
-    <font
-        android:fontStyle="normal"
-        android:fontWeight="400"
-        android:font="@font/inter_regular" />
-    <font
-        android:fontStyle="normal"
-        android:fontWeight="700"
-        android:font="@font/inter_bold" />
-</font-family>
\ No newline at end of file
diff --git a/core-ui/src/main/res/layout/collections_icon.xml b/core-ui/src/main/res/layout/collections_icon.xml
deleted file mode 100644
index 1540a0b9de..0000000000
--- a/core-ui/src/main/res/layout/collections_icon.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<com.anytypeio.anytype.core_ui.widgets.ObjectIconWidget xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="@dimen/list_item_object_icon_width"
-    android:layout_height="@dimen/list_item_object_icon_height"
-    android:contentDescription="@string/content_desc_object_icon"
-    app:checkboxSize="@dimen/list_item_object_checkbox_size"
-    app:emojiSize="@dimen/list_item_object_emoji_size"
-    app:hasEmojiRounded8Background="true"
-    app:hasInitialRounded8Background="true"
-    app:imageCornerRadius="@dimen/list_item_object_image_corner_radius"
-    app:imageSize="@dimen/list_item_object_icon_height"
-    app:initialTextSize="@dimen/list_item_object_initials_size" />
\ No newline at end of file
diff --git a/core-ui/src/main/res/layout/item_block_bookmark_error.xml b/core-ui/src/main/res/layout/item_block_bookmark_error.xml
deleted file mode 100644
index 5d9b1c698c..0000000000
--- a/core-ui/src/main/res/layout/item_block_bookmark_error.xml
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/bookmarkErrorRoot"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-
-    <com.anytypeio.anytype.core_ui.features.editor.decoration.EditorDecorationContainer
-        android:id="@+id/decorationContainer"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
-
-    <FrameLayout
-        android:id="@+id/card"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/dp_48"
-        android:layout_marginStart="@dimen/default_indent"
-        android:layout_marginTop="7dp"
-        android:layout_marginEnd="@dimen/default_indent"
-        android:layout_marginBottom="7dp"
-        android:background="@drawable/rectangle_media_block_placeholder">
-
-        <ImageView
-            android:id="@+id/ivBookmark"
-            android:layout_width="32dp"
-            android:layout_height="32dp"
-            android:layout_gravity="center_vertical"
-            android:layout_marginStart="12dp"
-            android:contentDescription="@string/content_description_bookmark_image"
-            android:src="@drawable/ic_bookmark_block_error" />
-
-        <TextView
-            android:id="@+id/errorBookmarkUrl"
-            style="@style/TextView.ContentStyle.Relations.3"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
-            android:layout_marginStart="48dp"
-            android:layout_marginEnd="16dp"
-            android:ellipsize="end"
-            android:text="@string/bookmark_error"
-            android:hint="@string/bookmark_error"
-            android:maxLines="1"
-            android:textColor="@color/palette_system_red" />
-
-    </FrameLayout>
-
-    <View
-        android:id="@+id/selected"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="@drawable/item_block_multi_select_mode_selector"
-        />
-
-</FrameLayout>
diff --git a/core-ui/src/main/res/layout/item_block_file_error.xml b/core-ui/src/main/res/layout/item_block_file_error.xml
deleted file mode 100644
index a364fb58e5..0000000000
--- a/core-ui/src/main/res/layout/item_block_file_error.xml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<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"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-
-    <com.anytypeio.anytype.core_ui.features.editor.decoration.EditorDecorationContainer
-        android:id="@+id/decorationContainer"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/card"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/dp_48"
-        android:layout_marginTop="7dp"
-        android:layout_marginBottom="7dp"
-        android:layout_marginStart="@dimen/default_indent"
-        android:layout_marginEnd="@dimen/default_indent"
-        android:background="@drawable/rectangle_media_block_placeholder">
-
-        <ImageView
-            android:id="@+id/icFile"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="12dp"
-            android:layout_marginTop="12dp"
-            android:layout_marginBottom="12dp"
-            android:contentDescription="@string/content_description_file_icon"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:srcCompat="@drawable/ic_file_light" />
-
-        <TextView
-            android:id="@+id/errorMessage"
-            style="@style/UploadMediaInActiveTextStyle"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="8dp"
-            android:layout_marginEnd="24dp"
-            android:text="@string/error_while_loading"
-            app:layout_constraintBottom_toBottomOf="@+id/icFile"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@+id/icFile"
-            app:layout_constraintTop_toTopOf="@+id/icFile"
-            tools:text="@string/error_while_loading" />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-    <View
-        android:id="@+id/selected"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="@drawable/item_block_multi_select_mode_selector"
-        tools:background="@drawable/item_block_multi_select_selected" />
-
-</FrameLayout>
\ No newline at end of file
diff --git a/core-ui/src/main/res/layout/item_block_media_placeholder.xml b/core-ui/src/main/res/layout/item_block_media_placeholder.xml
index fe922862b6..f041f4f2a2 100644
--- a/core-ui/src/main/res/layout/item_block_media_placeholder.xml
+++ b/core-ui/src/main/res/layout/item_block_media_placeholder.xml
@@ -58,7 +58,7 @@
                 android:layout_height="wrap_content"
                 android:indeterminate="true"
                 app:trackColor="@color/glyph_inactive"
-                app:indicatorColor="#B6B6B6"
+                app:indicatorColor="@color/tag_icon_gray"
                 app:indicatorSize="20dp"
                 app:trackThickness="@dimen/dp_2"
                 app:layout_constraintBottom_toBottomOf="parent"
diff --git a/core-ui/src/main/res/layout/item_block_object_link_card.xml b/core-ui/src/main/res/layout/item_block_object_link_card.xml
deleted file mode 100644
index 7d0cb86375..0000000000
--- a/core-ui/src/main/res/layout/item_block_object_link_card.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<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"
-    android:id="@+id/root"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-
-    <com.anytypeio.anytype.core_ui.features.editor.decoration.EditorDecorationContainer
-        android:id="@+id/decorationContainer"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
-
-    <com.google.android.material.card.MaterialCardView
-        android:id="@+id/card"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        style="@style/DefaultLinkCardBlockCardStyle">
-
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:id="@+id/containerWithBackground"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:minHeight="96dp">
-
-            <ImageView
-                android:id="@+id/cover"
-                android:layout_width="0dp"
-                android:layout_height="0dp"
-                android:adjustViewBounds="true"
-                android:contentDescription="@string/content_description_document_cover"
-                android:scaleType="fitXY"
-                android:visibility="gone"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
-
-            <com.anytypeio.anytype.core_ui.widgets.ObjectIconWidget
-                android:id="@+id/cardIcon"
-                android:layout_width="64dp"
-                android:layout_height="64dp"
-                android:layout_marginStart="16dp"
-                android:layout_marginTop="@dimen/dp_16"
-                android:layout_marginBottom="@dimen/dp_16"
-                app:checkboxSize="28dp"
-                app:emojiSize="36dp"
-                app:hasEmojiRounded12Background="true"
-                app:imageCornerRadius="@dimen/list_item_object_image_corner_radius"
-                app:imageSize="64dp"
-                app:initialTextSize="28sp"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
-
-            <TextView
-                android:id="@+id/cardName"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="12dp"
-                android:layout_marginEnd="19dp"
-                style="@style/ObjectLinkBlockCardTitleStyle"
-                app:layout_constraintBottom_toTopOf="@+id/cardDescription"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toEndOf="@+id/cardIcon"
-                app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintVertical_chainStyle="packed"
-                app:layout_goneMarginStart="@dimen/dp_16"
-                tools:text="What is Aesthetic intelligence? What is Aesthetic intelligence? What is Aesthetic intelligence?" />
-
-            <TextView
-                android:id="@+id/cardDescription"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="12dp"
-                android:layout_marginEnd="19dp"
-                style="@style/ObjectLinkBlockCardDescriptionStyle"
-                app:layout_constraintBottom_toTopOf="@id/cardType"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toEndOf="@+id/cardIcon"
-                app:layout_constraintTop_toBottomOf="@+id/cardName"
-                app:layout_goneMarginStart="@dimen/dp_16"
-                tools:text="When a few objects that can be mabbbyfgg"
-                tools:visibility="visible" />
-
-            <TextView
-                android:id="@+id/cardType"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="12dp"
-                android:layout_marginEnd="19dp"
-                style="@style/ObjectLinkBlockCardObjectTypeStyle"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toEndOf="@+id/cardIcon"
-                app:layout_constraintTop_toBottomOf="@+id/cardDescription"
-                app:layout_goneMarginStart="@dimen/dp_16"
-                tools:text="Page"
-                tools:visibility="visible" />
-
-        </androidx.constraintlayout.widget.ConstraintLayout>
-
-    </com.google.android.material.card.MaterialCardView>
-
-    <View
-        android:id="@+id/selected"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="@drawable/item_block_multi_select_mode_selector"
-        tools:background="@drawable/item_block_multi_select_selected" />
-
-</FrameLayout>
\ No newline at end of file
diff --git a/core-ui/src/main/res/layout/item_block_picture_error.xml b/core-ui/src/main/res/layout/item_block_picture_error.xml
deleted file mode 100644
index 400d6c15d7..0000000000
--- a/core-ui/src/main/res/layout/item_block_picture_error.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<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"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-
-    <com.anytypeio.anytype.core_ui.features.editor.decoration.EditorDecorationContainer
-        android:id="@+id/decorationContainer"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/card"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/dp_48"
-        android:layout_marginTop="7dp"
-        android:layout_marginBottom="7dp"
-        android:layout_marginStart="@dimen/default_indent"
-        android:layout_marginEnd="@dimen/default_indent"
-        android:background="@drawable/rectangle_media_block_placeholder">
-
-        <ImageView
-            android:id="@+id/icPicture"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="12dp"
-            android:layout_marginTop="12dp"
-            android:layout_marginBottom="12dp"
-            android:contentDescription="@string/content_description_file_icon"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:srcCompat="@drawable/ic_picture" />
-
-        <TextView
-            android:id="@+id/editUrl"
-            style="@style/BlockVideoStyle"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="8dp"
-            android:layout_marginEnd="24dp"
-            android:inputType="none"
-            android:text="@string/error_while_loading"
-            android:textColor="@color/text_tertiary"
-            app:layout_constraintBottom_toBottomOf="@+id/icPicture"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@+id/icPicture"
-            app:layout_constraintTop_toTopOf="@+id/icPicture"
-            tools:text="@string/error_while_loading" />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-    <View
-        android:id="@+id/selected"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="@drawable/item_block_multi_select_mode_selector"
-        tools:background="@drawable/item_block_multi_select_selected" />
-
-</FrameLayout>
\ No newline at end of file
diff --git a/core-ui/src/main/res/layout/item_block_video_error.xml b/core-ui/src/main/res/layout/item_block_video_error.xml
deleted file mode 100644
index 1e34174ec3..0000000000
--- a/core-ui/src/main/res/layout/item_block_video_error.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<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"
-    android:layout_width="match_parent"
-    style="@style/BlockMediaRootLayoutStyle"
-    android:layout_height="wrap_content"
-    android:background="@drawable/item_block_multi_select_mode_selector">
-
-    <com.anytypeio.anytype.core_ui.features.editor.decoration.EditorDecorationContainer
-        android:id="@+id/decorationContainer"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/card"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/dp_48"
-        android:layout_marginTop="7dp"
-        android:layout_marginBottom="7dp"
-        android:layout_marginStart="@dimen/default_indent"
-        android:layout_marginEnd="@dimen/default_indent"
-        android:background="@drawable/rectangle_media_block_placeholder">
-
-        <ImageView
-            android:id="@+id/icVideo"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="12dp"
-            android:layout_marginTop="12dp"
-            android:layout_marginBottom="12dp"
-            android:contentDescription="@string/content_description_file_icon"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:srcCompat="@drawable/ic_video" />
-
-        <TextView
-            android:id="@+id/tvError"
-            style="@style/UploadMediaInActiveTextStyle"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="8dp"
-            android:layout_marginEnd="24dp"
-            android:text="@string/error_while_loading"
-            app:layout_constraintBottom_toBottomOf="@+id/icVideo"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@+id/icVideo"
-            app:layout_constraintTop_toTopOf="@+id/icVideo"
-            tools:text="@string/error_while_loading" />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-    <View
-        android:id="@+id/selected"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="@drawable/item_block_multi_select_mode_selector"
-        tools:background="@drawable/item_block_multi_select_selected" />
-
-</FrameLayout>
\ No newline at end of file
diff --git a/core-ui/src/main/res/layout/item_create_filter_tag.xml b/core-ui/src/main/res/layout/item_create_filter_tag.xml
index 9954bf10d1..aef63be13e 100644
--- a/core-ui/src/main/res/layout/item_create_filter_tag.xml
+++ b/core-ui/src/main/res/layout/item_create_filter_tag.xml
@@ -11,9 +11,9 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center_vertical"
         android:layout_marginEnd="24dp"
-        android:backgroundTint="#D6F5F3"
+        android:backgroundTint="@color/tag_background_tint"
         tools:text="Architect"
-        android:textColor="#0CBBAE" />
+        android:textColor="@color/tag_text_color" />
 
     <ImageView
         android:id="@+id/ivSelectTagIcon"
diff --git a/core-ui/src/main/res/layout/item_dv_manage_viewer.xml b/core-ui/src/main/res/layout/item_dv_manage_viewer.xml
deleted file mode 100644
index 3d91ee4e29..0000000000
--- a/core-ui/src/main/res/layout/item_dv_manage_viewer.xml
+++ /dev/null
@@ -1,78 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<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="52dp"
-    android:orientation="horizontal">
-
-    <ImageView
-        android:id="@+id/icRemove"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:paddingStart="20dp"
-        android:paddingTop="14dp"
-        android:paddingEnd="@dimen/dp_16"
-        android:paddingBottom="14dp"
-        android:src="@drawable/ic_remove_red"
-        tools:visibility="visible" />
-
-    <ImageView
-        android:id="@+id/icRemoveInactive"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:paddingStart="20dp"
-        android:paddingTop="14dp"
-        android:paddingEnd="@dimen/dp_16"
-        android:paddingBottom="14dp"
-        android:visibility="gone"
-        android:src="@drawable/ic_remove_inactive"
-        tools:visibility="gone" />
-
-    <FrameLayout
-        android:layout_width="0dp"
-        android:layout_height="match_parent"
-        android:layout_weight="1"
-        android:gravity="center_vertical">
-
-        <TextView
-            android:layout_gravity="center_vertical"
-            android:id="@+id/title"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:ellipsize="end"
-            style="@style/ModifyViewerTextStyle"
-            android:maxLines="1"
-            android:singleLine="true"
-            tools:text="@string/default_text_placeholder" />
-
-    </FrameLayout>
-
-    <ImageView
-        android:id="@+id/btnActionMore"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:contentDescription="@string/content_description_more_button"
-        android:paddingStart="14dp"
-        android:paddingTop="14dp"
-        android:paddingEnd="18dp"
-        android:paddingBottom="14dp"
-        android:src="@drawable/ic_data_view_edit_view"
-        android:visibility="visible"
-        tools:visibility="visible" />
-
-    <ImageView
-        android:id="@+id/dndDragger"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:paddingStart="8dp"
-        android:paddingTop="14dp"
-        android:paddingEnd="@dimen/dp_20"
-        android:paddingBottom="14dp"
-        android:src="@drawable/ic_dv_manage_view_dnd_dragger"
-        tools:visibility="visible" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/core-ui/src/main/res/layout/item_dv_manage_viewer_done.xml b/core-ui/src/main/res/layout/item_dv_manage_viewer_done.xml
deleted file mode 100644
index a8ace405f8..0000000000
--- a/core-ui/src/main/res/layout/item_dv_manage_viewer_done.xml
+++ /dev/null
@@ -1,33 +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="52dp">
-
-    <TextView
-        android:id="@+id/title"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="20dp"
-        android:layout_marginEnd="12dp"
-        style="@style/ModifyViewerTextStyle"
-        android:ellipsize="end"
-        android:maxLines="1"
-        android:singleLine="true"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@+id/iconChecked"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:text="@string/default_text_placeholder" />
-
-    <ImageView
-        android:id="@+id/iconChecked"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="20dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:srcCompat="@drawable/ic_option_checked_black" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/core-ui/src/main/res/layout/item_dv_viewer_filter_tag_value.xml b/core-ui/src/main/res/layout/item_dv_viewer_filter_tag_value.xml
deleted file mode 100644
index 28094d12b6..0000000000
--- a/core-ui/src/main/res/layout/item_dv_viewer_filter_tag_value.xml
+++ /dev/null
@@ -1,25 +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">
-
-    <com.google.android.material.chip.Chip
-        android:id="@+id/chip1"
-        style="@style/ViewerFilterTagChipStyle"
-        android:layout_width="wrap_content"
-        android:layout_height="@dimen/dv_viewer_filter_value_tag_height"
-        android:layout_marginStart="4dp"
-        android:ellipsize="end"
-        android:maxLines="1"
-        app:chipMinTouchTargetSize="0dp"
-        android:includeFontPadding="false"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintHorizontal_bias="0.0"
-        app:layout_constraintHorizontal_chainStyle="packed"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:text="And" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/core-ui/src/main/res/layout/item_edit_cell_file.xml b/core-ui/src/main/res/layout/item_edit_cell_file.xml
deleted file mode 100644
index 93cda6e5ad..0000000000
--- a/core-ui/src/main/res/layout/item_edit_cell_file.xml
+++ /dev/null
@@ -1,85 +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/btnRemoveFile"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:paddingTop="@dimen/dp_12"
-        android:paddingEnd="@dimen/dp_12"
-        android:paddingBottom="@dimen/dp_12"
-        android:src="@drawable/ic_remove_viewer_sort"
-        android:visibility="gone"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:visibility="visible" />
-
-    <ImageView
-        android:id="@+id/iconMime"
-        android:layout_width="24dp"
-        android:layout_height="24dp"
-        android:layout_marginTop="12dp"
-        android:layout_marginBottom="12dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toEndOf="@id/btnRemoveFile"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_goneMarginStart="0dp"
-        tools:background="@drawable/ic_mime_image"
-        tools:visibility="visible" />
-
-    <TextView
-        android:id="@+id/tvTitle"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/dp_6"
-        android:ellipsize="end"
-        android:maxLines="1"
-        android:singleLine="true"
-        style="@style/TextView.UXStyle.Body"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@+id/btnDragAndDropFile"
-        app:layout_constraintStart_toEndOf="@+id/iconMime"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_chainStyle="packed"
-        app:layout_goneMarginEnd="0dp"
-        tools:text="Charlie Chaplin" />
-
-    <ImageView
-        android:id="@+id/btnDragAndDropFile"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:paddingStart="@dimen/dp_12"
-        android:paddingTop="@dimen/dp_12"
-        android:paddingBottom="@dimen/dp_12"
-        android:src="@drawable/ic_dv_manage_view_dnd_dragger"
-        android:visibility="invisible"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <TextView
-        android:id="@+id/fileSelectionIndex"
-        style="@style/RelationCircleBadgeStyle"
-        android:layout_width="24dp"
-        android:layout_height="24dp"
-        android:visibility="invisible"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:text="1"
-        tools:visibility="visible" />
-
-    <androidx.constraintlayout.widget.Guideline
-        android:id="@+id/center"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        app:layout_constraintGuide_percent="0.5" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/core-ui/src/main/res/layout/item_grid_column_header_plus.xml b/core-ui/src/main/res/layout/item_grid_column_header_plus.xml
deleted file mode 100644
index 6f387c5a3b..0000000000
--- a/core-ui/src/main/res/layout/item_grid_column_header_plus.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="wrap_content"
-    android:layout_height="match_parent">
-
-    <ImageView
-        android:id="@+id/headerPlusIcon"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:paddingStart="12dp"
-        android:paddingEnd="12dp"
-        android:src="@drawable/ic_dv_plus" />
-
-</FrameLayout>
diff --git a/core-ui/src/main/res/layout/item_object_type.xml b/core-ui/src/main/res/layout/item_object_type.xml
deleted file mode 100644
index 864c4cd1ec..0000000000
--- a/core-ui/src/main/res/layout/item_object_type.xml
+++ /dev/null
@@ -1,44 +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_marginStart="8dp"
-    android:layout_marginTop="1dp"
-    android:layout_marginEnd="8dp"
-    android:layout_marginBottom="1dp"
-    android:background="@drawable/item_block_multi_select_mode_selector"
-    android:paddingStart="12dp"
-    android:paddingEnd="12dp"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-
-    <androidx.constraintlayout.widget.Guideline
-        android:id="@+id/pageGuideline"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        app:layout_constraintGuide_begin="0dp" />
-
-    <ImageView
-        android:id="@+id/linkEmoji"
-        android:layout_width="20dp"
-        android:layout_height="20dp"
-        android:src="@drawable/ic_new_page"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toEndOf="@id/pageGuideline"
-        app:layout_constraintTop_toTopOf="parent">
-
-    </ImageView>
-
-    <TextView
-        android:id="@+id/title"
-        style="@style/BlockPageContentStyle"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@+id/linkEmoji"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:text="Partnership terms" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/core-ui/src/main/res/layout/item_toolbar_action.xml b/core-ui/src/main/res/layout/item_toolbar_action.xml
deleted file mode 100644
index be18d1b1e3..0000000000
--- a/core-ui/src/main/res/layout/item_toolbar_action.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="@dimen/default_toolbar_action_width"
-    android:layout_height="wrap_content"
-    android:clickable="true"
-    android:orientation="vertical"
-    android:stateListAnimator="@animator/scale_shrink">
-
-    <FrameLayout
-        android:layout_width="@dimen/default_toolbar_action_width"
-        android:layout_height="@dimen/default_toolbar_action_height"
-        android:background="@drawable/rectangle_default_bottom_toolbar_action_background"
-        android:orientation="vertical">
-
-        <ImageView
-            android:id="@+id/pic"
-            android:layout_width="@dimen/default_container_width"
-            android:layout_height="@dimen/default_container_height"
-            android:layout_gravity="center"
-            android:contentDescription="@string/content_description_action_picture" />
-
-    </FrameLayout>
-
-    <TextView
-        android:id="@+id/title"
-        style="@style/TextView.UXStyle.Captions.2.Regular"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="6dp"
-        android:gravity="center"
-        tools:text="Text" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/core-ui/src/main/res/layout/item_viewer_cover_default.xml b/core-ui/src/main/res/layout/item_viewer_cover_default.xml
deleted file mode 100644
index 0274ad2b74..0000000000
--- a/core-ui/src/main/res/layout/item_viewer_cover_default.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout android:id="@+id/btnCardSmall"
-    android:layout_width="match_parent"
-    android:layout_height="@dimen/dp_48"
-    android:background="@drawable/default_ripple"
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools">
-
-    <TextView
-        android:layout_marginStart="20dp"
-        android:id="@+id/tvCoverType"
-        tools:text="Cover"
-        style="@style/ViewerSettingOptionTextStyle"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical" />
-
-    <ImageView
-        android:layout_marginEnd="20dp"
-        android:id="@+id/ivCheckbox"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical|end"
-        android:src="@drawable/ic_option_checked_black"
-        android:visibility="invisible" />
-
-</FrameLayout>
\ No newline at end of file
diff --git a/core-ui/src/main/res/layout/item_viewer_cover_relation.xml b/core-ui/src/main/res/layout/item_viewer_cover_relation.xml
deleted file mode 100644
index 1fee6e0518..0000000000
--- a/core-ui/src/main/res/layout/item_viewer_cover_relation.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/btnCardSmall"
-    android:layout_width="match_parent"
-    android:layout_height="@dimen/dp_48"
-    android:background="@drawable/default_ripple"
-    android:orientation="horizontal">
-
-    <ImageView
-        android:id="@+id/icAttachment"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:layout_marginStart="20dp"
-        android:src="@drawable/ic_relation_attachment_small" />
-
-    <TextView
-        android:id="@+id/tvRelationName"
-        style="@style/ViewerSettingOptionTextStyle"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:layout_marginStart="10dp"
-        android:layout_weight="1"
-        android:text="@string/small" />
-
-    <ImageView
-        android:id="@+id/ivRelationCheckbox"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical|end"
-        android:layout_marginStart="10dp"
-        android:layout_marginEnd="20dp"
-        android:src="@drawable/ic_option_checked_black"
-        android:visibility="invisible" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/core-ui/src/main/res/layout/item_viewer_cover_section.xml b/core-ui/src/main/res/layout/item_viewer_cover_section.xml
deleted file mode 100644
index a39639b56f..0000000000
--- a/core-ui/src/main/res/layout/item_viewer_cover_section.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout android:id="@+id/btnCardSmall"
-    android:layout_width="match_parent"
-    android:layout_height="52dp"
-    android:background="@drawable/default_ripple"
-    xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <TextView
-        android:layout_marginStart="20dp"
-        style="@style/TextView.UXStyle.Captions.1.Regular"
-        android:textColor="@color/text_secondary"
-        android:gravity="bottom"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="bottom"
-        android:layout_marginBottom="8dp"
-        android:text="@string/relations" />
-
-</FrameLayout>
\ No newline at end of file
diff --git a/core-ui/src/main/res/layout/item_viewer_relation_list_section.xml b/core-ui/src/main/res/layout/item_viewer_relation_list_section.xml
deleted file mode 100644
index bbb06cc767..0000000000
--- a/core-ui/src/main/res/layout/item_viewer_relation_list_section.xml
+++ /dev/null
@@ -1,15 +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="48dp"
-    xmlns:tools="http://schemas.android.com/tools">
-
-    <TextView
-        android:id="@+id/tvSectionName"
-        style="@style/TextView.UXStyle.Titles.1"
-        android:gravity="center"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        tools:text="Relations"/>
-
-</FrameLayout>
\ No newline at end of file
diff --git a/core-ui/src/main/res/layout/item_viewer_relation_list_setting.xml b/core-ui/src/main/res/layout/item_viewer_relation_list_setting.xml
deleted file mode 100644
index 8743035dd7..0000000000
--- a/core-ui/src/main/res/layout/item_viewer_relation_list_setting.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:paddingStart="12dp"
-    android:paddingEnd="12dp"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-
-    <TextView
-        android:id="@+id/tvSettingName"
-        style="@style/TextView.UXStyle.Body"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:layout_marginTop="14dp"
-        android:layout_marginBottom="14dp"
-        tools:text="Card size" />
-
-    <TextView
-        android:id="@+id/tvSettingValue"
-        style="@style/TextView.UXStyle.Body"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical|end"
-        android:layout_marginEnd="18dp"
-        android:textColor="@color/text_secondary"
-        tools:text="Large" />
-
-    <ImageView
-        android:id="@+id/icArrow"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="end|center_vertical"
-        android:src="@drawable/ic_arrow_forward" />
-
-</FrameLayout>
\ No newline at end of file
diff --git a/core-ui/src/main/res/layout/item_viewer_relation_list_setting_toggle.xml b/core-ui/src/main/res/layout/item_viewer_relation_list_setting_toggle.xml
deleted file mode 100644
index 421379a1c2..0000000000
--- a/core-ui/src/main/res/layout/item_viewer_relation_list_setting_toggle.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<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"
-    android:paddingStart="12dp"
-    android:paddingEnd="12dp"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-
-    <TextView
-        android:id="@+id/tvSettingName"
-        style="@style/TextView.UXStyle.Body"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"
-        android:layout_marginTop="14dp"
-        android:layout_marginBottom="14dp"
-        tools:text="@string/fit_image" />
-
-    <com.google.android.material.switchmaterial.SwitchMaterial
-        android:id="@+id/switchView"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="end|center_vertical"
-        app:useMaterialThemeColors="false"
-        app:splitTrack="false"
-        app:thumbTint="@drawable/viewer_relation_switch_thumb"
-        app:trackTint="@drawable/viewer_relation_switch_track"/>
-
-</FrameLayout>
\ No newline at end of file
diff --git a/core-ui/src/main/res/layout/playback_off.xml b/core-ui/src/main/res/layout/playback_off.xml
deleted file mode 100644
index a45641180d..0000000000
--- a/core-ui/src/main/res/layout/playback_off.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="match_parent"
-    android:clickable="true"
-    android:focusable="true"
-    android:background="#54000000">
-
-</FrameLayout>
\ No newline at end of file
diff --git a/core-ui/src/main/res/layout/widget_icon.xml b/core-ui/src/main/res/layout/widget_icon.xml
deleted file mode 100644
index b1317ff52e..0000000000
--- a/core-ui/src/main/res/layout/widget_icon.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<merge xmlns:android="http://schemas.android.com/apk/res/android">
-    <ImageView
-        android:id="@+id/emojiIcon"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:layout_gravity="center"/>
-    <ImageView
-        android:id="@+id/imageIcon"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
-</merge>
\ No newline at end of file
diff --git a/core-ui/src/main/res/layout/widget_markup_toolbar.xml b/core-ui/src/main/res/layout/widget_markup_toolbar.xml
deleted file mode 100644
index 907ae4b506..0000000000
--- a/core-ui/src/main/res/layout/widget_markup_toolbar.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<merge xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/markup"
-    android:layout_width="match_parent"
-    android:layout_height="@dimen/default_toolbar_height">
-
-    <ImageView
-        android:id="@+id/bold"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:clickable="true"
-        android:contentDescription="@string/content_description_bold_text"
-        android:src="@drawable/ic_toolbar_markup_bold"
-        android:stateListAnimator="@animator/scale_shrink"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <ImageView
-        android:id="@+id/italic"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:clickable="true"
-        android:contentDescription="@string/content_description_italic_text"
-        android:src="@drawable/ic_toolbar_markup_italic"
-        android:stateListAnimator="@animator/scale_shrink"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toEndOf="@+id/bold"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <ImageView
-        android:id="@+id/strike"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:clickable="true"
-        android:contentDescription="@string/content_description_strike_through_text"
-        android:src="@drawable/ic_toolbar_markup_strike_through"
-        android:stateListAnimator="@animator/scale_shrink"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toEndOf="@+id/italic"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <ImageView
-        android:id="@+id/link"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:contentDescription="@string/content_description_link"
-        android:src="@drawable/ic_toolbar_markup_link"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toEndOf="@+id/strike"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <ImageView
-        android:id="@+id/code"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:clickable="true"
-        android:contentDescription="@string/content_description_code"
-        android:src="@drawable/ic_toolbar_markup_code"
-        android:stateListAnimator="@animator/scale_shrink"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toEndOf="@+id/link"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <ImageView
-        android:id="@+id/color"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="16dp"
-        android:clickable="true"
-        android:focusable="true"
-        android:contentDescription="@string/content_description_show_colors"
-        android:src="@drawable/ic_toolbar_color_selector"
-        android:stateListAnimator="@animator/scale_shrink"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@+id/keyboard"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <ImageView
-        android:id="@+id/keyboard"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="16dp"
-        android:clickable="true"
-        android:contentDescription="@string/content_description_hide_keyboard_button"
-        android:src="@drawable/ic_toolbar_keyboard"
-        android:stateListAnimator="@animator/scale_shrink"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-</merge>
\ No newline at end of file
diff --git a/core-ui/src/main/res/layout/widget_toolbar.xml b/core-ui/src/main/res/layout/widget_toolbar.xml
deleted file mode 100644
index 3a7af50c78..0000000000
--- a/core-ui/src/main/res/layout/widget_toolbar.xml
+++ /dev/null
@@ -1,15 +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">
-
-    <com.anytypeio.anytype.core_ui.widgets.toolbar.BlockToolbarWidget
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/default_toolbar_height" />
-
-    <com.anytypeio.anytype.core_ui.widgets.toolbar.MarkupToolbarWidget
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/default_toolbar_height" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/core-ui/src/main/res/values-night/colors.xml b/core-ui/src/main/res/values-night/colors.xml
index ea51d557c3..feddb4c3b1 100644
--- a/core-ui/src/main/res/values-night/colors.xml
+++ b/core-ui/src/main/res/values-night/colors.xml
@@ -29,7 +29,6 @@
     <color name="glyph_inactive">#494949</color>
     <color name="glyph_accent">#FFB522</color>
     <color name="glyph_white">#FFFFFF</color>
-    <color name="glyph_label">#66FFFFFF</color>
     <color name="glyph_button">#F3F3F3</color>
 
     <color name="button_text">#000000</color>
@@ -78,9 +77,7 @@
     <color name="palette_system_yellow">#ECD91B</color>
     <color name="palette_system_amber_125">#FFC83C</color>
     <color name="palette_system_amber_100">#FFB522</color>
-    <color name="palette_system_amber_80">#D38D00</color>
     <color name="palette_system_amber_50">#9F6B00</color>
-    <color name="palette_system_amber_25">#694500</color>
     <color name="palette_system_red">#F55522</color>
     <color name="palette_system_pink">#E51CA0</color>
     <color name="palette_system_purple">#AB50CC</color>
@@ -92,9 +89,6 @@
     <color name="object_loading_state_gradient_start_color">#161615</color>
     <color name="object_loading_state_gradient_end_color">#1F1E1D</color>
 
-    <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>
diff --git a/core-ui/src/main/res/values/colors.xml b/core-ui/src/main/res/values/colors.xml
index 652ff8ef92..2a3c6308ef 100644
--- a/core-ui/src/main/res/values/colors.xml
+++ b/core-ui/src/main/res/values/colors.xml
@@ -1,70 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <color name="debug">#F44336</color>
     <color name="orange">#FFBB2C</color>
     <color name="white">#FFFFFF</color>
     <color name="black">#2C2B27</color>
     <color name="gray">#ACA996</color>
-    <color name="grey_50">#ACA996</color>
-    <color name="emoji_color">#FFFFFF</color>
 
-    <color name="default_bottom_detail_toolbar_background_color">#F3F2EC</color>
-    <color name="chapter_default">#FFFFFF</color>
     <color name="chapter_yellow">#ECD91B</color>
-    <color name="default_toolbar_option_stroke_color">#DFDDD0</color>
 
     <color name="turquoise">#0FC8BA</color>
 
-    <color name="toolbar_block_turn_into_toggle_selected">#2C2B27</color>
-    <color name="toolbar_block_turn_into_toggle_default">#ACA996</color>
-
-    <color name="toolbar_section_text">#ECD91B</color>
-    <color name="toolbar_section_list">#FFB522</color>
     <color name="toolbar_section_tool">#2AA7EE</color>
-    <color name="toolbar_section_media">#F55522</color>
-    <color name="toolbar_section_other">#A646C9</color>
     <color name="block_highlight_divider">#FFB522</color>
-    <color name="block_file_size_text_color">#ACA996</color>
 
-    <color name="kanban_main">#EEEEEE</color>
-    <color name="kanban_second">#BDBDBD</color>
-
-    <color name="divider">#ACA996</color>
     <color name="viewer_divider">#DFDDD0</color>
 
     <color name="markup_keyboard_bg">#F3F2EC</color>
 
-    <color name="light_grayish">#f3f2ec</color>
     <color name="drag_shadow_alpha">#66000000</color>
 
-    <array name="toolbar_color_text_colors">
-        <item>#2C2B27</item>
-        <item>#ACA996</item>
-        <item>#ECD91B</item>
-        <item>#FFB522</item>
-        <item>#F55522</item>
-        <item>#E51CA0</item>
-        <item>#AB50CC</item>
-        <item>#3E58EB</item>
-        <item>#2AA7EE</item>
-        <item>#83CF36</item>
-    </array>
-
-    <array name="toolbar_color_background_colours">
-        <item>@android:color/transparent</item>
-        <item>#F3F2EC</item>
-        <item>#FEF9CC</item>
-        <item>#FEF3C5</item>
-        <item>#FFEBE5</item>
-        <item>#FEE3F5</item>
-        <item>#F4E3FA</item>
-        <item>#E4E7FC</item>
-        <item>#D6EFFD</item>
-        <item>#D6F5F3</item>
-        <item>#E3F7D0</item>
-    </array>
-
     <array name="avatar_colors">
         <item>#FFB522</item>
         <item>#F55522</item>
@@ -78,37 +32,17 @@
         <item>#88CDF3</item>
     </array>
 
-    <color name="context_menu_selected_item">#ACA996</color>
-
     <color name="default_style_color_circle_outer_stroke_color">#E4E2D7</color>
     <color name="default_style_color_circle_inner_stroke_color">#DFDDD0</color>
-    <color name="viewer_filter_add_stroke_color">#DFDDD0</color>
-    <color name="default_tag_text_color">#E89D00</color>
-    <color name="default_tag_background">#FEF3C5</color>
 
-    <color name="dark_amber">#E89D00</color>
     <color name="amber25">#FFEE94</color>
 
-    <color name="default_filter_tag_background_color">#F3F2EC</color>
     <color name="default_filter_tag_text_color">#6C6A5F</color>
-    <color name="default_filter_status_text_color">@color/black</color>
-    <color name="data_view_divider_color">#DFDDD0</color>
 
-    <color name="dashboard_default_avatar_circle_color">#80F5F5F5</color>
-
-    <color name="default_object_profile_avatar_background_color">#DFDDD0</color>
-    <color name="default_object_profile_avatar_text_color">#FFFFFF</color>
-    <color name="default_object_basic_avatar_background_color">#F3F2EC</color>
-    <color name="default_object_basic_avatar_text_color">#CBC9BD</color>
-    <color name="RelationPlaceholderTextColor">#929082</color>
     <color name="default_status_text_color">@color/text_secondary</color>
     <color name="default_grey">#929082</color>
     <color name="keychain_text_color">#1BA0EB</color>
 
-    <color name="orange_button_background_color">#FFB522</color>
-
-    <color name="auth_background_color">#0066C3</color>
-
     <color name="text_primary">#252525</color>
     <color name="text_secondary">#949494</color>
     <color name="text_secondary_widgets">#949494</color>
@@ -136,7 +70,6 @@
     <color name="glyph_inactive">#DCDCDC</color>
     <color name="glyph_accent">#F09C0E</color>
     <color name="glyph_white">#FFFFFF</color>
-    <color name="glyph_label">#66000000</color>
     <color name="glyph_button">#252525</color>
 
     <color name="button_text">#FFFFFF</color>
@@ -186,9 +119,7 @@
     <color name="palette_system_yellow">#ECD91B</color>
     <color name="palette_system_amber_125">#F09C0E</color>
     <color name="palette_system_amber_100">#FFB522</color>
-    <color name="palette_system_amber_80">#FFC532</color>
     <color name="palette_system_amber_50">#FFD15B</color>
-    <color name="palette_system_amber_25">#FFEE94</color>
     <color name="palette_system_red">#F55522</color>
     <color name="palette_system_pink">#E51CA0</color>
     <color name="palette_system_purple">#AB50CC</color>
@@ -197,19 +128,13 @@
     <color name="palette_system_teal">#0FC8BA</color>
     <color name="palette_system_green">#5DD400</color>
 
-    <color name="library_action_btn_text_color">#FFFFFF</color>
-
-    <color name="dashboard_tab_color">#CC0066C3</color>
     <color name="amber_80">#FFC532</color>
     <color name="amber_100">#FFB522</color>
-    <color name="table_row_header_background">#1A50491C</color>
     <color name="object_loading_state_gradient_start_color">#F6F5F3</color>
     <color name="object_loading_state_gradient_end_color">#F1F0ED</color>
 
-    <color name="widget_button">#A6FFFFFF</color>
     <color name="widgets_edit_mode_button">#CC2C2B27</color>
     <color name="home_screen_toolbar_button">#F2F0F0F0</color>
-    <color name="set_new_btn_text">#FFFFFF</color>
 
     <color name="colorPrimary">#FF5722</color>
     <color name="colorPrimaryDark">#000000</color>
@@ -220,7 +145,6 @@
     <color name="ds_button_icon_divider">#1AFFFFFF</color>
 
     <color name="select_space_bottom_sheet_background_color">#7C7C7C</color>
-    <color name="default_gradient_background">#2C2B27</color>
 
     <color name="cursor_color">#FFBB2C</color>
 
@@ -251,6 +175,130 @@
 
     <color name="object_number_background">#F2F2F2</color>
 
-    <color name="object_search_cursor_color">#007AFF</color>
+    <color name="overlay_black_light_5">#0D000000</color>
+    <color name="transparent_black">#00000000</color>
+    <color name="background_light_gray">#F3F2EC</color>
+    <color name="background_soft_beige">#DFDDD0</color>
+    <color name="gradient_soft_gray_end_transparent">#00ACA996</color>
+
+    <!-- Colors from ic_alert_install_gallery.xml -->
+    <color name="gallery_gradient_start">#FFA9F496</color>
+    <color name="gallery_gradient_end">#00BCF2AF</color>
+    <color name="gallery_inactive_gray">#D9D9D9</color>
+
+    <!-- Colors from ic_block_task_checked.xml -->
+    <color name="toolbar_keyboard_background">#EAE9E0</color>
+    <color name="checkbox_blue">#1BA0EB</color>
+
+    <color name="dnd_muted_gray">#CCCABB</color>
+
+    <!-- Colors from ic_home_widget_space.xml -->
+    <color name="widget_gradient_start">#FFEDD89A</color>
+    <color name="widget_gradient_end">#FFCA4565</color>
+
+    <!-- Colors from ic_icon_loading.xml -->
+    <color name="loading_start_transparent">#00A7A7A7</color>
+    <color name="loading_end">#FFA7A7A7</color>
+
+    <color name="border_gray">#ABA99B</color>
+
+    <!-- Colors from ic_layout_gallery.xml -->
+    <color name="gallery_gradient_bg_start">#FFE9E9E9</color>
+    <color name="gallery_gradient_bg_end">#00F2F2F2</color>
+
+    <!-- Colors from  ic_local_first_internet.xml -->
+    <color name="network_light_gray">#D4D4D4</color>
+
+    <!-- Colors from ic_onboarding_settings.xml -->
+    <color name="settings_dark_gray">#7B7A72</color>
+
+    <!-- Colors from  ic_relation_format_tag_small.xml -->
+    <color name="tag_icon_gray">#B6B6B6</color>
+
+    <!-- Colors from  из ic_shared_space_arrow.xml -->
+    <color name="space_arrow_overlay_black">#B3252525</color>
+
+    <!--Colors from ic_slash_main_style.xml -->
+    <color name="slash_accent_orange">#F59D08</color>
+
+    <!-- Colors from ic_slash_main_style.xml -->
+    <color name="icon_primary_blue">#1BA0EB</color>
+
+    <!-- Colors from ic_remove_widget.xml -->
+    <color name="widget_remove_dark_gray">#CC2C2B27</color>
+
+    <!-- Colors from из ic_slash_media_picture.xml -->
+    <color name="slash_picture_green">#38C569</color>
+
+    <!--Colors from из ic_sync_grey_10.xml, ic_system_relation.xml -->
+    <color name="sync_icon_gray">#A7A7A7</color>
+
+    <!--Colors from ic_task_1_h1.xml -->
+    <color name="success_green">#57C600</color>
+
+    <!-- Colors from из ic_widget_bundled_source_collection.xml -->
+    <color name="collection_grey_gradient_start">#7FA7A7A7</color>
+    <color name="collection_grey_gradient_end">#FFB6B6B6</color>
+
+    <!-- Colors from item_block_multi_select_selected.xml -->
+    <color name="multi_select_highlight">#33FFB522</color>
+
+    <!-- Colors from logo_builder_64.xml -->
+    <color name="logo_gradient_start">#00A5AEFF</color>
+    <color name="logo_gradient_end">#FFA5AEFF</color>
+
+    <!-- Colors from logo_co_creator_64.xml -->
+    <color name="gradient_light_red_gray_start">#00F05F5F</color>
+    <color name="gradient_light_red_gray_end">#FFF05F5F</color>
+
+    <!-- Colors from logo_custom_64.xml -->
+    <color name="custom_logo_gradient_start">#00E86DE3</color>
+    <color name="custom_logo_gradient_end">#FFE86DE3</color>
+
+    <!-- Colors from logo_explorer_64.xml -->
+    <color name="explorer_gradient_outer_start">#0024BFD4</color>
+    <color name="explorer_gradient_outer_end">#FF24BFD4</color>
+    <color name="explorer_gradient_inner_start">#002AAFC1</color>
+    <color name="explorer_gradient_inner_end">#FF2AAFC1</color>
+
+    <!-- Colors from progressbar.xml-->
+    <color name="progressbar_background">#BDC3C7</color>
+    <color name="progressbar_secondary_progress">#3397DA</color>
+
+    <!-- Colors fromrect_object_menu_button_default.xml -->
+    <color name="object_menu_button_default_black_transparent">#26000000</color>
+
+    <!-- Colors from rectangle_default_page_logo_background.xml -->
+    <color name="page_logo_background">#F7F5F0</color>
+
+    <!-- Colors from rounded_dialog_network_settings.xml -->
+    <color name="dialog_network_background">#171717</color>
+
+    <!-- Colors from wallpaper_gradient_1.xml -->
+    <color name="wallpaper_gradient_1_start">#D8A4E1</color>
+    <color name="wallpaper_gradient_1_center">#FDD0CD</color>
+    <color name="wallpaper_gradient_1_end">#FFCC81</color>
+
+    <!-- Colors from wallpaper_gradient_2.xml -->
+    <color name="wallpaper_gradient_2_start">#73B7F0</color>
+    <color name="wallpaper_gradient_2_center">#ABB6ED</color>
+    <color name="wallpaper_gradient_2_end">#F3BFAC</color>
+
+    <!-- Colors extracted from wallpaper_gradient_3.xml -->
+    <color name="wallpaper_gradient_3_start">#63B3CB</color>
+    <color name="wallpaper_gradient_3_center">#C5D3AC</color>
+    <color name="wallpaper_gradient_3_end">#F6C47A</color>
+
+    <!-- Colors extracted from wallpaper_gradient_4.xml -->
+    <color name="wallpaper_gradient_4_start">#6EB6E4</color>
+    <color name="wallpaper_gradient_4_center">#A4CFEC</color>
+    <color name="wallpaper_gradient_4_end">#DAEAF3</color>
+
+    <!-- Colors extracted from ic_personalization.xml -->
+    <color name="personalization_background_purple">#9F43C1</color>
+
+    <!-- Colors extracted from item_create_filter_tag.xml -->
+    <color name="tag_background_tint">#D6F5F3</color>
+    <color name="tag_text_color">#0CBBAE</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 b1cd4e711a..0f73c5c968 100644
--- a/core-ui/src/main/res/values/design_system.xml
+++ b/core-ui/src/main/res/values/design_system.xml
@@ -40,28 +40,11 @@
         <item name="android:letterSpacing">-0.024</item>
     </style>
 
-    <style name="TextView.ContentStyle.Body.Bold" parent="TextView.ContentStyle.Body">
-        <item name="android:fontFamily">@font/inter_semibold</item>
-        <item name="android:fontWeight">600</item>
-    </style>
-
-    <style name="TextView.ContentStyle.Body.Bold.Italic" parent="TextView.ContentStyle.Body">
-        <item name="android:fontFamily">@font/inter_semibold</item>
-        <item name="android:textStyle">italic</item>
-        <item name="android:fontWeight">600</item>
-    </style>
-
     <style name="TextView.ContentStyle.Body.Regular" parent="TextView.ContentStyle.Body">
         <item name="android:fontFamily">@font/inter_regular</item>
         <item name="android:fontWeight">400</item>
     </style>
 
-    <style name="TextView.ContentStyle.Body.Italic" parent="TextView.ContentStyle.Body">
-        <item name="android:fontFamily">@font/inter_regular</item>
-        <item name="android:textStyle">italic</item>
-        <item name="android:fontWeight">400</item>
-    </style>
-
     <style name="TextView.ContentStyle.Body.Callout" parent="BaseTextView">
         <item name="android:fontFamily">@font/inter_regular</item>
         <item name="android:fontWeight">400</item>
@@ -79,14 +62,6 @@
         <item name="android:letterSpacing">-0.024</item>
     </style>
 
-    <style name="TextView.ContentStyle.PreviewTitles.1.Regular" parent="BaseTextView">
-        <item name="android:fontFamily">@font/inter_regular</item>
-        <item name="android:fontWeight">400</item>
-        <item name="android:textSize">17sp</item>
-        <item name="lineHeight" tools:targetApi="28">22sp</item>
-        <item name="android:letterSpacing">-0.024</item>
-    </style>
-
     <style name="TextView.ContentStyle.PreviewTitles.2.Medium" parent="BaseTextView">
         <item name="android:fontFamily">@font/inter_medium</item>
         <item name="android:fontWeight">500</item>
@@ -168,14 +143,6 @@
         <item name="android:letterSpacing">-0.014</item>
     </style>
 
-    <style name="TextView.UXStyle.Titles.2.Semibold" parent="BaseTextView">
-        <item name="android:fontFamily">@font/inter_regular</item>
-        <item name="android:fontWeight">600</item>
-        <item name="android:textSize">15sp</item>
-        <item name="lineHeight" tools:targetApi="28">20sp</item>
-        <item name="android:letterSpacing">-0.014</item>
-    </style>
-
     <!-- Body -->
     <style name="TextView.UXStyle.Body" parent="BaseTextView">
         <item name="android:fontFamily">@font/inter_regular</item>
@@ -309,12 +276,6 @@
         <item name="android:paddingBottom">12dp</item>
     </style>
 
-    <style name="Button.Primary.Large.Icon" parent="Widget.Material3.Button.TextButton">
-        <item name="android:layout_width">match_parent</item>
-        <item name="android:insetTop">7dp</item>
-        <item name="android:insetBottom">7dp</item>
-    </style>
-
     <style name="Button.Secondary.XSmall" parent="TextView.UXStyle.Captions.1.Regular">
         <item name="android:background">@drawable/button_secondary_xsmall_selector</item>
         <item name="android:textColor">@color/text_color_button_secondary_selector</item>
@@ -407,6 +368,46 @@
         <item name="android:paddingBottom">12dp</item>
     </style>
 
+
+    <style name="TextView.ContentStyle.Body.Bold" parent="TextView.ContentStyle.Body">
+        <item name="android:fontFamily">@font/inter_semibold</item>
+        <item name="android:fontWeight">600</item>
+    </style>
+
+    <style name="TextView.ContentStyle.Body.Bold.Italic" parent="TextView.ContentStyle.Body">
+        <item name="android:fontFamily">@font/inter_semibold</item>
+        <item name="android:textStyle">italic</item>
+        <item name="android:fontWeight">600</item>
+    </style>
+
+    <style name="TextView.ContentStyle.Body.Italic" parent="TextView.ContentStyle.Body">
+        <item name="android:fontFamily">@font/inter_regular</item>
+        <item name="android:textStyle">italic</item>
+        <item name="android:fontWeight">400</item>
+    </style>
+
+    <style name="TextView.ContentStyle.PreviewTitles.1.Regular" parent="BaseTextView">
+        <item name="android:fontFamily">@font/inter_regular</item>
+        <item name="android:fontWeight">400</item>
+        <item name="android:textSize">17sp</item>
+        <item name="lineHeight" tools:targetApi="28">22sp</item>
+        <item name="android:letterSpacing">-0.024</item>
+    </style>
+
+    <style name="TextView.UXStyle.Titles.2.Semibold" parent="BaseTextView">
+        <item name="android:fontFamily">@font/inter_regular</item>
+        <item name="android:fontWeight">600</item>
+        <item name="android:textSize">15sp</item>
+        <item name="lineHeight" tools:targetApi="28">20sp</item>
+        <item name="android:letterSpacing">-0.014</item>
+    </style>
+
+    <style name="Button.Primary.Large.Icon" parent="Widget.Material3.Button.TextButton">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:insetTop">7dp</item>
+        <item name="android:insetBottom">7dp</item>
+    </style>
+
     <!-- button styles -->
     <attr name="primaryXSmallButtonStyle" format="reference" />
     <attr name="secondaryXSmallButtonStyle" format="reference" />
diff --git a/core-ui/src/main/res/values/dimens.xml b/core-ui/src/main/res/values/dimens.xml
index 0101d4137d..ea934c381a 100644
--- a/core-ui/src/main/res/values/dimens.xml
+++ b/core-ui/src/main/res/values/dimens.xml
@@ -5,89 +5,19 @@
     <dimen name="default_document_item_padding_end">8dp</dimen>
 
     <dimen name="default_toast_top_gravity_offset">16dp</dimen>
-    <dimen name="default_container_height">24dp</dimen>
-    <dimen name="default_container_width">24dp</dimen>
-
-    <dimen name="default_avatar_text_size">21sp</dimen>
 
     <dimen name="default_toolbar_height">48dp</dimen>
     <dimen name="default_nav_panel_height">52dp</dimen>
-    <dimen name="default_nav_panel_width">288dp</dimen>
     <dimen name="default_editor_item_offset">48dp</dimen>
 
-    <dimen name="default_toolbar_section_radius">16dp</dimen>
-    <dimen name="default_toolbar_section_height">24dp</dimen>
-    <dimen name="default_toolbar_section_text_size">13sp</dimen>
-    <dimen name="default_toolbar_section_padding_top">2dp</dimen>
-    <dimen name="default_toolbar_section_padding_bottom">2dp</dimen>
-    <dimen name="default_toolbar_section_padding_start">16dp</dimen>
-    <dimen name="default_toolbar_section_padding_end">16dp</dimen>
-
     <dimen name="main_bottom_toolbar_icon_width">72dp</dimen>
     <dimen name="main_bottom_toolbar_icon_height">52dp</dimen>
 
-    <dimen name="default_toolbar_option_height">64dp</dimen>
-    <dimen name="default_toolbar_option_width">64dp</dimen>
-    <dimen name="default_toolbar_option_corner_radius">10dp</dimen>
-
-    <dimen name="default_toolbar_action_height">64dp</dimen>
-    <dimen name="default_toolbar_action_width">64dp</dimen>
-    <dimen name="default_toolbar_action_corner_radius">10dp</dimen>
-    <dimen name="default_toolbar_action_text_size">11sp</dimen>
-
-    <dimen name="default_bottom_toolbar_option_text_size">11sp</dimen>
-    <dimen name="default_bottom_toolbar_option_item_spacing">8dp</dimen>
-    <dimen name="default_bottom_toolbar_option_item_spacing_first">16dp</dimen>
-    <dimen name="default_bottom_toolbar_option_item_spacing_last">16dp</dimen>
-
-    <dimen name="default_toolbar_section_item_spacing">8dp</dimen>
-    <dimen name="default_toolbar_section_item_spacing_first">16dp</dimen>
-    <dimen name="default_toolbar_section_item_spacing_last">16dp</dimen>
-
-
-    <dimen name="default_toolbar_action_item_height">44dp</dimen>
-    <dimen name="default_toolbar_action_item_spacing">8dp</dimen>
-    <dimen name="default_toolbar_action_item_spacing_first">16dp</dimen>
-    <dimen name="default_toolbar_action_item_spacing_last">16dp</dimen>
-    <dimen name="default_toolbar_action_item_divider_height">1dp</dimen>
-    <dimen name="default_toolbar_action_item_divider_extended_height">8dp</dimen>
-
-    <dimen name="default_toolbar_text_color_item_height">48dp</dimen>
-    <dimen name="default_toolbar_text_color_item_width">64dp</dimen>
-    <dimen name="default_toolbar_color_item_spacing_first">16dp</dimen>
-    <dimen name="default_toolbar_color_item_spacing_last">16dp</dimen>
-    <dimen name="default_toolbar_background_color_item_height">48dp</dimen>
-    <dimen name="default_toolbar_background_color_item_width">64dp</dimen>
-    <dimen name="default_toolbar_background_color_content_radius">2dp</dimen>
-    <dimen name="default_toolbar_background_color_container_radius">10dp</dimen>
-    <dimen name="default_toolbar_color_item_divider_width">1dp</dimen>
-    <dimen name="default_toolbar_color_placeholder_text_size">22sp</dimen>
-
     <dimen name="default_note_title_offset">72dp</dimen>
 
     <dimen name="modal_rect_margin_top">6dp</dimen>
-    <dimen name="modal_main_margin_start">20dp</dimen>
-    <dimen name="modal_main_margin_end">20dp</dimen>
-    <dimen name="modal_top_item_margin_top">30dp</dimen>
-    <dimen name="modal_item_divider_margin_top">12dp</dimen>
-    <dimen name="modal_item_icon_margin_top">12dp</dimen>
-    <dimen name="modal_text_from_button_margin">8dp</dimen>
-    <dimen name="modal_button_width">155dp</dimen>
-    <dimen name="modal_button_height">40dp</dimen>
-    <dimen name="modal_button_margin_top">30dp</dimen>
-    <dimen name="modal_button_margin_bottom">16dp</dimen>
 
     <!-- Item property -->
-    <dimen name="modal_property_margin_start">20dp</dimen>
-    <dimen name="modal_property_margin_end">20dp</dimen>
-    <dimen name="modal_property_margin_top">12dp</dimen>
-    <dimen name="modal_property_margin_bottom">12dp</dimen>
-    <dimen name="modal_property_text_from_icon_margin">4dp</dimen>
-    <dimen name="modal_property_hide_forward_margin">20dp</dimen>
-
-    <dimen name="sp_12">12sp</dimen>
-    <dimen name="sp_13">13sp</dimen>
-    <dimen name="sp_15">15sp</dimen>
     <dimen name="dp_2">2dp</dimen>
     <dimen name="dp_3">3dp</dimen>
     <dimen name="dp_4">4dp</dimen>
@@ -96,15 +26,12 @@
     <dimen name="dp_10">10dp</dimen>
     <dimen name="dp_1">1dp</dimen>
     <dimen name="dp_16">16dp</dimen>
-    <dimen name="dp_17">17dp</dimen>
     <dimen name="dp_12">12dp</dimen>
-    <dimen name="dp_13">13dp</dimen>
     <dimen name="dp_32">32dp</dimen>
     <dimen name="dp_20">20dp</dimen>
     <dimen name="dp_24">24dp</dimen>
     <dimen name="dp_104">104dp</dimen>
     <dimen name="dp_40">40dp</dimen>
-    <dimen name="dp_45">45dp</dimen>
     <dimen name="dp_46">46dp</dimen>
     <dimen name="dp_48">48dp</dimen>
     <dimen name="dp_54">54dp</dimen>
@@ -120,9 +47,6 @@
     <dimen name="roundedTextBorderRadius">4dp</dimen>
     <dimen name="roundedTextBorderWidth">1dp</dimen>
 
-    <dimen name="footer_default_height">50dp</dimen>
-
-    <dimen name="default_dashboard_item_spacing">20dp</dimen>
     <dimen name="cover_gallery_item_spacing">8dp</dimen>
 
     <dimen name="default_block_type_width">24dp</dimen>
@@ -131,20 +55,12 @@
     <dimen name="default_document_content_padding_end">12dp</dimen>
     <dimen name="default_document_item_margin_top">1dp</dimen>
     <dimen name="default_document_item_margin_bottom">1dp</dimen>
-    <dimen name="bookmark_default_margin_start">@dimen/dp_8</dimen>
     <dimen name="video_default_margin_start">@dimen/dp_8</dimen>
-    <dimen name="picture_default_margin_start">@dimen/dp_8</dimen>
-    <dimen name="file_default_margin_start">@dimen/dp_8</dimen>
 
-    <dimen name="popup_context_menu_height">44dp</dimen>
-    <dimen name="popup_context_menu_margin">8dp</dimen>
-    <dimen name="popup_context_menu_bottom_allowance">40dp</dimen>
     <dimen name="default_style_color_circle_inner_radius">22dp</dimen>
     <dimen name="default_style_color_outer_stroke_width">2dp</dimen>
     <dimen name="default_style_color_slanted_line_height">16dp</dimen>
 
-    <dimen name="default_page_links_bottom_offset">64dp</dimen>
-    
     <dimen name="mention_span_image_size_default">20dp</dimen>
     <dimen name="mention_span_image_size_header_three">20dp</dimen>
     <dimen name="mention_span_image_size_header_two">24dp</dimen>
@@ -161,25 +77,20 @@
     <dimen name="mention_suggester_item_height">56dp</dimen>
     <dimen name="mention_list_padding_top">4dp</dimen>
     <dimen name="mention_list_padding_bottom">5dp</dimen>
-    <dimen name="mention_suggester_padding_top">10dp</dimen>
     <dimen name="mention_divider_height">1dp</dimen>
 
     <dimen name="viewer_grid_header_width">144dp</dimen>
 
-    <dimen name="viewer_base_item_list_height">40dp</dimen>
     <dimen name="dv_viewer_filter_item_height">72dp</dimen>
     <dimen name="db_viewer_filter_condition_item_height">48dp</dimen>
     <dimen name="default_dragger_width">48dp</dimen>
     <dimen name="default_dragger_height">4dp</dimen>
-    <dimen name="dv_viewer_filter_value_tag_height">20dp</dimen>
     <dimen name="dv_grid_cell_height">20dp</dimen>
     <dimen name="dv_grid_cell_description_height">22dp</dimen>
     <dimen name="dv_grid_cell_width">144dp</dimen>
     <dimen name="dv_grid_name_margin_end">16dp</dimen>
 
     <dimen name="dv_tag_left_right_padding">5dp</dimen>
-    <dimen name="dv_tag_text_size">15sp</dimen>
-    <dimen name="edit_tag_list_text_margin_start">36dp</dimen>
 
     <dimen name="relation_view_padding_top">5dp</dimen>
     <dimen name="relation_view_padding_bottom">7dp</dimen>
@@ -223,44 +134,20 @@
     <dimen name="list_item_object_half_emoji_size">24dp</dimen>
     <dimen name="list_item_object_half_checkbox_size">22dp</dimen>
     <dimen name="list_item_object_half_initials_size">24sp</dimen>
-    <dimen name="list_item_object_half_text_margin_start">72dp</dimen>
-    <dimen name="list_item_object_half_text_margin_end">20dp</dimen>
     <dimen name="default_cover_height">188dp</dimen>
-    <dimen name="default_cover_height_todo">188dp</dimen>
     <dimen name="dp_14">14dp</dimen>
     <dimen name="defaultGalleryViewTextSize">12sp</dimen>
     <dimen name="defaultGalleryViewAvatarTextSize">11sp</dimen>
     <dimen name="default_wallpaper_select_item_height">208dp</dimen>
-    <dimen name="todoToolbarHeaderMinHeight">80dp</dimen>
-    <dimen name="space_between_header_container_and_title">32dp</dimen>
 
     <!-- Editor, block: graphic + text -->
-    <dimen name="default_graphic_text_container_padding_start">@dimen/default_document_content_padding_start</dimen>
-    <dimen name="default_graphic_text_container_padding_end">@dimen/default_document_content_padding_end</dimen>
-    <dimen name="default_graphic_text_root_margin_top">0dp</dimen>
-    <dimen name="default_graphic_text_root_margin_bottom">2dp</dimen>
-    <dimen name="default_graphic_text_text_margin_start">4dp</dimen>
-    <dimen name="default_graphic_text_text_padding_top">4dp</dimen>
-    <dimen name="default_graphic_text_text_padding_bottom">4dp</dimen>
-    <dimen name="default_graphic_text_graphic_margin_top">5dp</dimen>
-    <dimen name="default_graphic_text_graphic_width">24dp</dimen>
     <dimen name="default_graphic_text_text_first_line_margin_start">28dp</dimen>
 
     <!-- Editor, block: media placeholder -->
-    <dimen name="default_media_placeholder_root_margin_top">10dp</dimen>
-    <dimen name="default_media_placeholder_root_margin_bottom">10dp</dimen>
-    <dimen name="default_media_placeholder_root_height">52dp</dimen>
-    <dimen name="default_media_placeholder_root_margin_start">8dp</dimen>
     <dimen name="default_media_placeholder_card_padding_end">12dp</dimen>
     <dimen name="default_media_placeholder_card_padding_start">12dp</dimen>
-    <dimen name="default_media_placeholder_card_margin_start">12dp</dimen>
-    <dimen name="default_media_placeholder_card_margin_end">12dp</dimen>
-    <dimen name="default_media_placeholder_title_margin_start">12dp</dimen>
     <dimen name="default_media_placeholder_title_icon_padding">8dp</dimen>
 
-    <!-- Editor, block: link to object as card -->
-    <dimen name="default_link_card_root_margin_top">10dp</dimen>
-
     <!-- Editor, block: table of contents -->
     <dimen name="def_toc_item_padding_start">20dp</dimen>
 
@@ -273,15 +160,6 @@
     <dimen name="drag_shadow_padding_width_other">10dp</dimen>
     <dimen name="drag_shadow_max_size">150dp</dimen>
 
-    <!-- Editor, block: headers -->
-    <dimen name="default_header_one_extra_space_top">16dp</dimen>
-    <dimen name="default_header_one_extra_space_bottom">2dp</dimen>
-    <dimen name="default_header_two_extra_space_top">16dp</dimen>
-    <dimen name="default_header_two_extra_space_bottom">2dp</dimen>
-    <dimen name="default_header_three_extra_space_top">16dp</dimen>
-    <dimen name="default_header_three_extra_space_bottom">2dp</dimen>
-
-
     <!-- Editor, block: bookmark -->
     <dimen name="card_block_extra_space_top">10dp</dimen>
     <dimen name="card_block_extra_space_bottom">10dp</dimen>
@@ -289,17 +167,13 @@
     <!-- Editor, block: highlight -->
 
     <dimen name="default_highlight_content_margin_top">6dp</dimen>
-    <dimen name="default_highlight_content_margin_bottom">6dp</dimen>
     <dimen name="highlight_line_width">2dp</dimen>
 
     <!-- Editor, indentation -->
     <dimen name="indent">28dp</dimen>
     <dimen name="default_indent">20dp</dimen>
     <dimen name="default_graphic_container_width">24dp</dimen>
-    <dimen name="default_graphic_container_height">24dp</dimen>
     <dimen name="default_graphic_container_right_offset">4dp</dimen>
-    <dimen name="default_selected_view_offset">8dp</dimen>
-    <dimen name="default_text_bottom_extra_space">2dp</dimen>
     <dimen name="callout_block_extra_space_top">7dp</dimen>
     <dimen name="callout_block_extra_space_bottom">7dp</dimen>
     <dimen name="default_callout_card_radius">2dp</dimen>
@@ -312,9 +186,6 @@
 
     <dimen name="item_block_table_cell_width">140dp</dimen>
     <dimen name="item_block_table_cell_height">63dp</dimen>
-    <dimen name="item_block_table_cell_padding_start">12dp</dimen>
-    <dimen name="item_block_table_cell_padding_top">9dp</dimen>
-    <dimen name="item_block_table_space_end_width">20dp</dimen>
     <dimen name="item_block_table_margin_top">10dp</dimen>
     <dimen name="item_block_table_margin_bottom">10dp</dimen>
 
@@ -324,17 +195,12 @@
 
     <dimen name="block_text_markup_underline_height">0.5dp</dimen>
 
-    <dimen name="featured_relations_text_size">13sp</dimen>
-
     <dimen name="block_data_view_height">96dp</dimen>
 
     <dimen name="default_dv_gallery_first_line_margin_start">22dp</dimen>
     <dimen name="default_collection_dv_header_height">56dp</dimen>
     <dimen name="default_dv_list_first_line_margin_start">26dp</dimen>
 
-    <dimen name="default_dv_gallery_title_height">38dp</dimen>
-    <dimen name="default_dv_gallery_title_desc_height">57dp</dimen>
-
     <!-- DataView, Gallery items-->
     <dimen name="dv_gallery_cover_height">102dp</dimen>
     <dimen name="dv_gallery_title_min_height">40dp</dimen>
diff --git a/core-ui/src/main/res/values/styles.xml b/core-ui/src/main/res/values/styles.xml
index e9d884d2e9..4d77ba5fd8 100644
--- a/core-ui/src/main/res/values/styles.xml
+++ b/core-ui/src/main/res/values/styles.xml
@@ -276,14 +276,6 @@
         <item name="android:paddingEnd">12dp</item>
     </style>
 
-    <style name="ActionModePopupButton">
-        <item name="android:layout_width">wrap_content</item>
-        <item name="android:layout_height">@dimen/popup_context_menu_height</item>
-        <item name="android:paddingStart">@dimen/dp_16</item>
-        <item name="android:paddingEnd">@dimen/dp_16</item>
-        <item name="android:background">?selectableItemBackground</item>
-    </style>
-
     <style name="DefaultCircleColorStyle">
         <item name="android:layout_width">@dimen/block_style_toolbar_circle_size</item>
         <item name="android:layout_height">@dimen/block_style_toolbar_circle_size</item>
@@ -324,25 +316,6 @@
         <item name="cornerFamily">cut</item>
     </style>
 
-    <style name="ViewerTagChipStyle" parent="Widget.MaterialComponents.Chip.Entry">
-        <item name="android:textColor">@color/default_tag_text_color</item>
-        <item name="android:textSize">13sp</item>
-        <item name="textStartPadding">5dp</item>
-        <item name="textEndPadding">5dp</item>
-        <item name="chipStartPadding">0dp</item>
-        <item name="chipEndPadding">0dp</item>
-        <item name="chipStrokeWidth">1dp</item>
-        <item name="closeIconVisible">false</item>
-        <item name="checkedIconVisible">false</item>
-        <item name="chipIconVisible">false</item>
-        <item name="chipStrokeColor">@color/default_tag_background</item>
-        <item name="chipBackgroundColor">@color/default_tag_background</item>
-        <item name="iconStartPadding">0dp</item>
-        <item name="iconEndPadding">0dp</item>
-        <item name="shapeAppearanceSmallComponent">@style/ViewerTagChipShapeAppearance</item>
-        <item name="shapeAppearanceOverlay">@null</item>
-    </style>
-
     <style name="ViewerTagChipShapeAppearance" parent="ShapeAppearance.MaterialComponents.SmallComponent">
         <item name="cornerSize">3dp</item>
         <item name="cornerFamily">cut</item>
@@ -401,23 +374,6 @@
         <item name="android:textColor">@color/text_secondary</item>
     </style>
 
-    <style name="ViewerFilterTagChipStyle" parent="Widget.MaterialComponents.Chip.Entry">
-        <item name="android:textAppearance">@style/TextView.ContentStyle.Relations.1</item>
-        <item name="textStartPadding">5dp</item>
-        <item name="textEndPadding">5dp</item>
-        <item name="chipStartPadding">0dp</item>
-        <item name="chipEndPadding">0dp</item>
-        <item name="chipStrokeWidth">0dp</item>
-        <item name="closeIconVisible">false</item>
-        <item name="checkedIconVisible">false</item>
-        <item name="chipIconVisible">false</item>
-        <item name="chipBackgroundColor">@color/default_filter_tag_background_color</item>
-        <item name="iconStartPadding">0dp</item>
-        <item name="iconEndPadding">0dp</item>
-        <item name="shapeAppearanceSmallComponent">@style/ViewerFilterTagChipShapeAppearance</item>
-        <item name="shapeAppearanceOverlay">@null</item>
-    </style>
-
     <style name="ViewerFilterTagChipShapeAppearance" parent="ShapeAppearance.MaterialComponents.SmallComponent">
         <item name="cornerSize">5dp</item>
         <item name="cornerFamily">cut</item>
@@ -482,14 +438,6 @@
         <item name="android:background">@drawable/ic_tag_selected_selector</item>
     </style>
 
-    <style name="RelationCircleBadgeStyle" parent="TextView.UXStyle.Body">
-        <item name="android:textSize">14sp</item>
-        <item name="android:textColor">@color/button_text</item>
-        <item name="android:layout_gravity">center_vertical|end</item>
-        <item name="android:gravity">center</item>
-        <item name="android:background">@drawable/ic_variant_selector</item>
-    </style>
-
     <style name="GridCellTagStyle" parent="TextView.ContentStyle.Relations.2">
         <item name="android:background">@drawable/rect_dv_cell_tag_item</item>
         <item name="android:singleLine">true</item>
@@ -647,38 +595,6 @@
         <item name="cornerSize">50%</item>
     </style>
 
-    <!-- Editor, Graphic + Text block styles, {root {container {guideline + graphic + text}}}-->
-    <!-- root -->
-    <style name="DefaultGraphicTextBlockRootStyle">
-        <item name="android:layout_marginTop">@dimen/default_graphic_text_root_margin_top</item>
-        <item name="android:layout_marginBottom">@dimen/default_graphic_text_root_margin_bottom
-        </item>
-        <item name="android:paddingStart">@dimen/default_document_item_padding_start</item>
-        <item name="android:paddingEnd">@dimen/default_document_item_padding_end</item>
-    </style>
-
-    <!-- container -->
-    <style name="DefaultGraphicTextBlockContainerStyle">
-        <item name="android:background">@drawable/item_block_multi_select_mode_selector</item>
-        <item name="android:paddingStart">@dimen/default_graphic_text_container_padding_start</item>
-        <item name="android:paddingEnd">@dimen/default_graphic_text_container_padding_end</item>
-    </style>
-
-    <!-- graphic -->
-    <style name="DefaultGraphicTextBlockGraphicStyle">
-        <item name="android:layout_width">@dimen/default_graphic_text_graphic_width</item>
-        <item name="android:layout_height">@dimen/default_graphic_text_graphic_width</item>
-        <item name="android:layout_marginTop">@dimen/default_graphic_text_graphic_margin_top</item>
-    </style>
-
-    <!-- Media placeholder {root {card {title}} selected}-->
-    <!-- root -->
-    <style name="DefaultMediaPlaceholderBlockRootStyle">
-        <item name="android:layout_marginBottom">
-            @dimen/default_media_placeholder_root_margin_bottom
-        </item>
-    </style>
-
     <!-- card -->
     <style name="DefaultMediaPlaceholderBlockCardStyle" parent="Widget.MaterialComponents.CardView">
         <item name="cardCornerRadius">16dp</item>
@@ -751,10 +667,6 @@
         <item name="android:paddingEnd">@dimen/default_document_content_padding_end</item>
     </style>
 
-    <style name="DefaultTableBlockContainerStyle">
-        <item name="android:paddingStart">@dimen/default_graphic_text_container_padding_start</item>
-    </style>
-
     <style name="BlockCellTextContentStyle" parent="DefaultEditorTextStyle">
         <item name="android:paddingTop">9dp</item>
         <item name="android:paddingBottom">9dp</item>
diff --git a/core-ui/src/main/res/xml/collapsing_add_block_toolbar_title.xml b/core-ui/src/main/res/xml/collapsing_add_block_toolbar_title.xml
deleted file mode 100644
index 65a47daa71..0000000000
--- a/core-ui/src/main/res/xml/collapsing_add_block_toolbar_title.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen>
-
-</PreferenceScreen>
\ No newline at end of file
diff --git a/feature-discussions/src/main/res/drawable/ic_edit_message_close.xml b/feature-discussions/src/main/res/drawable/ic_edit_message_close.xml
index bedcd54551..54a2230793 100644
--- a/feature-discussions/src/main/res/drawable/ic_edit_message_close.xml
+++ b/feature-discussions/src/main/res/drawable/ic_edit_message_close.xml
@@ -6,13 +6,13 @@
   <path
       android:pathData="M7,7L12,12L7,17"
       android:strokeWidth="1.5"
-      android:fillColor="#00000000"
+      android:fillColor="@color/transparent_black"
       android:strokeColor="@color/glyph_selected"
       android:strokeLineCap="round"/>
   <path
       android:pathData="M17,7L12,12L17,17"
       android:strokeWidth="1.5"
-      android:fillColor="#00000000"
+      android:fillColor="@color/transparent_black"
       android:strokeColor="@color/glyph_selected"
       android:strokeLineCap="round"/>
 </vector>
diff --git a/feature-discussions/src/main/res/drawable/ic_go_to_bottom_arrow.xml b/feature-discussions/src/main/res/drawable/ic_go_to_bottom_arrow.xml
index 8e6fbcaa28..c684384194 100644
--- a/feature-discussions/src/main/res/drawable/ic_go_to_bottom_arrow.xml
+++ b/feature-discussions/src/main/res/drawable/ic_go_to_bottom_arrow.xml
@@ -6,7 +6,7 @@
   <path
       android:pathData="M4,7L9,12L14,7"
       android:strokeWidth="1.5"
-      android:fillColor="#00000000"
+      android:fillColor="@color/transparent_black"
       android:strokeColor="@color/glyph_selected"
       android:strokeLineCap="round"/>
 </vector>
diff --git a/library-page-icon-picker-widget/src/main/res/drawable/action_menu_divider.xml b/library-page-icon-picker-widget/src/main/res/drawable/action_menu_divider.xml
deleted file mode 100644
index 820def1c45..0000000000
--- a/library-page-icon-picker-widget/src/main/res/drawable/action_menu_divider.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-    <size
-        android:width="1dp"
-        android:height="1dp" />
-    <solid android:color="#EAE9E0" />
-</shape>
\ No newline at end of file
diff --git a/library-page-icon-picker-widget/src/main/res/drawable/ic_clear_text.xml b/library-page-icon-picker-widget/src/main/res/drawable/ic_clear_text.xml
index dc5b98e589..e844918724 100644
--- a/library-page-icon-picker-widget/src/main/res/drawable/ic_clear_text.xml
+++ b/library-page-icon-picker-widget/src/main/res/drawable/ic_clear_text.xml
@@ -4,7 +4,7 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="#ACA996"
+        android:fillColor="@color/gray"
         android:fillType="evenOdd"
         android:pathData="M22,12C22,17.5228 17.5228,22 12,22C6.4771,22 2,17.5228 2,12C2,6.4771 6.4771,2 12,2C17.5228,2 22,6.4771 22,12ZM16.5656,7.4343C16.8781,7.7467 16.8781,8.2532 16.5656,8.5656L13.1314,11.9999L16.5657,15.4343C16.8782,15.7467 16.8782,16.2532 16.5657,16.5656C16.2533,16.8781 15.7468,16.8781 15.4344,16.5656L12,13.1313L8.5656,16.5656C8.2532,16.8781 7.7467,16.8781 7.4343,16.5656C7.1219,16.2532 7.1219,15.7467 7.4343,15.4343L10.8686,11.9999L7.4344,8.5656C7.1219,8.2532 7.1219,7.7467 7.4344,7.4343C7.7468,7.1219 8.2533,7.1219 8.5657,7.4343L12,10.8685L15.4343,7.4343C15.7467,7.1219 16.2532,7.1219 16.5656,7.4343Z" />
 </vector>
diff --git a/library-page-icon-picker-widget/src/main/res/drawable/ic_page_icon_picker_choose_emoji.xml b/library-page-icon-picker-widget/src/main/res/drawable/ic_page_icon_picker_choose_emoji.xml
index 112abd30a3..754b5e667f 100644
--- a/library-page-icon-picker-widget/src/main/res/drawable/ic_page_icon_picker_choose_emoji.xml
+++ b/library-page-icon-picker-widget/src/main/res/drawable/ic_page_icon_picker_choose_emoji.xml
@@ -5,16 +5,16 @@
     android:viewportHeight="24">
   <path
       android:pathData="M10.5,10C10.5,10.8284 9.8284,11.5 9,11.5C8.1716,11.5 7.5,10.8284 7.5,10C7.5,9.1716 8.1716,8.5 9,8.5C9.8284,8.5 10.5,9.1716 10.5,10Z"
-      android:fillColor="#ACA996"/>
+      android:fillColor="@color/gray"/>
   <path
       android:pathData="M16.5,10C16.5,10.8284 15.8284,11.5 15,11.5C14.1716,11.5 13.5,10.8284 13.5,10C13.5,9.1716 14.1716,8.5 15,8.5C15.8284,8.5 16.5,9.1716 16.5,10Z"
-      android:fillColor="#ACA996"/>
+      android:fillColor="@color/gray"/>
   <path
       android:pathData="M12,20.5C16.6944,20.5 20.5,16.6944 20.5,12C20.5,7.3056 16.6944,3.5 12,3.5C7.3056,3.5 3.5,7.3056 3.5,12C3.5,16.6944 7.3056,20.5 12,20.5ZM12,22C17.5228,22 22,17.5228 22,12C22,6.4771 17.5228,2 12,2C6.4771,2 2,6.4771 2,12C2,17.5228 6.4771,22 12,22Z"
-      android:fillColor="#ACA996"
+      android:fillColor="@color/gray"
       android:fillType="evenOdd"/>
   <path
       android:pathData="M17.6586,14H6.3414C7.1651,16.3304 9.3876,18 12,18C14.6125,18 16.8349,16.3304 17.6586,14Z"
-      android:fillColor="#ACA996"
+      android:fillColor="@color/gray"
       android:fillType="evenOdd"/>
 </vector>
diff --git a/library-page-icon-picker-widget/src/main/res/drawable/ic_page_icon_picker_random_emoji.xml b/library-page-icon-picker-widget/src/main/res/drawable/ic_page_icon_picker_random_emoji.xml
deleted file mode 100644
index b2f98ebe2d..0000000000
--- a/library-page-icon-picker-widget/src/main/res/drawable/ic_page_icon_picker_random_emoji.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:pathData="M9.5,8.0002C9.5,8.8287 8.8284,9.5002 8,9.5002C7.1716,9.5002 6.5,8.8287 6.5,8.0002C6.5,7.1718 7.1716,6.5002 8,6.5002C8.8284,6.5002 9.5,7.1718 9.5,8.0002Z"
-      android:fillColor="#ACA996"/>
-  <path
-      android:pathData="M17.5,8.0002C17.5,8.8287 16.8284,9.5002 16,9.5002C15.1716,9.5002 14.5,8.8287 14.5,8.0002C14.5,7.1718 15.1716,6.5002 16,6.5002C16.8284,6.5002 17.5,7.1718 17.5,8.0002Z"
-      android:fillColor="#ACA996"/>
-  <path
-      android:pathData="M9.5,16.0002C9.5,16.8287 8.8284,17.5002 8,17.5002C7.1716,17.5002 6.5,16.8287 6.5,16.0002C6.5,15.1718 7.1716,14.5002 8,14.5002C8.8284,14.5002 9.5,15.1718 9.5,16.0002Z"
-      android:fillColor="#ACA996"/>
-  <path
-      android:pathData="M17.5,16.0002C17.5,16.8287 16.8284,17.5002 16,17.5002C15.1716,17.5002 14.5,16.8287 14.5,16.0002C14.5,15.1718 15.1716,14.5002 16,14.5002C16.8284,14.5002 17.5,15.1718 17.5,16.0002Z"
-      android:fillColor="#ACA996"/>
-  <path
-      android:pathData="M13.5,12.0002C13.5,12.8287 12.8284,13.5002 12,13.5002C11.1716,13.5002 10.5,12.8287 10.5,12.0002C10.5,11.1718 11.1716,10.5002 12,10.5002C12.8284,10.5002 13.5,11.1718 13.5,12.0002Z"
-      android:fillColor="#ACA996"/>
-  <path
-      android:pathData="M17,4.5002H7C5.6193,4.5002 4.5,5.6195 4.5,7.0002V17.0002C4.5,18.381 5.6193,19.5002 7,19.5002H17C18.3807,19.5002 19.5,18.381 19.5,17.0002V7.0002C19.5,5.6195 18.3807,4.5002 17,4.5002ZM7,3.0002C4.7909,3.0002 3,4.7911 3,7.0002V17.0002C3,19.2094 4.7909,21.0002 7,21.0002H17C19.2091,21.0002 21,19.2094 21,17.0002V7.0002C21,4.7911 19.2091,3.0002 17,3.0002H7Z"
-      android:fillColor="#ACA996"
-      android:fillType="evenOdd"/>
-</vector>
diff --git a/library-page-icon-picker-widget/src/main/res/drawable/ic_page_icon_picker_search.xml b/library-page-icon-picker-widget/src/main/res/drawable/ic_page_icon_picker_search.xml
index f18757a00b..57f0cbcd3a 100644
--- a/library-page-icon-picker-widget/src/main/res/drawable/ic_page_icon_picker_search.xml
+++ b/library-page-icon-picker-widget/src/main/res/drawable/ic_page_icon_picker_search.xml
@@ -4,12 +4,12 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="#00000000"
+        android:fillColor="@color/transparent_black"
         android:pathData="M10.998,11m-6,0a6,6 0,1 1,12 0a6,6 0,1 1,-12 0"
         android:strokeWidth="2"
         android:strokeColor="@color/glyph_active" />
     <path
-        android:fillColor="#00000000"
+        android:fillColor="@color/transparent_black"
         android:pathData="M18.998,19L15.998,16"
         android:strokeWidth="2"
         android:strokeColor="@color/glyph_active"
diff --git a/library-page-icon-picker-widget/src/main/res/drawable/ic_page_icon_picker_upload_photo.xml b/library-page-icon-picker-widget/src/main/res/drawable/ic_page_icon_picker_upload_photo.xml
deleted file mode 100644
index 48f7a2ce89..0000000000
--- a/library-page-icon-picker-widget/src/main/res/drawable/ic_page_icon_picker_upload_photo.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:pathData="M5,19.75C5,19.3358 5.3358,19 5.75,19H18.25C18.6642,19 19,19.3358 19,19.75C19,20.1642 18.6642,20.5 18.25,20.5H5.75C5.3358,20.5 5,20.1642 5,19.75Z"
-      android:fillColor="#ACA996"/>
-  <path
-      android:pathData="M12,17C11.5858,17 11.25,16.6642 11.25,16.25V4.75C11.25,4.3358 11.5858,4 12,4C12.4142,4 12.75,4.3358 12.75,4.75V16.25C12.75,16.6642 12.4142,17 12,17Z"
-      android:fillColor="#ACA996"/>
-  <path
-      android:pathData="M12,2.9395L18.5303,9.4698C18.8232,9.7627 18.8232,10.2375 18.5303,10.5304C18.2374,10.8233 17.7626,10.8233 17.4697,10.5304L12,5.0608L6.5303,10.5304C6.2374,10.8233 5.7626,10.8233 5.4697,10.5304C5.1768,10.2375 5.1768,9.7627 5.4697,9.4698L12,2.9395Z"
-      android:fillColor="#ACA996"
-      android:fillType="evenOdd"/>
-</vector>
diff --git a/library-page-icon-picker-widget/src/main/res/drawable/ic_remove_page_icon.xml b/library-page-icon-picker-widget/src/main/res/drawable/ic_remove_page_icon.xml
deleted file mode 100644
index ad3ba22bf9..0000000000
--- a/library-page-icon-picker-widget/src/main/res/drawable/ic_remove_page_icon.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:pathData="M9.5,8H11V18H9.5V8Z"
-      android:fillColor="#ACA996"/>
-  <path
-      android:pathData="M13,8H14.5V18H13V8Z"
-      android:fillColor="#ACA996"/>
-  <path
-      android:pathData="M4.7431,6.5C4.3288,6.5 4,6.1642 4,5.75C4,5.3358 4.3358,5 4.75,5L19.25,5C19.6642,5 20,5.3358 20,5.75C20,6.1642 19.6705,6.5 19.2563,6.5C16.4869,6.5 7.4099,6.5 4.7431,6.5Z"
-      android:fillColor="#ACA996"/>
-  <path
-      android:pathData="M14,3.5H10V5H14V3.5ZM10,2C9.1716,2 8.5,2.6716 8.5,3.5V6.5H15.5V3.5C15.5,2.6716 14.8284,2 14,2H10Z"
-      android:fillColor="#ACA996"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M5.2656,5L5.8686,18.1376C5.9421,19.7392 7.2621,21 8.8655,21H15.1372C16.7395,21 18.059,19.7409 18.1339,18.1403L18.75,4.9844L5.2656,5ZM6.836,6.4982L7.367,18.0688C7.4038,18.8696 8.0638,19.5 8.8655,19.5H15.1372C15.9383,19.5 16.5981,18.8704 16.6356,18.0702L17.178,6.4862L6.836,6.4982Z"
-      android:fillColor="#ACA996"
-      android:fillType="evenOdd"/>
-</vector>
diff --git a/sample/src/main/res/drawable-v24/ic_launcher_foreground.xml b/sample/src/main/res/drawable-v24/ic_launcher_foreground.xml
index 1f6bb29060..c5fe940d07 100644
--- a/sample/src/main/res/drawable-v24/ic_launcher_foreground.xml
+++ b/sample/src/main/res/drawable-v24/ic_launcher_foreground.xml
@@ -8,7 +8,7 @@
         android:fillType="evenOdd"
         android:pathData="M32,64C32,64 38.39,52.99 44.13,50.95C51.37,48.37 70.14,49.57 70.14,49.57L108.26,87.69L108,109.01L75.97,107.97L32,64Z"
         android:strokeWidth="1"
-        android:strokeColor="#00000000">
+        android:strokeColor="@color/transparent_black">
         <aapt:attr name="android:fillColor">
             <gradient
                 android:endX="78.5885"
@@ -17,18 +17,18 @@
                 android:startY="61.0927"
                 android:type="linear">
                 <item
-                    android:color="#44000000"
+                    android:color="@color/translucent_black"
                     android:offset="0.0" />
                 <item
-                    android:color="#00000000"
+                    android:color="@color/transparent_black"
                     android:offset="1.0" />
             </gradient>
         </aapt:attr>
     </path>
     <path
-        android:fillColor="#FFFFFF"
+        android:fillColor="@color/white"
         android:fillType="nonZero"
         android:pathData="M66.94,46.02L66.94,46.02C72.44,50.07 76,56.61 76,64L32,64C32,56.61 35.56,50.11 40.98,46.06L36.18,41.19C35.45,40.45 35.45,39.3 36.18,38.56C36.91,37.81 38.05,37.81 38.78,38.56L44.25,44.05C47.18,42.57 50.48,41.71 54,41.71C57.48,41.71 60.78,42.57 63.68,44.05L69.11,38.56C69.84,37.81 70.98,37.81 71.71,38.56C72.44,39.3 72.44,40.45 71.71,41.19L66.94,46.02ZM62.94,56.92C64.08,56.92 65,56.01 65,54.88C65,53.76 64.08,52.85 62.94,52.85C61.8,52.85 60.88,53.76 60.88,54.88C60.88,56.01 61.8,56.92 62.94,56.92ZM45.06,56.92C46.2,56.92 47.13,56.01 47.13,54.88C47.13,53.76 46.2,52.85 45.06,52.85C43.92,52.85 43,53.76 43,54.88C43,56.01 43.92,56.92 45.06,56.92Z"
         android:strokeWidth="1"
-        android:strokeColor="#00000000" />
+        android:strokeColor="@color/transparent_black" />
 </vector>
diff --git a/sample/src/main/res/drawable/bg_scroll_and_move.xml b/sample/src/main/res/drawable/bg_scroll_and_move.xml
index 701ef27fc4..297aa2cb12 100644
--- a/sample/src/main/res/drawable/bg_scroll_and_move.xml
+++ b/sample/src/main/res/drawable/bg_scroll_and_move.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <solid android:color="#FFFFFF" />
+    <solid android:color="@color/white" />
 </shape>
\ No newline at end of file
diff --git a/sample/src/main/res/drawable/bg_scroll_and_move_active.xml b/sample/src/main/res/drawable/bg_scroll_and_move_active.xml
index b8d7b5ea16..16aae5f3fc 100644
--- a/sample/src/main/res/drawable/bg_scroll_and_move_active.xml
+++ b/sample/src/main/res/drawable/bg_scroll_and_move_active.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <solid android:color="#FFBB2C" />
+    <solid android:color="@color/orange" />
 </shape>
\ No newline at end of file
diff --git a/sample/src/main/res/drawable/ic_launcher_background.xml b/sample/src/main/res/drawable/ic_launcher_background.xml
index 0d025f9bf6..16ae0c684f 100644
--- a/sample/src/main/res/drawable/ic_launcher_background.xml
+++ b/sample/src/main/res/drawable/ic_launcher_background.xml
@@ -5,166 +5,166 @@
     android:viewportWidth="108"
     android:viewportHeight="108">
     <path
-        android:fillColor="#008577"
+        android:fillColor="@color/background_primary_teal"
         android:pathData="M0,0h108v108h-108z" />
     <path
-        android:fillColor="#00000000"
+        android:fillColor="@color/transparent_black"
         android:pathData="M9,0L9,108"
         android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
+        android:strokeColor="@color/grid_line_translucent_white" />
     <path
-        android:fillColor="#00000000"
+        android:fillColor="@color/transparent_black"
         android:pathData="M19,0L19,108"
         android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
+        android:strokeColor="@color/grid_line_translucent_white" />
     <path
-        android:fillColor="#00000000"
+        android:fillColor="@color/transparent_black"
         android:pathData="M29,0L29,108"
         android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
+        android:strokeColor="@color/grid_line_translucent_white" />
     <path
-        android:fillColor="#00000000"
+        android:fillColor="@color/transparent_black"
         android:pathData="M39,0L39,108"
         android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
+        android:strokeColor="@color/grid_line_translucent_white" />
     <path
-        android:fillColor="#00000000"
+        android:fillColor="@color/transparent_black"
         android:pathData="M49,0L49,108"
         android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
+        android:strokeColor="@color/grid_line_translucent_white" />
     <path
-        android:fillColor="#00000000"
+        android:fillColor="@color/transparent_black"
         android:pathData="M59,0L59,108"
         android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
+        android:strokeColor="@color/grid_line_translucent_white" />
     <path
-        android:fillColor="#00000000"
+        android:fillColor="@color/transparent_black"
         android:pathData="M69,0L69,108"
         android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
+        android:strokeColor="@color/grid_line_translucent_white" />
     <path
-        android:fillColor="#00000000"
+        android:fillColor="@color/transparent_black"
         android:pathData="M79,0L79,108"
         android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
+        android:strokeColor="@color/grid_line_translucent_white" />
     <path
-        android:fillColor="#00000000"
+        android:fillColor="@color/transparent_black"
         android:pathData="M89,0L89,108"
         android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
+        android:strokeColor="@color/grid_line_translucent_white" />
     <path
-        android:fillColor="#00000000"
+        android:fillColor="@color/transparent_black"
         android:pathData="M99,0L99,108"
         android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
+        android:strokeColor="@color/grid_line_translucent_white" />
     <path
-        android:fillColor="#00000000"
+        android:fillColor="@color/transparent_black"
         android:pathData="M0,9L108,9"
         android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
+        android:strokeColor="@color/grid_line_translucent_white" />
     <path
-        android:fillColor="#00000000"
+        android:fillColor="@color/transparent_black"
         android:pathData="M0,19L108,19"
         android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
+        android:strokeColor="@color/grid_line_translucent_white" />
     <path
-        android:fillColor="#00000000"
+        android:fillColor="@color/transparent_black"
         android:pathData="M0,29L108,29"
         android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
+        android:strokeColor="@color/grid_line_translucent_white" />
     <path
-        android:fillColor="#00000000"
+        android:fillColor="@color/transparent_black"
         android:pathData="M0,39L108,39"
         android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
+        android:strokeColor="@color/grid_line_translucent_white" />
     <path
-        android:fillColor="#00000000"
+        android:fillColor="@color/transparent_black"
         android:pathData="M0,49L108,49"
         android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
+        android:strokeColor="@color/grid_line_translucent_white" />
     <path
-        android:fillColor="#00000000"
+        android:fillColor="@color/transparent_black"
         android:pathData="M0,59L108,59"
         android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
+        android:strokeColor="@color/grid_line_translucent_white" />
     <path
-        android:fillColor="#00000000"
+        android:fillColor="@color/transparent_black"
         android:pathData="M0,69L108,69"
         android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
+        android:strokeColor="@color/grid_line_translucent_white" />
     <path
-        android:fillColor="#00000000"
+        android:fillColor="@color/transparent_black"
         android:pathData="M0,79L108,79"
         android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
+        android:strokeColor="@color/grid_line_translucent_white" />
     <path
-        android:fillColor="#00000000"
+        android:fillColor="@color/transparent_black"
         android:pathData="M0,89L108,89"
         android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
+        android:strokeColor="@color/grid_line_translucent_white" />
     <path
-        android:fillColor="#00000000"
+        android:fillColor="@color/transparent_black"
         android:pathData="M0,99L108,99"
         android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
+        android:strokeColor="@color/grid_line_translucent_white" />
     <path
-        android:fillColor="#00000000"
+        android:fillColor="@color/transparent_black"
         android:pathData="M19,29L89,29"
         android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
+        android:strokeColor="@color/grid_line_translucent_white" />
     <path
-        android:fillColor="#00000000"
+        android:fillColor="@color/transparent_black"
         android:pathData="M19,39L89,39"
         android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
+        android:strokeColor="@color/grid_line_translucent_white" />
     <path
-        android:fillColor="#00000000"
+        android:fillColor="@color/transparent_black"
         android:pathData="M19,49L89,49"
         android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
+        android:strokeColor="@color/grid_line_translucent_white" />
     <path
-        android:fillColor="#00000000"
+        android:fillColor="@color/transparent_black"
         android:pathData="M19,59L89,59"
         android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
+        android:strokeColor="@color/grid_line_translucent_white" />
     <path
-        android:fillColor="#00000000"
+        android:fillColor="@color/transparent_black"
         android:pathData="M19,69L89,69"
         android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
+        android:strokeColor="@color/grid_line_translucent_white" />
     <path
-        android:fillColor="#00000000"
+        android:fillColor="@color/transparent_black"
         android:pathData="M19,79L89,79"
         android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
+        android:strokeColor="@color/grid_line_translucent_white" />
     <path
-        android:fillColor="#00000000"
+        android:fillColor="@color/transparent_black"
         android:pathData="M29,19L29,89"
         android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
+        android:strokeColor="@color/grid_line_translucent_white" />
     <path
-        android:fillColor="#00000000"
+        android:fillColor="@color/transparent_black"
         android:pathData="M39,19L39,89"
         android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
+        android:strokeColor="@color/grid_line_translucent_white" />
     <path
-        android:fillColor="#00000000"
+        android:fillColor="@color/transparent_black"
         android:pathData="M49,19L49,89"
         android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
+        android:strokeColor="@color/grid_line_translucent_white" />
     <path
-        android:fillColor="#00000000"
+        android:fillColor="@color/transparent_black"
         android:pathData="M59,19L59,89"
         android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
+        android:strokeColor="@color/grid_line_translucent_white" />
     <path
-        android:fillColor="#00000000"
+        android:fillColor="@color/transparent_black"
         android:pathData="M69,19L69,89"
         android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
+        android:strokeColor="@color/grid_line_translucent_white" />
     <path
-        android:fillColor="#00000000"
+        android:fillColor="@color/transparent_black"
         android:pathData="M79,19L79,89"
         android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
+        android:strokeColor="@color/grid_line_translucent_white" />
 </vector>
diff --git a/sample/src/main/res/drawable/red_circle.xml b/sample/src/main/res/drawable/red_circle.xml
index c48b8799f8..c6c07db439 100644
--- a/sample/src/main/res/drawable/red_circle.xml
+++ b/sample/src/main/res/drawable/red_circle.xml
@@ -4,8 +4,8 @@
     android:shape="oval">
     <stroke
         android:width="1dp"
-        android:color="#F44336" />
+        android:color="@color/debug" />
 
-    <solid android:color="#F44336" />
+    <solid android:color="@color/debug" />
 
 </shape>
\ No newline at end of file
diff --git a/sample/src/main/res/values/colors.xml b/sample/src/main/res/values/colors.xml
index 69b22338c6..da16bfa579 100644
--- a/sample/src/main/res/values/colors.xml
+++ b/sample/src/main/res/values/colors.xml
@@ -3,4 +3,8 @@
     <color name="colorPrimary">#008577</color>
     <color name="colorPrimaryDark">#00574B</color>
     <color name="colorAccent">#D81B60</color>
-</resources>
+    <color name="background_primary_teal">#008577</color>
+    <color name="grid_line_translucent_white">#33FFFFFF</color>
+    <color name="debug">#F44336</color>
+    <color name="translucent_black">#44000000</color>
+</resources>
\ No newline at end of file
diff --git a/ui-settings/src/main/res/drawable/ic_about.xml b/ui-settings/src/main/res/drawable/ic_about.xml
index 966dce5dfd..3b34d672d4 100644
--- a/ui-settings/src/main/res/drawable/ic_about.xml
+++ b/ui-settings/src/main/res/drawable/ic_about.xml
@@ -5,23 +5,23 @@
     android:viewportHeight="28">
   <path
       android:pathData="M6.025,0L22.025,0A6,6 0,0 1,28.025 6L28.025,22A6,6 0,0 1,22.025 28L6.025,28A6,6 0,0 1,0.025 22L0.025,6A6,6 0,0 1,6.025 0z"
-      android:fillColor="#FFB522"/>
+      android:fillColor="@color/palette_system_amber_100"/>
   <path
       android:pathData="M13.275,5.75C13.275,5.336 13.611,5 14.025,5C14.44,5 14.775,5.336 14.775,5.75V22.25C14.775,22.664 14.44,23 14.025,23C13.611,23 13.275,22.664 13.275,22.25V5.75Z"
-      android:fillColor="#ffffff"/>
+      android:fillColor="@color/white"/>
   <path
       android:pathData="M5.775,14.75C5.361,14.75 5.025,14.414 5.025,14C5.025,13.586 5.361,13.25 5.775,13.25L22.275,13.25C22.69,13.25 23.025,13.586 23.025,14C23.025,14.414 22.69,14.75 22.275,14.75L5.775,14.75Z"
-      android:fillColor="#ffffff"/>
+      android:fillColor="@color/white"/>
   <path
       android:pathData="M9.251,7.23C9.044,6.871 9.167,6.413 9.526,6.206C9.884,5.998 10.343,6.121 10.55,6.48L18.8,20.77C19.007,21.128 18.884,21.587 18.525,21.794C18.167,22.001 17.708,21.878 17.501,21.52L9.251,7.23Z"
-      android:fillColor="#ffffff"/>
+      android:fillColor="@color/white"/>
   <path
       android:pathData="M7.256,18.774C6.897,18.982 6.439,18.859 6.231,18.5C6.024,18.141 6.147,17.683 6.506,17.475L20.795,9.225C21.154,9.018 21.613,9.141 21.82,9.5C22.027,9.859 21.904,10.317 21.545,10.524L7.256,18.774Z"
-      android:fillColor="#ffffff"/>
+      android:fillColor="@color/white"/>
   <path
       android:pathData="M6.506,10.524C6.147,10.317 6.024,9.859 6.231,9.5C6.439,9.141 6.897,9.018 7.256,9.225L21.545,17.475C21.904,17.683 22.027,18.141 21.82,18.5C21.613,18.859 21.154,18.982 20.795,18.774L6.506,10.524Z"
-      android:fillColor="#ffffff"/>
+      android:fillColor="@color/white"/>
   <path
       android:pathData="M10.55,21.52C10.343,21.879 9.884,22.001 9.525,21.794C9.167,21.587 9.044,21.129 9.251,20.77L17.501,6.481C17.708,6.122 18.167,5.999 18.525,6.206C18.884,6.413 19.007,6.872 18.8,7.231L10.55,21.52Z"
-      android:fillColor="#ffffff"/>
+      android:fillColor="@color/white"/>
 </vector>
diff --git a/ui-settings/src/main/res/drawable/ic_account_and_data.xml b/ui-settings/src/main/res/drawable/ic_account_and_data.xml
deleted file mode 100644
index a28f1d1fad..0000000000
--- a/ui-settings/src/main/res/drawable/ic_account_and_data.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="28dp"
-    android:height="28dp"
-    android:viewportWidth="28"
-    android:viewportHeight="28">
-  <path
-      android:pathData="M6,0L22,0A6,6 0,0 1,28 6L28,22A6,6 0,0 1,22 28L6,28A6,6 0,0 1,0 22L0,6A6,6 0,0 1,6 0z"
-      android:fillColor="#2AA7EE"/>
-  <path
-      android:pathData="M10.4707,9.5a3.5,4 0,1 0,7 0a3.5,4 0,1 0,-7 0z"
-      android:fillColor="#ffffff"/>
-  <path
-      android:pathData="M6.9707,20C6.9707,17.2386 9.2093,15 11.9707,15H15.9707C18.7321,15 20.9707,17.2386 20.9707,20V21C20.9707,21.5523 20.523,22 19.9707,22H7.9707C7.4184,22 6.9707,21.5523 6.9707,21V20Z"
-      android:fillColor="#ffffff"/>
-</vector>
diff --git a/ui-settings/src/main/res/drawable/ic_appearance.xml b/ui-settings/src/main/res/drawable/ic_appearance.xml
index 067bcfb724..a1f62cb5e0 100644
--- a/ui-settings/src/main/res/drawable/ic_appearance.xml
+++ b/ui-settings/src/main/res/drawable/ic_appearance.xml
@@ -5,18 +5,18 @@
     android:viewportHeight="28">
   <path
       android:pathData="M6,0L22,0A6,6 0,0 1,28 6L28,22A6,6 0,0 1,22 28L6,28A6,6 0,0 1,0 22L0,6A6,6 0,0 1,6 0z"
-      android:fillColor="#F55522"/>
+      android:fillColor="@color/palette_system_red"/>
   <path
       android:pathData="M19,11.5C19,10.1193 17.8807,9 16.5,9H11.5C10.2905,9 9.2816,9.8589 9.05,11H13.5C15.433,11 17,12.567 17,14.5V18.95C18.1411,18.7184 19,17.7095 19,16.5V11.5Z"
-      android:fillColor="#ffffff"
+      android:fillColor="@color/white"
       android:fillType="evenOdd"/>
   <path
       android:pathData="M21.9998,8.5C21.9998,7.1193 20.8805,6 19.4998,6H14.4998C13.2903,6 12.2814,6.8589 12.0498,8H16.4998C18.4328,8 19.9998,9.567 19.9998,11.5V15.95C21.1409,15.7184 21.9998,14.7095 21.9998,13.5V8.5Z"
-      android:fillColor="#ffffff"
+      android:fillColor="@color/white"
       android:fillType="evenOdd"/>
   <path
       android:strokeWidth="1"
       android:pathData="M16.5,14.5L16.5,19.5A3,3 0,0 1,13.5 22.5L8.5,22.5A3,3 0,0 1,5.5 19.5L5.5,14.5A3,3 0,0 1,8.5 11.5L13.5,11.5A3,3 0,0 1,16.5 14.5z"
-      android:fillColor="#ffffff"
-      android:strokeColor="#F55522"/>
+      android:fillColor="@color/white"
+      android:strokeColor="@color/palette_system_red"/>
 </vector>
diff --git a/ui-settings/src/main/res/drawable/ic_file_storage.xml b/ui-settings/src/main/res/drawable/ic_file_storage.xml
index b83a252d30..3361b7e19e 100644
--- a/ui-settings/src/main/res/drawable/ic_file_storage.xml
+++ b/ui-settings/src/main/res/drawable/ic_file_storage.xml
@@ -5,9 +5,9 @@
     android:viewportHeight="28">
   <path
       android:pathData="M6,0L22,0A6,6 0,0 1,28 6L28,22A6,6 0,0 1,22 28L6,28A6,6 0,0 1,0 22L0,6A6,6 0,0 1,6 0z"
-      android:fillColor="#3E58EB"/>
+      android:fillColor="@color/palette_system_blue"/>
   <path
       android:pathData="M6,10.5C6,9.119 7.119,8 8.5,8H19.5C20.881,8 22,9.119 22,10.5C22,11.881 20.881,13 19.5,13H8.5C7.119,13 6,11.881 6,10.5ZM10,10.5C10,11.052 9.552,11.5 9,11.5C8.448,11.5 8,11.052 8,10.5C8,9.948 8.448,9.5 9,9.5C9.552,9.5 10,9.948 10,10.5ZM6,17.5C6,16.119 7.119,15 8.5,15H19.5C20.881,15 22,16.119 22,17.5C22,18.881 20.881,20 19.5,20H8.5C7.119,20 6,18.881 6,17.5ZM10,17.5C10,18.052 9.552,18.5 9,18.5C8.448,18.5 8,18.052 8,17.5C8,16.948 8.448,16.5 9,16.5C9.552,16.5 10,16.948 10,17.5Z"
-      android:fillColor="#ffffff"
+      android:fillColor="@color/white"
       android:fillType="evenOdd"/>
 </vector>
diff --git a/ui-settings/src/main/res/drawable/ic_keychain_phrase.xml b/ui-settings/src/main/res/drawable/ic_keychain_phrase.xml
index 134b8afef7..1ec5a95042 100644
--- a/ui-settings/src/main/res/drawable/ic_keychain_phrase.xml
+++ b/ui-settings/src/main/res/drawable/ic_keychain_phrase.xml
@@ -5,14 +5,14 @@
     android:viewportHeight="28">
   <path
       android:pathData="M6,0L22,0A6,6 0,0 1,28 6L28,22A6,6 0,0 1,22 28L6,28A6,6 0,0 1,0 22L0,6A6,6 0,0 1,6 0z"
-      android:fillColor="#2AA7EE"/>
+      android:fillColor="@color/palette_system_sky"/>
   <path
       android:pathData="M12.0015,13H16.0015V16L14.5015,17.5L16.0015,19L14.5015,20.5L16.0015,22V23L14.0015,25.0312L12.0015,23V13Z"
-      android:fillColor="#ffffff"/>
+      android:fillColor="@color/white"/>
   <path
       android:pathData="M14,9m-5,0a5,5 0,1 1,10 0a5,5 0,1 1,-10 0"
-      android:fillColor="#ffffff"/>
+      android:fillColor="@color/white"/>
   <path
       android:pathData="M14,7.5m-1.5,0a1.5,1.5 0,1 1,3 0a1.5,1.5 0,1 1,-3 0"
-      android:fillColor="#2AA7EE"/>
+      android:fillColor="@color/palette_system_sky"/>
 </vector>
diff --git a/ui-settings/src/main/res/drawable/ic_personalization.xml b/ui-settings/src/main/res/drawable/ic_personalization.xml
index 20dcb6ec36..c572e86584 100644
--- a/ui-settings/src/main/res/drawable/ic_personalization.xml
+++ b/ui-settings/src/main/res/drawable/ic_personalization.xml
@@ -5,29 +5,29 @@
     android:viewportHeight="28">
   <path
       android:pathData="M6,0L22,0A6,6 0,0 1,28 6L28,22A6,6 0,0 1,22 28L6,28A6,6 0,0 1,0 22L0,6A6,6 0,0 1,6 0z"
-      android:fillColor="#AB50CC"/>
+      android:fillColor="@color/palette_system_purple"/>
   <path
       android:pathData="M5.9707,20L5.9707,20A0.75,0.75 0,0 1,6.7207 19.25L21.2207,19.25A0.75,0.75 0,0 1,21.9707 20L21.9707,20A0.75,0.75 0,0 1,21.2207 20.75L6.7207,20.75A0.75,0.75 0,0 1,5.9707 20z"
-      android:fillColor="#ffffff"/>
+      android:fillColor="@color/white"/>
   <path
       android:strokeWidth="1"
       android:pathData="M15.4707,20L15.4707,20A2,2 0,0 1,17.4707 18L17.4707,18A2,2 0,0 1,19.4707 20L19.4707,20A2,2 0,0 1,17.4707 22L17.4707,22A2,2 0,0 1,15.4707 20z"
-      android:fillColor="#9F43C1"
-      android:strokeColor="#ffffff"/>
+      android:fillColor="@color/personalization_background_purple"
+      android:strokeColor="@color/white"/>
   <path
       android:pathData="M5.9707,14L5.9707,14A0.75,0.75 0,0 1,6.7207 13.25L21.2207,13.25A0.75,0.75 0,0 1,21.9707 14L21.9707,14A0.75,0.75 0,0 1,21.2207 14.75L6.7207,14.75A0.75,0.75 0,0 1,5.9707 14z"
-      android:fillColor="#ffffff"/>
+      android:fillColor="@color/white"/>
   <path
       android:pathData="M5.9707,8L5.9707,8A0.75,0.75 0,0 1,6.7207 7.25L21.2207,7.25A0.75,0.75 0,0 1,21.9707 8L21.9707,8A0.75,0.75 0,0 1,21.2207 8.75L6.7207,8.75A0.75,0.75 0,0 1,5.9707 8z"
-      android:fillColor="#ffffff"/>
+      android:fillColor="@color/white"/>
   <path
       android:strokeWidth="1"
       android:pathData="M8.4707,14L8.4707,14A2,2 0,0 1,10.4707 12L10.4707,12A2,2 0,0 1,12.4707 14L12.4707,14A2,2 0,0 1,10.4707 16L10.4707,16A2,2 0,0 1,8.4707 14z"
-      android:fillColor="#9F43C1"
-      android:strokeColor="#ffffff"/>
+      android:fillColor="@color/personalization_background_purple"
+      android:strokeColor="@color/white"/>
   <path
       android:strokeWidth="1"
       android:pathData="M15.4707,8L15.4707,8A2,2 0,0 1,17.4707 6L17.4707,6A2,2 0,0 1,19.4707 8L19.4707,8A2,2 0,0 1,17.4707 10L17.4707,10A2,2 0,0 1,15.4707 8z"
-      android:fillColor="#9F43C1"
-      android:strokeColor="#ffffff"/>
+      android:fillColor="@color/personalization_background_purple"
+      android:strokeColor="@color/white"/>
 </vector>
diff --git a/ui-settings/src/main/res/drawable/ic_pin_code.xml b/ui-settings/src/main/res/drawable/ic_pin_code.xml
deleted file mode 100644
index e0e1139a51..0000000000
--- a/ui-settings/src/main/res/drawable/ic_pin_code.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="28dp"
-    android:height="28dp"
-    android:viewportWidth="28"
-    android:viewportHeight="28">
-  <path
-      android:pathData="M6,0L22,0A6,6 0,0 1,28 6L28,22A6,6 0,0 1,22 28L6,28A6,6 0,0 1,0 22L0,6A6,6 0,0 1,6 0z"
-      android:fillColor="#5DD400"/>
-  <path
-      android:pathData="M8,12L20,12A1,1 0,0 1,21 13L21,21A1,1 0,0 1,20 22L8,22A1,1 0,0 1,7 21L7,13A1,1 0,0 1,8 12z"
-      android:fillColor="#ffffff"/>
-  <path
-      android:pathData="M14,5.75L14,5.75A3.75,3.75 0,0 1,17.75 9.5L17.75,15.5A3.75,3.75 0,0 1,14 19.25L14,19.25A3.75,3.75 0,0 1,10.25 15.5L10.25,9.5A3.75,3.75 0,0 1,14 5.75z"
-      android:strokeWidth="1.5"
-      android:fillColor="#00000000"
-      android:strokeColor="#ffffff"/>
-</vector>
diff --git a/ui-settings/src/main/res/drawable/ic_wallpaper.xml b/ui-settings/src/main/res/drawable/ic_wallpaper.xml
deleted file mode 100644
index 56fed2b731..0000000000
--- a/ui-settings/src/main/res/drawable/ic_wallpaper.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="28dp"
-    android:height="28dp"
-    android:viewportWidth="28"
-    android:viewportHeight="28">
-  <path
-      android:pathData="M6,0L22,0A6,6 0,0 1,28 6L28,22A6,6 0,0 1,22 28L6,28A6,6 0,0 1,0 22L0,6A6,6 0,0 1,6 0z"
-      android:fillColor="#AB50CC"/>
-  <path
-      android:pathData="M18,22.0039C18.5523,22.0039 19,21.5562 19,21.0039V7.0039C19,6.4516 18.5523,6.0039 18,6.0039H10C9.4477,6.0039 9,6.4516 9,7.0039L9,21.0039C9,21.5562 9.4477,22.0039 10,22.0039H18Z"
-      android:fillColor="#ffffff"/>
-  <path
-      android:pathData="M21,20.0039C21.5523,20.0039 22,19.5562 22,19.0039V9.0039C22,8.4516 21.5523,8.0039 21,8.0039H20.5V20.0039H21Z"
-      android:fillColor="#ffffff"/>
-  <path
-      android:pathData="M7,20.0039C6.4477,20.0039 6,19.5562 6,19.0039L6,9.0039C6,8.4516 6.4477,8.0039 7,8.0039H7.5L7.5,20.0039H7Z"
-      android:fillColor="#ffffff"/>
-</vector>