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 21e11ef378..6bbe655f96 100644
--- a/core-ui/src/main/res/drawable/ic_bookmark_placeholder.xml
+++ b/core-ui/src/main/res/drawable/ic_bookmark_placeholder.xml
@@ -7,5 +7,5 @@
       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:strokeColor="#ABA99B"/>
+      android:strokeColor="@color/glyph_active"/>
 </vector>
diff --git a/core-ui/src/main/res/drawable/ic_file_light.xml b/core-ui/src/main/res/drawable/ic_file_light.xml
index 0e3793d9e2..188dd16251 100644
--- a/core-ui/src/main/res/drawable/ic_file_light.xml
+++ b/core-ui/src/main/res/drawable/ic_file_light.xml
@@ -5,23 +5,23 @@
     android:viewportHeight="25">
   <path
       android:pathData="M12.2487,2.6655L13.2208,3.6377L5.1197,11.7388L4.1476,10.7667L12.2487,2.6655Z"
-      android:fillColor="#ABA99B"/>
+      android:fillColor="@color/glyph_active"/>
   <path
       android:pathData="M18.7246,9.1415C20.0866,7.6118 20.0341,5.2662 18.5673,3.7994C17.1005,2.3326 14.7549,2.2801 13.2252,3.6421L12.2519,2.6687C14.3196,0.7706 17.5356,0.8235 19.5394,2.8273C21.5432,4.8311 21.5961,8.0471 19.698,10.1148L18.7246,9.1415Z"
-      android:fillColor="#ABA99B"/>
+      android:fillColor="@color/glyph_active"/>
   <path
       android:pathData="M13.5449,20.164C11.2183,22.4905 7.4463,22.4905 5.1197,20.164C2.7932,17.8374 2.7932,14.0653 5.1197,11.7388L4.1476,10.7667C1.2841,13.6301 1.2841,18.2727 4.1476,21.1361C7.011,23.9996 11.6536,23.9996 14.517,21.1361L13.5449,20.164Z"
-      android:fillColor="#ABA99B"/>
+      android:fillColor="@color/glyph_active"/>
   <path
       android:pathData="M14.193,6.5541L15.1651,7.5262L8.6842,14.0071L7.7121,13.035L14.193,6.5541Z"
-      android:fillColor="#ABA99B"/>
+      android:fillColor="@color/glyph_active"/>
   <path
       android:pathData="M11.2766,16.5995C10.5607,17.3153 9.4001,17.3153 8.6842,16.5995C7.9683,15.8836 7.9683,14.723 8.6842,14.0071L7.7121,13.035C6.4593,14.2877 6.4593,16.3189 7.7121,17.5716C8.9648,18.8244 10.996,18.8244 12.2487,17.5716L11.2766,16.5995Z"
-      android:fillColor="#ABA99B"/>
+      android:fillColor="@color/glyph_active"/>
   <path
       android:pathData="M18.7296,9.1464L19.7017,10.1186L12.2487,17.5716L11.2766,16.5995L18.7296,9.1464Z"
-      android:fillColor="#ABA99B"/>
+      android:fillColor="@color/glyph_active"/>
   <path
       android:pathData="M20.6739,13.035L21.646,14.0071L14.517,21.1361L13.5449,20.164L20.6739,13.035Z"
-      android:fillColor="#ABA99B"/>
+      android:fillColor="@color/glyph_active"/>
 </vector>
diff --git a/core-ui/src/main/res/drawable/ic_picture.xml b/core-ui/src/main/res/drawable/ic_picture.xml
index b86e768256..8d687b0ee3 100644
--- a/core-ui/src/main/res/drawable/ic_picture.xml
+++ b/core-ui/src/main/res/drawable/ic_picture.xml
@@ -5,13 +5,13 @@
     android:viewportHeight="25">
   <path
       android:pathData="M9,2.7837H15C16.4249,2.7837 17.4033,2.7849 18.1618,2.8468C18.9028,2.9074 19.3009,3.0184 19.589,3.1652C20.2475,3.5007 20.783,4.0362 21.1185,4.6947C21.2653,4.9828 21.3763,5.3808 21.4369,6.1219C21.4988,6.8804 21.5,7.8588 21.5,9.2837V15.2837C21.5,16.7086 21.4988,17.687 21.4369,18.4455C21.3763,19.1865 21.2653,19.5846 21.1185,19.8727C20.783,20.5312 20.2475,21.0667 19.589,21.4022C19.3009,21.549 18.9028,21.66 18.1618,21.7206C17.4033,21.7825 16.4249,21.7837 15,21.7837H9C7.5751,21.7837 6.5967,21.7825 5.8382,21.7206C5.0972,21.66 4.6991,21.549 4.411,21.4022C3.7525,21.0667 3.217,20.5312 2.8815,19.8727C2.7347,19.5846 2.6237,19.1865 2.5631,18.4455C2.5012,17.687 2.5,16.7086 2.5,15.2837V9.2837C2.5,7.8588 2.5012,6.8804 2.5631,6.1219C2.6237,5.3808 2.7347,4.9828 2.8815,4.6947C3.217,4.0362 3.7525,3.5007 4.411,3.1652C4.6991,3.0184 5.0972,2.9074 5.8382,2.8468C6.5967,2.7849 7.5751,2.7837 9,2.7837ZM22.455,4.0137C23,5.0833 23,6.4834 23,9.2837V15.2837C23,18.084 23,19.4841 22.455,20.5536C21.9757,21.4945 21.2108,22.2594 20.27,22.7387C19.2004,23.2837 17.8003,23.2837 15,23.2837H9C6.1997,23.2837 4.7996,23.2837 3.7301,22.7387C2.7892,22.2594 2.0243,21.4945 1.545,20.5536C1,19.4841 1,18.084 1,15.2837V9.2837C1,6.4834 1,5.0833 1.545,4.0137C2.0243,3.0729 2.7892,2.308 3.7301,1.8287C4.7996,1.2837 6.1997,1.2837 9,1.2837H15C17.8003,1.2837 19.2004,1.2837 20.27,1.8287C21.2108,2.308 21.9757,3.0729 22.455,4.0137Z"
-      android:fillColor="#ABA99B"
+      android:fillColor="@color/glyph_active"
       android:fillType="evenOdd"/>
   <path
       android:pathData="M8.5,10.2837C7.3954,10.2837 6.5,9.3883 6.5,8.2837C6.5,7.1791 7.3954,6.2837 8.5,6.2837C9.6046,6.2837 10.5,7.1791 10.5,8.2837C10.5,9.3883 9.6046,10.2837 8.5,10.2837Z"
-      android:fillColor="#ABA99B"/>
+      android:fillColor="@color/glyph_active"/>
   <path
       android:pathData="M14.5015,11.8428C14.5126,11.8539 14.5244,11.8656 14.5368,11.878L21.4712,18.773L22.5288,17.7094L15.5945,10.8143C15.5897,10.8096 15.585,10.8048 15.5802,10.8001C15.4938,10.7141 15.4001,10.6209 15.3124,10.5469C15.2131,10.463 15.0734,10.361 14.8849,10.3002C14.6341,10.2192 14.3642,10.2196 14.1137,10.3013C13.9254,10.3626 13.786,10.4651 13.6869,10.5492C13.5994,10.6235 13.506,10.717 13.4198,10.8031C13.4151,10.8079 13.4103,10.8127 13.4056,10.8174L9.5004,14.7226L8.0817,13.3018C7.9954,13.2153 7.9018,13.1215 7.8142,13.047C7.715,12.9627 7.5753,12.8599 7.3866,12.7985C7.1356,12.7167 6.8652,12.7165 6.6141,12.7979C6.4253,12.8591 6.2854,12.9616 6.1861,13.0458C6.0984,13.1202 6.0047,13.2138 5.9183,13.3001L1.47,17.7417L2.5299,18.8031L6.9638,14.3759C6.9763,14.3634 6.988,14.3517 6.9992,14.3406C7.0103,14.3517 7.0221,14.3635 7.0345,14.3759L9.4996,16.8447L14.4662,11.8781C14.4787,11.8656 14.4904,11.8539 14.5015,11.8428Z"
-      android:fillColor="#ABA99B"
+      android:fillColor="@color/glyph_active"
       android:fillType="evenOdd"/>
 </vector>
diff --git a/core-ui/src/main/res/drawable/ic_video.xml b/core-ui/src/main/res/drawable/ic_video.xml
index b5d2c41db3..5ba47d1a01 100644
--- a/core-ui/src/main/res/drawable/ic_video.xml
+++ b/core-ui/src/main/res/drawable/ic_video.xml
@@ -10,9 +10,9 @@
         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:strokeColor="#ABA99B"/>
+        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"
-        android:fillColor="#ABA99B"/>
+        android:fillColor="@color/glyph_active"/>
   </group>
 </vector>
diff --git a/core-ui/src/main/res/drawable/rectangle_bookmark_placeholder.xml b/core-ui/src/main/res/drawable/rectangle_media_block_placeholder.xml
similarity index 86%
rename from core-ui/src/main/res/drawable/rectangle_bookmark_placeholder.xml
rename to core-ui/src/main/res/drawable/rectangle_media_block_placeholder.xml
index 16d5f7a2f2..003f611dfc 100644
--- a/core-ui/src/main/res/drawable/rectangle_bookmark_placeholder.xml
+++ b/core-ui/src/main/res/drawable/rectangle_media_block_placeholder.xml
@@ -4,5 +4,5 @@
     <stroke
         android:width="0.5dp"
         android:color="@color/shape_primary" />
-    <corners android:radius="4dp" />
+    <corners android:radius="2dp" />
 </shape>
\ 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
index a9af26f0a7..bde236fa9c 100644
--- a/core-ui/src/main/res/layout/item_block_bookmark_error.xml
+++ b/core-ui/src/main/res/layout/item_block_bookmark_error.xml
@@ -10,7 +10,7 @@
     <FrameLayout
         android:layout_width="match_parent"
         android:layout_height="@dimen/dp_48"
-        android:background="@drawable/rectangle_bookmark_placeholder">
+        android:background="@drawable/rectangle_media_block_placeholder">
 
         <TextView
             android:id="@+id/errorBookmarkUrl"
@@ -23,7 +23,7 @@
             android:maxLines="1"
             android:layout_gravity="center_vertical"
             android:text="@string/bookmark_error"
-            android:textColor="#2C2B27"
+            android:textColor="@color/text_tertiary"
             android:textSize="15sp"
             tools:text="error url medium.com/s/story/The Akari pull request as ready for review" />
 
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
index ab53d276aa..2266c1ea6c 100644
--- a/core-ui/src/main/res/layout/item_block_file_error.xml
+++ b/core-ui/src/main/res/layout/item_block_file_error.xml
@@ -1,16 +1,16 @@
 <?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"
-    android:layout_width="match_parent"
     xmlns:tools="http://schemas.android.com/tools"
-    android:layout_height="wrap_content"
     style="@style/BlockMediaRootLayoutStyle"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
     android:background="@drawable/item_block_multi_select_mode_selector">
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="@dimen/dp_48"
-        android:background="@drawable/rectangle_bookmark_placeholder">
+        android:background="@drawable/rectangle_media_block_placeholder">
 
         <ImageView
             android:id="@+id/icFile"
@@ -30,11 +30,11 @@
             style="@style/BlockVideoStyle"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginStart="5dp"
+            android:layout_marginStart="8dp"
             android:layout_marginEnd="24dp"
             android:inputType="none"
             android:text="@string/error_while_loading"
-            android:textColor="@android:color/holo_red_dark"
+            android:textColor="@color/text_tertiary"
             app:layout_constraintBottom_toBottomOf="@+id/icFile"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@+id/icFile"
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
index 041e14861d..fca5e31feb 100644
--- a/core-ui/src/main/res/layout/item_block_picture_error.xml
+++ b/core-ui/src/main/res/layout/item_block_picture_error.xml
@@ -2,15 +2,15 @@
 <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_width="match_parent"
     android:layout_height="wrap_content"
     android:background="@drawable/item_block_multi_select_mode_selector">
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="@dimen/dp_48"
-        android:background="@drawable/rectangle_bookmark_placeholder">
+        android:background="@drawable/rectangle_media_block_placeholder">
 
         <ImageView
             android:id="@+id/icPicture"
@@ -23,18 +23,18 @@
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            app:srcCompat="@drawable/ic_file_light" />
+            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="5dp"
+            android:layout_marginStart="8dp"
             android:layout_marginEnd="24dp"
             android:inputType="none"
             android:text="@string/error_while_loading"
-            android:textColor="@android:color/holo_red_dark"
+            android:textColor="@color/text_tertiary"
             app:layout_constraintBottom_toBottomOf="@+id/icPicture"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@+id/icPicture"
diff --git a/core-ui/src/main/res/layout/item_block_picture_uploading.xml b/core-ui/src/main/res/layout/item_block_picture_uploading.xml
index 61cf112007..586c9612a8 100644
--- a/core-ui/src/main/res/layout/item_block_picture_uploading.xml
+++ b/core-ui/src/main/res/layout/item_block_picture_uploading.xml
@@ -9,7 +9,7 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="@dimen/dp_48"
-        android:background="@drawable/rectangle_bookmark_placeholder">
+        android:background="@drawable/rectangle_media_block_placeholder">
 
         <ImageView
             android:id="@+id/icPicture"
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
index dafa0d6977..496d1c053e 100644
--- a/core-ui/src/main/res/layout/item_block_video_error.xml
+++ b/core-ui/src/main/res/layout/item_block_video_error.xml
@@ -10,7 +10,7 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="@dimen/dp_48"
-        android:background="@drawable/rectangle_bookmark_placeholder">
+        android:background="@drawable/rectangle_media_block_placeholder">
 
         <ImageView
             android:id="@+id/icVideo"
@@ -30,10 +30,10 @@
             android:id="@+id/tvError"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginStart="5dp"
+            android:layout_marginStart="8dp"
             android:layout_marginEnd="24dp"
             android:text="@string/error_while_loading"
-            android:textColor="@android:color/holo_red_dark"
+            android:textColor="@color/text_tertiary"
             app:layout_constraintBottom_toBottomOf="@+id/icVideo"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toEndOf="@+id/icVideo"
diff --git a/core-ui/src/main/res/layout/item_block_video_uploading.xml b/core-ui/src/main/res/layout/item_block_video_uploading.xml
index a46348cdb4..dfee535024 100644
--- a/core-ui/src/main/res/layout/item_block_video_uploading.xml
+++ b/core-ui/src/main/res/layout/item_block_video_uploading.xml
@@ -10,7 +10,7 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="@dimen/dp_48"
-        android:background="@drawable/rectangle_bookmark_placeholder">
+        android:background="@drawable/rectangle_media_block_placeholder">
 
         <ImageView
             android:id="@+id/icVideo"