diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index d9dd672e9a..610285da55 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -27,4 +27,4 @@ jobs:
 
       - name: Android test report
         uses: asadmansr/android-test-report-action@v1.2.0
-        if: ${{ always() }} # IMPORTANT: run Android Test Report regardless
\ No newline at end of file
+        if: ${{ always() }} # IMPORTANT: run Android Test Report regardless
diff --git a/app/src/androidTest/java/com/anytypeio/anytype/features/editor/RelationBlockUITesting.kt b/app/src/androidTest/java/com/anytypeio/anytype/features/editor/RelationBlockUITesting.kt
index 783c3b3c0d..10c38d63dd 100644
--- a/app/src/androidTest/java/com/anytypeio/anytype/features/editor/RelationBlockUITesting.kt
+++ b/app/src/androidTest/java/com/anytypeio/anytype/features/editor/RelationBlockUITesting.kt
@@ -696,7 +696,7 @@ class RelationBlockUITesting : EditorTestSetup() {
         advance(EditorViewModel.DELAY_REFRESH_DOCUMENT_TO_ENTER_MULTI_SELECT_MODE)
 
         rvMatcher.onItemView(1, R.id.textContent).perform(click())
-        rvMatcher.onItemView(2, R.id.placeholderContainer).perform(click())
+        rvMatcher.onItemView(2, R.id.content).perform(click())
 
         advance(EditorViewModel.TEXT_CHANGES_DEBOUNCE_DURATION)
     }
diff --git a/core-ui/src/main/res/drawable/ic_slash_actions_clean_style.xml b/core-ui/src/main/res/drawable/ic_slash_actions_clean_style.xml
index b7e7adeede..b8eedfb3b6 100644
--- a/core-ui/src/main/res/drawable/ic_slash_actions_clean_style.xml
+++ b/core-ui/src/main/res/drawable/ic_slash_actions_clean_style.xml
@@ -5,12 +5,12 @@
     android:viewportHeight="24">
   <path
       android:pathData="M16.5962,16.6586C16.3034,16.9515 15.8285,16.9515 15.5356,16.6586L7.4039,8.5269C7.111,8.234 7.111,7.7591 7.4039,7.4662C7.6968,7.1733 8.1716,7.1733 8.4645,7.4662L16.5962,15.598C16.8891,15.8909 16.8891,16.3657 16.5962,16.6586Z"
-      android:fillColor="#ACA996"/>
+      android:fillColor="@color/glyph_active"/>
   <path
       android:pathData="M7.4039,16.6587C7.111,16.3659 7.111,15.891 7.4039,15.5981L15.5356,7.4664C15.8285,7.1735 16.3034,7.1735 16.5963,7.4664C16.8891,7.7593 16.8891,8.2341 16.5963,8.527L8.4645,16.6587C8.1716,16.9516 7.6968,16.9516 7.4039,16.6587Z"
-      android:fillColor="#ACA996"/>
+      android:fillColor="@color/glyph_active"/>
   <path
       android:pathData="M17,2.5625H7C4.5147,2.5625 2.5,4.5772 2.5,7.0625V17.0625C2.5,19.5478 4.5147,21.5625 7,21.5625H17C19.4853,21.5625 21.5,19.5478 21.5,17.0625V7.0625C21.5,4.5772 19.4853,2.5625 17,2.5625ZM7,1.0625C3.6863,1.0625 1,3.7488 1,7.0625V17.0625C1,20.3762 3.6863,23.0625 7,23.0625H17C20.3137,23.0625 23,20.3762 23,17.0625V7.0625C23,3.7488 20.3137,1.0625 17,1.0625H7Z"
-      android:fillColor="#ACA996"
+      android:fillColor="@color/glyph_active"
       android:fillType="evenOdd"/>
 </vector>
diff --git a/core-ui/src/main/res/drawable/ic_slash_actions_copy.xml b/core-ui/src/main/res/drawable/ic_slash_actions_copy.xml
index cd54ca354b..3101801edc 100644
--- a/core-ui/src/main/res/drawable/ic_slash_actions_copy.xml
+++ b/core-ui/src/main/res/drawable/ic_slash_actions_copy.xml
@@ -5,10 +5,10 @@
     android:viewportHeight="24">
   <path
       android:pathData="M19.5,7.5H10.5C8.8432,7.5 7.5,8.8432 7.5,10.5V19.5C7.5,21.1569 8.8432,22.5 10.5,22.5H19.5C21.1569,22.5 22.5,21.1569 22.5,19.5V10.5C22.5,8.8432 21.1569,7.5 19.5,7.5ZM10.5,6C8.0147,6 6,8.0147 6,10.5V19.5C6,21.9853 8.0147,24 10.5,24H19.5C21.9853,24 24,21.9853 24,19.5V10.5C24,8.0147 21.9853,6 19.5,6H10.5Z"
-      android:fillColor="#ACA996"
+      android:fillColor="@color/glyph_active"
       android:fillType="evenOdd"/>
   <path
       android:pathData="M4.5,1.5H13.5C15.1569,1.5 16.5,2.8431 16.5,4.5V6H18V4.5C18,2.0147 15.9853,0 13.5,0H4.5C2.0147,0 0,2.0147 0,4.5V13.5C0,15.9853 2.0147,18 4.5,18H6V16.5H4.5C2.8431,16.5 1.5,15.1569 1.5,13.5V4.5C1.5,2.8431 2.8431,1.5 4.5,1.5Z"
-      android:fillColor="#ACA996"
+      android:fillColor="@color/glyph_active"
       android:fillType="evenOdd"/>
 </vector>
diff --git a/core-ui/src/main/res/drawable/ic_slash_actions_delete.xml b/core-ui/src/main/res/drawable/ic_slash_actions_delete.xml
index 39fec12f66..3832e8bce9 100644
--- a/core-ui/src/main/res/drawable/ic_slash_actions_delete.xml
+++ b/core-ui/src/main/res/drawable/ic_slash_actions_delete.xml
@@ -5,21 +5,21 @@
     android:viewportHeight="24">
   <path
       android:pathData="M9,8H10.5V19H9V8Z"
-      android:fillColor="#ACA996"/>
+      android:fillColor="@color/glyph_active"/>
   <path
       android:pathData="M13.5,8H15V19H13.5V8Z"
-      android:fillColor="#ACA996"/>
+      android:fillColor="@color/glyph_active"/>
   <path
       android:pathData="M2.75,4L21.25,4A0.75,0.75 0,0 1,22 4.75L22,4.75A0.75,0.75 0,0 1,21.25 5.5L2.75,5.5A0.75,0.75 0,0 1,2 4.75L2,4.75A0.75,0.75 0,0 1,2.75 4z"
-      android:fillColor="#ACA996"/>
+      android:fillColor="@color/glyph_active"/>
   <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:strokeColor="#ACA996"/>
+      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:strokeColor="#ACA996"/>
+      android:strokeColor="@color/glyph_active"/>
 </vector>
diff --git a/core-ui/src/main/res/drawable/ic_slash_actions_duplicate.xml b/core-ui/src/main/res/drawable/ic_slash_actions_duplicate.xml
index 78754f3e3c..86c1cc5dd2 100644
--- a/core-ui/src/main/res/drawable/ic_slash_actions_duplicate.xml
+++ b/core-ui/src/main/res/drawable/ic_slash_actions_duplicate.xml
@@ -5,16 +5,16 @@
     android:viewportHeight="24">
   <path
       android:pathData="M19.5078,7.5H10.5078C8.851,7.5 7.5078,8.8432 7.5078,10.5V19.5C7.5078,21.1569 8.851,22.5 10.5078,22.5H19.5078C21.1647,22.5 22.5078,21.1569 22.5078,19.5V10.5C22.5078,8.8432 21.1647,7.5 19.5078,7.5ZM10.5078,6C8.0225,6 6.0078,8.0147 6.0078,10.5V19.5C6.0078,21.9853 8.0225,24 10.5078,24H19.5078C21.9931,24 24.0078,21.9853 24.0078,19.5V10.5C24.0078,8.0147 21.9931,6 19.5078,6H10.5078Z"
-      android:fillColor="#ACA996"
+      android:fillColor="@color/glyph_active"
       android:fillType="evenOdd"/>
   <path
       android:pathData="M4.5078,1.5H13.5078C15.1647,1.5 16.5078,2.8431 16.5078,4.5V6H18.0078V4.5C18.0078,2.0147 15.9931,0 13.5078,0H4.5078C2.0225,0 0.0078,2.0147 0.0078,4.5V13.5C0.0078,15.9853 2.0225,18 4.5078,18H6.0078V16.5H4.5078C2.851,16.5 1.5078,15.1569 1.5078,13.5V4.5C1.5078,2.8431 2.851,1.5 4.5078,1.5Z"
-      android:fillColor="#ACA996"
+      android:fillColor="@color/glyph_active"
       android:fillType="evenOdd"/>
   <path
       android:pathData="M15.0078,10.5L15.0078,10.5A0.75,0.75 0,0 1,15.7578 11.25L15.7578,18.75A0.75,0.75 0,0 1,15.0078 19.5L15.0078,19.5A0.75,0.75 0,0 1,14.2578 18.75L14.2578,11.25A0.75,0.75 0,0 1,15.0078 10.5z"
-      android:fillColor="#ACA996"/>
+      android:fillColor="@color/glyph_active"/>
   <path
       android:pathData="M10.5078,15L10.5078,15A0.75,0.75 0,0 1,11.2578 14.25L18.7578,14.25A0.75,0.75 0,0 1,19.5078 15L19.5078,15A0.75,0.75 0,0 1,18.7578 15.75L11.2578,15.75A0.75,0.75 0,0 1,10.5078 15z"
-      android:fillColor="#ACA996"/>
+      android:fillColor="@color/glyph_active"/>
 </vector>
diff --git a/core-ui/src/main/res/drawable/ic_slash_actions_link_to.xml b/core-ui/src/main/res/drawable/ic_slash_actions_link_to.xml
index 07e0d502e6..305b75715f 100644
--- a/core-ui/src/main/res/drawable/ic_slash_actions_link_to.xml
+++ b/core-ui/src/main/res/drawable/ic_slash_actions_link_to.xml
@@ -5,13 +5,13 @@
     android:viewportHeight="28">
   <path
       android:pathData="M12.7197,8.7197C13.0126,8.4268 13.4874,8.4268 13.7803,8.7197L19.0607,14L13.7803,19.2803C13.4874,19.5732 13.0126,19.5732 12.7197,19.2803C12.4268,18.9874 12.4268,18.5126 12.7197,18.2197L16.9393,14L12.7197,9.7803C12.4268,9.4874 12.4268,9.0126 12.7197,8.7197Z"
-      android:fillColor="#ACA996"
+      android:fillColor="@color/glyph_active"
       android:fillType="evenOdd"/>
   <path
       android:pathData="M17,13.25H0V14.75H17V13.25Z"
-      android:fillColor="#ACA996"/>
+      android:fillColor="@color/glyph_active"/>
   <path
       android:pathData="M17.0002,4.5H11.0002C9.5753,4.5 8.5969,4.5012 7.8384,4.5631C7.0974,4.6237 6.6993,4.7347 6.4113,4.8815C5.7527,5.217 5.2173,5.7525 4.8817,6.411C4.7349,6.6991 4.6239,7.0972 4.5634,7.8382C4.526,8.2956 4.5107,8.833 4.5045,9.5H3.0044C3.0214,7.661 3.1076,6.5889 3.5452,5.7301C4.0246,4.7892 4.7895,4.0243 5.7303,3.545C6.7998,3 8.2,3 11.0002,3H17.0002C19.8005,3 21.2006,3 22.2702,3.545C23.211,4.0243 23.9759,4.7892 24.4553,5.7301C25.0002,6.7996 25.0002,8.1997 25.0002,11V17C25.0002,19.8003 25.0002,21.2004 24.4553,22.27C23.9759,23.2108 23.211,23.9757 22.2702,24.455C21.2006,25 19.8005,25 17.0002,25H11.0002C8.2,25 6.7998,25 5.7303,24.455C4.7895,23.9757 4.0246,23.2108 3.5452,22.27C3.1076,21.4111 3.0214,20.339 3.0044,18.5H4.5045C4.5107,19.167 4.526,19.7044 4.5634,20.1618C4.6239,20.9028 4.7349,21.3009 4.8817,21.589C5.2173,22.2475 5.7527,22.783 6.4113,23.1185C6.6993,23.2653 7.0974,23.3763 7.8384,23.4369C8.5969,23.4988 9.5753,23.5 11.0002,23.5H17.0002C18.4251,23.5 19.4036,23.4988 20.1621,23.4369C20.9031,23.3763 21.3011,23.2653 21.5892,23.1185C22.2478,22.783 22.7832,22.2475 23.1188,21.589C23.2655,21.3009 23.3765,20.9028 23.4371,20.1618C23.4991,19.4033 23.5002,18.4249 23.5002,17V11C23.5002,9.5751 23.4991,8.5967 23.4371,7.8382C23.3765,7.0972 23.2655,6.6991 23.1188,6.411C22.7832,5.7525 22.2478,5.217 21.5892,4.8815C21.3011,4.7347 20.9031,4.6237 20.1621,4.5631C19.4036,4.5012 18.4251,4.5 17.0002,4.5Z"
-      android:fillColor="#ACA996"
+      android:fillColor="@color/glyph_active"
       android:fillType="evenOdd"/>
 </vector>
diff --git a/core-ui/src/main/res/drawable/ic_slash_actions_move.xml b/core-ui/src/main/res/drawable/ic_slash_actions_move.xml
index 0ef0dba503..a26f14089b 100644
--- a/core-ui/src/main/res/drawable/ic_slash_actions_move.xml
+++ b/core-ui/src/main/res/drawable/ic_slash_actions_move.xml
@@ -5,13 +5,13 @@
     android:viewportHeight="24">
   <path
       android:pathData="M2.5,17.5V19.5312C2.5,20.0835 2.9477,20.5312 3.5,20.5312H20.5C21.0523,20.5312 21.5,20.0835 21.5,19.5313V17.5C21.5,16.9477 21.0523,16.5 20.5,16.5H3.5C2.9477,16.5 2.5,16.9477 2.5,17.5ZM1,19.5312C1,20.912 2.1193,22.0312 3.5,22.0312H20.5C21.8807,22.0312 23,20.912 23,19.5313V17.5C23,16.1193 21.8807,15 20.5,15H3.5C2.1193,15 1,16.1193 1,17.5V19.5312Z"
-      android:fillColor="#ACA996"
+      android:fillColor="@color/glyph_active"
       android:fillType="evenOdd"/>
   <path
       android:pathData="M2.5,4.5V6.5C2.5,7.0523 2.9477,7.5 3.5,7.5L20.5,7.5C21.0523,7.5 21.5,7.0523 21.5,6.5V4.5C21.5,3.9477 21.0523,3.5 20.5,3.5L3.5,3.5C2.9477,3.5 2.5,3.9477 2.5,4.5ZM1,6.5C1,7.8807 2.1193,9 3.5,9L20.5,9C21.8807,9 23,7.8807 23,6.5V4.5C23,3.1193 21.8807,2 20.5,2L3.5,2C2.1193,2 1,3.1193 1,4.5V6.5Z"
-      android:fillColor="#ACA996"
+      android:fillColor="@color/glyph_active"
       android:fillType="evenOdd"/>
   <path
       android:pathData="M1.75,12.75C1.3358,12.75 1,12.4142 1,12C1,11.5858 1.3358,11.25 1.75,11.25L22.25,11.25C22.6642,11.25 23,11.5858 23,12C23,12.4142 22.6642,12.75 22.25,12.75L1.75,12.75Z"
-      android:fillColor="#ACA996"/>
+      android:fillColor="@color/glyph_active"/>
 </vector>
diff --git a/core-ui/src/main/res/drawable/ic_slash_actions_move_to.xml b/core-ui/src/main/res/drawable/ic_slash_actions_move_to.xml
index d5b60eb2fd..0874fb013a 100644
--- a/core-ui/src/main/res/drawable/ic_slash_actions_move_to.xml
+++ b/core-ui/src/main/res/drawable/ic_slash_actions_move_to.xml
@@ -5,13 +5,13 @@
     android:viewportHeight="24">
   <path
       android:pathData="M6.5156,11.2388H17.0117V12.7388H6.5156V11.2388Z"
-      android:fillColor="#ACA996"/>
+      android:fillColor="@color/glyph_active"/>
   <path
       android:pathData="M17.5,2.4888H6.5C4.2909,2.4888 2.5,4.2796 2.5,6.4888V17.4888C2.5,19.6979 4.2909,21.4888 6.5,21.4888H17.5C19.7091,21.4888 21.5,19.6979 21.5,17.4888V6.4888C21.5,4.2796 19.7091,2.4888 17.5,2.4888ZM6.5,0.9888C3.4624,0.9888 1,3.4512 1,6.4888V17.4888C1,20.5263 3.4624,22.9888 6.5,22.9888H17.5C20.5376,22.9888 23,20.5263 23,17.4888V6.4888C23,3.4512 20.5376,0.9888 17.5,0.9888H6.5Z"
-      android:fillColor="#ACA996"
+      android:fillColor="@color/glyph_active"
       android:fillType="evenOdd"/>
   <path
       android:pathData="M11.4697,6.4697C11.7626,6.1768 12.2374,6.1768 12.5303,6.4697L18.0607,12L12.5303,17.5303C12.2374,17.8232 11.7626,17.8232 11.4697,17.5303C11.1768,17.2374 11.1768,16.7626 11.4697,16.4697L15.9393,12L11.4697,7.5303C11.1768,7.2374 11.1768,6.7626 11.4697,6.4697Z"
-      android:fillColor="#ACA996"
+      android:fillColor="@color/glyph_active"
       android:fillType="evenOdd"/>
 </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 7c6d14cce8..ac7f9e7b05 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
@@ -7,20 +7,20 @@
       android:pathData="M2.375,4.125h19.25v0.75h-19.25z"
       android:strokeWidth="0.75"
       android:fillColor="#00000000"
-      android:strokeColor="#ACA996"/>
+      android:strokeColor="@color/glyph_active"/>
   <path
       android:pathData="M6.375,19.125h11.25v0.75h-11.25z"
       android:strokeWidth="0.75"
       android:fillColor="#00000000"
-      android:strokeColor="#ACA996"/>
+      android:strokeColor="@color/glyph_active"/>
   <path
       android:pathData="M6.375,9.125h11.25v0.75h-11.25z"
       android:strokeWidth="0.75"
       android:fillColor="#00000000"
-      android:strokeColor="#ACA996"/>
+      android:strokeColor="@color/glyph_active"/>
   <path
       android:pathData="M2.375,14.125h19.25v0.75h-19.25z"
       android:strokeWidth="0.75"
       android:fillColor="#00000000"
-      android:strokeColor="#ACA996"/>
+      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 76c4cbb76b..cbbfc6cee0 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
@@ -7,20 +7,20 @@
       android:pathData="M2.375,4.125h19.25v0.75h-19.25z"
       android:strokeWidth="0.75"
       android:fillColor="#00000000"
-      android:strokeColor="#ACA996"/>
+      android:strokeColor="@color/glyph_active"/>
   <path
       android:pathData="M2.375,19.125h11.25v0.75h-11.25z"
       android:strokeWidth="0.75"
       android:fillColor="#00000000"
-      android:strokeColor="#ACA996"/>
+      android:strokeColor="@color/glyph_active"/>
   <path
       android:pathData="M2.375,9.125h11.25v0.75h-11.25z"
       android:strokeWidth="0.75"
       android:fillColor="#00000000"
-      android:strokeColor="#ACA996"/>
+      android:strokeColor="@color/glyph_active"/>
   <path
       android:pathData="M2.375,14.125h19.25v0.75h-19.25z"
       android:strokeWidth="0.75"
       android:fillColor="#00000000"
-      android:strokeColor="#ACA996"/>
+      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 da867b4263..7060ae47d1 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
@@ -7,20 +7,20 @@
       android:pathData="M21.625,4.125l-19.25,0l-0,0.75l19.25,0z"
       android:strokeWidth="0.75"
       android:fillColor="#00000000"
-      android:strokeColor="#ACA996"/>
+      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:strokeColor="#ACA996"/>
+      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:strokeColor="#ACA996"/>
+      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:strokeColor="#ACA996"/>
+      android:strokeColor="@color/glyph_active"/>
 </vector>
diff --git a/core-ui/src/main/res/drawable/ic_slash_main_actions.xml b/core-ui/src/main/res/drawable/ic_slash_main_actions.xml
index 0508f8d279..728d22c846 100644
--- a/core-ui/src/main/res/drawable/ic_slash_main_actions.xml
+++ b/core-ui/src/main/res/drawable/ic_slash_main_actions.xml
@@ -5,5 +5,5 @@
     android:viewportHeight="24">
   <path
       android:pathData="M5.9456,22.0674C8.1293,22.0674 9.9007,20.2961 9.91,18.1217V15.6381H14.1087V18.1217C14.0993,20.2961 15.8707,22.0674 18.0544,22.0674C20.2381,22.0674 22.0094,20.2961 22.0094,18.1217C22.0094,15.938 20.2381,14.1667 18.0544,14.1574H15.5801V9.9587H18.0544C20.2381,9.968 22.0094,8.1967 22.0094,6.013C22.0094,3.8387 20.2381,2.0674 18.0544,2.0674C15.8707,2.0674 14.0993,3.8387 14.1087,6.013V8.4873H9.91V6.013C9.9007,3.8387 8.1293,2.0674 5.9456,2.0674C3.7713,2.0674 2,3.8387 2,6.013C2,8.1967 3.7713,9.968 5.9456,9.9587H8.4386V14.1574H5.9456C3.7713,14.1667 2,15.938 2,18.1217C2,20.2961 3.7713,22.0674 5.9456,22.0674ZM5.9456,20.596C4.5867,20.596 3.4714,19.4901 3.4714,18.1217C3.4714,16.7534 4.5867,15.6381 5.9456,15.6381H8.4386V18.1217C8.4292,19.4901 7.3233,20.596 5.9456,20.596ZM5.9456,8.4873C4.5867,8.4966 3.4714,7.3814 3.4714,6.013C3.4714,4.6447 4.5867,3.5388 5.9456,3.5388C7.3233,3.5388 8.4292,4.6447 8.4386,6.013V8.4873H5.9456ZM18.0544,20.596C16.686,20.596 15.5801,19.4901 15.5801,18.1217V15.6381H18.0544C19.4227,15.6381 20.5286,16.7534 20.5286,18.1217C20.5286,19.4901 19.4227,20.596 18.0544,20.596ZM15.5801,8.4873V6.013C15.5801,4.6447 16.686,3.5388 18.0544,3.5388C19.4227,3.5388 20.5286,4.6447 20.5286,6.013C20.5286,7.3814 19.4227,8.4966 18.0544,8.4873H15.5801ZM9.91,14.1574V9.9587H14.1087V14.1574H9.91Z"
-      android:fillColor="#ACA996"/>
+      android:fillColor="@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 76c4cbb76b..cbbfc6cee0 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
@@ -7,20 +7,20 @@
       android:pathData="M2.375,4.125h19.25v0.75h-19.25z"
       android:strokeWidth="0.75"
       android:fillColor="#00000000"
-      android:strokeColor="#ACA996"/>
+      android:strokeColor="@color/glyph_active"/>
   <path
       android:pathData="M2.375,19.125h11.25v0.75h-11.25z"
       android:strokeWidth="0.75"
       android:fillColor="#00000000"
-      android:strokeColor="#ACA996"/>
+      android:strokeColor="@color/glyph_active"/>
   <path
       android:pathData="M2.375,9.125h11.25v0.75h-11.25z"
       android:strokeWidth="0.75"
       android:fillColor="#00000000"
-      android:strokeColor="#ACA996"/>
+      android:strokeColor="@color/glyph_active"/>
   <path
       android:pathData="M2.375,14.125h19.25v0.75h-19.25z"
       android:strokeWidth="0.75"
       android:fillColor="#00000000"
-      android:strokeColor="#ACA996"/>
+      android:strokeColor="@color/glyph_active"/>
 </vector>
diff --git a/core-ui/src/main/res/drawable/ic_slash_main_color.xml b/core-ui/src/main/res/drawable/ic_slash_main_color.xml
index f9d9c19edd..c8e9f6ed53 100644
--- a/core-ui/src/main/res/drawable/ic_slash_main_color.xml
+++ b/core-ui/src/main/res/drawable/ic_slash_main_color.xml
@@ -5,5 +5,5 @@
     android:viewportHeight="23">
   <path
       android:pathData="M11,0.0625L11,0.0625A11,11 0,0 1,22 11.0625L22,11.0625A11,11 0,0 1,11 22.0625L11,22.0625A11,11 0,0 1,0 11.0625L0,11.0625A11,11 0,0 1,11 0.0625z"
-      android:fillColor="#2C2B27"/>
+      android:fillColor="@color/black"/>
 </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 1704b57632..9c11f5724a 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
@@ -7,5 +7,5 @@
       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:strokeColor="#929082"/>
+      android:strokeColor="@color/glyph_active"/>
 </vector>
diff --git a/core-ui/src/main/res/drawable/ic_slash_other_dots.xml b/core-ui/src/main/res/drawable/ic_slash_other_dots.xml
index fef41236bb..c3cb66710e 100644
--- a/core-ui/src/main/res/drawable/ic_slash_other_dots.xml
+++ b/core-ui/src/main/res/drawable/ic_slash_other_dots.xml
@@ -5,11 +5,11 @@
     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="#ACA996"/>
+      android:fillColor="@color/glyph_active"/>
   <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="#ACA996"/>
+      android:fillColor="@color/glyph_active"/>
   <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="#ACA996"/>
+      android:fillColor="@color/glyph_active"/>
 </vector>
diff --git a/core-ui/src/main/res/drawable/ic_slash_other_line.xml b/core-ui/src/main/res/drawable/ic_slash_other_line.xml
index 10d4b651a5..f7f3f9a43e 100644
--- a/core-ui/src/main/res/drawable/ic_slash_other_line.xml
+++ b/core-ui/src/main/res/drawable/ic_slash_other_line.xml
@@ -5,5 +5,5 @@
     android:viewportHeight="24">
   <path
       android:pathData="M0,11.5H24V12.5H0V11.5Z"
-      android:fillColor="#ACA996"/>
+      android:fillColor="@color/glyph_active"/>
 </vector>
diff --git a/core-ui/src/main/res/drawable/ic_slash_style_bulleted.xml b/core-ui/src/main/res/drawable/ic_slash_style_bulleted.xml
index 31d15e7844..0f433788c6 100644
--- a/core-ui/src/main/res/drawable/ic_slash_style_bulleted.xml
+++ b/core-ui/src/main/res/drawable/ic_slash_style_bulleted.xml
@@ -5,5 +5,5 @@
     android:viewportHeight="6">
   <path
       android:pathData="M3,3m-3,0a3,3 0,1 1,6 0a3,3 0,1 1,-6 0"
-      android:fillColor="@color/text_primary"/>
+      android:fillColor="@color/glyph_active"/>
 </vector>
diff --git a/core-ui/src/main/res/drawable/ic_slash_style_callout.xml b/core-ui/src/main/res/drawable/ic_slash_style_callout.xml
index 2e941a075e..329ece72d8 100644
--- a/core-ui/src/main/res/drawable/ic_slash_style_callout.xml
+++ b/core-ui/src/main/res/drawable/ic_slash_style_callout.xml
@@ -5,8 +5,8 @@
     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="#F3F2EC"/>
+      android:fillColor="@color/shape_tertiary"/>
   <path
       android:pathData="M6.514,19L7.6113,15.9105H12.0218L13.1191,19H14.5041L10.4984,8.0909H9.1348L5.1291,19H6.514ZM8.0268,14.7386L9.774,9.8168H9.8592L11.6064,14.7386H8.0268ZM18.3605,19.1918C19.7881,19.1918 20.5338,18.4247 20.7895,17.892H20.8534V19H22.1105V13.6094C22.1105,11.0099 20.129,10.7116 19.085,10.7116C17.8492,10.7116 16.4429,11.1378 15.8037,12.6293L16.9969,13.0554C17.2739,12.4588 17.9291,11.8196 19.1276,11.8196C20.2835,11.8196 20.8534,12.4322 20.8534,13.4815V13.5241C20.8534,14.1314 20.2355,14.0781 18.744,14.2699C17.2259,14.467 15.5693,14.8026 15.5693,16.6776C15.5693,18.2756 16.8051,19.1918 18.3605,19.1918ZM18.5523,18.0625C17.5509,18.0625 16.8264,17.6151 16.8264,16.7415C16.8264,15.7827 17.7,15.4844 18.6801,15.3565C19.2128,15.2926 20.6404,15.1435 20.8534,14.8878V16.0384C20.8534,17.0611 20.0438,18.0625 18.5523,18.0625Z"
-      android:fillColor="#2C2B27"/>
+      android:fillColor="@color/glyph_selected"/>
 </vector>
diff --git a/core-ui/src/main/res/drawable/ic_slash_style_heading.xml b/core-ui/src/main/res/drawable/ic_slash_style_heading.xml
index feccc3721b..9da4c7ca66 100644
--- a/core-ui/src/main/res/drawable/ic_slash_style_heading.xml
+++ b/core-ui/src/main/res/drawable/ic_slash_style_heading.xml
@@ -5,5 +5,5 @@
     android:viewportHeight="17">
   <path
       android:pathData="M5.878,0.27L0.708,16H4.052L5.13,12.502H10.828L11.906,16H15.624L10.52,0.27H5.878ZM5.9,9.972L7.99,3.174L10.058,9.972H5.9ZM20.11,16.242C21.936,16.242 22.904,15.56 23.586,14.614V16H26.688V8.498C26.688,6.936 26.204,5.88 25.346,5.198C24.466,4.516 23.278,4.23 21.87,4.23C20.462,4.23 19.208,4.538 18.306,5.176C17.404,5.814 16.788,6.826 16.7,8.168H19.714C19.868,7.178 20.418,6.54 21.672,6.54C23.146,6.54 23.542,7.266 23.542,8.652V9.114H22.244C20.484,9.114 18.988,9.356 17.932,9.95C16.876,10.544 16.26,11.468 16.26,12.81C16.26,14.02 16.7,14.878 17.404,15.428C18.108,15.978 19.054,16.242 20.11,16.242ZM21.056,14.02C19.89,14.02 19.384,13.492 19.384,12.634C19.384,11.402 20.462,11.006 22.31,11.006H23.542V11.974C23.542,13.272 22.464,14.02 21.056,14.02Z"
-      android:fillColor="@color/text_primary"/>
+      android:fillColor="@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 15abca7ddf..36ed1ae214 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
@@ -5,7 +5,7 @@
     android:viewportHeight="28">
   <path
       android:pathData="M9.5506,20L10.7942,16.4986H15.7928L17.0364,20H18.606L14.0662,7.6364H12.5207L7.981,20H9.5506ZM11.2651,15.1705L13.2452,9.5923H13.3418L15.3219,15.1705H11.2651ZM22.9073,20.2173C24.5252,20.2173 25.3703,19.348 25.6601,18.7443H25.7325V20H27.1573V13.8906C27.1573,10.9446 24.9115,10.6065 23.7283,10.6065C22.3277,10.6065 20.734,11.0895 20.0095,12.7798L21.3618,13.2628C21.6757,12.5866 22.4183,11.8622 23.7766,11.8622C25.0866,11.8622 25.7325,12.5565 25.7325,13.7457V13.794C25.7325,14.4822 25.0323,14.4219 23.3419,14.6392C21.6214,14.8626 19.7439,15.2429 19.7439,17.3679C19.7439,19.179 21.1445,20.2173 22.9073,20.2173ZM23.1246,18.9375C21.9896,18.9375 21.1686,18.4304 21.1686,17.4403C21.1686,16.3537 22.1587,16.0156 23.2695,15.8707C23.8732,15.7983 25.4911,15.6293 25.7325,15.3395V16.6435C25.7325,17.8026 24.8149,18.9375 23.1246,18.9375Z"
-      android:fillColor="@color/text_primary"/>
+      android:fillColor="@color/glyph_active"/>
   <path
       android:pathData="M0,0h1v28h-1z"
       android:fillColor="#FFB522"/>
diff --git a/core-ui/src/main/res/drawable/ic_slash_style_numbered.xml b/core-ui/src/main/res/drawable/ic_slash_style_numbered.xml
index 9a0fae78cd..0f36a05954 100644
--- a/core-ui/src/main/res/drawable/ic_slash_style_numbered.xml
+++ b/core-ui/src/main/res/drawable/ic_slash_style_numbered.xml
@@ -5,5 +5,5 @@
     android:viewportHeight="12">
   <path
       android:pathData="M4.775,0.5909H3.454L0.7267,2.402V3.7443L3.39,1.9758H3.454V11.5H4.775V0.5909ZM8.1254,11.5852C8.6527,11.5852 9.0842,11.1538 9.0842,10.6264C9.0842,10.0991 8.6527,9.6676 8.1254,9.6676C7.5981,9.6676 7.1666,10.0991 7.1666,10.6264C7.1666,11.1538 7.5981,11.5852 8.1254,11.5852Z"
-      android:fillColor="@color/text_primary"/>
+      android:fillColor="@color/glyph_active"/>
 </vector>
diff --git a/core-ui/src/main/res/drawable/ic_slash_style_subheading.xml b/core-ui/src/main/res/drawable/ic_slash_style_subheading.xml
index 88f91d9b52..63c7bc3ed3 100644
--- a/core-ui/src/main/res/drawable/ic_slash_style_subheading.xml
+++ b/core-ui/src/main/res/drawable/ic_slash_style_subheading.xml
@@ -5,5 +5,5 @@
     android:viewportHeight="14">
   <path
       android:pathData="M2.9966,13L3.9142,10.1808H8.3755L9.2931,13H12.0942L7.8321,0.6364H4.4635L0.1954,13H2.9966ZM4.5782,8.1403L6.0995,3.4616H6.1961L7.7174,8.1403H4.5782ZM16.0182,13.1751C17.3886,13.1751 18.276,12.5774 18.7288,11.7141H18.8012V13H21.2401V6.7457C21.2401,4.5362 19.3687,3.6065 17.3041,3.6065C15.0825,3.6065 13.6215,4.669 13.2653,6.3594L15.6439,6.5526C15.819,5.9368 16.3683,5.484 17.292,5.484C18.1673,5.484 18.6684,5.9247 18.6684,6.6854V6.7216C18.6684,7.3193 18.0345,7.3977 16.4227,7.5547C14.5874,7.7237 12.9394,8.3395 12.9394,10.4102C12.9394,12.2454 14.2494,13.1751 16.0182,13.1751ZM16.7547,11.4002C15.9639,11.4002 15.3964,11.032 15.3964,10.3256C15.3964,9.6012 15.994,9.245 16.8996,9.1182C17.461,9.0398 18.3786,8.907 18.6865,8.7017V9.6857C18.6865,10.6577 17.8836,11.4002 16.7547,11.4002Z"
-      android:fillColor="@color/text_primary"/>
+      android:fillColor="@color/glyph_active"/>
 </vector>
diff --git a/core-ui/src/main/res/drawable/ic_slash_style_text.xml b/core-ui/src/main/res/drawable/ic_slash_style_text.xml
index eb8bf98bfb..9f5c7ee090 100644
--- a/core-ui/src/main/res/drawable/ic_slash_style_text.xml
+++ b/core-ui/src/main/res/drawable/ic_slash_style_text.xml
@@ -5,5 +5,5 @@
     android:viewportHeight="12">
   <path
       android:pathData="M1.514,11L2.6113,7.9105H7.0219L8.1192,11H9.5041L5.4984,0.0909H4.1348L0.1291,11H1.514ZM3.0268,6.7386L4.774,1.8168H4.8592L6.6064,6.7386H3.0268ZM13.3605,11.1918C14.7881,11.1918 15.5338,10.4247 15.7895,9.892H15.8534V11H17.1105V5.6094C17.1105,3.0099 15.129,2.7116 14.085,2.7116C12.8492,2.7116 11.4429,3.1378 10.8037,4.6293L11.9969,5.0554C12.2739,4.4588 12.9291,3.8196 14.1276,3.8196C15.2835,3.8196 15.8534,4.4322 15.8534,5.4815V5.5241C15.8534,6.1314 15.2355,6.0781 13.744,6.2699C12.2259,6.467 10.5693,6.8026 10.5693,8.6776C10.5693,10.2756 11.8051,11.1918 13.3605,11.1918ZM13.5523,10.0625C12.5509,10.0625 11.8264,9.6151 11.8264,8.7415C11.8264,7.7827 12.7,7.4844 13.6801,7.3565C14.2128,7.2926 15.6404,7.1435 15.8534,6.8878V8.0384C15.8534,9.0611 15.0438,10.0625 13.5523,10.0625Z"
-      android:fillColor="@color/text_primary"/>
+      android:fillColor="@color/glyph_active"/>
 </vector>
diff --git a/core-ui/src/main/res/drawable/ic_slash_style_title.xml b/core-ui/src/main/res/drawable/ic_slash_style_title.xml
index c88e756293..b166fa211f 100644
--- a/core-ui/src/main/res/drawable/ic_slash_style_title.xml
+++ b/core-ui/src/main/res/drawable/ic_slash_style_title.xml
@@ -5,5 +5,5 @@
     android:viewportHeight="22">
   <path
       android:pathData="M6.5975,0.98L0.0175,21H4.2735L5.6455,16.548H12.8975L14.2695,21H19.0015L12.5055,0.98H6.5975ZM6.6255,13.328L9.2855,4.676L11.9175,13.328H6.6255ZM24.8418,21.308C27.1658,21.308 28.3978,20.44 29.2658,19.236V21H33.2138V11.452C33.2138,9.464 32.5978,8.12 31.5058,7.252C30.3858,6.384 28.8738,6.02 27.0818,6.02C25.2898,6.02 23.6938,6.412 22.5458,7.224C21.3978,8.036 20.6138,9.324 20.5018,11.032H24.3378C24.5338,9.772 25.2338,8.96 26.8298,8.96C28.7058,8.96 29.2098,9.884 29.2098,11.648V12.236H27.5578C25.3178,12.236 23.4138,12.544 22.0698,13.3C20.7258,14.056 19.9418,15.232 19.9418,16.94C19.9418,18.48 20.5018,19.572 21.3978,20.272C22.2938,20.972 23.4978,21.308 24.8418,21.308ZM26.0458,18.48C24.5618,18.48 23.9178,17.808 23.9178,16.716C23.9178,15.148 25.2898,14.644 27.6418,14.644H29.2098V15.876C29.2098,17.528 27.8378,18.48 26.0458,18.48Z"
-      android:fillColor="@color/text_primary"/>
+      android:fillColor="@color/glyph_active"/>
 </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 4769f73117..6f9143fba6 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
@@ -7,6 +7,6 @@
       android:pathData="M1.5,1.5L6.5,6.4416L1.5584,11.5"
       android:strokeWidth="1.25"
       android:fillColor="#00000000"
-      android:strokeColor="@color/text_primary"
+      android:strokeColor="@color/glyph_active"
       android:strokeLineCap="round"/>
 </vector>
diff --git a/core-ui/src/main/res/drawable/ic_slash_toc.xml b/core-ui/src/main/res/drawable/ic_slash_toc.xml
index bd798d7bdc..355ba4fcce 100644
--- a/core-ui/src/main/res/drawable/ic_slash_toc.xml
+++ b/core-ui/src/main/res/drawable/ic_slash_toc.xml
@@ -5,17 +5,17 @@
     android:viewportHeight="24">
   <path
       android:pathData="M0.75,15L19.25,15A0.75,0.75 0,0 1,20 15.75L20,15.75A0.75,0.75 0,0 1,19.25 16.5L0.75,16.5A0.75,0.75 0,0 1,0 15.75L0,15.75A0.75,0.75 0,0 1,0.75 15z"
-      android:fillColor="#ACA996"/>
+      android:fillColor="@color/glyph_active"/>
   <path
       android:pathData="M8.75,11L23.25,11A0.75,0.75 0,0 1,24 11.75L24,11.75A0.75,0.75 0,0 1,23.25 12.5L8.75,12.5A0.75,0.75 0,0 1,8 11.75L8,11.75A0.75,0.75 0,0 1,8.75 11z"
-      android:fillColor="#ACA996"/>
+      android:fillColor="@color/glyph_active"/>
   <path
       android:pathData="M4.75,7L23.25,7A0.75,0.75 0,0 1,24 7.75L24,7.75A0.75,0.75 0,0 1,23.25 8.5L4.75,8.5A0.75,0.75 0,0 1,4 7.75L4,7.75A0.75,0.75 0,0 1,4.75 7z"
-      android:fillColor="#ACA996"/>
+      android:fillColor="@color/glyph_active"/>
   <path
       android:pathData="M4.75,19L23.25,19A0.75,0.75 0,0 1,24 19.75L24,19.75A0.75,0.75 0,0 1,23.25 20.5L4.75,20.5A0.75,0.75 0,0 1,4 19.75L4,19.75A0.75,0.75 0,0 1,4.75 19z"
-      android:fillColor="#ACA996"/>
+      android:fillColor="@color/glyph_active"/>
   <path
       android:pathData="M0.75,3L19.25,3A0.75,0.75 0,0 1,20 3.75L20,3.75A0.75,0.75 0,0 1,19.25 4.5L0.75,4.5A0.75,0.75 0,0 1,0 3.75L0,3.75A0.75,0.75 0,0 1,0.75 3z"
-      android:fillColor="#ACA996"/>
+      android:fillColor="@color/glyph_active"/>
 </vector>
diff --git a/core-ui/src/main/res/layout/widget_editor_slash.xml b/core-ui/src/main/res/layout/widget_editor_slash.xml
index c26c7194c9..27441981e2 100644
--- a/core-ui/src/main/res/layout/widget_editor_slash.xml
+++ b/core-ui/src/main/res/layout/widget_editor_slash.xml
@@ -5,7 +5,7 @@
     android:id="@+id/container"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/background_secondary"
+    android:background="@color/background_primary"
     android:clickable="true"
     android:focusable="true">
 
diff --git a/core-ui/src/main/res/values-night/colors.xml b/core-ui/src/main/res/values-night/colors.xml
index 3bcbc19e1e..400172d04e 100644
--- a/core-ui/src/main/res/values-night/colors.xml
+++ b/core-ui/src/main/res/values-night/colors.xml
@@ -3,8 +3,8 @@
     <color name="markup_keyboard_bg">#1F1E1D</color>
 
     <color name="text_primary">#F3F2EC</color>
-    <color name="text_secondary">#908F86</color>
-    <color name="text_tertiary">#64635B</color>
+    <color name="text_secondary">#959385</color>
+    <color name="text_tertiary">#CBC9BD</color>
     <color name="text_white">#FFFFFF</color>
 
     <color name="background_primary">#000000</color>