diff --git a/android/res/layout/about.xml b/android/res/layout/about.xml
index 78a8be42b5..541e315538 100644
--- a/android/res/layout/about.xml
+++ b/android/res/layout/about.xml
@@ -45,19 +45,16 @@
       <TextView android:id="@+id/web"
                 style="@style/MwmWidget.TextView.Item"
                 android:text="@string/website"
-                android:drawableLeft="@drawable/ic_website"
                 android:drawableStart="@drawable/ic_website"/>
 
       <TextView android:id="@+id/facebook"
                 style="@style/MwmWidget.TextView.Item"
                 android:text="@string/facebook"
-                android:drawableLeft="@drawable/ic_facebook"
                 android:drawableStart="@drawable/ic_facebook"/>
 
       <TextView android:id="@+id/twitter"
                 style="@style/MwmWidget.TextView.Item"
                 android:text="@string/twitter"
-                android:drawableLeft="@drawable/ic_twitter"
                 android:drawableStart="@drawable/ic_twitter"/>
 
       <View android:layout_width="match_parent"
@@ -69,13 +66,11 @@
       <TextView android:id="@+id/rate"
                 style="@style/MwmWidget.TextView.Item"
                 android:text="@string/rate_gp"
-                android:drawableLeft="@drawable/ic_rate"
                 android:drawableStart="@drawable/ic_rate"/>
 
       <TextView android:id="@+id/share"
                 style="@style/MwmWidget.TextView.Item"
                 android:text="@string/tell_friends"
-                android:drawableLeft="@drawable/ic_share"
                 android:drawableStart="@drawable/ic_share"/>
 
       <View android:layout_width="match_parent"
diff --git a/android/res/layout/activity_download_resources.xml b/android/res/layout/activity_download_resources.xml
index 92dc85de47..0450b6c675 100644
--- a/android/res/layout/activity_download_resources.xml
+++ b/android/res/layout/activity_download_resources.xml
@@ -16,7 +16,6 @@
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:layout_marginTop="@dimen/margin_base_plus"
-      android:drawableLeft="@mipmap/ic_launcher"
       android:drawablePadding="@dimen/margin_base"
       android:drawableStart="@mipmap/ic_launcher"
       android:padding="@dimen/margin_half"
diff --git a/android/res/layout/ads_removal_explanation_items.xml b/android/res/layout/ads_removal_explanation_items.xml
index 2d2e60b5fc..85bddf9348 100644
--- a/android/res/layout/ads_removal_explanation_items.xml
+++ b/android/res/layout/ads_removal_explanation_items.xml
@@ -11,7 +11,6 @@
   <TextView
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:drawableLeft="?attr/accentDot"
     android:drawableStart="?attr/accentDot"
     android:drawablePadding="@dimen/margin_half"
     android:text="@string/why_support_item1"
@@ -20,7 +19,6 @@
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:layout_marginTop="@dimen/margin_half_plus"
-    android:drawableLeft="?attr/accentDot"
     android:drawableStart="?attr/accentDot"
     android:drawablePadding="@dimen/margin_half"
     android:text="@string/why_support_item2"
@@ -29,7 +27,6 @@
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:layout_marginTop="@dimen/margin_half_plus"
-    android:drawableLeft="?attr/accentDot"
     android:drawableStart="?attr/accentDot"
     android:drawablePadding="@dimen/margin_half"
     android:text="@string/why_support_item3"
diff --git a/android/res/layout/fragment_auth_passport_dialog.xml b/android/res/layout/fragment_auth_passport_dialog.xml
index 349fb2bbd3..88819bed8b 100644
--- a/android/res/layout/fragment_auth_passport_dialog.xml
+++ b/android/res/layout/fragment_auth_passport_dialog.xml
@@ -88,7 +88,6 @@
       android:background="?ghostButtonBackground"
       android:textColor="?ghostButtonTextColor"
       android:drawableStart="@drawable/img_google"
-      android:drawableLeft="@drawable/img_google"
       android:paddingLeft="@dimen/margin_half_plus"
       android:paddingStart="@dimen/margin_half_plus"
       android:paddingRight="@dimen/margin_base_plus"
@@ -108,7 +107,6 @@
       android:background="?facebookButtonBackground"
       android:textColor="?accentButtonTextColor"
       android:drawableStart="@drawable/img_facebook"
-      android:drawableLeft="@drawable/img_facebook"
       android:paddingLeft="@dimen/margin_half_plus"
       android:paddingStart="@dimen/margin_half_plus"
       android:paddingRight="@dimen/margin_base_plus"
diff --git a/android/res/layout/fragment_google_play_dialog.xml b/android/res/layout/fragment_google_play_dialog.xml
index 309e78c409..986658f569 100644
--- a/android/res/layout/fragment_google_play_dialog.xml
+++ b/android/res/layout/fragment_google_play_dialog.xml
@@ -55,7 +55,7 @@
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
       android:background="?clickableBackground"
-      android:drawableLeft="@drawable/ic_edit"
+      android:drawableStart="@drawable/ic_edit"
       android:drawablePadding="@dimen/margin_half"
       android:layout_marginLeft="@dimen/margin_half"
       android:fontFamily="@string/robotoRegular"
@@ -66,4 +66,4 @@
       android:visibility="gone"
       tools:visibility="visible"/>
   </RelativeLayout>
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/android/res/layout/item_search_clear_history.xml b/android/res/layout/item_search_clear_history.xml
index 06f2282c92..3015839ae3 100644
--- a/android/res/layout/item_search_clear_history.xml
+++ b/android/res/layout/item_search_clear_history.xml
@@ -2,4 +2,4 @@
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
           style="@style/MwmWidget.TextView.Search"
           android:text="@string/clear_search"
-          android:drawableLeft="@drawable/ic_cancel"/>
+          android:drawableStart="@drawable/ic_cancel"/>
diff --git a/android/res/layout/item_search_my_position.xml b/android/res/layout/item_search_my_position.xml
index 38f47f40e0..ea1f02f94f 100644
--- a/android/res/layout/item_search_my_position.xml
+++ b/android/res/layout/item_search_my_position.xml
@@ -2,4 +2,4 @@
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
           style="@style/MwmWidget.TextView.Search"
           android:text="@string/p2p_your_location"
-          android:drawableLeft="@drawable/ic_search_my_position"/>
+          android:drawableStart="@drawable/ic_search_my_position"/>
diff --git a/android/res/layout/item_search_recent.xml b/android/res/layout/item_search_recent.xml
index f486ac570d..d21db4a622 100644
--- a/android/res/layout/item_search_recent.xml
+++ b/android/res/layout/item_search_recent.xml
@@ -2,5 +2,5 @@
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
           xmlns:tools="http://schemas.android.com/tools"
           style="@style/MwmWidget.TextView.Search"
-          android:drawableLeft="@drawable/ic_search_recent"
+          android:drawableStart="@drawable/ic_search_recent"
           tools:text="Some recent query"/>
diff --git a/android/res/layout/item_search_suggest.xml b/android/res/layout/item_search_suggest.xml
index 0b59a24ce6..24022e4712 100644
--- a/android/res/layout/item_search_suggest.xml
+++ b/android/res/layout/item_search_suggest.xml
@@ -3,5 +3,5 @@
           xmlns:tools="http://schemas.android.com/tools"
           style="@style/MwmWidget.TextView.Search"
           android:textColor="?colorAccent"
-          android:drawableLeft="@drawable/ic_search_suggest"
+          android:drawableStart="@drawable/ic_search_suggest"
           tools:text="Some suggest title"/>
diff --git a/android/src/com/mapswithme/util/Graphics.java b/android/src/com/mapswithme/util/Graphics.java
index b0ababa8b4..68bd10d3a3 100644
--- a/android/src/com/mapswithme/util/Graphics.java
+++ b/android/src/com/mapswithme/util/Graphics.java
@@ -72,7 +72,7 @@ public final class Graphics
 
   public static void tint(TextView view, @AttrRes int tintAttr)
   {
-    final Drawable[] dlist = view.getCompoundDrawables();
+    final Drawable[] dlist = view.getCompoundDrawablesRelative();
     for (int i = 0; i < dlist.length; i++)
       dlist[i] = tint(view.getContext(), dlist[i], tintAttr);
 
@@ -81,7 +81,7 @@ public final class Graphics
 
   public static void tint(TextView view, ColorStateList tintColors)
   {
-    final Drawable[] dlist = view.getCompoundDrawables();
+    final Drawable[] dlist = view.getCompoundDrawablesRelative();
     for (int i = 0; i < dlist.length; i++)
       dlist[i] = tint(dlist[i], tintColors);