diff --git a/android/res/drawable-v21/button.xml b/android/res/drawable-v21/button.xml
index 49bdf00c32..83784276f7 100644
--- a/android/res/drawable-v21/button.xml
+++ b/android/res/drawable-v21/button.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ripple xmlns:android="http://schemas.android.com/apk/res/android"
-        android:color="@color/button_pressed">
+        android:color="?attr/colorControlHighlight">
   <item android:id="@android:id/mask">
     <shape android:shape="rectangle">
       <solid android:color="@android:color/white"/>
       <corners android:radius="2dp"/>
     </shape>
   </item>
-</ripple>
\ No newline at end of file
+</ripple>
diff --git a/android/res/drawable-v21/button_accent.xml b/android/res/drawable-v21/button_accent.xml
new file mode 100644
index 0000000000..4093909251
--- /dev/null
+++ b/android/res/drawable-v21/button_accent.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  android:color="?attr/colorControlHighlight">
+  <item android:drawable="@drawable/ripple_mask"/>
+  <item android:drawable="@drawable/button_accent_internal"/>
+</ripple>
diff --git a/android/res/drawable-v21/button_accent_night.xml b/android/res/drawable-v21/button_accent_night.xml
new file mode 100644
index 0000000000..fd0c8e776a
--- /dev/null
+++ b/android/res/drawable-v21/button_accent_night.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  android:color="?attr/colorControlHighlight">
+  <item android:drawable="@drawable/ripple_mask"/>
+  <item android:drawable="@drawable/button_accent_night_internal"/>
+</ripple>
diff --git a/android/res/drawable-v21/button_accent_normal.xml b/android/res/drawable-v21/button_accent_normal.xml
deleted file mode 100644
index 34ed5bd979..0000000000
--- a/android/res/drawable-v21/button_accent_normal.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/button_accent_pressed">
-  <item>
-    <shape android:shape="rectangle">
-      <solid android:color="@color/button_accent"/>
-      <corners android:radius="2dp"/>
-    </shape>
-  </item>
-</ripple>
\ No newline at end of file
diff --git a/android/res/drawable-v21/button_accent_normal_night.xml b/android/res/drawable-v21/button_accent_normal_night.xml
deleted file mode 100644
index 6429dfd9e7..0000000000
--- a/android/res/drawable-v21/button_accent_normal_night.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/button_accent_pressed_night">
-  <item>
-    <shape android:shape="rectangle">
-      <solid android:color="@color/button_accent_night"/>
-      <corners android:radius="2dp"/>
-    </shape>
-  </item>
-</ripple>
\ No newline at end of file
diff --git a/android/res/drawable-v21/button_megafon.xml b/android/res/drawable-v21/button_megafon.xml
new file mode 100644
index 0000000000..2085a19333
--- /dev/null
+++ b/android/res/drawable-v21/button_megafon.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple
+  xmlns:android="http://schemas.android.com/apk/res/android"
+  android:color="?attr/colorControlHighlight">
+  <item android:id="@android:id/mask" android:drawable="@drawable/ripple_mask_big_corner_radius"/>
+  <item android:drawable="@drawable/button_megafon_internal"/>
+</ripple>
diff --git a/android/res/drawable-v21/button_primary.xml b/android/res/drawable-v21/button_primary.xml
deleted file mode 100644
index cce279d055..0000000000
--- a/android/res/drawable-v21/button_primary.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ripple
-  xmlns:android="http://schemas.android.com/apk/res/android"
-  android:color="?attr/colorControlHighlight">
-  <item>
-    <selector>
-      <item android:state_pressed="true">
-        <shape android:shape="rectangle">
-          <corners android:radius="@dimen/button_small_corner_radius"/>
-          <solid android:color="@color/button_accent_pressed"/>
-        </shape>
-      </item>
-
-      <item android:state_enabled="true">
-        <shape android:shape="rectangle">
-          <corners android:radius="@dimen/button_small_corner_radius"/>
-          <solid android:color="@color/button_accent"/>
-        </shape>
-      </item>
-
-      <item>
-        <shape android:shape="rectangle">
-          <corners android:radius="@dimen/button_small_corner_radius"/>
-          <solid android:color="@color/button_accent_disabled"/>
-        </shape>
-      </item>
-    </selector>
-  </item>
-</ripple>
diff --git a/android/res/drawable-v21/button_primary_night.xml b/android/res/drawable-v21/button_primary_night.xml
deleted file mode 100644
index 2e1feab4f7..0000000000
--- a/android/res/drawable-v21/button_primary_night.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ripple
-  xmlns:android="http://schemas.android.com/apk/res/android"
-  android:color="?attr/colorControlHighlight">
-  <item>
-    <selector>
-      <item android:state_pressed="true">
-        <shape android:shape="rectangle">
-          <corners android:radius="@dimen/button_small_corner_radius"/>
-          <solid android:color="@color/button_accent_pressed_night"/>
-        </shape>
-      </item>
-
-      <item android:state_enabled="true">
-        <shape android:shape="rectangle">
-          <corners android:radius="@dimen/button_small_corner_radius"/>
-          <solid android:color="@color/button_accent_night"/>
-        </shape>
-      </item>
-
-      <item>
-        <shape android:shape="rectangle">
-          <corners android:radius="@dimen/button_small_corner_radius"/>
-          <solid android:color="@color/button_accent_disabled_night"/>
-        </shape>
-      </item>
-    </selector>
-  </item>
-</ripple>
diff --git a/android/res/drawable-v21/ripple_mask.xml b/android/res/drawable-v21/ripple_mask.xml
new file mode 100644
index 0000000000..9f8cd2b774
--- /dev/null
+++ b/android/res/drawable-v21/ripple_mask.xml
@@ -0,0 +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="@android:color/white"/>
+  <corners android:radius="@dimen/button_small_corner_radius"/>
+</shape>
diff --git a/android/res/drawable-v21/ripple_mask_big_corner_radius.xml b/android/res/drawable-v21/ripple_mask_big_corner_radius.xml
new file mode 100644
index 0000000000..7c2425becc
--- /dev/null
+++ b/android/res/drawable-v21/ripple_mask_big_corner_radius.xml
@@ -0,0 +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="@android:color/white"/>
+  <corners android:radius="@dimen/megafon_button_corner_radius"/>
+</shape>
diff --git a/android/res/drawable/button_accent.xml b/android/res/drawable/button_accent.xml
index aef260d419..72ffa49022 100644
--- a/android/res/drawable/button_accent.xml
+++ b/android/res/drawable/button_accent.xml
@@ -1,10 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-  <item android:drawable="@drawable/button_accent_pressed"
-        android:state_pressed="true"/>
-
-  <item android:drawable="@drawable/button_accent_normal"
-        android:state_enabled="true"/>
-
-  <item android:drawable="@drawable/button_accent_disabled"/>
-</selector>
\ No newline at end of file
+<layer-list
+  xmlns:android="http://schemas.android.com/apk/res/android">
+  <item android:drawable="@drawable/button_accent_internal"/>
+</layer-list>
diff --git a/android/res/drawable/button_accent_disabled.xml b/android/res/drawable/button_accent_disabled.xml
index 3b8050c4d2..9fb0d5d59f 100644
--- a/android/res/drawable/button_accent_disabled.xml
+++ b/android/res/drawable/button_accent_disabled.xml
@@ -2,5 +2,5 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
        android:shape="rectangle">
   <solid android:color="@color/button_accent_disabled"/>
-  <corners android:radius="2dp"/>
-</shape>
\ No newline at end of file
+  <corners android:radius="@dimen/button_small_corner_radius"/>
+</shape>
diff --git a/android/res/drawable/button_accent_internal.xml b/android/res/drawable/button_accent_internal.xml
new file mode 100644
index 0000000000..d2aa33222d
--- /dev/null
+++ b/android/res/drawable/button_accent_internal.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector
+  xmlns:android="http://schemas.android.com/apk/res/android">
+  <item android:drawable="@drawable/button_accent_pressed"
+        android:state_pressed="true"/>
+  <item android:drawable="@drawable/button_accent_normal"
+        android:state_enabled="true"/>
+  <item android:drawable="@drawable/button_accent_disabled"/>
+</selector>
diff --git a/android/res/drawable/button_accent_night.xml b/android/res/drawable/button_accent_night.xml
index ca177b2131..c2b770f0d5 100644
--- a/android/res/drawable/button_accent_night.xml
+++ b/android/res/drawable/button_accent_night.xml
@@ -1,10 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-  <item android:drawable="@drawable/button_accent_pressed_night"
-        android:state_pressed="true"/>
-
-  <item android:drawable="@drawable/button_accent_normal_night"
-        android:state_enabled="true"/>
-
-  <item android:drawable="@drawable/button_accent_disabled_night"/>
-</selector>
\ No newline at end of file
+<layer-list
+  xmlns:android="http://schemas.android.com/apk/res/android">
+  <item android:drawable="@drawable/button_accent_night_internal"/>
+</layer-list>
diff --git a/android/res/drawable/button_accent_night_internal.xml b/android/res/drawable/button_accent_night_internal.xml
new file mode 100644
index 0000000000..67c7755d24
--- /dev/null
+++ b/android/res/drawable/button_accent_night_internal.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector
+  xmlns:android="http://schemas.android.com/apk/res/android">
+  <item android:drawable="@drawable/button_accent_pressed_night"
+        android:state_pressed="true"/>
+  <item android:drawable="@drawable/button_accent_normal_night"
+        android:state_enabled="true"/>
+  <item android:drawable="@drawable/button_accent_disabled_night"/>
+</selector>
diff --git a/android/res/drawable/button_accent_normal.xml b/android/res/drawable/button_accent_normal.xml
index 0e17e438cc..a3334b8ab0 100644
--- a/android/res/drawable/button_accent_normal.xml
+++ b/android/res/drawable/button_accent_normal.xml
@@ -2,5 +2,5 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
        android:shape="rectangle">
   <solid android:color="@color/button_accent"/>
-  <corners android:radius="2dp"/>
-</shape>
\ No newline at end of file
+  <corners android:radius="@dimen/button_small_corner_radius"/>
+</shape>
diff --git a/android/res/drawable/button_accent_pressed.xml b/android/res/drawable/button_accent_pressed.xml
index 467c498b4f..567fdecdb0 100644
--- a/android/res/drawable/button_accent_pressed.xml
+++ b/android/res/drawable/button_accent_pressed.xml
@@ -2,5 +2,5 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
        android:shape="rectangle">
   <solid android:color="@color/button_accent_pressed"/>
-  <corners android:radius="2dp"/>
-</shape>
\ No newline at end of file
+  <corners android:radius="@dimen/button_small_corner_radius"/>
+</shape>
diff --git a/android/res/drawable/button_megafon.xml b/android/res/drawable/button_megafon.xml
new file mode 100644
index 0000000000..964ecc82de
--- /dev/null
+++ b/android/res/drawable/button_megafon.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list
+  xmlns:android="http://schemas.android.com/apk/res/android">
+  <item android:drawable="@drawable/button_megafon_internal"/>
+</layer-list>
diff --git a/android/res/drawable/button_megafon_internal.xml b/android/res/drawable/button_megafon_internal.xml
new file mode 100644
index 0000000000..7e995664bf
--- /dev/null
+++ b/android/res/drawable/button_megafon_internal.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector
+  xmlns:android="http://schemas.android.com/apk/res/android">
+  <item android:drawable="@drawable/button_megafon_pressed"
+        android:state_pressed="true"/>
+  <item android:drawable="@drawable/button_megafon_normal"/>
+</selector>
diff --git a/android/res/drawable/button_primary.xml b/android/res/drawable/button_primary.xml
deleted file mode 100644
index 24ea19bbf6..0000000000
--- a/android/res/drawable/button_primary.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-  <item android:state_pressed="true">
-    <shape android:shape="rectangle">
-      <corners android:radius="@dimen/button_small_corner_radius"/>
-      <solid android:color="@color/button_accent_pressed"/>
-    </shape>
-  </item>
-
-  <item android:state_enabled="true">
-    <shape android:shape="rectangle">
-      <corners android:radius="@dimen/button_small_corner_radius"/>
-      <solid android:color="@color/button_accent"/>
-    </shape>
-  </item>
-
-  <item>
-    <shape android:shape="rectangle">
-      <corners android:radius="@dimen/button_small_corner_radius"/>
-      <solid android:color="@color/button_accent_disabled"/>
-    </shape>
-  </item>
-</selector>
diff --git a/android/res/drawable/button_primary_night.xml b/android/res/drawable/button_primary_night.xml
deleted file mode 100644
index 9db85b51b5..0000000000
--- a/android/res/drawable/button_primary_night.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-  <item android:state_pressed="true">
-    <shape android:shape="rectangle">
-      <corners android:radius="@dimen/button_small_corner_radius"/>
-      <solid android:color="@color/button_accent_pressed_night"/>
-    </shape>
-  </item>
-
-  <item android:state_enabled="true">
-    <shape android:shape="rectangle">
-      <corners android:radius="@dimen/button_small_corner_radius"/>
-      <solid android:color="@color/button_accent_night"/>
-    </shape>
-  </item>
-
-  <item>
-    <shape android:shape="rectangle">
-      <corners android:radius="@dimen/button_small_corner_radius"/>
-      <solid android:color="@color/button_accent_disabled_night"/>
-    </shape>
-  </item>
-</selector>
diff --git a/android/res/values/themes-base.xml b/android/res/values/themes-base.xml
index a921af45af..93357dbc44 100644
--- a/android/res/values/themes-base.xml
+++ b/android/res/values/themes-base.xml
@@ -25,6 +25,7 @@
     <item name="colorPrimary">@color/bg_primary</item>
     <item name="colorControlNormal">?secondary</item>
     <item name="colorAccent">@color/base_accent</item>
+    <item name="colorControlHighlight">@color/white_38</item>
     <item name="panel">@color/bg_panel</item>
     <item name="sidePanel">@color/bg_side_panel</item>
     <item name="iconTint">@color/icon_tint</item>
@@ -62,7 +63,7 @@
     <item name="redButtonTextColor">@color/button_red_text</item>
     <item name="redButtonTextColorDisabled">@color/button_red_text_disabled</item>
 
-    <item name="primaryButtonBackground">@drawable/button_primary</item>
+    <item name="primaryButtonBackground">@drawable/button_accent</item>
     <item name="reviewButtonBackground">@drawable/button_leave_review</item>
 
     <item name="circleAccent">@drawable/circle_accent</item>
@@ -155,6 +156,7 @@
     <item name="colorPrimary">@color/bg_primary_night</item>
     <item name="colorControlNormal">?secondary</item>
     <item name="colorAccent">@color/base_accent_night</item>
+    <item name="colorControlHighlight">@color/white_24</item>
     <item name="panel">@color/bg_panel_night</item>
     <item name="sidePanel">@color/bg_side_panel_night</item>
     <item name="iconTint">@color/icon_tint_night</item>
@@ -192,7 +194,7 @@
     <item name="redButtonTextColor">@color/button_red_text</item>
     <item name="redButtonTextColorDisabled">@color/button_red_text_disabled</item>
 
-    <item name="primaryButtonBackground">@drawable/button_primary_night</item>
+    <item name="primaryButtonBackground">@drawable/button_accent_night</item>
     <item name="reviewButtonBackground">@drawable/button_leave_review_night</item>
 
     <item name="circleAccent">@drawable/circle_accent_night</item>