diff --git a/OsmAnd-telegram/res/drawable/btn_round.xml b/OsmAnd-telegram/res/drawable/btn_round.xml
index 47458a958d..59cc46b826 100644
--- a/OsmAnd-telegram/res/drawable/btn_round.xml
+++ b/OsmAnd-telegram/res/drawable/btn_round.xml
@@ -3,19 +3,19 @@
 
 	<item android:state_pressed="true">
 		<shape android:shape="rectangle">
-			<solid android:color="@color/ctrl_active_color_light" />
+			<solid android:color="@color/ctrl_active_light" />
 			<corners android:radius="@dimen/dialog_button_radius" />
 		</shape>
 	</item>
 	<item android:state_enabled="false">
 		<shape android:shape="rectangle">
-			<solid android:color="@color/ctrl_color_light" />
+			<solid android:color="@color/ctrl_light" />
 			<corners android:radius="@dimen/dialog_button_radius" />
 		</shape>
 	</item>
 	<item>
 		<shape android:shape="rectangle">
-			<solid android:color="@color/ctrl_color_light" />
+			<solid android:color="@color/ctrl_light" />
 			<corners android:radius="@dimen/dialog_button_radius" />
 		</shape>
 	</item>
diff --git a/OsmAnd-telegram/res/drawable/btn_round_blue.xml b/OsmAnd-telegram/res/drawable/btn_round_blue.xml
index fb0e06cfb9..71ed302bdc 100644
--- a/OsmAnd-telegram/res/drawable/btn_round_blue.xml
+++ b/OsmAnd-telegram/res/drawable/btn_round_blue.xml
@@ -3,19 +3,19 @@
 
 	<item android:state_pressed="true">
 		<shape android:shape="rectangle">
-			<solid android:color="@color/ctrl_active_color_light" />
+			<solid android:color="@color/ctrl_active_light" />
 			<corners android:radius="@dimen/dialog_button_radius" />
 		</shape>
 	</item>
 	<item android:state_enabled="false">
 		<shape android:shape="rectangle">
-			<solid android:color="@color/ctrl_color_light" />
+			<solid android:color="@color/ctrl_light" />
 			<corners android:radius="@dimen/dialog_button_radius" />
 		</shape>
 	</item>
 	<item>
 		<shape android:shape="rectangle">
-			<solid android:color="@color/ctrl_active_color_light" />
+			<solid android:color="@color/ctrl_active_light" />
 			<corners android:radius="@dimen/dialog_button_radius" />
 		</shape>
 	</item>
diff --git a/OsmAnd-telegram/res/layout/activity_main.xml b/OsmAnd-telegram/res/layout/activity_main.xml
index 555db87557..0bd3315e7b 100644
--- a/OsmAnd-telegram/res/layout/activity_main.xml
+++ b/OsmAnd-telegram/res/layout/activity_main.xml
@@ -39,7 +39,7 @@
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:visibility="visible"
-		app:itemBackground="?attr/bg_color"
+		app:itemBackground="?attr/card_bg_color"
 		app:menu="@menu/bottom_navigation_menu"/>
 
 </LinearLayout>
diff --git a/OsmAnd-telegram/res/layout/chat_list_item.xml b/OsmAnd-telegram/res/layout/chat_list_item.xml
index a47ad13068..dbeb1ebc5c 100644
--- a/OsmAnd-telegram/res/layout/chat_list_item.xml
+++ b/OsmAnd-telegram/res/layout/chat_list_item.xml
@@ -9,7 +9,7 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="?attr/bg_color"
+        android:background="?attr/card_bg_color"
         android:minHeight="@dimen/list_item_height_min"
         android:orientation="horizontal"
         android:paddingBottom="@dimen/content_padding_half"
diff --git a/OsmAnd-telegram/res/values/attrs.xml b/OsmAnd-telegram/res/values/attrs.xml
index 0beeb60bcb..b79cf5d82f 100644
--- a/OsmAnd-telegram/res/values/attrs.xml
+++ b/OsmAnd-telegram/res/values/attrs.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 	<declare-styleable name="AppTheme">
-		<attr name="bg_color" format="reference" />
+		<attr name="card_bg_color" format="reference" />
+		<attr name="screen_bg_color" format="reference" />
 		<attr name="icon_color" format="reference" />
 		<attr name="ctrl_active_color" format="reference" />
 		<attr name="ctrl_color" format="reference" />
diff --git a/OsmAnd-telegram/res/values/colors.xml b/OsmAnd-telegram/res/values/colors.xml
index 48222a3ade..57273ae3be 100644
--- a/OsmAnd-telegram/res/values/colors.xml
+++ b/OsmAnd-telegram/res/values/colors.xml
@@ -1,31 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-	<color name="white_color">#fff</color>
+	<color name="white">#fff</color>
 
-	<color name="bg_color_light">#fff</color>
-	<color name="bg_color_dark">#222526</color>
+	<color name="card_bg_light">#fff</color>
+	<color name="card_bg_dark">#222526</color>
 
-	<color name="icon_color_light">#727272</color>
-	<color name="icon_color_dark">#727272</color>
+	<color name="screen_bg_light">#f0f0f0</color>
+	<color name="screen_bg_dark">#17191a</color>
+
+	<color name="icon_light">#727272</color>
+	<color name="icon_dark">#727272</color>
 
 	<color name="osmand_orange">#ff8f00</color>
 
-	<color name="ctrl_active_color_light">#237bff</color>
-	<color name="ctrl_active_color_dark">#d28521</color>
+	<color name="ctrl_active_light">#237bff</color>
+	<color name="ctrl_active_dark">#d28521</color>
 
-	<color name="ctrl_color_light">#f0f0f0</color>
-	<color name="ctrl_color_dark">#17191a</color>
+	<color name="ctrl_light">#f0f0f0</color>
+	<color name="ctrl_dark">#17191a</color>
 
-	<color name="primary_text_color_light">#212121</color>
-	<color name="primary_text_color_dark">#cccccc</color>
+	<color name="primary_text_light">#212121</color>
+	<color name="primary_text_dark">#cccccc</color>
 
-	<color name="secondary_text_color_light">#727272</color>
-	<color name="secondary_text_color_dark">#727272</color>
+	<color name="secondary_text_light">#727272</color>
+	<color name="secondary_text_dark">#727272</color>
 
-	<color name="description_text_color_light">#b3b3b3</color>
-	<color name="description_text_color_dark">#4d4d4d</color>
+	<color name="description_text_light">#b3b3b3</color>
+	<color name="description_text_dark">#4d4d4d</color>
 
-	<color name="divider_color_light">#f0f0f0</color>
-	<color name="divider_color_dark">#2d3133</color>
+	<color name="card_divider_light">#f0f0f0</color>
+	<color name="card_divider_dark">#2d3133</color>
 
 </resources>
diff --git a/OsmAnd-telegram/res/values/styles.xml b/OsmAnd-telegram/res/values/styles.xml
index ddb7ad85e2..876536fd3d 100644
--- a/OsmAnd-telegram/res/values/styles.xml
+++ b/OsmAnd-telegram/res/values/styles.xml
@@ -2,23 +2,24 @@
 
 	<!-- Base application theme. -->
 	<style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
-		<item name="android:windowBackground">@color/bg_color_light</item>
-		<item name="android:colorBackground">@color/bg_color_light</item>
-		<item name="colorControlNormal">@color/primary_text_color_light</item>
-		<item name="colorControlActivated">@color/ctrl_active_color_light</item>
+		<item name="android:windowBackground">@color/card_bg_light</item>
+		<item name="android:colorBackground">@color/card_bg_light</item>
+		<item name="colorControlNormal">@color/primary_text_light</item>
+		<item name="colorControlActivated">@color/ctrl_active_light</item>
 		<item name="android:windowLightStatusBar">true</item>
 
-		<item name="colorPrimary">@color/ctrl_active_color_light</item>
-		<item name="colorPrimaryDark">@color/bg_color_light</item>
-		<item name="colorAccent">@color/ctrl_active_color_light</item>
-		<item name="android:textColorPrimary">@color/primary_text_color_light</item>
-		<item name="android:textColorSecondary">@color/secondary_text_color_light</item>
-		<item name="android:textColorTertiary">@color/description_text_color_light</item>
+		<item name="colorPrimary">@color/ctrl_active_light</item>
+		<item name="colorPrimaryDark">@color/card_bg_light</item>
+		<item name="colorAccent">@color/ctrl_active_light</item>
+		<item name="android:textColorPrimary">@color/primary_text_light</item>
+		<item name="android:textColorSecondary">@color/secondary_text_light</item>
+		<item name="android:textColorTertiary">@color/description_text_light</item>
 
-		<item name="bg_color">@color/bg_color_light</item>
-		<item name="icon_color">@color/icon_color_light</item>
-		<item name="ctrl_active_color">@color/ctrl_active_color_light</item>
-		<item name="ctrl_color">@color/ctrl_color_light</item>
+		<item name="card_bg_color">@color/card_bg_light</item>
+		<item name="screen_bg_color">@color/screen_bg_light</item>
+		<item name="icon_color">@color/icon_light</item>
+		<item name="ctrl_active_color">@color/ctrl_active_light</item>
+		<item name="ctrl_color">@color/ctrl_light</item>
 
 		<item name="bottom_nav_shadow">@drawable/bg_bottom_bar_shadow_with_line_day</item>
 	</style>
@@ -36,7 +37,7 @@
 		<item name="android:paddingRight">16dp</item>
 		<item name="android:paddingTop">8dp</item>
 		<item name="android:paddingBottom">8dp</item>
-		<item name="android:textColor">@color/white_color</item>
+		<item name="android:textColor">@color/white</item>
 		<item name="android:textAllCaps">false</item>
 		<item name="android:background">@drawable/btn_round_blue</item>
 	</style>
@@ -49,7 +50,7 @@
 		<item name="android:paddingRight">16dp</item>
 		<item name="android:paddingTop">8dp</item>
 		<item name="android:paddingBottom">8dp</item>
-		<item name="android:textColor">@color/secondary_text_color_light</item>
+		<item name="android:textColor">@color/secondary_text_light</item>
 		<item name="android:textAllCaps">false</item>
 		<item name="android:background">@drawable/btn_round</item>
 	</style>
diff --git a/OsmAnd-telegram/src/net/osmand/telegram/utils/UiUtils.kt b/OsmAnd-telegram/src/net/osmand/telegram/utils/UiUtils.kt
index d2dd82c16a..a45e53d8ba 100644
--- a/OsmAnd-telegram/src/net/osmand/telegram/utils/UiUtils.kt
+++ b/OsmAnd-telegram/src/net/osmand/telegram/utils/UiUtils.kt
@@ -82,7 +82,7 @@ class UiUtils(private val app: TelegramApplication) {
 	}
 
 	fun getThemedIcon(@DrawableRes id: Int): Drawable? {
-		return getDrawable(id, if (isLightContent) R.color.icon_color_light else 0)
+		return getDrawable(id, if (isLightContent) R.color.icon_light else 0)
 	}
 
 	fun getIcon(@DrawableRes id: Int): Drawable? {
@@ -90,7 +90,7 @@ class UiUtils(private val app: TelegramApplication) {
 	}
 
 	fun getIcon(@DrawableRes id: Int, light: Boolean): Drawable? {
-		return getDrawable(id, if (light) R.color.icon_color_light else 0)
+		return getDrawable(id, if (light) R.color.icon_light else 0)
 	}
 
 	private fun createCircleBitmap(source: Bitmap, recycleSource: Boolean = false): Bitmap {