diff --git a/app/AndroidManifest.xml b/app/AndroidManifest.xml
index 2c45970177..edf400b14c 100644
--- a/app/AndroidManifest.xml
+++ b/app/AndroidManifest.xml
@@ -339,14 +339,12 @@
         <activity android:name="org.commcare.gis.EntityMapActivity">
         </activity>
 
-        <activity android:name="org.commcare.gis.EntityMapboxActivity"
-            android:theme="@style/Theme.AppCompat.Light.NoActionBar">
+        <activity android:name="org.commcare.gis.EntityMapboxActivity">
         </activity>
 
         <activity
             android:name="org.commcare.gis.DrawingBoundaryActivity"
-            android:exported="false"
-            android:theme="@style/Theme.AppCompat.Light.NoActionBar">
+            android:exported="false">
             <intent-filter>
                 <action android:name="org.commcare.dalvik.action.DrawBoundary"/>
 
@@ -362,8 +360,7 @@
         </activity>
         <activity android:name="org.commcare.activities.InstallFromListActivity">
         </activity>
-        <activity android:name="org.commcare.gis.MapboxLocationPickerActivity"
-            android:theme="@style/Theme.AppCompat.Light.NoActionBar"/>
+        <activity android:name="org.commcare.gis.MapboxLocationPickerActivity" />
 
         <uses-library
             android:name="com.google.android.maps"
diff --git a/app/res/color/button_green_background.xml b/app/res/color/button_green_background.xml
new file mode 100644
index 0000000000..bf0ae6833f
--- /dev/null
+++ b/app/res/color/button_green_background.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- Disabled state -->
+    <item android:state_enabled="false" android:color="@color/green_700" />
+    <!-- Pressed state -->
+    <item android:state_pressed="true" android:color="@color/green_900" />
+    <!-- Default state -->
+    <item android:color="@color/green_500" />
+</selector>
+
diff --git a/app/res/color/button_orange_background.xml b/app/res/color/button_orange_background.xml
new file mode 100644
index 0000000000..1493a7709c
--- /dev/null
+++ b/app/res/color/button_orange_background.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- Disabled state -->
+    <item android:state_enabled="false" android:color="@color/orange_700" />
+    <!-- Pressed state -->
+    <item android:state_pressed="true" android:color="@color/orange_900" />
+    <!-- Default state -->
+    <item android:color="@color/orange_500" />
+</selector>
\ No newline at end of file
diff --git a/app/res/color/button_red_background.xml b/app/res/color/button_red_background.xml
new file mode 100644
index 0000000000..0fca04b82b
--- /dev/null
+++ b/app/res/color/button_red_background.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <!-- Disabled state -->
+    <item android:state_enabled="false" android:color="@color/red_700" />
+    <!-- Pressed state -->
+    <item android:state_pressed="true" android:color="@color/red_900" />
+    <!-- Default state -->
+    <item android:color="@color/red_500" />
+</selector>
\ No newline at end of file
diff --git a/app/res/color/primary_button_background.xml b/app/res/color/primary_button_background.xml
index 90bafb37c1..22f6c49dad 100644
--- a/app/res/color/primary_button_background.xml
+++ b/app/res/color/primary_button_background.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:color="@color/button_disabled" android:state_enabled="false" />
-    <item android:color="@color/button_primary" />
+    <item android:color="@color/button_primary_color" />
 </selector>
\ No newline at end of file
diff --git a/app/res/drawable-hdpi-v14/notification.png b/app/res/drawable-hdpi-v14/notification.png
deleted file mode 100644
index a307880630..0000000000
Binary files a/app/res/drawable-hdpi-v14/notification.png and /dev/null differ
diff --git a/app/res/drawable-hdpi/icon_app_white.png b/app/res/drawable-hdpi/icon_app_white.png
deleted file mode 100644
index 4e2c034930..0000000000
Binary files a/app/res/drawable-hdpi/icon_app_white.png and /dev/null differ
diff --git a/app/res/drawable-hdpi/notification.png b/app/res/drawable-hdpi/notification.png
deleted file mode 100644
index b62adeb031..0000000000
Binary files a/app/res/drawable-hdpi/notification.png and /dev/null differ
diff --git a/app/res/drawable-hdpi/pause_question_audio.png b/app/res/drawable-hdpi/pause_question_audio.png
index 8d1a5e26f6..0093ff1f67 100644
Binary files a/app/res/drawable-hdpi/pause_question_audio.png and b/app/res/drawable-hdpi/pause_question_audio.png differ
diff --git a/app/res/drawable-hdpi/play_question_audio.png b/app/res/drawable-hdpi/play_question_audio.png
index ef923b91d1..da3d7eeec0 100644
Binary files a/app/res/drawable-hdpi/play_question_audio.png and b/app/res/drawable-hdpi/play_question_audio.png differ
diff --git a/app/res/drawable-ldpi-v14/notification.png b/app/res/drawable-ldpi-v14/notification.png
deleted file mode 100644
index 51ba81206b..0000000000
Binary files a/app/res/drawable-ldpi-v14/notification.png and /dev/null differ
diff --git a/app/res/drawable-ldpi/icon_app_white.png b/app/res/drawable-ldpi/icon_app_white.png
deleted file mode 100644
index 0495c7abdb..0000000000
Binary files a/app/res/drawable-ldpi/icon_app_white.png and /dev/null differ
diff --git a/app/res/drawable-ldpi/notification.png b/app/res/drawable-ldpi/notification.png
deleted file mode 100644
index 3a53999386..0000000000
Binary files a/app/res/drawable-ldpi/notification.png and /dev/null differ
diff --git a/app/res/drawable-mdpi-v14/notification.png b/app/res/drawable-mdpi-v14/notification.png
deleted file mode 100644
index 283e66dce0..0000000000
Binary files a/app/res/drawable-mdpi-v14/notification.png and /dev/null differ
diff --git a/app/res/drawable-mdpi/icon_app_white.png b/app/res/drawable-mdpi/icon_app_white.png
deleted file mode 100644
index 90f745543b..0000000000
Binary files a/app/res/drawable-mdpi/icon_app_white.png and /dev/null differ
diff --git a/app/res/drawable-mdpi/notification.png b/app/res/drawable-mdpi/notification.png
deleted file mode 100644
index 88bba12b48..0000000000
Binary files a/app/res/drawable-mdpi/notification.png and /dev/null differ
diff --git a/app/res/drawable-mdpi/pause_question_audio.png b/app/res/drawable-mdpi/pause_question_audio.png
index 61edf086c1..1bd7dcb056 100644
Binary files a/app/res/drawable-mdpi/pause_question_audio.png and b/app/res/drawable-mdpi/pause_question_audio.png differ
diff --git a/app/res/drawable-mdpi/play_question_audio.png b/app/res/drawable-mdpi/play_question_audio.png
index a52be7a023..912853bbdb 100644
Binary files a/app/res/drawable-mdpi/play_question_audio.png and b/app/res/drawable-mdpi/play_question_audio.png differ
diff --git a/app/res/drawable-xhdpi/icon_app_white.png b/app/res/drawable-xhdpi/icon_app_white.png
deleted file mode 100644
index 12f02e63f3..0000000000
Binary files a/app/res/drawable-xhdpi/icon_app_white.png and /dev/null differ
diff --git a/app/res/drawable-xhdpi/pause_question_audio.png b/app/res/drawable-xhdpi/pause_question_audio.png
index 627f96e7e0..1f77f3a5dd 100644
Binary files a/app/res/drawable-xhdpi/pause_question_audio.png and b/app/res/drawable-xhdpi/pause_question_audio.png differ
diff --git a/app/res/drawable-xhdpi/play_question_audio.png b/app/res/drawable-xhdpi/play_question_audio.png
index fb26073fe6..d231d4a4d0 100644
Binary files a/app/res/drawable-xhdpi/play_question_audio.png and b/app/res/drawable-xhdpi/play_question_audio.png differ
diff --git a/app/res/drawable-xxxhdpi/pause_question_audio.png b/app/res/drawable-xxxhdpi/pause_question_audio.png
index 295a704ff6..74d106537f 100644
Binary files a/app/res/drawable-xxxhdpi/pause_question_audio.png and b/app/res/drawable-xxxhdpi/pause_question_audio.png differ
diff --git a/app/res/drawable-xxxhdpi/play_question_audio.png b/app/res/drawable-xxxhdpi/play_question_audio.png
index 4655703b3f..628e87ea15 100644
Binary files a/app/res/drawable-xxxhdpi/play_question_audio.png and b/app/res/drawable-xxxhdpi/play_question_audio.png differ
diff --git a/app/res/drawable/actionbar_modern_spacing.xml b/app/res/drawable/actionbar_modern_spacing.xml
deleted file mode 100644
index acf2c3d719..0000000000
--- a/app/res/drawable/actionbar_modern_spacing.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:left="8dp"
-        android:drawable="@drawable/icon_app_white"
-        android:right="8dp"/>
-</layer-list>
\ No newline at end of file
diff --git a/app/res/drawable/btn_finish_background.xml b/app/res/drawable/btn_finish_background.xml
index 060b6bed00..ead1dc4273 100644
--- a/app/res/drawable/btn_finish_background.xml
+++ b/app/res/drawable/btn_finish_background.xml
@@ -4,5 +4,5 @@
         android:state_pressed="true"
         android:drawable="@color/cc_attention_positive_text"/>
     <item
-        android:drawable="@color/cc_attention_positive_color"/>
+        android:drawable="@color/start_home_button"/>
 </selector>
\ No newline at end of file
diff --git a/app/res/drawable/button_background_white.xml b/app/res/drawable/button_background_white.xml
new file mode 100644
index 0000000000..dedb7d4e34
--- /dev/null
+++ b/app/res/drawable/button_background_white.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/white" /> <!-- Background color -->
+    <corners android:radius="22dp" /> <!-- Rounded corners -->
+    <stroke
+        android:width="2dp"
+        android:color="@color/cc_brand_color" /> <!-- Optional border -->
+</shape>
diff --git a/app/res/drawable/button_green_background.xml b/app/res/drawable/button_green_background.xml
deleted file mode 100644
index 7c1d045bc2..0000000000
--- a/app/res/drawable/button_green_background.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:drawable="@color/green_700" android:state_enabled="false" />
-    <item android:drawable="@color/green_900" android:state_pressed="true" />
-    <item android:drawable="@color/green_500" />
-
-</selector>
\ No newline at end of file
diff --git a/app/res/drawable/button_orange_background.xml b/app/res/drawable/button_orange_background.xml
deleted file mode 100644
index dd8e722370..0000000000
--- a/app/res/drawable/button_orange_background.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:drawable="@color/orange_700" android:state_enabled="false" />
-    <item android:drawable="@color/orange_900" android:state_pressed="true" />
-    <item android:drawable="@color/orange_500" />
-
-</selector>
\ No newline at end of file
diff --git a/app/res/drawable/button_red_background.xml b/app/res/drawable/button_red_background.xml
deleted file mode 100644
index 2c16258f98..0000000000
--- a/app/res/drawable/button_red_background.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <item android:drawable="@color/red_700" android:state_enabled="false" />
-    <item android:drawable="@color/red_900" android:state_pressed="true" />
-    <item android:drawable="@color/red_500" />
-
-</selector>
\ No newline at end of file
diff --git a/app/res/drawable/ccbanner.png b/app/res/drawable/ccbanner.png
deleted file mode 100644
index 423a53be10..0000000000
Binary files a/app/res/drawable/ccbanner.png and /dev/null differ
diff --git a/app/res/drawable/check_update.xml b/app/res/drawable/check_update.xml
index 4e69e9ed32..c963c7cb1b 100644
--- a/app/res/drawable/check_update.xml
+++ b/app/res/drawable/check_update.xml
@@ -5,5 +5,5 @@
         android:viewportHeight="232.5">
     <path
         android:pathData="M238.1,74.1l-117.2,109.2l-0.8,-0.9l-23,-24.6l-34,-36.6l25.2,-23.4l34,36.4l91.9,-85.7z"
-        android:fillColor="#BCDEFF"/>
+        android:fillColor="@color/square_button_icon_color"/>
 </vector>
diff --git a/app/res/drawable/commcare_actionbar_logo.xml b/app/res/drawable/commcare_actionbar_logo.xml
new file mode 100644
index 0000000000..0157ae2e24
--- /dev/null
+++ b/app/res/drawable/commcare_actionbar_logo.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="20dp"
+    android:height="20dp"
+    android:viewportWidth="20"
+    android:viewportHeight="20">
+  <path
+      android:pathData="M10,10m-10,0a10,10 0,1 1,20 0a10,10 0,1 1,-20 0"
+      android:fillColor="#000000"/>
+  <path
+      android:pathData="M17.591,8.821C17.286,7.737 16.584,6.836 15.611,6.287C15.111,6.005 14.57,5.834 14.018,5.775C13.992,5.539 13.95,5.304 13.886,5.071C13.582,3.987 12.879,3.086 11.907,2.537C10.934,1.987 9.809,1.854 8.738,2.162C7.667,2.47 6.777,3.181 6.235,4.166C5.956,4.672 5.788,5.22 5.729,5.779C5.496,5.805 5.264,5.847 5.034,5.912C3.963,6.22 3.073,6.931 2.53,7.916C1.988,8.9 1.856,10.039 2.16,11.124C2.465,12.208 3.167,13.108 4.14,13.658C4.639,13.94 5.181,14.11 5.733,14.17C5.759,14.405 5.801,14.641 5.865,14.873C6.169,15.958 6.872,16.858 7.844,17.408C8.817,17.957 9.942,18.09 11.013,17.782C12.084,17.474 12.974,16.763 13.516,15.778C13.795,15.273 13.963,14.725 14.022,14.165C14.255,14.139 14.487,14.097 14.717,14.032C15.788,13.724 16.678,13.013 17.221,12.029C17.762,11.044 17.893,9.905 17.591,8.821ZM7.498,4.88C7.853,4.238 8.432,3.773 9.132,3.572C9.832,3.371 10.566,3.458 11.201,3.816C11.837,4.175 12.295,4.762 12.494,5.47C12.532,5.606 12.557,5.743 12.574,5.882C12.634,6.365 12.569,6.852 12.378,7.303C12.341,7.391 12.3,7.479 12.252,7.565C12.145,7.76 11.948,8.091 11.711,8.481C10.755,7.868 8.835,6.644 8.203,6.287C7.875,6.102 7.53,5.969 7.176,5.879C7.217,5.532 7.326,5.194 7.498,4.88ZM10.946,9.973C10.946,10.571 10.466,11.057 9.875,11.057C9.284,11.057 8.804,10.571 8.804,9.973C8.804,9.374 9.284,8.889 9.875,8.889C10.466,8.889 10.946,9.374 10.946,9.973ZM6.233,11.666C6.05,11.997 5.919,12.347 5.831,12.705C5.488,12.662 5.154,12.552 4.844,12.377C4.21,12.019 3.75,11.432 3.551,10.723C3.353,10.015 3.438,9.272 3.793,8.629C4.147,7.985 4.727,7.521 5.426,7.32C5.561,7.281 5.696,7.257 5.833,7.239C6.31,7.179 6.792,7.244 7.237,7.437C7.324,7.475 7.411,7.518 7.496,7.566C7.688,7.674 8.015,7.874 8.401,8.114C7.796,9.082 6.587,11.027 6.233,11.666ZM12.251,15.064C11.897,15.706 11.317,16.172 10.617,16.373C9.918,16.574 9.184,16.487 8.548,16.128C7.913,15.77 7.454,15.183 7.256,14.475C7.217,14.339 7.193,14.201 7.176,14.063C7.116,13.58 7.18,13.093 7.37,12.642C7.407,12.553 7.448,12.465 7.497,12.38C7.604,12.185 7.801,11.854 8.038,11.463C8.995,12.076 10.914,13.301 11.547,13.658C11.874,13.843 12.22,13.976 12.574,14.066C12.532,14.412 12.424,14.751 12.251,15.064ZM15.955,11.314C15.601,11.958 15.021,12.422 14.322,12.623C14.188,12.662 14.052,12.686 13.915,12.704C13.438,12.764 12.957,12.699 12.511,12.506C12.424,12.468 12.337,12.426 12.252,12.377C12.06,12.269 11.733,12.069 11.347,11.829C11.953,10.861 13.162,8.918 13.515,8.277C13.698,7.946 13.829,7.596 13.918,7.238C14.26,7.281 14.594,7.391 14.904,7.566C15.538,7.925 15.998,8.511 16.197,9.22C16.395,9.928 16.31,10.673 15.955,11.314Z"
+      android:fillColor="#ffffff"/>
+</vector>
diff --git a/app/res/drawable/commcare_actionbar_logo_spacing.xml b/app/res/drawable/commcare_actionbar_logo_spacing.xml
new file mode 100644
index 0000000000..31f5d733b5
--- /dev/null
+++ b/app/res/drawable/commcare_actionbar_logo_spacing.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:drawable="@drawable/commcare_actionbar_logo"
+        android:right="16dp"/>
+</layer-list>
\ No newline at end of file
diff --git a/app/res/drawable/home_incomplete.xml b/app/res/drawable/home_incomplete.xml
index b5115fbd1c..394c4221bf 100644
--- a/app/res/drawable/home_incomplete.xml
+++ b/app/res/drawable/home_incomplete.xml
@@ -1,10 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="167dp"
-    android:height="168dp"
-    android:viewportWidth="167"
-    android:viewportHeight="168">
+    android:width="300dp"
+    android:height="233dp"
+    android:viewportWidth="300"
+    android:viewportHeight="233">
   <path
-      android:pathData="M54.73,22.85C58.9,10.98 70.23,2.49 83.53,2.49C96.83,2.49 108.16,10.98 112.33,22.85H124.26C135.5,22.85 144.63,31.98 144.63,43.22V145.04C144.63,156.28 135.5,165.41 124.26,165.41H42.8C31.57,165.41 22.44,156.28 22.44,145.04V43.22C22.44,31.98 31.57,22.85 42.8,22.85H54.73ZM90.73,25.83C88.82,23.92 86.23,22.85 83.53,22.85C80.83,22.85 78.24,23.92 76.33,25.83C74.42,27.74 73.35,30.33 73.35,33.03C73.35,35.73 74.42,38.32 76.33,40.23C78.24,42.14 80.83,43.22 83.53,43.22C86.23,43.22 88.82,42.14 90.73,40.23C92.64,38.32 93.72,35.73 93.72,33.03C93.72,30.33 92.64,27.74 90.73,25.83ZM47.58,71.95C46.15,73.38 45.35,75.32 45.35,77.35C45.35,79.38 46.15,81.32 47.58,82.75C49.02,84.18 50.96,84.99 52.98,84.99C55.01,84.99 56.95,84.18 58.38,82.75C59.82,81.32 60.62,79.38 60.62,77.35C60.62,75.32 59.82,73.38 58.38,71.95C56.95,70.52 55.01,69.71 52.98,69.71C50.96,69.71 49.02,70.52 47.58,71.95ZM119.17,72.26H78.44C75.64,72.26 73.35,74.55 73.35,77.35C73.35,80.15 75.64,82.44 78.44,82.44H119.17C121.97,82.44 124.26,80.15 124.26,77.35C124.26,74.55 121.97,72.26 119.17,72.26ZM128.84,124.26C128.84,135.51 119.72,144.63 108.47,144.63C97.22,144.63 88.1,135.51 88.1,124.26C88.1,113.01 97.22,103.9 108.47,103.9C119.72,103.9 128.84,113.01 128.84,124.26ZM110.38,115.99C110.38,114.93 109.53,114.08 108.47,114.08C107.41,114.08 106.56,114.93 106.56,115.99V124.9C106.56,125.96 107.41,126.81 108.47,126.81C109.53,126.81 110.38,125.96 110.38,124.9V115.99ZM108.47,134.45C109.88,134.45 111.02,133.31 111.02,131.9C111.02,130.49 109.88,129.35 108.47,129.35C107.06,129.35 105.92,130.49 105.92,131.9C105.92,133.31 107.06,134.45 108.47,134.45Z"
-      android:fillColor="#ffffff"
+      android:pathData="M122.98,58.67C126.89,47.53 137.52,39.56 150,39.56C162.48,39.56 173.11,47.53 177.02,58.67H188.22C198.76,58.67 207.33,67.24 207.33,77.78V173.33C207.33,183.87 198.76,192.44 188.22,192.44H111.78C101.24,192.44 92.67,183.87 92.67,173.33V77.78C92.67,67.24 101.24,58.67 111.78,58.67H122.98ZM156.76,61.47C154.96,59.68 152.53,58.67 150,58.67C147.47,58.67 145.04,59.68 143.24,61.47C141.45,63.26 140.45,65.69 140.45,68.22C140.45,70.76 141.45,73.19 143.24,74.98C145.04,76.77 147.47,77.78 150,77.78C152.53,77.78 154.96,76.77 156.76,74.98C158.55,73.19 159.55,70.76 159.55,68.22C159.55,65.69 158.55,63.26 156.76,61.47ZM116.27,104.74C114.92,106.08 114.17,107.91 114.17,109.81C114.17,111.71 114.92,113.53 116.27,114.88C117.61,116.22 119.43,116.97 121.33,116.97C123.24,116.97 125.06,116.22 126.4,114.88C127.75,113.53 128.5,111.71 128.5,109.81C128.5,107.91 127.75,106.08 126.4,104.74C125.06,103.4 123.24,102.64 121.33,102.64C119.43,102.64 117.61,103.4 116.27,104.74ZM183.44,105.03H145.22C142.6,105.03 140.45,107.18 140.45,109.81C140.45,112.44 142.6,114.59 145.22,114.59H183.44C186.07,114.59 188.22,112.44 188.22,109.81C188.22,107.18 186.07,105.03 183.44,105.03ZM192.51,153.83C192.51,164.38 183.96,172.94 173.4,172.94C162.85,172.94 154.29,164.38 154.29,153.83C154.29,143.27 162.85,134.72 173.4,134.72C183.96,134.72 192.51,143.27 192.51,153.83ZM175.19,146.07C175.19,145.07 174.39,144.27 173.4,144.27C172.41,144.27 171.61,145.07 171.61,146.07V154.43C171.61,155.42 172.41,156.22 173.4,156.22C174.39,156.22 175.19,155.42 175.19,154.43V146.07ZM173.4,163.38C174.72,163.38 175.79,162.32 175.79,161C175.79,159.68 174.72,158.61 173.4,158.61C172.08,158.61 171.01,159.68 171.01,161C171.01,162.32 172.08,163.38 173.4,163.38Z"
+      android:fillColor="@color/square_button_icon_color"
       android:fillType="evenOdd"/>
 </vector>
diff --git a/app/res/drawable/home_logout.xml b/app/res/drawable/home_logout.xml
index a5e310ef93..e448c752cb 100644
--- a/app/res/drawable/home_logout.xml
+++ b/app/res/drawable/home_logout.xml
@@ -1,12 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="748dp"
-    android:height="748dp"
-    android:viewportWidth="748"
-    android:viewportHeight="748">
+    android:width="300dp"
+    android:height="233dp"
+    android:viewportWidth="300"
+    android:viewportHeight="233">
   <path
-      android:pathData="M522.21,145.36C526.28,148.26 529.77,151.64 533.23,155.23C535.02,157.02 536.88,158.67 538.81,160.31C542.02,163.08 545.02,165.99 548,169C550.92,171.95 553.85,174.8 557,177.5C561.08,180.98 564.8,184.78 568.56,188.59C570.65,190.65 572.77,192.6 575,194.5C579.08,197.98 582.8,201.78 586.56,205.59C588.65,207.65 590.77,209.6 593,211.5C597.08,214.98 600.8,218.78 604.56,222.59C606.65,224.65 608.77,226.6 611,228.5C615.08,231.98 618.8,235.78 622.56,239.59C624.65,241.65 626.77,243.6 629,245.5C633.08,248.98 636.8,252.78 640.56,256.59C642.65,258.65 644.77,260.6 647,262.5C651.08,265.98 654.8,269.78 658.56,273.59C660.65,275.65 662.77,277.6 665,279.5C669.08,282.98 672.8,286.78 676.56,290.59C678.65,292.65 680.77,294.6 683,296.5C687.08,299.98 690.8,303.78 694.56,307.59C696.65,309.65 698.77,311.6 701,313.5C705.08,316.98 708.8,320.78 712.56,324.59C714.65,326.65 716.77,328.6 719,330.5C723.07,333.98 726.8,337.77 730.55,341.6C732.7,343.7 734.9,345.57 737.25,347.44C742.6,351.99 746.83,359.01 748,366C748.86,378.84 747.6,388.4 739.18,398.65C735.65,402.46 731.8,405.91 727.93,409.36C725.45,411.59 723.08,413.87 720.75,416.25C718.29,418.75 715.78,421.1 713.13,423.38C709.93,426.12 706.96,429.01 704,432C700.48,435.56 696.87,438.9 693.06,442.16C690.61,444.35 688.31,446.66 686,449C682.48,452.56 678.87,455.9 675.06,459.16C672.61,461.35 670.31,463.66 668,466C664.48,469.56 660.87,472.9 657.06,476.16C654.61,478.35 652.31,480.66 650,483C646.48,486.56 642.87,489.9 639.06,493.16C636.61,495.35 634.31,497.66 632,500C628.48,503.56 624.87,506.9 621.06,510.16C618.61,512.35 616.31,514.66 614,517C610.48,520.56 606.87,523.9 603.06,527.16C600.61,529.35 598.31,531.66 596,534C592.48,537.56 588.87,540.9 585.06,544.16C582.61,546.35 580.31,548.66 578,551C574.48,554.56 570.87,557.9 567.06,561.16C564.61,563.35 562.31,565.66 560,568C556.48,571.56 552.87,574.9 549.06,578.16C546.61,580.35 544.31,582.66 542,585C538.4,588.63 534.75,592.11 530.85,595.41C529.66,596.44 528.5,597.49 527.37,598.59C520.52,605.09 512.35,608.26 502.94,608.56C491.94,608.11 482.89,604.22 475.32,596.22C468.37,587.75 466.39,578.27 466.55,567.56C466.55,566.48 466.54,565.39 466.54,564.28C466.55,560.73 466.58,557.19 466.61,553.64C466.62,551.17 466.62,548.7 466.63,546.23C466.64,539.75 466.68,533.27 466.73,526.79C466.77,520.17 466.78,513.54 466.8,506.92C466.85,493.95 466.91,480.97 467,468C465.52,468 465.52,468 464.02,468.01C440.04,468.08 416.06,468.12 392.08,468.16C380.48,468.17 368.88,468.19 357.29,468.23C347.18,468.26 337.07,468.28 326.96,468.28C321.61,468.29 316.26,468.3 310.91,468.32C305.86,468.34 300.82,468.34 295.78,468.34C293.93,468.34 292.09,468.35 290.24,468.36C274.06,468.45 259.25,466.57 246.88,455C235.96,443.36 232.86,430.62 232.84,415.05C232.83,414.07 232.83,413.1 232.82,412.09C232.81,408.88 232.8,405.67 232.8,402.46C232.79,401.36 232.79,400.26 232.79,399.12C232.77,393.28 232.76,387.44 232.76,381.61C232.75,375.61 232.73,369.6 232.7,363.6C232.68,358.96 232.68,354.32 232.68,349.68C232.67,347.47 232.67,345.26 232.65,343.05C232.55,324.82 233.14,307.83 246.25,293.62C256.42,284.18 268.17,279.83 281.93,279.88C282.72,279.88 283.51,279.88 284.33,279.88C286.98,279.88 289.63,279.88 292.28,279.89C294.19,279.89 296.09,279.89 297.99,279.89C303.15,279.89 308.32,279.89 313.48,279.9C318.88,279.9 324.27,279.91 329.67,279.91C339.88,279.91 350.1,279.92 360.32,279.93C371.95,279.94 383.58,279.94 395.22,279.95C419.14,279.96 443.07,279.98 467,280C467,279.44 466.99,278.88 466.99,278.31C466.93,264.7 466.88,251.1 466.84,237.49C466.83,230.91 466.81,224.33 466.77,217.75C466.74,211.4 466.72,205.04 466.72,198.69C466.71,196.27 466.7,193.85 466.68,191.43C466.66,188.03 466.66,184.63 466.66,181.23C466.65,180.24 466.64,179.25 466.63,178.22C466.68,166.91 469.88,157.59 477.63,149.25C489.91,137.88 508.08,136.71 522.21,145.36Z"
-      android:fillColor="#FFFFFF"/>
-  <path
-      android:pathData="M143.68,45.84C145.19,45.83 145.19,45.83 146.73,45.82C150.01,45.81 153.3,45.8 156.59,45.8C157.72,45.79 158.85,45.79 160.02,45.79C166,45.77 171.99,45.76 177.98,45.76C184.13,45.75 190.28,45.73 196.43,45.7C201.19,45.68 205.95,45.68 210.72,45.68C212.98,45.67 215.25,45.67 217.52,45.65C235.9,45.55 253.05,46.02 267.38,59.25C277.29,69.93 281.36,82.21 281.21,96.59C280.44,108.89 274.99,120.57 266,129C254.4,138.7 242.37,141.15 227.67,141.14C226.14,141.15 226.14,141.15 224.59,141.15C222.39,141.16 220.19,141.17 218,141.17C214.51,141.18 211.02,141.19 207.54,141.21C197.63,141.26 187.72,141.31 177.81,141.33C171.74,141.34 165.67,141.37 159.6,141.41C157.29,141.42 154.99,141.42 152.69,141.42C135.89,141.18 135.89,141.18 120,146C118.37,146.78 118.37,146.78 116.7,147.57C105.55,154.64 98.59,164.34 95.45,177.26C94.93,180.43 94.87,183.43 94.87,186.64C94.86,187.3 94.86,187.95 94.86,188.63C94.85,190.83 94.85,193.04 94.85,195.24C94.85,196.84 94.85,198.43 94.84,200.03C94.83,204.42 94.83,208.81 94.83,213.19C94.82,217.92 94.81,222.65 94.8,227.39C94.78,238.81 94.77,250.24 94.76,261.67C94.76,267.05 94.75,272.43 94.75,277.81C94.73,295.71 94.72,313.61 94.71,331.5C94.71,336.15 94.71,340.79 94.7,345.43C94.7,347.17 94.7,347.17 94.7,348.93C94.7,367.62 94.67,386.32 94.64,405.01C94.6,424.2 94.59,443.4 94.58,462.6C94.58,473.37 94.57,484.15 94.55,494.92C94.52,504.1 94.52,513.28 94.53,522.46C94.53,527.14 94.53,531.82 94.51,536.5C94.49,540.79 94.49,545.08 94.51,549.37C94.51,550.91 94.51,552.46 94.49,554.01C94.39,568.16 96.86,580.78 106,592C116.4,602.38 127.78,606.14 142.09,606.16C143.11,606.16 144.12,606.17 145.16,606.17C147.36,606.18 149.56,606.19 151.76,606.2C155.25,606.21 158.74,606.23 162.23,606.25C172.16,606.31 182.08,606.37 192.01,606.4C198.08,606.42 204.16,606.46 210.23,606.5C212.54,606.52 214.84,606.52 217.15,606.53C235.62,606.56 252.97,606.95 267.38,620.25C277.29,630.93 281.36,643.21 281.21,657.59C280.44,669.89 274.99,681.57 266,690C254.5,699.61 242.51,702.15 227.85,702.15C226.36,702.15 226.36,702.15 224.83,702.16C221.55,702.16 218.26,702.17 214.98,702.17C212.68,702.17 210.38,702.17 208.08,702.18C203.25,702.18 198.43,702.19 193.6,702.19C187.46,702.19 181.32,702.2 175.19,702.22C170.43,702.23 165.67,702.23 160.91,702.23C158.65,702.23 156.39,702.23 154.13,702.24C137.78,702.29 121.17,702.27 105.31,697.75C104.53,697.53 103.74,697.32 102.93,697.09C79.5,690.41 59.67,678.7 42,662C40.78,660.88 40.78,660.88 39.54,659.74C21.97,643 10.54,621.18 4,598C3.81,597.35 3.62,596.7 3.42,596.03C-1.55,578.31 -0.57,559.75 -0.51,541.52C-0.5,536.57 -0.51,531.63 -0.52,526.68C-0.53,517.02 -0.52,507.36 -0.51,497.7C-0.49,486.43 -0.5,475.16 -0.5,463.89C-0.51,443.77 -0.49,423.65 -0.47,403.54C-0.44,384.05 -0.44,364.56 -0.45,345.07C-0.46,323.81 -0.46,302.55 -0.44,281.28C-0.44,279.01 -0.44,276.74 -0.44,274.47C-0.44,273.36 -0.44,272.24 -0.44,271.09C-0.43,263.25 -0.44,255.4 -0.44,247.56C-0.44,238 -0.44,228.43 -0.42,218.87C-0.41,214 -0.4,209.12 -0.41,204.25C-0.42,199.78 -0.41,195.31 -0.39,190.84C-0.39,189.23 -0.39,187.62 -0.4,186.02C-0.51,156.71 8.2,127.54 26,104C26.66,103.12 27.32,102.24 28,101.33C50.67,72.44 82.46,53 118.9,47.36C127.17,46.4 135.35,45.85 143.68,45.84Z"
-      android:fillColor="#FFFFFF"/>
+      android:pathData="M120.75,67.5C126.14,67.5 130.5,63.14 130.5,57.75C130.5,52.36 126.14,48 120.75,48H101.25C85.1,48 72,61.1 72,77.25V155.25C72,171.4 85.1,184.5 101.25,184.5H120.75C126.14,184.5 130.5,180.14 130.5,174.75C130.5,169.36 126.14,165 120.75,165H101.25C95.86,165 91.5,160.64 91.5,155.25V77.25C91.5,71.86 95.86,67.5 101.25,67.5H120.75ZM225.71,121.55C227.18,120.18 228,118.26 228,116.25C228,114.24 227.18,112.32 225.71,110.95L181.84,69.51C179.71,67.5 176.6,66.95 173.92,68.11C171.24,69.27 169.5,71.92 169.5,74.81V96.75H130.5C125.11,96.75 120.75,101.11 120.75,106.5V126C120.75,131.39 125.11,135.75 130.5,135.75H169.5V157.69C169.5,160.61 171.24,163.23 173.92,164.39C176.6,165.55 179.71,165 181.84,162.99L225.71,121.55Z"
+      android:fillColor="@color/square_button_icon_color"/>
 </vector>
diff --git a/app/res/drawable/home_saved.xml b/app/res/drawable/home_saved.xml
index 25b33040c4..d20a0f5b00 100644
--- a/app/res/drawable/home_saved.xml
+++ b/app/res/drawable/home_saved.xml
@@ -1,5 +1,9 @@
-<vector android:height="48dp" android:tint="#FFFFFF"
-    android:viewportHeight="24" android:viewportWidth="24"
-    android:width="48dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@android:color/white" android:pathData="M17,3L5,3c-1.11,0 -2,0.9 -2,2v14c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2L21,7l-4,-4zM12,19c-1.66,0 -3,-1.34 -3,-3s1.34,-3 3,-3 3,1.34 3,3 -1.34,3 -3,3zM15,9L5,9L5,5h10v4z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="300dp"
+    android:height="233dp"
+    android:viewportWidth="300"
+    android:viewportHeight="233">
+  <path
+      android:pathData="M94.21,38C81.96,38 72,48 72,60.3V171.78C72,184.07 81.96,194.07 94.21,194.07H205.29C217.54,194.07 227.5,184.07 227.5,171.78V87.23C227.5,81.3 225.17,75.62 221.01,71.44L194.18,44.51C190.01,40.33 184.36,38 178.46,38H94.21ZM94.21,71.44C94.21,65.28 99.18,60.3 105.32,60.3H171.96C178.11,60.3 183.07,65.28 183.07,71.44V93.74C183.07,99.91 178.11,104.89 171.96,104.89H105.32C99.18,104.89 94.21,99.91 94.21,93.74V71.44ZM149.75,171.78C137.5,171.78 127.54,161.78 127.54,149.48C127.54,137.18 137.5,127.18 149.75,127.18C162,127.18 171.96,137.18 171.96,149.48C171.96,161.78 162,171.78 149.75,171.78Z"
+      android:fillColor="@color/square_button_icon_color"/>
 </vector>
diff --git a/app/res/drawable/home_start.xml b/app/res/drawable/home_start.xml
index c66a93bd48..044cc99479 100644
--- a/app/res/drawable/home_start.xml
+++ b/app/res/drawable/home_start.xml
@@ -1,15 +1,13 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="704dp"
-    android:height="704dp"
-    android:viewportWidth="704"
-    android:viewportHeight="704">
-  <path
-      android:pathData="M132.05,87.6C133.59,87.59 135.12,87.58 136.65,87.58C140.75,87.56 144.86,87.56 148.96,87.56C152.41,87.57 155.85,87.56 159.3,87.56C167.42,87.54 175.55,87.54 183.68,87.55C192.04,87.57 200.39,87.55 208.75,87.52C215.96,87.5 223.17,87.5 230.38,87.5C234.67,87.5 238.96,87.5 243.25,87.49C247.28,87.47 251.31,87.47 255.34,87.49C256.81,87.5 258.29,87.49 259.76,87.48C273.26,87.39 284.54,90.23 294.69,99.44C295.45,100.28 296.21,101.13 297,102C297.85,102.93 298.69,103.86 299.56,104.81C308.11,115.29 309.21,128 308,141C305.97,150.36 301.09,158.6 294,165C293.07,165.85 292.14,166.69 291.19,167.56C281.54,175.43 271.33,176.3 259.3,176.27C257.91,176.28 256.53,176.28 255.14,176.29C252.16,176.3 249.18,176.3 246.2,176.3C241.48,176.31 236.76,176.33 232.04,176.35C220.31,176.39 208.58,176.43 196.84,176.45C187.73,176.46 178.62,176.49 169.5,176.53C164.82,176.55 160.14,176.56 155.46,176.56C152.53,176.56 149.6,176.57 146.67,176.59C144.69,176.6 142.72,176.59 140.74,176.59C128.86,176.68 116.89,177.95 107,185C105.86,185.8 105.86,185.8 104.7,186.61C94.67,194.5 90.58,205.71 89,218C88.73,222.91 88.72,227.82 88.74,232.74C88.74,234.21 88.73,235.68 88.73,237.15C88.72,241.15 88.72,245.16 88.72,249.17C88.73,253.5 88.72,257.83 88.71,262.17C88.7,270.64 88.7,279.12 88.7,287.6C88.7,294.49 88.7,301.38 88.69,308.28C88.69,309.26 88.69,310.24 88.69,311.25C88.69,313.25 88.69,315.24 88.69,317.24C88.68,335.95 88.68,354.65 88.69,373.36C88.69,390.45 88.68,407.54 88.66,424.64C88.64,442.21 88.63,459.78 88.64,477.35C88.64,487.21 88.64,497.07 88.62,506.93C88.61,515.32 88.61,523.71 88.62,532.1C88.63,536.38 88.63,540.66 88.62,544.93C88.6,548.86 88.61,552.78 88.62,556.7C88.62,558.12 88.62,559.53 88.61,560.94C88.55,573.56 89.47,586.44 97,597C97.53,597.76 98.06,598.52 98.61,599.3C106.5,609.33 117.71,613.42 130,615C134.91,615.27 139.82,615.28 144.74,615.26C146.21,615.26 147.68,615.27 149.15,615.27C153.15,615.28 157.16,615.28 161.17,615.28C165.5,615.27 169.83,615.28 174.17,615.29C182.64,615.3 191.12,615.3 199.6,615.3C206.49,615.3 213.38,615.3 220.28,615.31C221.75,615.31 221.75,615.31 223.25,615.31C225.25,615.31 227.24,615.31 229.24,615.31C247.95,615.32 266.65,615.32 285.36,615.31C302.45,615.31 319.54,615.32 336.64,615.34C354.21,615.36 371.78,615.37 389.35,615.36C399.21,615.36 409.07,615.36 418.93,615.38C427.32,615.39 435.71,615.39 444.1,615.38C448.38,615.37 452.66,615.37 456.93,615.38C460.86,615.4 464.78,615.39 468.7,615.38C470.12,615.38 471.53,615.38 472.94,615.39C485.56,615.45 498.44,614.53 509,607C509.76,606.47 510.52,605.94 511.3,605.39C521.34,597.5 525.41,586.29 527,574C527.27,569.26 527.27,564.54 527.26,559.8C527.26,558.41 527.26,557.01 527.27,555.62C527.27,552.64 527.28,549.67 527.27,546.69C527.27,541.97 527.29,537.26 527.3,532.54C527.35,519.13 527.37,505.73 527.38,492.32C527.38,484.9 527.4,477.48 527.44,470.06C527.46,465.38 527.46,460.7 527.45,456.02C527.45,453.1 527.46,450.18 527.48,447.26C527.49,445.28 527.47,443.3 527.46,441.32C527.57,429.01 531.11,418.5 539.44,409.31C540.28,408.55 541.13,407.79 542,407C542.93,406.15 543.86,405.31 544.81,404.44C555.29,395.89 568,394.79 581,396C590.36,398.03 598.6,402.91 605,410C605.85,410.93 606.69,411.86 607.56,412.81C613.39,419.96 616.24,428.47 616.27,437.67C616.28,438.97 616.28,440.27 616.29,441.61C616.29,443.04 616.29,444.46 616.29,445.89C616.3,447.4 616.3,448.92 616.31,450.44C616.33,454.54 616.33,458.65 616.33,462.75C616.34,465.33 616.34,467.9 616.35,470.48C616.36,479.49 616.37,488.5 616.37,497.51C616.37,505.86 616.39,514.21 616.42,522.56C616.45,529.76 616.46,536.96 616.46,544.16C616.46,548.45 616.46,552.74 616.48,557.02C616.66,594.29 610.94,627.73 586,657C585.26,657.88 584.52,658.76 583.76,659.66C561.71,685.01 529.8,701.92 496.04,704.28C491.9,704.39 487.77,704.41 483.63,704.39C482.05,704.39 480.47,704.4 478.88,704.4C474.58,704.42 470.28,704.41 465.97,704.41C461.31,704.4 456.65,704.41 451.99,704.42C442.88,704.44 433.77,704.44 424.66,704.44C417.25,704.43 409.83,704.44 402.42,704.44C401.37,704.44 400.31,704.44 399.22,704.44C397.07,704.44 394.92,704.45 392.77,704.45C372.64,704.46 352.52,704.46 332.39,704.44C314.02,704.43 295.64,704.45 277.26,704.47C258.36,704.5 239.45,704.51 220.54,704.5C209.94,704.49 199.34,704.5 188.74,704.51C179.72,704.53 170.69,704.53 161.67,704.51C157.07,704.5 152.48,704.5 147.88,704.52C110.27,704.63 76.58,699.2 47,674C46.12,673.26 45.24,672.52 44.34,671.76C18.99,649.71 2.08,617.8 -0.28,584.04C-0.39,579.9 -0.41,575.77 -0.39,571.63C-0.39,570.05 -0.4,568.47 -0.4,566.88C-0.42,562.58 -0.41,558.28 -0.41,553.97C-0.4,549.31 -0.41,544.65 -0.42,539.99C-0.44,530.88 -0.44,521.77 -0.44,512.66C-0.43,505.25 -0.44,497.83 -0.44,490.42C-0.44,488.84 -0.44,488.84 -0.44,487.22C-0.44,485.07 -0.45,482.92 -0.45,480.77C-0.46,460.64 -0.46,440.52 -0.44,420.39C-0.43,402.02 -0.45,383.64 -0.47,365.26C-0.5,346.36 -0.51,327.45 -0.5,308.54C-0.49,297.94 -0.5,287.34 -0.51,276.74C-0.53,267.72 -0.53,258.69 -0.51,249.67C-0.5,245.07 -0.5,240.48 -0.52,235.88C-0.63,198.27 4.8,164.58 30,135C30.74,134.12 31.48,133.24 32.24,132.34C57.57,103.22 93.61,87.46 132.05,87.6Z"
-      android:fillColor="#FFFFFF"/>
-  <path
-      android:pathData="M466,102C469.86,103.79 472.53,106.25 475.49,109.25C476.03,109.79 476.58,110.33 477.14,110.89C478.95,112.7 480.76,114.52 482.57,116.34C483.87,117.65 485.17,118.95 486.47,120.25C490.01,123.78 493.53,127.32 497.06,130.86C500.75,134.56 504.44,138.25 508.13,141.94C515.11,148.93 522.1,155.93 529.08,162.93C537.03,170.9 544.98,178.87 552.93,186.83C569.3,203.22 585.65,219.61 602,236C600.55,239.34 598.72,241.54 596.15,244.11C595.35,244.92 594.54,245.73 593.71,246.57C592.82,247.46 591.93,248.35 591.01,249.27C590.05,250.22 589.1,251.18 588.15,252.14C585.53,254.78 582.9,257.4 580.27,260.03C577.44,262.87 574.61,265.71 571.79,268.54C565.6,274.75 559.41,280.96 553.21,287.16C549.34,291.03 545.47,294.91 541.6,298.79C530.88,309.53 520.15,320.27 509.42,331C508.74,331.69 508.05,332.37 507.34,333.08C505.95,334.48 504.56,335.87 503.16,337.26C502.13,338.3 502.13,338.3 501.07,339.36C500.38,340.05 499.69,340.74 498.97,341.45C487.78,352.65 476.59,363.87 465.41,375.08C453.92,386.61 442.43,398.12 430.92,409.63C424.46,416.09 418.01,422.55 411.57,429.02C406.08,434.53 400.58,440.04 395.07,445.53C392.27,448.33 389.46,451.14 386.67,453.95C373.27,467.46 360.83,479.93 342.49,486.42C341.79,486.67 341.09,486.92 340.37,487.17C339.19,487.58 339.19,487.58 338,488C336.64,488.48 336.64,488.48 335.26,488.96C327.32,491.72 319.36,494.39 311.4,497.05C310.12,497.47 308.85,497.9 307.58,498.33C300.92,500.56 294.26,502.78 287.59,505.01C281.43,507.06 275.26,509.13 269.1,511.21C263.76,513 258.43,514.78 253.09,516.56C249.92,517.62 246.75,518.68 243.58,519.75C240.05,520.94 236.52,522.12 232.98,523.29C231.44,523.81 231.44,523.81 229.88,524.34C218.08,528.22 206.05,531.13 194.3,525.77C184.85,520.5 179.4,513.19 176,503C173.71,487.87 179.62,473.91 184.42,459.82C185.62,456.3 186.79,452.77 187.96,449.25C189.93,443.33 191.93,437.41 193.93,431.5C196.24,424.71 198.51,417.91 200.78,411.11C202.97,404.51 205.18,397.92 207.4,391.33C208.33,388.55 209.26,385.77 210.19,382.99C218.19,359.03 226.6,341.04 244.73,323.03C245.69,322.07 246.65,321.11 247.61,320.14C250.22,317.53 252.84,314.92 255.46,312.31C258.29,309.49 261.12,306.66 263.94,303.83C268.83,298.94 273.73,294.05 278.63,289.16C285.71,282.1 292.78,275.03 299.85,267.96C311.33,256.49 322.81,245.02 334.3,233.55C345.45,222.42 356.6,211.28 367.75,200.14C368.43,199.46 369.12,198.77 369.83,198.06C373.28,194.61 376.73,191.16 380.18,187.72C408.78,159.14 437.39,130.57 466,102Z"
-      android:fillColor="#FFFFFF"/>
-  <path
-      android:pathData="M629.38,14.69C630.28,15.12 630.28,15.12 631.21,15.57C643.1,21.76 652.62,32.22 662.01,41.58C664.12,43.68 666.24,45.76 668.37,47.83C685.75,65 697.14,84.21 697.44,109.25C697.23,140.62 680.09,160.42 658.75,181.49C657.78,182.45 656.81,183.41 655.84,184.36C653.37,186.8 650.91,189.26 648.44,191.71C643.64,196.48 638.82,201.24 634,206C630.07,204.41 627.43,201.71 624.51,198.75C623.97,198.21 623.42,197.67 622.86,197.11C621.05,195.3 619.24,193.48 617.43,191.66C616.13,190.35 614.83,189.05 613.53,187.75C609.99,184.22 606.47,180.68 602.94,177.14C599.25,173.44 595.56,169.75 591.87,166.06C584.89,159.07 577.9,152.07 570.92,145.07C562.97,137.1 555.02,129.13 547.07,121.17C530.7,104.78 514.35,88.39 498,72C499.6,68.62 501.37,66.37 504.02,63.71C504.84,62.87 505.67,62.03 506.53,61.17C507.42,60.27 508.32,59.37 509.25,58.45C510.18,57.52 511.11,56.58 512.06,55.62C514.03,53.65 516,51.68 517.97,49.71C520.48,47.21 522.97,44.7 525.46,42.19C527.4,40.24 529.34,38.29 531.29,36.35C532.65,34.99 534.01,33.62 535.36,32.25C560.77,7.03 596.55,-1.15 629.38,14.69Z"
-      android:fillColor="#FFFFFF"/>
+    android:width="300dp"
+    android:height="233dp"
+    android:viewportWidth="300"
+    android:viewportHeight="233">
+  <group>
+    <clip-path
+        android:pathData="M72,38h156v156h-156z"/>
+    <path
+        android:pathData="M215.69,44.61C209.02,37.94 198.23,37.94 191.56,44.61L182.39,53.75L212.22,83.58L221.39,74.41C228.06,67.74 228.06,56.95 221.39,50.28L215.69,44.61ZM124.53,111.64C122.67,113.5 121.24,115.79 120.42,118.32L111.4,145.37C110.51,147.99 111.21,150.89 113.16,152.87C115.11,154.85 118.01,155.52 120.66,154.63L147.71,145.62C150.21,144.76 152.5,143.36 154.39,141.5L205.36,90.5L175.5,60.64L124.53,111.64V111.64ZM101.25,57.5C85.1,57.5 72,70.6 72,86.75V164.75C72,180.9 85.1,194 101.25,194H179.25C195.4,194 208.5,180.9 208.5,164.75V135.5C208.5,130.11 204.14,125.75 198.75,125.75C193.36,125.75 189,130.11 189,135.5V164.75C189,170.14 184.64,174.5 179.25,174.5H101.25C95.86,174.5 91.5,170.14 91.5,164.75V86.75C91.5,81.36 95.86,77 101.25,77H130.5C135.89,77 140.25,72.64 140.25,67.25C140.25,61.86 135.89,57.5 130.5,57.5H101.25Z"
+        android:fillColor="@color/square_button_icon_color"/>
+  </group>
 </vector>
diff --git a/app/res/drawable/home_sync.xml b/app/res/drawable/home_sync.xml
index 42b25c3333..072a233b71 100644
--- a/app/res/drawable/home_sync.xml
+++ b/app/res/drawable/home_sync.xml
@@ -1,21 +1,13 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="748dp"
-    android:height="664dp"
-    android:viewportWidth="748"
-    android:viewportHeight="664">
-  <path
-      android:pathData="M427.48,100.89C444.14,114.86 455.82,134.03 458,156C459.55,177.02 455.78,195.33 444,213C444.34,217.46 446.37,221.32 448.25,225.32C448.59,226.03 448.92,226.75 449.26,227.48C449.98,229.03 450.7,230.58 451.42,232.13C453.38,236.32 455.32,240.51 457.26,244.71C457.66,245.57 458.06,246.43 458.47,247.32C462.03,255.03 465.49,262.79 468.91,270.56C475.76,286.1 482.83,301.52 490,316.92C495.56,328.88 501.06,340.88 506.51,352.9C507.12,354.24 507.72,355.57 508.33,356.91C508.78,357.9 508.78,357.9 509.24,358.91C511.45,363.8 513.68,368.68 515.92,373.56C522.98,388.95 529.96,404.37 536.8,419.86C542.62,433.01 548.64,446.07 554.72,459.11C560.6,471.75 566.35,484.44 571.97,497.2C577.34,509.37 582.88,521.45 588.5,533.5C596.34,550.31 603.94,567.22 611.43,584.19C613.24,588.31 615.09,592.41 616.96,596.51C617.38,597.45 617.81,598.38 618.25,599.35C619.01,601 619.76,602.64 620.53,604.28C624.99,614.04 625.87,625.62 622.38,635.88C617.64,647.07 610.62,655.66 599.63,660.96C589.39,665.03 577.82,665.79 567.33,662.03C555.88,656.97 548.79,650.12 543.3,638.86C542.96,638.16 542.62,637.47 542.26,636.76C538.12,628.31 534.22,619.75 530.31,611.19C529.57,609.57 528.83,607.95 528.09,606.34C524.38,598.23 520.69,590.12 517,582C422.95,581.67 328.9,581.34 232,581C231.34,582.98 230.68,584.96 230,587C228.92,589.48 227.83,591.94 226.69,594.4C226.21,595.45 226.21,595.45 225.71,596.53C224.67,598.81 223.62,601.09 222.56,603.38C221.1,606.54 219.65,609.7 218.19,612.86C217.83,613.64 217.47,614.43 217.1,615.23C214.94,619.91 212.84,624.61 210.78,629.33C210.06,630.94 210.06,630.94 209.34,632.59C208.48,634.54 207.63,636.49 206.8,638.45C202.16,648.89 195.23,655.96 185,661C183.99,661.51 183.99,661.51 182.96,662.03C174.1,665.72 162.03,665.42 153,662.38C140.84,657.11 133.13,649.6 127.95,637.42C126.01,632.46 125.72,628.39 125.63,623.13C125.59,622.34 125.55,621.56 125.51,620.75C125.33,608.18 132.53,596.42 137.73,585.27C139.63,581.19 141.52,577.1 143.4,573.01C143.79,572.17 144.18,571.34 144.57,570.47C148.43,562.1 152.16,553.68 155.88,545.25C161.99,531.39 168.32,517.62 174.72,503.89C180.27,491.98 185.7,480.02 191,468C196.75,454.95 202.67,441.99 208.69,429.06C214.63,416.3 220.5,403.53 226.23,390.67C230.36,381.4 234.58,372.16 238.81,362.94C244.23,351.12 249.56,339.27 254.81,327.38C260.57,314.35 266.49,301.41 272.5,288.5C279.34,273.83 286.03,259.1 292.57,244.3C292.88,243.61 293.18,242.93 293.49,242.23C294.08,240.88 294.67,239.54 295.26,238.19C296.88,234.48 298.56,230.81 300.31,227.16C300.69,226.35 301.07,225.54 301.46,224.7C302.2,223.14 302.95,221.58 303.72,220.03C305.79,215.66 305.79,215.66 305.24,210.94C303.69,208.42 301.88,206.28 300,204C289.79,183.8 288.24,160.79 295.25,139.31C298.92,128.96 303.98,120.4 311,112C311.78,111 311.78,111 312.58,109.98C340.78,75.27 393.89,74.94 427.48,100.89ZM374,268C365.14,287.16 356.35,306.35 347.83,325.67C342.45,337.86 336.89,349.96 331.16,361.99C330.61,363.15 330.07,364.31 329.5,365.51C329.02,366.53 328.53,367.54 328.03,368.59C326.87,370.87 326.87,370.87 327,373C358.35,373 389.7,373 422,373C421.06,368.3 419.55,364.52 417.53,360.25C417.17,359.49 416.82,358.72 416.45,357.94C415.69,356.3 414.92,354.65 414.15,353.01C412.08,348.62 410.04,344.21 407.99,339.8C407.57,338.9 407.15,338 406.72,337.07C402.57,328.11 398.55,319.1 394.56,310.06C393.26,307.12 391.96,304.18 390.65,301.23C390.34,300.54 390.03,299.84 389.71,299.12C386.71,292.34 383.69,285.57 380.63,278.81C380.18,277.81 379.73,276.82 379.27,275.79C378.86,274.89 378.46,274 378.04,273.08C377.69,272.31 377.34,271.54 376.98,270.75C376.12,268.82 376.12,268.82 374,268ZM288,457C285.73,461.89 283.47,466.78 281.22,471.68C280.45,473.34 279.68,475.01 278.91,476.67C277.8,479.06 276.7,481.46 275.6,483.86C275.08,484.97 275.08,484.97 274.55,486.1C274.07,487.15 274.07,487.15 273.58,488.22C273.3,488.83 273.02,489.44 272.73,490.07C271.77,492.46 271.77,492.46 271,497C339.64,497 408.28,497 479,497C475.34,488.22 471.61,479.5 467.75,470.81C467.2,469.57 466.66,468.34 466.11,467.1C465.59,465.94 465.08,464.78 464.55,463.58C464.08,462.53 463.62,461.48 463.14,460.4C462.21,458.1 462.21,458.1 461,457C458.77,456.9 456.54,456.88 454.31,456.88C453.25,456.88 453.25,456.88 452.17,456.88C449.78,456.88 447.39,456.88 445.01,456.89C443.3,456.89 441.6,456.89 439.89,456.89C435.25,456.89 430.61,456.89 425.96,456.9C421.12,456.9 416.27,456.91 411.43,456.91C402.24,456.91 393.06,456.92 383.88,456.93C373.42,456.94 362.97,456.94 352.52,456.95C331.01,456.96 309.51,456.98 288,457Z"
-      android:fillColor="#FFFFFF"/>
-  <path
-      android:pathData="M89.49,5.54C98.86,12.44 105.76,21.01 108.61,32.46C109.05,35.33 109.24,38.1 109.31,41C109.37,42.52 109.37,42.52 109.43,44.06C108.44,53.14 104.74,61.84 101.75,70.42C94.49,91.46 89.39,112.86 87,135C86.91,135.87 86.81,136.74 86.71,137.63C85.84,146.77 85.76,155.89 85.75,165.06C85.75,165.9 85.75,166.73 85.75,167.59C85.79,203.9 92.69,239.14 105.78,273.03C110.55,285.39 110.39,297.76 105,310C99.15,320.4 90.62,327.61 79.25,331.34C67.38,333.75 55.36,332.97 44.84,326.71C42.74,325.26 40.88,323.72 39,322C38,321.1 38,321.1 36.98,320.18C3.88,286.89 0.68,210.12 0.69,166.06C0.87,121.72 5.3,46.86 36.56,11.56C50.76,-1.38 72.91,-4.73 89.49,5.54Z"
-      android:fillColor="#FFFFFF"/>
-  <path
-      android:pathData="M707.81,7.63C733.27,27.69 739.35,76.89 744.25,106.88C744.4,107.8 744.55,108.72 744.71,109.68C745.18,112.78 745.6,115.89 746,119C746.09,119.68 746.17,120.36 746.26,121.05C748.11,135.87 748.36,150.59 748.31,165.5C748.31,167.29 748.31,167.29 748.31,169.12C748.26,186.58 747.93,203.74 745,221C744.8,222.23 744.59,223.45 744.38,224.71C730.38,306.62 730.38,306.62 709,324C697.88,330.98 686.15,334.8 673,332C660.39,328 650.81,321.05 644.25,309.5C639.06,298.46 639.16,286.9 642.8,275.48C643.73,272.95 644.7,270.44 645.69,267.94C670.81,201.34 669.04,129.03 644.9,62.49C639.87,48.54 638.15,36.72 644.69,22.81C650.43,12.12 657.88,5.74 669.13,1.13C682.45,-2.81 696.47,0.01 707.81,7.63Z"
-      android:fillColor="#FFFFFF"/>
-  <path
-      android:pathData="M579.8,54.71C596.49,64.52 601.19,86.48 606,104C619.21,155.52 617.68,215.84 593,264C588.71,271.04 583.23,276.97 575.2,279.5C565.53,281.69 556.94,281.69 548.38,276.38C540.72,270.88 535.87,264.63 533.31,255.56C532.19,246.38 534.24,239.45 537.58,230.95C554.9,186.51 553.64,137.77 534.76,94.04C531.29,84.74 533.07,75.88 537,67C546.58,52.92 563.98,47.04 579.8,54.71Z"
-      android:fillColor="#FFFFFF"/>
-  <path
-      android:pathData="M199.86,54.74C208.34,59.72 213.24,66.61 216,76C217.14,86.1 215.1,94.04 211.31,103.31C195.9,143.54 195.65,188.21 211.21,228.45C215.6,239.84 218.57,249.31 214.44,261.38C209.86,271.04 203.02,276.38 193,280C183.9,282.07 176.02,280.86 167.88,276.44C149.46,264.39 144.64,234.58 140.27,214.33C139.43,210.24 138.69,206.12 138,202C137.88,201.33 137.76,200.65 137.64,199.96C130.43,157.17 135.92,101.37 159,64C168.43,51.54 185.83,48.09 199.86,54.74Z"
-      android:fillColor="#FFFFFF"/>
+    android:width="300dp"
+    android:height="233dp"
+    android:viewportWidth="300"
+    android:viewportHeight="233">
+  <group>
+    <clip-path
+        android:pathData="M72,47h156v138.67h-156z"/>
+    <path
+        android:pathData="M88.95,47.62C84.51,45.84 79.47,47.97 77.66,52.42C74,61.46 72,71.35 72,81.67C72,91.99 74,101.87 77.66,110.92C79.45,115.36 84.51,117.5 88.95,115.71C93.4,113.92 95.54,108.86 93.75,104.42C90.9,97.4 89.33,89.74 89.33,81.67C89.33,73.6 90.9,65.93 93.75,58.92C95.54,54.47 93.4,49.44 88.95,47.62ZM211.05,47.62C206.6,49.44 204.46,54.47 206.25,58.92C209.1,65.93 210.67,73.6 210.67,81.67C210.67,89.74 209.1,97.4 206.25,104.42C204.46,108.86 206.6,113.9 211.05,115.71C215.49,117.53 220.52,115.36 222.34,110.92C226,101.87 228,91.99 228,81.67C228,71.35 226,61.46 222.34,52.42C220.52,47.97 215.49,45.84 211.05,47.62ZM164.11,91.74C166.14,88.9 167.33,85.43 167.33,81.67C167.33,72.11 159.56,64.33 150,64.33C140.44,64.33 132.67,72.11 132.67,81.67C132.67,85.43 133.86,88.9 135.89,91.74L98.79,173.43C96.81,177.79 98.73,182.93 103.09,184.91C107.45,186.88 112.6,184.96 114.57,180.6L120.13,168.33H179.87L185.45,180.57C187.43,184.93 192.57,186.86 196.93,184.88C201.3,182.9 203.22,177.76 201.24,173.4L164.11,91.74ZM171.99,151H128.01L131.93,142.33H168.07L171.99,151ZM150,102.6L160.18,125H139.82L150,102.6ZM116.23,66.93C117.66,63.66 116.17,59.81 112.87,58.37C109.57,56.94 105.75,58.43 104.31,61.73C101.66,67.85 100.17,74.6 100.17,81.67C100.17,88.74 101.66,95.48 104.31,101.6C105.75,104.88 109.59,106.39 112.87,104.96C116.15,103.52 117.66,99.68 116.23,96.4C114.25,91.9 113.17,86.92 113.17,81.67C113.17,76.41 114.25,71.43 116.23,66.93ZM195.69,61.73C194.25,58.46 190.41,56.94 187.13,58.37C183.85,59.81 182.34,63.66 183.77,66.93C185.75,71.43 186.83,76.41 186.83,81.67C186.83,86.92 185.75,91.9 183.77,96.4C182.34,99.68 183.83,103.52 187.13,104.96C190.43,106.39 194.25,104.9 195.69,101.6C198.34,95.48 199.83,88.74 199.83,81.67C199.83,74.6 198.34,67.85 195.69,61.73V61.73Z"
+        android:fillColor="@color/square_button_icon_color"/>
+  </group>
 </vector>
diff --git a/app/res/drawable/icon_app_white.png b/app/res/drawable/icon_app_white.png
deleted file mode 100644
index b5da340312..0000000000
Binary files a/app/res/drawable/icon_app_white.png and /dev/null differ
diff --git a/app/res/drawable/icon_color.png b/app/res/drawable/icon_color.png
deleted file mode 100644
index 1e88bab4f5..0000000000
Binary files a/app/res/drawable/icon_color.png and /dev/null differ
diff --git a/app/res/drawable/install_start.xml b/app/res/drawable/install_start.xml
index 0a4839930a..0e1a2a49f1 100644
--- a/app/res/drawable/install_start.xml
+++ b/app/res/drawable/install_start.xml
@@ -1,13 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:height="156dp"
-    android:viewportHeight="156"
-    android:viewportWidth="155"
-    android:width="155dp">
-
-    <group>
-        <path
-            android:fillColor="#ffffff"
-            android:pathData="M87.2 10.1333C87.2 4.78647 82.8802 0.466675 77.5333 0.466675C72.1864 0.466675 67.8666 4.78647 67.8666 10.1333V83.449L45.6937 61.2761C41.9177 57.5 35.7854 57.5 32.0093 61.2761C28.2333 65.0521 28.2333 71.1844 32.0093 74.9604L70.676 113.627C74.452 117.403 80.5843 117.403 84.3604 113.627L123.027 74.9604C126.803 71.1844 126.803 65.0521 123.027 61.2761C119.251 57.5 113.119 57.5 109.343 61.2761L87.2 83.449V10.1333ZM19.5333 106.8C8.86974 106.8 0.199951 115.47 0.199951 126.133V135.8C0.199951 146.464 8.86974 155.133 19.5333 155.133H135.533C146.197 155.133 154.867 146.464 154.867 135.8V126.133C154.867 115.47 146.197 106.8 135.533 106.8H104.872L91.1875 120.484C83.6354 128.036 71.401 128.036 63.8489 120.484L50.1947 106.8H19.5333ZM130.7 123.717C132.623 123.717 134.467 124.481 135.826 125.84C137.186 127.2 137.95 129.044 137.95 130.967C137.95 132.889 137.186 134.734 135.826 136.093C134.467 137.453 132.623 138.217 130.7 138.217C128.777 138.217 126.933 137.453 125.573 136.093C124.214 134.734 123.45 132.889 123.45 130.967C123.45 129.044 124.214 127.2 125.573 125.84C126.933 124.481 128.777 123.717 130.7 123.717Z" />
-    </group>
-</vector>
\ No newline at end of file
+    android:width="300dp"
+    android:height="233dp"
+    android:viewportWidth="300"
+    android:viewportHeight="233">
+  <path
+      android:pathData="M160,48.67C160,43.32 155.68,39 150.33,39C144.99,39 140.67,43.32 140.67,48.67V121.98L118.49,99.81C114.72,96.03 108.58,96.03 104.81,99.81C101.03,103.58 101.03,109.72 104.81,113.49L143.48,152.16C147.25,155.94 153.38,155.94 157.16,152.16L195.83,113.49C199.6,109.72 199.6,103.58 195.83,99.81C192.05,96.03 185.92,96.03 182.14,99.81L160,121.98V48.67ZM92.33,145.33C81.67,145.33 73,154 73,164.67V174.33C73,185 81.67,193.67 92.33,193.67H208.33C219,193.67 227.67,185 227.67,174.33V164.67C227.67,154 219,145.33 208.33,145.33H177.67L163.99,159.02C156.43,166.57 144.2,166.57 136.65,159.02L123,145.33H92.33ZM203.5,162.25C205.42,162.25 207.27,163.01 208.63,164.37C209.99,165.73 210.75,167.58 210.75,169.5C210.75,171.42 209.99,173.27 208.63,174.63C207.27,175.99 205.42,176.75 203.5,176.75C201.58,176.75 199.73,175.99 198.37,174.63C197.01,173.27 196.25,171.42 196.25,169.5C196.25,167.58 197.01,165.73 198.37,164.37C199.73,163.01 201.58,162.25 203.5,162.25Z"
+      android:fillColor="@color/square_button_icon_color"/>
+</vector>
diff --git a/app/res/drawable/install_stop.xml b/app/res/drawable/install_stop.xml
index ef2b97a49f..af188dfb8d 100644
--- a/app/res/drawable/install_stop.xml
+++ b/app/res/drawable/install_stop.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="232dp"
-    android:height="232dp"
-    android:viewportWidth="232"
-    android:viewportHeight="232">
+    android:width="300dp"
+    android:height="233dp"
+    android:viewportWidth="300"
+    android:viewportHeight="233">
   <path
-      android:pathData="M180.03,36.51C182.4,38.63 184.72,40.78 187,43C192.04,38.79 196.72,34.38 201.31,29.69C202.54,28.44 203.76,27.19 204.99,25.95C205.79,25.13 205.79,25.13 206.6,24.3C209.4,21.7 212.14,21.61 215.89,21.64C219.62,22.28 221.4,24.34 224,27C225.39,29.79 225.14,32.09 225.16,35.21C225.17,36.51 225.18,37.82 225.19,39.16C225.2,40.59 225.2,42.03 225.2,43.46C225.21,44.92 225.21,46.39 225.22,47.85C225.23,50.93 225.24,54 225.24,57.07C225.25,61.01 225.27,64.94 225.3,68.88C225.32,71.9 225.32,74.93 225.32,77.96C225.33,79.41 225.33,80.86 225.35,82.31C225.36,84.34 225.36,86.37 225.36,88.41C225.36,90.14 225.36,90.14 225.37,91.91C224.95,95.4 224.16,97.23 222,100C218.71,102.38 215.56,102.27 211.58,102.31C209.63,102.33 209.63,102.33 207.64,102.35C206.22,102.36 204.8,102.37 203.38,102.37C201.92,102.38 200.46,102.39 199,102.4C195.95,102.41 192.89,102.42 189.83,102.43C185.92,102.43 182.01,102.47 178.1,102.51C175.09,102.54 172.07,102.55 169.06,102.55C167.62,102.56 166.18,102.57 164.74,102.59C152.07,102.76 152.07,102.76 148.13,99.59C145.36,96.23 144.34,93.84 144.41,89.4C146.7,80.08 158.22,71.55 165,65C152.2,51.8 135.23,45.61 117.04,45.01C97.17,44.75 79.57,52.67 65.25,66.19C51.73,80.33 45.14,98.05 44.97,117.53C45.9,138.17 54.23,155.92 69.13,170.13C85.46,183.99 104.97,188.46 126,187C141.16,185.15 154.29,177.96 165.63,167.98C170.65,163.78 174.08,162.42 180.57,162.66C184.33,163.19 186.26,164.39 189,167C191.78,170.82 193.38,174.35 193,179.13C191.1,188.44 182.68,194.64 175.32,199.92C151.48,215.52 124.13,221.84 95.94,216.5C76.04,212.32 59.64,202.99 45,189C44.32,188.4 43.65,187.8 42.95,187.18C26.85,172.3 15.98,148.15 14.86,126.31C14.17,105.26 16.48,87.83 26,69C26.53,67.94 27.07,66.88 27.62,65.79C40.44,42.34 62.59,25.64 88,18C89.12,17.66 90.23,17.32 91.38,16.98C121.72,9.44 155.89,16.51 180.03,36.51Z"
-      android:fillColor="#FFFFFF"/>
+      android:pathData="M218.18,105.06H220.95C225.29,105.06 228.78,101.57 228.78,97.23V55.48C228.78,52.32 226.89,49.45 223.95,48.24C221.02,47.04 217.66,47.69 215.41,49.94L201.84,63.51C173.27,35.29 127.24,35.39 98.83,63.83C70.29,92.37 70.29,138.63 98.83,167.17C127.37,195.71 173.63,195.71 202.16,167.17C206.24,163.09 206.24,156.47 202.16,152.39C198.09,148.31 191.47,148.31 187.39,152.39C167,172.78 133.96,172.78 113.58,152.39C93.19,132 93.19,98.96 113.58,78.58C133.87,58.29 166.65,58.19 187.06,78.25L173.66,91.69C171.41,93.94 170.76,97.3 171.96,100.24C173.17,103.17 176.04,105.06 179.2,105.06H218.18Z"
+      android:fillColor="@color/square_button_icon_color"/>
 </vector>
diff --git a/app/res/drawable/pause.png b/app/res/drawable/pause.png
index 3a23ef0186..54b1940c49 100644
Binary files a/app/res/drawable/pause.png and b/app/res/drawable/pause.png differ
diff --git a/app/res/drawable/play.png b/app/res/drawable/play.png
index 57c1e426cb..0ff12899ff 100644
Binary files a/app/res/drawable/play.png and b/app/res/drawable/play.png differ
diff --git a/app/res/drawable/progressbar_modern.xml b/app/res/drawable/progressbar_modern.xml
index 01fb1a2324..b47bd1c7c7 100644
--- a/app/res/drawable/progressbar_modern.xml
+++ b/app/res/drawable/progressbar_modern.xml
@@ -2,7 +2,7 @@
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:id="@android:id/background">
         <shape>
-            <corners android:radius="4dp" />
+            <corners android:radius="@dimen/modern_progressbar_radius" />
             <gradient
                 android:startColor="@color/progress_bar_bg"
                 android:endColor="@color/progress_bar_bg"
@@ -12,7 +12,7 @@
     <item android:id="@android:id/progress">
         <scale android:scaleWidth="100%">
             <shape>
-                <corners android:radius="4dp" />
+                <corners android:radius="@dimen/modern_progressbar_radius" />
                 <gradient
                     android:startColor="@color/white"
                     android:endColor="@color/white"
diff --git a/app/res/drawable/progressbar_modern_blue.xml b/app/res/drawable/progressbar_modern_blue.xml
index aa3937eed2..4b226bbb79 100644
--- a/app/res/drawable/progressbar_modern_blue.xml
+++ b/app/res/drawable/progressbar_modern_blue.xml
@@ -2,7 +2,7 @@
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:id="@android:id/background">
         <shape>
-            <corners android:radius="4dp" />
+            <corners android:radius="@dimen/modern_progressbar_radius" />
             <gradient
                 android:startColor="@color/progress_bar_bg"
                 android:endColor="@color/progress_bar_bg"
@@ -12,10 +12,10 @@
     <item android:id="@android:id/progress">
         <scale android:scaleWidth="100%">
             <shape>
-                <corners android:radius="4dp" />
+                <corners android:radius="@dimen/modern_progressbar_radius" />
                 <gradient
-                    android:startColor="@color/start_sync_button"
-                    android:endColor="@color/start_sync_button"
+                    android:startColor="@color/cc_brand_color"
+                    android:endColor="@color/cc_brand_color"
                     />
             </shape>
         </scale>
diff --git a/app/res/drawable/record.png b/app/res/drawable/record.png
index 92561ada60..5e3940cb1e 100644
Binary files a/app/res/drawable/record.png and b/app/res/drawable/record.png differ
diff --git a/app/res/drawable/record_add.png b/app/res/drawable/record_add.png
index a13f2f624b..478b569692 100644
Binary files a/app/res/drawable/record_add.png and b/app/res/drawable/record_add.png differ
diff --git a/app/res/drawable/record_in_progress.png b/app/res/drawable/record_in_progress.png
index 45ab7e1056..f221d17b5a 100644
Binary files a/app/res/drawable/record_in_progress.png and b/app/res/drawable/record_in_progress.png differ
diff --git a/app/res/drawable/record_start.png b/app/res/drawable/record_start.png
index ea6fd034c9..040e424214 100644
Binary files a/app/res/drawable/record_start.png and b/app/res/drawable/record_start.png differ
diff --git a/app/res/drawable/recording_trash.png b/app/res/drawable/recording_trash.png
index 6f522522b8..eda65ed533 100644
Binary files a/app/res/drawable/recording_trash.png and b/app/res/drawable/recording_trash.png differ
diff --git a/app/res/drawable/rounded_button_shape.xml b/app/res/drawable/rounded_button_shape.xml
new file mode 100644
index 0000000000..5bfcbec484
--- /dev/null
+++ b/app/res/drawable/rounded_button_shape.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle"   >
+
+    <size
+        android:minHeight="@dimen/min_button_height">
+    </size>
+
+    <corners android:radius="@dimen/rounded_button_corner_radius"/>
+</shape>
\ No newline at end of file
diff --git a/app/res/drawable/startup_barcode.xml b/app/res/drawable/startup_barcode.xml
index d65cfcfec4..ac3e33305c 100644
--- a/app/res/drawable/startup_barcode.xml
+++ b/app/res/drawable/startup_barcode.xml
@@ -1,24 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="342dp"
-    android:height="394dp"
-    android:viewportWidth="342"
-    android:viewportHeight="394">
+    android:width="300dp"
+    android:height="233dp"
+    android:viewportWidth="300"
+    android:viewportHeight="233">
   <path
-      android:pathData="M40.03,220.84C41.22,220.83 41.22,220.83 42.43,220.82C45.05,220.81 47.67,220.8 50.29,220.8C52.12,220.79 53.95,220.79 55.78,220.78C59.62,220.77 63.45,220.76 67.29,220.76C72.18,220.75 77.08,220.73 81.97,220.7C85.75,220.68 89.53,220.68 93.31,220.68C95.12,220.67 96.92,220.67 98.72,220.65C113.26,220.55 126.23,221.52 137.27,232.19C147.48,243.98 147.61,257 147.53,271.82C147.53,273.72 147.54,275.63 147.54,277.54C147.55,281.52 147.54,285.49 147.52,289.47C147.5,294.54 147.51,299.62 147.54,304.69C147.55,308.62 147.55,312.55 147.54,316.48C147.53,318.35 147.54,320.22 147.55,322.09C147.6,336.05 146.4,347.89 137,359C128.43,367.11 118.6,370.13 107.02,370.18C106.23,370.18 105.44,370.19 104.63,370.2C102.02,370.22 99.42,370.23 96.81,370.24C95.47,370.24 95.47,370.24 94.1,370.25C89.36,370.27 84.62,370.29 79.88,370.3C75.01,370.31 70.14,370.34 65.27,370.38C61.51,370.41 57.74,370.41 53.97,370.42C52.18,370.42 50.39,370.43 48.59,370.45C34.82,370.59 21.56,370.08 11,360C3.74,352.81 -0.07,345.09 -0.17,334.84C-0.17,333.61 -0.17,333.61 -0.18,332.35C-0.18,331.48 -0.19,330.61 -0.2,329.71C-0.22,326.82 -0.23,323.94 -0.24,321.05C-0.24,320.07 -0.25,319.08 -0.25,318.06C-0.27,312.83 -0.29,307.6 -0.3,302.37C-0.31,296.98 -0.34,291.6 -0.38,286.21C-0.41,282.05 -0.41,277.9 -0.42,273.74C-0.42,271.76 -0.43,269.77 -0.45,267.79C-0.59,252.55 0.77,241.8 11.59,230.31C19.52,222.85 29.46,220.85 40.03,220.84ZM49,271C49,287.17 49,303.34 49,320C64.84,320 80.68,320 97,320C97,303.83 97,287.66 97,271C81.16,271 65.32,271 49,271Z"
-      android:fillColor="#FFFFFF"/>
-  <path
-      android:pathData="M234.98,23.82C236.16,23.81 236.16,23.81 237.37,23.8C239.98,23.78 242.58,23.77 245.19,23.76C246.08,23.76 246.98,23.75 247.9,23.75C252.64,23.73 257.38,23.71 262.12,23.7C266.99,23.69 271.86,23.66 276.73,23.62C280.49,23.59 284.26,23.59 288.03,23.58C289.82,23.58 291.61,23.57 293.41,23.55C307.18,23.41 320.44,23.92 331,34C338.26,41.19 342.07,48.91 342.17,59.16C342.17,59.98 342.17,60.8 342.18,61.65C342.18,62.52 342.19,63.39 342.2,64.29C342.22,67.18 342.23,70.06 342.24,72.95C342.24,73.93 342.25,74.92 342.25,75.94C342.27,81.17 342.29,86.4 342.3,91.63C342.31,97.02 342.34,102.4 342.38,107.79C342.41,111.95 342.41,116.1 342.42,120.26C342.42,122.24 342.43,124.23 342.45,126.21C342.59,141.45 341.23,152.2 330.41,163.69C322.48,171.15 312.54,173.15 301.97,173.16C301.18,173.17 300.38,173.17 299.57,173.18C296.95,173.19 294.33,173.2 291.71,173.2C289.88,173.21 288.05,173.21 286.22,173.22C282.38,173.23 278.55,173.24 274.71,173.24C269.82,173.25 264.92,173.27 260.03,173.3C256.25,173.32 252.47,173.32 248.69,173.32C246.88,173.33 245.08,173.33 243.28,173.35C228.74,173.45 215.77,172.48 204.73,161.81C194.52,150.02 194.39,137 194.47,122.18C194.47,120.28 194.46,118.37 194.46,116.46C194.45,112.48 194.46,108.51 194.48,104.53C194.5,99.46 194.49,94.38 194.46,89.31C194.45,85.38 194.45,81.45 194.46,77.52C194.47,75.65 194.46,73.78 194.45,71.91C194.4,57.95 195.6,46.11 205,35C213.57,26.89 223.4,23.87 234.98,23.82ZM245,74C245,90.17 245,106.34 245,123C260.84,123 276.68,123 293,123C293,106.83 293,90.66 293,74C277.16,74 261.32,74 245,74Z"
-      android:fillColor="#FFFFFF"/>
-  <path
-      android:pathData="M40.03,23.84C41.22,23.83 41.22,23.83 42.43,23.82C45.05,23.81 47.67,23.8 50.29,23.8C52.12,23.79 53.95,23.79 55.78,23.78C59.62,23.77 63.45,23.76 67.29,23.76C72.18,23.75 77.08,23.73 81.97,23.7C85.75,23.68 89.53,23.68 93.31,23.68C95.12,23.67 96.92,23.67 98.72,23.65C113.26,23.55 126.23,24.52 137.27,35.19C147.48,46.98 147.61,60 147.53,74.82C147.53,76.72 147.54,78.63 147.54,80.54C147.55,84.52 147.54,88.49 147.52,92.47C147.5,97.54 147.51,102.62 147.54,107.69C147.55,111.62 147.55,115.55 147.54,119.48C147.53,121.35 147.54,123.22 147.55,125.09C147.6,139.05 146.4,150.89 137,162C128.43,170.11 118.6,173.13 107.02,173.18C106.23,173.18 105.44,173.19 104.63,173.2C102.02,173.22 99.42,173.23 96.81,173.24C95.47,173.24 95.47,173.24 94.1,173.25C89.36,173.27 84.62,173.29 79.88,173.3C75.01,173.31 70.14,173.34 65.27,173.38C61.51,173.41 57.74,173.41 53.97,173.42C52.18,173.42 50.39,173.43 48.59,173.45C34.82,173.59 21.56,173.08 11,163C3.74,155.81 -0.07,148.09 -0.17,137.84C-0.17,136.61 -0.17,136.61 -0.18,135.35C-0.18,134.48 -0.19,133.61 -0.2,132.71C-0.22,129.82 -0.23,126.94 -0.24,124.05C-0.24,123.07 -0.25,122.08 -0.25,121.06C-0.27,115.83 -0.29,110.6 -0.3,105.37C-0.31,99.98 -0.34,94.6 -0.38,89.21C-0.41,85.05 -0.41,80.9 -0.42,76.74C-0.42,74.76 -0.43,72.77 -0.45,70.79C-0.59,55.55 0.77,44.8 11.59,33.31C19.52,25.85 29.46,23.85 40.03,23.84ZM49,74C49,90.17 49,106.34 49,123C64.84,123 80.68,123 97,123C97,106.83 97,90.66 97,74C81.16,74 65.32,74 49,74Z"
-      android:fillColor="#FFFFFF"/>
-  <path
-      android:pathData="M195,221C219.42,221 243.84,221 269,221C269,229.25 269,237.5 269,246C284.84,246 300.68,246 317,246C317,237.75 317,229.5 317,221C325.25,221 333.5,221 342,221C342,254 342,287 342,321C329.98,321.02 317.95,321.04 305.56,321.06C299.86,321.08 299.86,321.08 294.04,321.09C289.41,321.09 289.41,321.09 287.25,321.1C285.73,321.1 284.21,321.1 282.7,321.11C280.4,321.11 278.11,321.11 275.81,321.11C273.87,321.12 273.87,321.12 271.89,321.12C269,321 269,321 268,320C267.91,318.22 267.89,316.44 267.9,314.65C267.91,313.03 267.91,313.03 267.91,311.38C267.92,309.68 267.92,309.68 267.94,307.94C267.94,306.8 267.95,305.66 267.95,304.48C267.96,301.65 267.98,298.83 268,296C260.41,296 252.82,296 245,296C245,320.42 245,344.84 245,370C228.5,370 212,370 195,370C195,320.83 195,271.66 195,221Z"
-      android:fillColor="#FFFFFF"/>
-  <path
-      android:pathData="M268,344C276.58,344 285.16,344 294,344C294,352.58 294,361.16 294,370C285.42,370 276.84,370 268,370C268,361.42 268,352.84 268,344Z"
-      android:fillColor="#FFFFFF"/>
-  <path
-      android:pathData="M317,344C325.25,344 333.5,344 342,344C342,352.58 342,361.16 342,370C333.75,370 325.5,370 317,370C317,361.42 317,352.84 317,344Z"
-      android:fillColor="#FFFFFF"/>
+      android:pathData="M98.93,50.36C91.24,50.36 85,56.64 85,64.39V92.46C85,100.21 91.24,106.49 98.93,106.49H126.79C134.48,106.49 140.71,100.21 140.71,92.46V64.39C140.71,56.64 134.48,50.36 126.79,50.36H98.93ZM122.14,69.07V87.78H103.57V69.07H122.14ZM98.93,125.21C91.24,125.21 85,131.49 85,139.24V167.31C85,175.05 91.24,181.34 98.93,181.34H126.79C134.48,181.34 140.71,175.05 140.71,167.31V139.24C140.71,131.49 134.48,125.21 126.79,125.21H98.93ZM122.14,143.92V162.63H103.57V143.92H122.14ZM159.29,64.39V92.46C159.29,100.21 165.52,106.49 173.21,106.49H201.07C208.76,106.49 215,100.21 215,92.46V64.39C215,56.64 208.76,50.36 201.07,50.36H173.21C165.52,50.36 159.29,56.64 159.29,64.39ZM177.86,69.07H196.43V87.78H177.86V69.07ZM187.14,171.99V181.34H196.43V171.99H187.14ZM215,171.99H205.71V181.34H215V171.99ZM205.71,125.21V134.56H187.14V125.21H159.29V153.27V181.34H177.86V153.27H187.14V162.63H215V143.92V134.56V125.21H205.71Z"
+      android:fillColor="@color/square_button_icon_color"/>
 </vector>
diff --git a/app/res/drawable/startup_url.xml b/app/res/drawable/startup_url.xml
index 442e6b7bd9..9a04552800 100644
--- a/app/res/drawable/startup_url.xml
+++ b/app/res/drawable/startup_url.xml
@@ -1,12 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="400dp"
-    android:height="325dp"
-    android:viewportWidth="400"
-    android:viewportHeight="325">
-  <path
-      android:pathData="M235.42,82.44C251.99,98.76 262,122 262.38,145.23C262.34,167.32 257.23,188.52 243,206C237.68,211.02 232.5,212.39 225.37,212.27C219.67,211.62 215.48,208.83 211.63,204.69C207.45,199.31 206.32,193.68 207.12,187C208.3,182.98 210.25,179.65 212.38,176.06C219.95,163.22 222.46,149.85 218.81,135.13C214.51,121.87 207.09,111.61 194.94,104.47C182.82,98.4 170.23,96.95 157.13,100.69C142.54,105.81 132.98,115.84 122.23,126.64C120.81,128.07 119.38,129.49 117.95,130.92C117.02,131.84 116.1,132.77 115.14,133.72C113.91,134.96 113.91,134.96 112.66,136.22C110.61,138.36 108.68,140.52 106.75,142.76C102.67,147.46 98.26,151.79 93.81,156.14C92.04,157.89 90.28,159.64 88.51,161.38C85.75,164.1 83,166.81 80.23,169.52C77.54,172.16 74.86,174.81 72.19,177.46C71.37,178.25 70.55,179.04 69.71,179.86C58.25,191.27 51.7,203.77 51.5,220.06C51.66,233.24 56.33,245.23 64.96,255.29C74.55,264.54 87.25,269.81 100.5,270.25C112.23,269.92 122.61,266.07 132.09,259.27C136.89,256.08 142.46,256.46 148,257C153.94,258.75 157.52,261.99 161,267C163.74,272.83 164.13,279.06 162.35,285.28C157.34,296.45 144.41,302.36 133.69,306.75C109.95,315.24 84.66,314.27 61.74,303.9C40.3,293.62 24.05,275.75 15.29,253.73C6.69,228.81 7.45,201.71 18.95,177.83C23.56,168.89 29.66,160.78 37.01,153.92C38.9,152.1 40.61,150.21 42.31,148.21C45.68,144.33 49.19,140.64 52.81,136.99C53.46,136.34 54.1,135.69 54.76,135.02C56.86,132.9 58.96,130.78 61.07,128.66C61.79,127.93 62.52,127.2 63.27,126.44C67.11,122.57 70.96,118.7 74.81,114.84C77.97,111.66 81.13,108.48 84.28,105.29C88.1,101.41 91.95,97.55 95.8,93.69C97.25,92.23 98.7,90.77 100.14,89.3C138.25,50.59 194.05,43.93 235.42,82.44Z"
-      android:fillColor="#FFFFFF"/>
-  <path
-      android:pathData="M354.36,31.63C373.3,47.46 386.01,68.18 389,93C391.15,119.98 385.15,143.91 368,165C366.06,167.11 364.09,169.12 361.99,171.08C360.1,172.9 358.39,174.79 356.69,176.79C353.32,180.67 349.81,184.36 346.19,188.01C345.22,188.98 345.22,188.98 344.24,189.98C342.14,192.1 340.04,194.22 337.93,196.34C337.21,197.07 336.48,197.8 335.73,198.56C331.89,202.43 328.04,206.3 324.19,210.16C321.03,213.34 317.87,216.52 314.72,219.71C310.9,223.59 307.05,227.45 303.2,231.31C301.75,232.77 300.3,234.23 298.86,235.7C279.59,255.27 257.25,268.29 229.23,269.04C207.03,269.12 185.62,261.78 169,247C168.26,246.41 167.51,245.82 166.75,245.21C151.34,232.62 142.01,213.16 138,194C137.81,193.09 137.62,192.18 137.42,191.24C134.13,165.92 139.84,142.5 154.01,121.45C157.67,116.95 161.34,114.33 167,113C172.87,112.53 177.87,112.93 183,116C188.59,120.88 191.49,125.63 192.2,133.1C192.17,139.33 189.71,143.72 186.63,148.94C179.05,161.78 176.54,175.15 180.19,189.88C184.49,203.13 191.91,213.39 204.06,220.53C216.18,226.6 228.77,228.05 241.88,224.31C256.63,219.13 266.33,208.84 277.19,197.94C278.04,197.09 278.89,196.24 279.76,195.37C280.6,194.54 281.43,193.7 282.29,192.84C283.4,191.73 283.4,191.73 284.53,190.6C286.49,188.54 288.34,186.45 290.19,184.3C294.43,179.42 299.01,174.93 303.63,170.42C305.48,168.58 307.34,166.74 309.2,164.9C312.1,162.04 315,159.18 317.91,156.33C320.74,153.56 323.56,150.77 326.38,147.98C327.24,147.14 328.1,146.31 328.98,145.44C340.57,133.91 347.29,121.45 347.5,104.94C347.42,97.4 346.16,90.9 343,84C342.64,83.2 342.28,82.41 341.9,81.59C335.65,69.26 325.51,61.18 312.52,56.84C299.05,53.46 286.5,54.83 274,61C271.57,62.5 269.23,64.07 266.91,65.73C262.11,68.92 256.54,68.54 251,68C245.06,66.25 241.48,63.01 238,58C235.26,52.17 234.87,45.94 236.65,39.72C241.66,28.55 254.59,22.64 265.31,18.25C295.14,7.58 329.28,11.68 354.36,31.63Z"
-      android:fillColor="#FFFFFF"/>
+    android:width="300dp"
+    android:height="232dp"
+    android:viewportWidth="300.0"
+    android:viewportHeight="232.5">
+
+    <path android:fillColor="@color/square_button_icon_color"
+        android:pathData="M205.88,118.88C218.04,106.55 218.04,86.58 205.88,74.24C195.13,63.33 178.18,61.91 165.81,70.88L165.47,71.12C162.37,73.37 161.66,77.74 163.87,80.86C166.09,83.98 170.39,84.72 173.47,82.47L173.81,82.23C180.72,77.24 190.16,78.02 196.14,84.11C202.92,90.99 202.92,102.12 196.14,108.99L172.01,133.53C165.23,140.4 154.26,140.4 147.48,133.53C141.48,127.44 140.71,117.86 145.63,110.87L145.87,110.52C148.09,107.38 147.35,103.01 144.28,100.79C141.2,98.56 136.88,99.28 134.68,102.4L134.45,102.75C125.58,115.28 126.98,132.48 137.74,143.39C149.89,155.73 169.57,155.73 181.73,143.39L205.88,118.88ZM94.12,113.77C81.96,126.11 81.96,146.08 94.12,158.41C104.87,169.32 121.82,170.74 134.19,161.77L134.53,161.53C137.63,159.28 138.34,154.92 136.13,151.8C133.91,148.68 129.61,147.93 126.53,150.18L126.19,150.42C119.28,155.42 109.84,154.63 103.86,148.54C97.08,141.65 97.08,130.51 103.86,123.64L128,99.13C134.77,92.25 145.74,92.25 152.52,99.13C158.52,105.22 159.29,114.8 154.37,121.81L154.13,122.15C151.91,125.3 152.65,129.66 155.72,131.89C158.8,134.12 163.12,133.4 165.32,130.27L165.55,129.93C174.41,117.38 173.02,100.18 162.26,89.26C150.11,76.93 130.43,76.93 118.27,89.26L94.12,113.77Z"/>
 </vector>
diff --git a/app/res/drawable/wifi_direct_change_mode.xml b/app/res/drawable/wifi_direct_change_mode.xml
index c7cb385497..a735171ce4 100644
--- a/app/res/drawable/wifi_direct_change_mode.xml
+++ b/app/res/drawable/wifi_direct_change_mode.xml
@@ -5,6 +5,6 @@
         android:width="512dp"
         xmlns:android="http://schemas.android.com/apk/res/android">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="@color/square_button_icon_color"
         android:pathData="M19.43,12.98c0.04,-0.32 0.07,-0.64 0.07,-0.98s-0.03,-0.66 -0.07,-0.98l2.11,-1.65c0.19,-0.15 0.24,-0.42 0.12,-0.64l-2,-3.46c-0.12,-0.22 -0.39,-0.3 -0.61,-0.22l-2.49,1c-0.52,-0.4 -1.08,-0.73 -1.69,-0.98l-0.38,-2.65C14.46,2.18 14.25,2 14,2h-4c-0.25,0 -0.46,0.18 -0.49,0.42l-0.38,2.65c-0.61,0.25 -1.17,0.59 -1.69,0.98l-2.49,-1c-0.23,-0.09 -0.49,0 -0.61,0.22l-2,3.46c-0.13,0.22 -0.07,0.49 0.12,0.64l2.11,1.65c-0.04,0.32 -0.07,0.65 -0.07,0.98s0.03,0.66 0.07,0.98l-2.11,1.65c-0.19,0.15 -0.24,0.42 -0.12,0.64l2,3.46c0.12,0.22 0.39,0.3 0.61,0.22l2.49,-1c0.52,0.4 1.08,0.73 1.69,0.98l0.38,2.65c0.03,0.24 0.24,0.42 0.49,0.42h4c0.25,0 0.46,-0.18 0.49,-0.42l0.38,-2.65c0.61,-0.25 1.17,-0.59 1.69,-0.98l2.49,1c0.23,0.09 0.49,0 0.61,-0.22l2,-3.46c0.12,-0.22 0.07,-0.49 -0.12,-0.64l-2.11,-1.65zM12,15.5c-1.93,0 -3.5,-1.57 -3.5,-3.5s1.57,-3.5 3.5,-3.5 3.5,1.57 3.5,3.5 -1.57,3.5 -3.5,3.5z"/>
 </vector>
diff --git a/app/res/drawable/wifi_direct_discover.xml b/app/res/drawable/wifi_direct_discover.xml
index 3a365e98e4..2b6ba5b485 100644
--- a/app/res/drawable/wifi_direct_discover.xml
+++ b/app/res/drawable/wifi_direct_discover.xml
@@ -5,9 +5,9 @@
         android:width="512dp"
         xmlns:android="http://schemas.android.com/apk/res/android">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="@color/square_button_icon_color"
         android:pathData="M34.6,39c-0.9,0 -1.8,-0.4 -2.4,-1l-8,-8C18,33.9 9.9,33 4.6,27.8c-3,-2.9 -4.6,-6.8 -4.6,-11c0,-4.2 1.6,-8.2 4.6,-11.2c2.9,-3 6.8,-4.6 11,-4.6c4.2,0 8.2,1.6 11.2,4.6c0,0 0,0 0,0C32,10.9 32.9,19 29,25.1l8,8c0.6,0.6 1,1.5 1,2.4c0,0.9 -0.4,1.7 -1,2.4C36.4,38.6 35.6,39 34.6,39C34.7,39 34.6,39 34.6,39zM24.3,27.7c0.3,0 0.5,0.1 0.7,0.3l8.6,8.6c0.3,0.3 0.7,0.5 1,0.4c0.4,0 0.7,-0.2 0.9,-0.4c0.3,-0.3 0.4,-0.7 0.4,-1.1c0,-0.3 -0.1,-0.6 -0.4,-0.9L27,26c-0.3,-0.3 -0.4,-0.9 -0.1,-1.3c3.9,-5.4 3.2,-12.9 -1.5,-17.7c-2.6,-2.6 -6,-4 -9.7,-4c0,0 0,0 0,0C12,3 8.6,4.4 6,7c-2.6,2.6 -4,6.1 -4,9.7c0,3.6 1.4,7 4,9.6c4.8,4.8 12.2,5.4 17.7,1.5C23.9,27.7 24.1,27.7 24.3,27.7z"/>
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="@color/square_button_icon_color"
         android:pathData="M15.7,28.6c-6.6,0 -11.9,-5.3 -11.9,-11.9S9.1,4.8 15.7,4.8s11.9,5.3 11.9,11.9S22.2,28.6 15.7,28.6zM15.7,6.8c-5.5,0 -9.9,4.4 -9.9,9.9s4.4,9.9 9.9,9.9s9.9,-4.4 9.9,-9.9S21.1,6.8 15.7,6.8z"/>
 </vector>
diff --git a/app/res/drawable/wifi_direct_submit.xml b/app/res/drawable/wifi_direct_submit.xml
index 5a6ad4bf0c..22d10c7cc6 100644
--- a/app/res/drawable/wifi_direct_submit.xml
+++ b/app/res/drawable/wifi_direct_submit.xml
@@ -5,9 +5,9 @@
         android:width="512dp"
         xmlns:android="http://schemas.android.com/apk/res/android">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="@color/square_button_icon_color"
         android:pathData="M10,12 L6,12 6,6 2,6 8,0 14,6 10,6z"/>
     <path
-        android:fillColor="#000"
+        android:fillColor="@color/square_button_icon_color"
         android:pathData="m0,11 l0,5 16,0 0,-5 -2,0 0,3 -12,0 0,-3z"/>
 </vector>
diff --git a/app/res/drawable/wifi_direct_transfer.xml b/app/res/drawable/wifi_direct_transfer.xml
index 994c07960c..376611cdf8 100644
--- a/app/res/drawable/wifi_direct_transfer.xml
+++ b/app/res/drawable/wifi_direct_transfer.xml
@@ -5,6 +5,6 @@
         android:width="512dp"
         xmlns:android="http://schemas.android.com/apk/res/android">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="@color/square_button_icon_color"
         android:pathData="M78.100006,84.400024c-1.8,0 -3.1,-1.4 -3.1,-3.1s1.4,-3.1 3.1,-3.1s3.1,1.4 3.1,3.1S79.899994,84.400024 78.100006,84.400024zM21.899994,84.400024c-1.8,0 -3.1,-1.4 -3.1,-3.1s1.4,-3.1 3.1,-3.1s3.1,1.4 3.1,3.1S23.600006,84.400024 21.899994,84.400024zM50,34.400024l0,9.4l-15.6,0c-3.1,0 -3.1,0 -3.1,3.1l0,6.2c0,3.1 0,3.1 3.1,3.1l15.6,0l0,9.4l17.2,-15.6L50,34.400024zM56.200012,31.200012l6.2,6.2l0,-15.6l31.2,0L93.60004,75l-31.2,0l0,-12.5l-6.2,6.2l0,15.6c0,3.1 0,3.1 3.1,3.1l37.5,0c3.1,0 3.1,0 3.1,-3.1l0,-68.8c0,-3.1 0,-3.1 -3.1,-3.1l-37.5,0c-3.1,0 -3.1,0 -3.1,3.1L56.200012,31.200012zM43.799988,37.5l0,-21.9c0,-3.1 0,-3.1 -3.1,-3.1l-37.5,0c-3.1,0 -3.1,0 -3.1,3.1l0,68.8c0,3.1 0,3.1 3.1,3.1l37.5,0c3.1,0 3.1,0 3.1,-3.1l0,-21.9l-6.2,0L37.599976,75l-31.2,0l0,-53.1l31.2,0l0,15.6L43.799988,37.5z"/>
 </vector>
diff --git a/app/res/layout-land/activity_crash_warning.xml b/app/res/layout-land/activity_crash_warning.xml
index 92bde2be99..60f0faecae 100644
--- a/app/res/layout-land/activity_crash_warning.xml
+++ b/app/res/layout-land/activity_crash_warning.xml
@@ -93,12 +93,10 @@
         </LinearLayout>
     </ScrollView>
 
-    <Button
+    <com.google.android.material.button.MaterialButton
         android:id="@+id/RestartCommCare"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
-        android:layout_margin="@dimen/content_min_margin"
-        android:background="@color/cc_brand_color"
-        android:textColor="@color/cc_neutral_bg"/>
+        android:layout_margin="@dimen/content_min_margin"/>
 </RelativeLayout>
diff --git a/app/res/layout/activity_crash_warning.xml b/app/res/layout/activity_crash_warning.xml
index 31cf7fda08..3695850f16 100644
--- a/app/res/layout/activity_crash_warning.xml
+++ b/app/res/layout/activity_crash_warning.xml
@@ -108,12 +108,10 @@
         </LinearLayout>
     </LinearLayout>
 
-    <Button
+    <com.google.android.material.button.MaterialButton
         android:id="@+id/RestartCommCare"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
-        android:layout_margin="@dimen/content_min_margin"
-        android:background="@color/cc_brand_color"
-        android:textColor="@color/cc_neutral_bg"/>
+        android:layout_margin="@dimen/content_min_margin"/>
 </RelativeLayout>
diff --git a/app/res/layout/activity_drawing_boundary.xml b/app/res/layout/activity_drawing_boundary.xml
index 89f742fdee..426377a3ad 100644
--- a/app/res/layout/activity_drawing_boundary.xml
+++ b/app/res/layout/activity_drawing_boundary.xml
@@ -44,7 +44,7 @@
         android:layout_width="match_parent"
         android:orientation="horizontal">
 
-        <Button
+        <com.google.android.material.button.MaterialButton
             style="@style/MapButtonGreen"
             android:id="@+id/start_tracking_button"
             android:layout_height="wrap_content"
@@ -52,15 +52,15 @@
             android:visibility="gone"
             android:layout_width="0dp" />
 
-        <Button
-            style="@style/MapButtonRed"
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/stop_tracking_button"
+            style="@style/MapButtonRed"
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:layout_width="0dp"
             android:visibility="gone" />
 
-        <Button
+        <com.google.android.material.button.MaterialButton
             style="@style/MapButtonOrange"
             android:id="@+id/redo_tracking_button"
             android:layout_height="wrap_content"
@@ -68,7 +68,7 @@
             android:layout_width="0dp"
             android:visibility="gone" />
 
-        <Button
+        <com.google.android.material.button.MaterialButton
             style="@style/MapButtonGreen"
             android:id="@+id/ok_tracking_button"
             android:layout_height="wrap_content"
diff --git a/app/res/layout/activity_mapbox_location_picker.xml b/app/res/layout/activity_mapbox_location_picker.xml
index 62f4d970d6..74398bbd91 100644
--- a/app/res/layout/activity_mapbox_location_picker.xml
+++ b/app/res/layout/activity_mapbox_location_picker.xml
@@ -56,21 +56,19 @@
             android:maxLines="3"
             android:minLines="3" />
 
-        <Button
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/confirm_location_button"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="bottom"
             android:enabled="false"
-            style="@style/Commcare.Button.Primary"
             android:text="@string/confirm_location" />
 
-        <Button
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/cancel_button"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="bottom"
-            style="@style/Commcare.Button.Primary"
             android:text="@string/cancel" />
 
     </LinearLayout>
diff --git a/app/res/layout/activity_report_problem.xml b/app/res/layout/activity_report_problem.xml
index 35648f2e81..598eda0394 100644
--- a/app/res/layout/activity_report_problem.xml
+++ b/app/res/layout/activity_report_problem.xml
@@ -8,6 +8,7 @@
 
     <RelativeLayout
         android:layout_width="match_parent"
+        android:layout_margin="16dp"
         android:layout_height="wrap_content">
 
         <ImageView
@@ -46,7 +47,7 @@
             android:lines="5"
             android:textColor="@color/black"/>
 
-        <Button
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/ReportButton01"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
diff --git a/app/res/layout/activity_target_mismatch_error.xml b/app/res/layout/activity_target_mismatch_error.xml
index 92e6e71e06..028f6c2be7 100644
--- a/app/res/layout/activity_target_mismatch_error.xml
+++ b/app/res/layout/activity_target_mismatch_error.xml
@@ -38,8 +38,9 @@
             tools:text="In order to install CommCare LTS, Please click on install button below. Then try installing your app again."/>
     </LinearLayout>
 
-    <Button
-        style="@style/PromptedUpdateButtonUpdateLater"
+    <com.google.android.material.button.MaterialButton
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/standard_spacer_large"
         android:layout_below="@+id/error_info_container"
         android:id="@+id/install_app_button"
diff --git a/app/res/layout/app_manager.xml b/app/res/layout/app_manager.xml
index a0af3a65b6..5b0fd33b04 100644
--- a/app/res/layout/app_manager.xml
+++ b/app/res/layout/app_manager.xml
@@ -36,13 +36,14 @@
         android:layout_centerHorizontal="true"
         android:gravity="center"/>
 
-    <Button
+    <com.google.android.material.button.MaterialButton
         android:id="@+id/install_app_button"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_centerHorizontal="true"
         android:layout_below="@id/manager_instructions"
         android:layout_marginTop="@dimen/standard_spacer"
+        android:textSize="@dimen/font_size_xlarge"
         android:paddingHorizontal="@dimen/standard_spacer_double"
         android:onClick="installAppClicked"
         android:text="@string/install_app" />
diff --git a/app/res/layout/blank_missing_multimedia_layout.xml b/app/res/layout/blank_missing_multimedia_layout.xml
index dc44bfd6f1..f156e89344 100644
--- a/app/res/layout/blank_missing_multimedia_layout.xml
+++ b/app/res/layout/blank_missing_multimedia_layout.xml
@@ -16,13 +16,13 @@
         android:scaleType="fitStart"
         android:maxHeight="135px"
         android:maxWidth="663px"
-        app:srcCompat="@drawable/ccbanner"
+        app:srcCompat="@drawable/commcare_by_dimagi"
         android:visibility="gone"
         android:layout_marginEnd="20px"
         android:paddingStart="20px">
     </ImageView>
 
-    <Button
+    <com.google.android.material.button.MaterialButton
         android:id="@+id/skip_verification_button"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
@@ -31,7 +31,7 @@
         android:layout_above="@+id/screen_multimedia_retry"
         android:visibility="gone" />
 
-    <Button
+    <com.google.android.material.button.MaterialButton
         android:id="@id/screen_multimedia_retry"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
diff --git a/app/res/layout/blue_outlined_button.xml b/app/res/layout/blue_outlined_button.xml
index 31afd53836..82d3dca59d 100644
--- a/app/res/layout/blue_outlined_button.xml
+++ b/app/res/layout/blue_outlined_button.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Button xmlns:android="http://schemas.android.com/apk/res/android"
+<com.google.android.material.button.MaterialButton xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    style="@style/NegativeButtonStyle"
+    app:strokeColor="@color/cc_brand_color"
     android:id="@+id/blue_outlined_button"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:layout_gravity="right"
-    android:textColor="@color/blue"
+    android:layout_gravity="end"
     android:visibility="gone"
-    style="@style/CommCare.Button.Default"
-    android:background="@drawable/blue_outlined_view"
     android:padding="10dp"
-    tools:viewBindingIgnore="true"/>
\ No newline at end of file
+    tools:viewBindingIgnore="true" />
diff --git a/app/res/layout/choice_dialog_view.xml b/app/res/layout/choice_dialog_view.xml
index d4020842d5..6664567254 100644
--- a/app/res/layout/choice_dialog_view.xml
+++ b/app/res/layout/choice_dialog_view.xml
@@ -25,19 +25,18 @@
         android:layout_marginEnd="@dimen/standard_spacer_large">
     </ListView>
 
-    <Button xmlns:android="http://schemas.android.com/apk/res/android"
+    <com.google.android.material.button.MaterialButton
+        style="@style/NegativeButtonStyle"
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        app:strokeColor="@color/cc_brand_color"
             android:id="@+id/optional_button"
             android:layout_width="wrap_content"
             android:layout_height="@dimen/min_button_height"
             android:padding="@dimen/standard_spacer"
             android:layout_gravity="end"
             android:layout_marginRight="@dimen/standard_spacer"
-            android:background="@android:color/transparent"
-            android:textSize="@dimen/font_size_dp_medium"
-            android:textColor="@color/dialog_button_color"
             android:visibility="gone"
-        android:layout_marginEnd="@dimen/standard_spacer">
-    </Button>
+        android:layout_marginEnd="@dimen/standard_spacer"/>
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/res/layout/component_entity_detail_item.xml b/app/res/layout/component_entity_detail_item.xml
index 9d83e2da4b..abc4c8edee 100644
--- a/app/res/layout/component_entity_detail_item.xml
+++ b/app/res/layout/component_entity_detail_item.xml
@@ -41,7 +41,7 @@
             android:visibility="visible"
             android:layout_marginEnd="8dp" />
 
-        <Button
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/detail_value_phone"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
@@ -105,7 +105,7 @@
                 android:drawablePadding="@dimen/content_min_margin"
                 android:text="Callout"/>
 
-            <Button
+            <com.google.android.material.button.MaterialButton
                 android:id="@+id/callout_button"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
@@ -146,7 +146,7 @@
             android:paddingStart="11dp"
             android:paddingEnd="4dp">
 
-            <Button
+            <com.google.android.material.button.MaterialButton
                 android:id="@+id/detail_address_button"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
diff --git a/app/res/layout/connection_diagnostic.xml b/app/res/layout/connection_diagnostic.xml
index 3e3e9631fd..189a92ed72 100644
--- a/app/res/layout/connection_diagnostic.xml
+++ b/app/res/layout/connection_diagnostic.xml
@@ -39,10 +39,10 @@
             android:paddingStart="5dp"
             android:paddingEnd="5dp">
 
-            <Button
+            <com.google.android.material.button.MaterialButton
                 android:id="@+id/run_connection_test"
-                style="@style/ButtonBottom"
                 android:layout_width="match_parent"
+                android:layout_margin="10dp"
                 android:layout_height="wrap_content"
                 android:text="Run Connection Test"/>
 
@@ -58,17 +58,15 @@
             android:text="Output message."
             android:visibility="invisible"/>
 
-        <Button
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/settings_button"
-            style="?android:attr/buttonStyleSmall"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="Go to Settings"
             android:visibility="invisible"/>
 
-        <Button
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/report_button"
-            style="?android:attr/buttonStyleSmall"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="Report to CommCare"
diff --git a/app/res/layout/custom_alert_dialog.xml b/app/res/layout/custom_alert_dialog.xml
index e24d9d96c5..ff67065491 100755
--- a/app/res/layout/custom_alert_dialog.xml
+++ b/app/res/layout/custom_alert_dialog.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -71,50 +71,38 @@
             android:layout_weight="2"
             android:layout_marginBottom="@dimen/standard_spacer">
 
-            <Button xmlns:android="http://schemas.android.com/apk/res/android"
-                    android:id="@+id/positive_button"
-                    android:layout_width="wrap_content"
-                    android:layout_height="@dimen/min_button_height"
-                    android:padding="@dimen/standard_spacer"
-                    android:layout_alignParentRight="true"
-                    android:layout_marginRight="@dimen/standard_spacer"
-                    android:background="@android:color/transparent"
-                    android:textSize="@dimen/font_size_dp_medium"
-                    android:textColor="@color/dialog_button_color"
-                    android:visibility="gone"
+            <com.google.android.material.button.MaterialButton
+                app:strokeColor="@color/cc_brand_color"
+                android:id="@+id/positive_button"
+                android:layout_width="wrap_content"
+                android:layout_height="@dimen/min_button_height"
+                android:padding="@dimen/standard_spacer"
+                android:visibility="gone"
                 android:layout_alignParentEnd="true"
-                android:layout_marginEnd="@dimen/standard_spacer">
-            </Button>
+                android:layout_marginEnd="@dimen/standard_spacer"
+                android:layout_marginStart="@dimen/standard_spacer"/>
 
-            <Button xmlns:android="http://schemas.android.com/apk/res/android"
-                    android:id="@+id/neutral_button"
-                    android:layout_width="wrap_content"
-                    android:layout_height="@dimen/min_button_height"
-                    android:padding="@dimen/standard_spacer"
-                    android:layout_toLeftOf="@id/positive_button"
-                    android:background="@android:color/transparent"
-                    android:textSize="@dimen/font_size_dp_medium"
-                    android:textColor="@color/dialog_button_color"
-                    android:visibility="gone"
-                android:layout_toStartOf="@id/positive_button">
-            </Button>
+            <com.google.android.material.button.MaterialButton
+                app:strokeColor="@color/cc_brand_color"
+                android:id="@+id/neutral_button"
+                android:layout_width="wrap_content"
+                android:layout_height="@dimen/min_button_height"
+                android:padding="@dimen/standard_spacer"
+                android:layout_marginEnd="@dimen/standard_spacer"
+                android:visibility="gone"
+                android:layout_toStartOf="@id/positive_button"/>
 
-            <Button xmlns:android="http://schemas.android.com/apk/res/android"
-                    android:id="@+id/negative_button"
-                    android:layout_width="wrap_content"
-                    android:layout_height="@dimen/min_button_height"
-                    android:padding="@dimen/standard_spacer"
-                    android:layout_toLeftOf="@id/neutral_button"
-                    android:layout_marginRight="@dimen/standard_spacer"
-                    android:layout_marginLeft="@dimen/standard_spacer"
-                    android:background="@android:color/transparent"
-                    android:textSize="@dimen/font_size_dp_medium"
-                    android:textColor="@color/dialog_button_color"
-                    android:visibility="gone"
+            <com.google.android.material.button.MaterialButton
+                style="@style/NegativeButtonStyle"
+                android:id="@+id/negative_button"
+                android:layout_width="wrap_content"
+                android:layout_height="@dimen/min_button_height"
+                android:padding="@dimen/standard_spacer"
+                app:strokeColor="@color/cc_brand_color"
+                android:visibility="gone"
                 android:layout_marginStart="@dimen/standard_spacer"
                 android:layout_marginEnd="@dimen/standard_spacer"
-                android:layout_toStartOf="@id/neutral_button">
-            </Button>
+                android:layout_toStartOf="@id/neutral_button"/>
         </RelativeLayout>
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/res/layout/dots_detail.xml b/app/res/layout/dots_detail.xml
index f29952483e..9d1bb02a12 100644
--- a/app/res/layout/dots_detail.xml
+++ b/app/res/layout/dots_detail.xml
@@ -40,18 +40,18 @@
         android:id="@+id/dotsbuttonframe"
         android:weightSum="1">
 
-        <Button
+        <com.google.android.material.button.MaterialButton
             android:layout_height="wrap_content"
             android:layout_width="wrap_content"
             android:text="Save Details"
             android:id="@+id/btn_dots_detail_ok"
-            android:layout_weight="0.5"></Button>
+            android:layout_weight="0.5"/>
 
-        <Button
+        <com.google.android.material.button.MaterialButton
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:id="@+id/btn_dots_detail_cancel"
             android:text="Cancel"
-            android:layout_weight="0.5"></Button>
+            android:layout_weight="0.5"/>
     </LinearLayout>
 </RelativeLayout>
diff --git a/app/res/layout/dotsdoses.xml b/app/res/layout/dotsdoses.xml
index c11b044085..2a84d168db 100644
--- a/app/res/layout/dotsdoses.xml
+++ b/app/res/layout/dotsdoses.xml
@@ -61,10 +61,10 @@
             android:id="@+id/dots_dose_four"></TableRow>
     </TableLayout>
 
-    <Button
+    <com.google.android.material.button.MaterialButton
         android:layout_height="wrap_content"
         android:layout_width="fill_parent"
         android:id="@+id/btn_dots_doses_done"
         android:text="Done"
-        android:layout_alignParentBottom="true"></Button>
+        android:layout_alignParentBottom="true"/>
 </RelativeLayout>
diff --git a/app/res/layout/draw_layout.xml b/app/res/layout/draw_layout.xml
index 203a239874..3a49edaf24 100644
--- a/app/res/layout/draw_layout.xml
+++ b/app/res/layout/draw_layout.xml
@@ -17,9 +17,10 @@
     <RelativeLayout
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
+        android:layout_marginHorizontal="16dp"
         android:layout_alignParentBottom="true">
 
-        <Button
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/btnFinishDraw"
             android:layout_width="wrap_content"
             android:enabled="false"
@@ -31,12 +32,13 @@
             android:layout_alignParentRight="true"
             android:layout_alignParentEnd="true">
 
-            <Button
+            <com.google.android.material.button.MaterialButton
                 android:id="@+id/btnResetDraw"
                 android:layout_width="wrap_content"
+                android:layout_marginHorizontal="16dp"
                 android:layout_height="wrap_content"/>
 
-            <Button
+            <com.google.android.material.button.MaterialButton
                 android:id="@+id/btnCancelDraw"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"/>
diff --git a/app/res/layout/entity_detail.xml b/app/res/layout/entity_detail.xml
index 38458c1a22..4fb1ae5d46 100644
--- a/app/res/layout/entity_detail.xml
+++ b/app/res/layout/entity_detail.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/entity_detail"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
@@ -9,8 +10,12 @@
     tools:viewBindingIgnore="true">
 
     <Button
-        android:id="@+id/entity_select_button"
         style="@style/ScreenPinnedButton"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        app:backgroundTint="@color/cc_attention_positive_bg"
+        android:textColor="@color/cc_attention_positive_text"
+        android:id="@+id/entity_select_button"
         android:text="Continue"
         android:layout_below="@+id/universal_frame_tile"/>
 
diff --git a/app/res/layout/execute_recovery_measures.xml b/app/res/layout/execute_recovery_measures.xml
index 74ff5fa5c8..963deebbf1 100644
--- a/app/res/layout/execute_recovery_measures.xml
+++ b/app/res/layout/execute_recovery_measures.xml
@@ -17,9 +17,9 @@
         <ImageView
             android:id="@+id/screen_login_top_banner"
             android:layout_centerHorizontal="true"
-            android:layout_height="wrap_content"
-            android:layout_width="wrap_content"
-            app:srcCompat="@drawable/icon_color"/>
+            android:layout_height="136dp"
+            android:layout_width="136dp"
+            app:srcCompat="@mipmap/commcare_launcher"/>
 
         <TextView
             android:gravity="center"
@@ -53,7 +53,7 @@
             android:visibility="gone"
             tools:text="2 out of 5 done"/>
 
-        <Button
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/retry_button"
             android:layout_below="@id/status_tv"
             android:layout_centerHorizontal="true"
@@ -63,7 +63,7 @@
             android:text="@string/recovery_measure_retry"
             android:visibility="gone"/>
 
-        <Button
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/reinstall_button"
             android:layout_below="@id/retry_button"
             android:layout_centerHorizontal="true"
@@ -73,7 +73,7 @@
             android:text="@string/recovery_measure_reinstall"
             android:visibility="gone"/>
 
-        <Button
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/select_ccz_button"
             android:layout_below="@id/reinstall_button"
             android:layout_centerHorizontal="true"
diff --git a/app/res/layout/fragment_setup_enter_url.xml b/app/res/layout/fragment_setup_enter_url.xml
index 969d497871..c0f2f8faa0 100644
--- a/app/res/layout/fragment_setup_enter_url.xml
+++ b/app/res/layout/fragment_setup_enter_url.xml
@@ -65,7 +65,7 @@
                     </EditText>
                 </LinearLayout>
 
-                <Button
+                <com.google.android.material.button.MaterialButton
                     android:id="@+id/start_install"
                     android:layout_width="fill_parent"
                     android:layout_height="wrap_content"
diff --git a/app/res/layout/geo_progress.xml b/app/res/layout/geo_progress.xml
index 2fe494c747..ebccab0453 100644
--- a/app/res/layout/geo_progress.xml
+++ b/app/res/layout/geo_progress.xml
@@ -51,7 +51,7 @@
         android:orientation="horizontal"
         android:layout_weight="1">
 
-        <Button
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/geoOK"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
@@ -59,7 +59,7 @@
             android:text="Record Location"
             android:layout_margin="@dimen/standard_spacer"/>
 
-        <Button
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/geoCancel"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
diff --git a/app/res/layout/geopoint_layout.xml b/app/res/layout/geopoint_layout.xml
index b763e71d20..06bd8b0f49 100644
--- a/app/res/layout/geopoint_layout.xml
+++ b/app/res/layout/geopoint_layout.xml
@@ -33,7 +33,7 @@
             android:paddingBottom="2dip"
             android:paddingTop="2dip">
 
-            <Button
+            <com.google.android.material.button.MaterialButton
                 android:id="@+id/show_location"
                 android:layout_width="wrap_content"
                 android:layout_height="fill_parent"
@@ -41,14 +41,14 @@
                 android:text="@string/go_to_location"
                 android:visibility="gone"/>
 
-            <Button
+            <com.google.android.material.button.MaterialButton
                 android:id="@+id/accept_location"
                 android:layout_width="wrap_content"
                 android:layout_height="fill_parent"
                 android:layout_weight="1"
                 android:text="@string/accept_location" />
 
-            <Button
+            <com.google.android.material.button.MaterialButton
                 android:id="@+id/cancel_location"
                 android:layout_width="wrap_content"
                 android:layout_height="fill_parent"
diff --git a/app/res/layout/hierarchy_layout.xml b/app/res/layout/hierarchy_layout.xml
index 5b459716b6..6c6d3ff375 100644
--- a/app/res/layout/hierarchy_layout.xml
+++ b/app/res/layout/hierarchy_layout.xml
@@ -46,10 +46,10 @@ the License.
             android:layout_height="wrap_content"
             android:text="@string/jump_to_previous"
             android:padding="12dp"
-            android:textSize="@dimen/text_medium"
             android:textColor="@color/cc_brand_color"
             android:background="@color/cc_core_bg"
             style="@style/CommCare.Button.Default"
+            android:textSize="@dimen/text_medium"
             android:layout_weight="1"/>
 
         <Button
diff --git a/app/res/layout/http_request_layout.xml b/app/res/layout/http_request_layout.xml
index 44cd60fc01..7b8a9e100e 100644
--- a/app/res/layout/http_request_layout.xml
+++ b/app/res/layout/http_request_layout.xml
@@ -38,16 +38,14 @@
                 android:layout_height="wrap_content"
                 android:orientation="vertical" />
 
-            <Button
+            <com.google.android.material.button.MaterialButton
                 android:id="@+id/request_button"
-                style="@style/ButtonBottom"
+                android:layout_margin="10dp"
                 android:layout_width="wrap_content"
                 android:layout_gravity="center"
                 android:layout_height="wrap_content"
-                android:background="@color/cc_brand_color"
                 android:paddingBottom="@dimen/content_start"
-                android:paddingTop="@dimen/content_start"
-                android:textColor="@color/cc_neutral_bg"/>
+                android:paddingTop="@dimen/content_start" />
 
         </LinearLayout>
     </ScrollView>
diff --git a/app/res/layout/install_confirm_fragment.xml b/app/res/layout/install_confirm_fragment.xml
index cfbd735eca..e72045dc7a 100644
--- a/app/res/layout/install_confirm_fragment.xml
+++ b/app/res/layout/install_confirm_fragment.xml
@@ -75,8 +75,7 @@
                                 android:id="@+id/btn_start_install"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                android:padding="16dp"
-                                SquareButtonWithText:backgroundColor="@color/cc_attention_positive_color"
+                                SquareButtonWithText:backgroundColor="@color/start_home_button"
                                 SquareButtonWithText:img="@drawable/install_start"
                                 SquareButtonWithText:subtitle="Start install"
                                 SquareButtonWithText:textColor="@color/white"
@@ -96,8 +95,7 @@
                                 android:layout_width="wrap_content"
                                 android:layout_height="match_parent"
                                 android:gravity="end"
-                                android:padding="16dp"
-                                SquareButtonWithText:backgroundColor="@color/cc_neutral_color"
+                                SquareButtonWithText:backgroundColor="@color/start_logout_button"
                                 SquareButtonWithText:img="@drawable/install_stop"
                                 SquareButtonWithText:subtitle="Start over"
                                 SquareButtonWithText:textColor="@color/white"/>
diff --git a/app/res/layout/install_permission_requester.xml b/app/res/layout/install_permission_requester.xml
index 138276605d..9415ebdbc0 100644
--- a/app/res/layout/install_permission_requester.xml
+++ b/app/res/layout/install_permission_requester.xml
@@ -52,16 +52,14 @@
                 android:layout_marginStart="@dimen/content_min_margin"
                 android:layout_marginEnd="@dimen/content_min_margin" />
 
-            <Button
+            <com.google.android.material.button.MaterialButton
                 android:id="@+id/get_perms_button"
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
                 android:layout_gravity="bottom"
-                android:background="@color/cc_brand_color"
                 android:nextFocusUp="@+id/edit_password"
                 android:paddingBottom="@dimen/content_start"
-                android:paddingTop="@dimen/content_start"
-                android:textColor="@color/cc_neutral_bg"/>
+                android:paddingTop="@dimen/content_start" />
 
         </LinearLayout>
     </ScrollView>
diff --git a/app/res/layout/layout_note_msg.xml b/app/res/layout/layout_note_msg.xml
index 7ba15d9060..535d0726eb 100644
--- a/app/res/layout/layout_note_msg.xml
+++ b/app/res/layout/layout_note_msg.xml
@@ -42,7 +42,7 @@
         android:text="What to do about it"
         android:textAppearance="?android:attr/textAppearanceMedium"/>
 
-    <Button
+    <com.google.android.material.button.MaterialButton
         android:id="@+id/layout_note_msg_action_button"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
diff --git a/app/res/layout/list_gregorian_widget.xml b/app/res/layout/list_gregorian_widget.xml
index 4aa5816ebf..08b04e69ee 100644
--- a/app/res/layout/list_gregorian_widget.xml
+++ b/app/res/layout/list_gregorian_widget.xml
@@ -51,8 +51,9 @@
                 android:text="+"
                 android:textSize="@dimen/text_largest"
                 android:textColor="@color/white"
+                android:background="@drawable/date_button_top"
                 style="@style/CommCare.Button.Default"
-                android:background="@color/bright_blue_grad_start"
+                android:backgroundTint="@color/cc_brand_color"
                 android:elevation="@dimen/button_elevation"/>
 
             <EditText
@@ -74,8 +75,9 @@
                 android:text="-"
                 android:textSize="@dimen/text_largest"
                 style="@style/CommCare.Button.Default"
+                android:backgroundTint="@color/cc_brand_color"
                 android:textColor="@color/white"
-                android:background="@color/dark_blue"
+                android:background="@drawable/date_button_bottom"
                 android:elevation="@dimen/button_elevation" />
 
         </LinearLayout>
@@ -96,9 +98,10 @@
                 android:layout_marginLeft="5dp"
                 android:text="+"
                 android:textSize="@dimen/text_largest"
-                style="@style/CommCare.Button.Default"
                 android:textColor="@color/white"
-                android:background="@color/bright_blue_grad_start"
+                style="@style/CommCare.Button.Default"
+                android:backgroundTint="@color/cc_brand_color"
+                android:background="@drawable/date_button_top"
                 android:elevation="@dimen/button_elevation"
                 android:layout_marginStart="5dp" />
 
@@ -115,10 +118,11 @@
                 android:layout_marginLeft="5dp"
                 android:text="-"
                 android:textSize="@dimen/text_largest"
-                style="@style/CommCare.Button.Default"
+                android:background="@drawable/date_button_bottom"
                 android:textColor="@color/white"
-                android:background="@color/dark_blue"
                 android:elevation="@dimen/button_elevation"
+                style="@style/CommCare.Button.Default"
+                android:backgroundTint="@color/cc_brand_color"
                 android:layout_marginStart="5dp" />
 
         </LinearLayout>
@@ -138,10 +142,11 @@
                 android:layout_marginLeft="5dp"
                 android:text="+"
                 android:textSize="@dimen/text_largest"
-                style="@style/CommCare.Button.Default"
+                android:background="@drawable/date_button_top"
                 android:textColor="@color/white"
-                android:background="@color/bright_blue_grad_start"
                 android:elevation="@dimen/button_elevation"
+                style="@style/CommCare.Button.Default"
+                android:backgroundTint="@color/cc_brand_color"
                 android:layout_marginStart="5dp" />
 
             <EditText
@@ -154,7 +159,6 @@
                 android:textSize="@dimen/text_medium"
                 android:inputType="number"
                 android:maxLength="4"
-                android:elevation="@dimen/button_elevation"
                 android:selectAllOnFocus="true"
                 android:imeOptions="flagNoExtractUi"
                 android:layout_marginStart="5dp" />
@@ -167,8 +171,9 @@
                 android:text="-"
                 android:textSize="@dimen/text_largest"
                 style="@style/CommCare.Button.Default"
+                android:backgroundTint="@color/cc_brand_color"
                 android:textColor="@color/white"
-                android:background="@color/dark_blue"
+                android:background="@drawable/date_button_bottom"
                 android:elevation="@dimen/button_elevation"
                 android:layout_marginStart="5dp" />
         </LinearLayout>
diff --git a/app/res/layout/missing_multimedia_layout.xml b/app/res/layout/missing_multimedia_layout.xml
index dbb39efe03..196c5a6906 100644
--- a/app/res/layout/missing_multimedia_layout.xml
+++ b/app/res/layout/missing_multimedia_layout.xml
@@ -16,12 +16,12 @@
         android:scaleType="fitStart"
         android:maxHeight="135px"
         android:maxWidth="663px"
-        app:srcCompat="@drawable/ccbanner"
+        app:srcCompat="@drawable/commcare_by_dimagi"
         android:paddingStart="20px"
         android:layout_marginEnd="20px">
     </ImageView>
 
-    <Button
+    <com.google.android.material.button.MaterialButton
         android:id="@+id/skip_verification_button"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
@@ -30,7 +30,7 @@
         android:layout_above="@+id/screen_multimedia_retry"
         android:visibility="gone"/>
 
-    <Button
+    <com.google.android.material.button.MaterialButton
         android:id="@id/screen_multimedia_retry"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
diff --git a/app/res/layout/multiple_apps_limit_view.xml b/app/res/layout/multiple_apps_limit_view.xml
index fe3d3d9925..298e470339 100644
--- a/app/res/layout/multiple_apps_limit_view.xml
+++ b/app/res/layout/multiple_apps_limit_view.xml
@@ -14,7 +14,7 @@
         android:layout_centerInParent="true"
         android:gravity="center"/>
 
-    <Button
+    <com.google.android.material.button.MaterialButton
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:id="@+id/back_to_manager_button"
diff --git a/app/res/layout/pin_screen_buttons.xml b/app/res/layout/pin_screen_buttons.xml
index 9df7a359fd..ac72c48bef 100644
--- a/app/res/layout/pin_screen_buttons.xml
+++ b/app/res/layout/pin_screen_buttons.xml
@@ -8,14 +8,17 @@
     android:weightSum="2"
     tools:viewBindingIgnore="true">
 
-    <Button
+    <com.google.android.material.button.MaterialButton
+        style="@style/CustomButtonStyle"
         android:layout_width="wrap_content"
         android:layout_height="@dimen/min_button_height"
         android:id="@+id/pin_cancel_button"
         android:textSize="@dimen/font_size_dp_medium"
         android:layout_weight="1"/>
 
-    <Button
+
+    <com.google.android.material.button.MaterialButton
+        style="@style/CustomButtonStyle"
         android:layout_width="wrap_content"
         android:layout_height="@dimen/min_button_height"
         android:id="@+id/pin_confirm_button"
diff --git a/app/res/layout/privilege_claiming_view.xml b/app/res/layout/privilege_claiming_view.xml
index 32c46f041c..a6229e221f 100644
--- a/app/res/layout/privilege_claiming_view.xml
+++ b/app/res/layout/privilege_claiming_view.xml
@@ -50,7 +50,7 @@
         android:layout_marginStart="@dimen/standard_spacer_double"
         android:layout_marginEnd="@dimen/standard_spacer_double" />
 
-    <Button
+    <com.google.android.material.button.MaterialButton
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:id="@+id/claim_button"
diff --git a/app/res/layout/progress_dialog_cancel_button.xml b/app/res/layout/progress_dialog_cancel_button.xml
index 4284e7a09c..4f4bcf7790 100644
--- a/app/res/layout/progress_dialog_cancel_button.xml
+++ b/app/res/layout/progress_dialog_cancel_button.xml
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Button xmlns:android="http://schemas.android.com/apk/res/android"
+<com.google.android.material.button.MaterialButton xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    style="@style/NegativeButtonStyle"
+    app:strokeColor="@color/cc_brand_color"
     android:layout_width="wrap_content"
     android:layout_height="@dimen/min_button_height"
     android:layout_below="@+id/main_content_holder"
@@ -9,10 +12,7 @@
     android:layout_marginEnd="@dimen/standard_spacer_large"
     android:layout_marginRight="@dimen/standard_spacer_large"
     android:layout_marginBottom="@dimen/standard_spacer"
-    android:background="@android:color/transparent"
     android:padding="@dimen/standard_spacer"
-    style="@style/CommCare.Button.Default"
     android:text="STOP"
-    android:textSize="@dimen/font_size_dp_medium"
-    android:visibility="gone"
-    tools:viewBindingIgnore="true"/>
\ No newline at end of file
+    android:visibility="visible"
+    tools:viewBindingIgnore="true" />
\ No newline at end of file
diff --git a/app/res/layout/prompt_view.xml b/app/res/layout/prompt_view.xml
index 614a771256..c37e339d07 100644
--- a/app/res/layout/prompt_view.xml
+++ b/app/res/layout/prompt_view.xml
@@ -3,6 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     tools:viewBindingIgnore="true">
 
     <TextView
@@ -36,9 +37,13 @@
                 android:layout_margin="@dimen/standard_spacer_double"
                 android:gravity="center"/>
 
-            <Button
-                android:id="@+id/action_button"
-                style="@style/PromptedUpdateButtonUpdate" />
+            <com.google.android.material.button.MaterialButton
+                android:layout_height="wrap_content"
+                app:backgroundTint="@color/solid_green"
+                android:textSize="@dimen/font_size_xlargest"
+                android:layout_margin="16dp"
+                android:layout_width="wrap_content"
+                android:id="@+id/action_button"/>
 
             <ImageView
                 android:id="@+id/image_cue"
@@ -46,9 +51,13 @@
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="@dimen/standard_spacer_double"/>
 
-            <Button
-                android:id="@+id/do_later_button"
-                style="@style/PromptedUpdateButtonUpdateLater"/>
+            <com.google.android.material.button.MaterialButton
+                android:layout_height="wrap_content"
+                android:textSize="@dimen/font_size_xlarge"
+                android:layout_margin="16dp"
+                android:layout_width="wrap_content"
+                android:paddingHorizontal="24dp"
+                android:id="@+id/do_later_button" />
 
             <TextView
                 android:id="@+id/help_text"
diff --git a/app/res/layout/recording.xml b/app/res/layout/recording.xml
index c79de6c9eb..9e8b03022f 100644
--- a/app/res/layout/recording.xml
+++ b/app/res/layout/recording.xml
@@ -9,7 +9,7 @@
     android:layout_marginTop="10dp"
     tools:viewBindingIgnore="true">
 
-    <Button
+    <com.google.android.material.button.MaterialButton
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:id = "@+id/startrecording"/>
@@ -23,7 +23,7 @@
         android:id = "@+id/recordingprogress"
         android:background="@color/blue"/>
 
-    <Button
+    <com.google.android.material.button.MaterialButton
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:id="@+id/stoprecording"/>
diff --git a/app/res/layout/recording_fragment.xml b/app/res/layout/recording_fragment.xml
index b43b1e2fff..16c2b4b3d3 100644
--- a/app/res/layout/recording_fragment.xml
+++ b/app/res/layout/recording_fragment.xml
@@ -68,9 +68,8 @@
         android:layout_height="wrap_content"
         android:visibility="invisible" />
 
-    <Button
+    <com.google.android.material.button.MaterialButton
         android:id="@+id/action_button"
-        style="@style/Commcare.Button.Primary"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:padding="4dp"
diff --git a/app/res/layout/screen_form_dump.xml b/app/res/layout/screen_form_dump.xml
index 426e8deac2..6a465c61ac 100644
--- a/app/res/layout/screen_form_dump.xml
+++ b/app/res/layout/screen_form_dump.xml
@@ -15,16 +15,16 @@
             android:id="@+id/screen_bulk_image1"
             android:layout_height="wrap_content"
             android:layout_width="fill_parent"
-            android:paddingLeft="20px"
-            android:layout_marginRight="20px"
-            android:paddingTop="20px"
-            android:paddingBottom="0px"
+            android:paddingLeft="8dp"
+            android:layout_marginRight="8dp"
+            android:paddingTop="8dp"
+            android:paddingBottom="0dp"
             android:scaleType="fitStart"
-            android:maxHeight="135px"
-            android:maxWidth="663px"
-            app:srcCompat="@drawable/ccbanner"
-            android:layout_marginEnd="20px"
-            android:paddingStart="20px"></ImageView>
+            android:maxHeight="83dp"
+            android:maxWidth="442dp"
+            app:srcCompat="@drawable/commcare_by_dimagi"
+            android:layout_marginEnd="8dp"
+            android:paddingStart="8dp"></ImageView>
 
         <RelativeLayout
             android:id="@+id/screen_bulk_form_frame_location"
@@ -43,20 +43,19 @@
                 android:layout_centerHorizontal="true"
                 android:layout_margin="10dp"
                 android:gravity="center"
-                android:layout_below="@+id/screen_multimedia_inflater_filefetch"
                 android:text="From here you can dump your forms to an SD card or submit the forms on your SD card"/>
 
-            <Button
+            <com.google.android.material.button.MaterialButton
                 android:id="@+id/screen_bulk_form_dump"
-                style="@style/ButtonBottom"
                 android:layout_width="match_parent"
+                android:layout_margin="10dp"
                 android:layout_height="wrap_content"
                 android:layout_below="@+id/screen_bulk_form_prompt"
                 android:text="Dump Forms"/>
 
-            <Button
+            <com.google.android.material.button.MaterialButton
                 android:id="@+id/screen_bulk_form_submit"
-                style="@style/ButtonBottom"
+                android:layout_margin="10dp"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_below="@+id/screen_bulk_form_dump"
diff --git a/app/res/layout/screen_form_entry.xml b/app/res/layout/screen_form_entry.xml
index bab82092c8..c5869f1f51 100644
--- a/app/res/layout/screen_form_entry.xml
+++ b/app/res/layout/screen_form_entry.xml
@@ -56,7 +56,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_below="@id/nav_badge"
-        android:background="@color/start_sync_button"
+        android:background="@color/barcode_button_color"
         android:minHeight="@dimen/new_progressbar_minheight"
         android:paddingLeft="@dimen/content_start"
         android:paddingRight="@dimen/content_start"
@@ -97,7 +97,6 @@
             android:layout_toLeftOf="@+id/nav_btn_next"
             android:layout_toRightOf="@id/nav_btn_prev"
             android:layout_toStartOf="@+id/nav_btn_next"
-
             android:layout_width="wrap_content"
             android:max="100"
             android:paddingBottom="@dimen/content_start"
@@ -238,11 +237,16 @@
         android:layout_height="wrap_content"
         android:id="@+id/multiple_intent_dispatch_pane"
         android:layout_above="@+id/screen_form_entry_bottom_anchor">
-        <Button
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/multiple_intent_dispatch_button"
             android:text="Batch Dispatch"
+            android:drawableRight="@drawable/icon_chevron_right_brand"
             android:visibility="gone"
-            style="@style/ScreenPinnedButtonNeutral"/>
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:backgroundTint="@color/cc_light_cool_accent_bg"
+            android:textColor="@color/cc_light_cool_accent_text"
+           />
     </FrameLayout>
 
     <View
diff --git a/app/res/layout/screen_login.xml b/app/res/layout/screen_login.xml
index 2f2c7791f1..1f6604303b 100644
--- a/app/res/layout/screen_login.xml
+++ b/app/res/layout/screen_login.xml
@@ -166,14 +166,14 @@
                                 android:textSize="@dimen/font_size_medium"
                                 android:visibility="gone" />
 
-                            <Button
+                            <com.google.android.material.button.MaterialButton
                                 android:id="@+id/login_button"
                                 android:layout_width="fill_parent"
                                 android:layout_height="wrap_content"
                                 android:layout_gravity="bottom"
+                                android:textAllCaps="true"
                                 android:nextFocusUp="@+id/edit_password"
-                                android:paddingBottom="@dimen/content_start"
-                                android:paddingTop="@dimen/content_start" />
+                               />
 
                             <LinearLayout
                                 android:id="@+id/screen_login_error_view"
@@ -203,7 +203,6 @@
                                         android:id="@+id/btn_view_notifications"
                                         android:layout_width="match_parent"
                                         android:layout_height="@dimen/rectangle_button_height"
-
                                         RectangleButtonWithText:backgroundColor="@color/cc_attention_negative_bg"
                                         RectangleButtonWithText:img="@drawable/ic_list_error"
                                         RectangleButtonWithText:textColor="@color/cc_attention_negative_text" />
diff --git a/app/res/layout/screen_multimedia_inflater.xml b/app/res/layout/screen_multimedia_inflater.xml
index c5afe131c7..9b85c391d2 100644
--- a/app/res/layout/screen_multimedia_inflater.xml
+++ b/app/res/layout/screen_multimedia_inflater.xml
@@ -53,14 +53,13 @@
         android:layout_below="@id/screen_multimedia_inflater_frame_location"
         android:layout_centerHorizontal="true"/>
 
-    <Button
+    <com.google.android.material.button.MaterialButton
         android:id="@+id/screen_multimedia_inflater_install"
-        style="@style/ButtonBottom"
         android:layout_width="match_parent"
+        android:layout_margin="10dp"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
         android:layout_gravity="bottom"
-        android:paddingBottom="@dimen/content_start"
-        android:paddingTop="@dimen/content_start" />
+        android:paddingVertical="8dp"/>
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/res/layout/screen_permission_request.xml b/app/res/layout/screen_permission_request.xml
index 6cc1f74851..af7a534696 100644
--- a/app/res/layout/screen_permission_request.xml
+++ b/app/res/layout/screen_permission_request.xml
@@ -33,13 +33,13 @@
         android:layout_marginStart="30dp"
         android:layout_marginEnd="30dp">
 
-        <Button
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/screen_permission_request_button_grant"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:text="Grant Access"/>
 
-        <Button
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/screen_permission_request_button_deny"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
diff --git a/app/res/layout/screen_recovery.xml b/app/res/layout/screen_recovery.xml
index 62903b8099..a7c11b9028 100644
--- a/app/res/layout/screen_recovery.xml
+++ b/app/res/layout/screen_recovery.xml
@@ -38,7 +38,7 @@
         android:visibility="gone"
         tools:text="Waiting"/>
 
-    <Button
+    <com.google.android.material.button.MaterialButton
         android:id="@+id/retry_button"
         android:layout_below="@id/recovery_status"
         android:layout_centerHorizontal="true"
@@ -48,7 +48,7 @@
         android:text="@string/recovery_retry"
         android:visibility="gone"/>
 
-    <Button
+    <com.google.android.material.button.MaterialButton
         android:id="@+id/app_manager_button"
         android:layout_below="@id/retry_button"
         android:layout_centerHorizontal="true"
diff --git a/app/res/layout/screen_seat_app.xml b/app/res/layout/screen_seat_app.xml
index ddb386c647..14532e6489 100644
--- a/app/res/layout/screen_seat_app.xml
+++ b/app/res/layout/screen_seat_app.xml
@@ -10,9 +10,9 @@
 
     <ImageView
         android:id="@+id/screen_login_top_banner"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        app:srcCompat="@drawable/icon_color"
+        android:layout_width="72dp"
+        android:layout_height="72dp"
+        app:srcCompat="@mipmap/commcare_launcher"
         android:layout_centerHorizontal="true"/>
 
     <TextView
diff --git a/app/res/layout/scrolling_calendar_widget.xml b/app/res/layout/scrolling_calendar_widget.xml
index 4572612807..50dd850c02 100644
--- a/app/res/layout/scrolling_calendar_widget.xml
+++ b/app/res/layout/scrolling_calendar_widget.xml
@@ -134,12 +134,10 @@
             android:layout_centerVertical="true"
             android:layout_alignParentStart="true" />
 
-        <Button
+        <com.google.android.material.button.MaterialButton
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:background="@color/lightest_grey"
             android:text="Today"
-            android:textStyle="bold"
             android:id="@+id/today"
             android:layout_centerHorizontal="true"
             android:layout_marginTop="@dimen/standard_spacer"
diff --git a/app/res/layout/select_install_mode_fragment.xml b/app/res/layout/select_install_mode_fragment.xml
index bc81e76544..8bb3c51d39 100644
--- a/app/res/layout/select_install_mode_fragment.xml
+++ b/app/res/layout/select_install_mode_fragment.xml
@@ -72,8 +72,7 @@
                             android:id="@+id/btn_fetch_uri"
                             android:layout_width="wrap_content"
                             android:layout_height="match_parent"
-                            android:paddingHorizontal="24dp"
-                            SquareButtonWithText:backgroundColor="@color/cc_brand_color"
+                            SquareButtonWithText:backgroundColor="@color/barcode_button_color"
                             SquareButtonWithText:img="@drawable/startup_barcode"
                             SquareButtonWithText:subtitle="Scan Application Barcode"
                             SquareButtonWithText:textColor="@color/white"/>
@@ -93,8 +92,7 @@
                             android:layout_height="match_parent"
                             android:background="@drawable/tile_drop_shadow_small_margins"
                             android:gravity="end"
-                            android:paddingHorizontal="18dp"
-                            SquareButtonWithText:backgroundColor="@color/cc_light_cool_accent_color"
+                            SquareButtonWithText:backgroundColor="@color/barcode_button_color"
                             SquareButtonWithText:img="@drawable/startup_url"
                             SquareButtonWithText:subtitle="Enter Code"
                             SquareButtonWithText:textColor="@color/white"/>
diff --git a/app/res/layout/single_app_view.xml b/app/res/layout/single_app_view.xml
index e0d38e1613..35c5669a52 100644
--- a/app/res/layout/single_app_view.xml
+++ b/app/res/layout/single_app_view.xml
@@ -36,7 +36,7 @@
         style="@style/TextAppearance.AppCompat.Body2"
         android:visibility="visible"/>
 
-    <Button
+    <com.google.android.material.button.MaterialButton
         android:id="@+id/uninstall_button"
         android:layout_height="wrap_content"
         android:layout_margin="@dimen/standard_spacer"
@@ -44,7 +44,7 @@
         android:onClick="rebootAlertDialog"
         android:text="@string/uninstall_app" />
 
-    <Button
+    <com.google.android.material.button.MaterialButton
         android:id="@+id/archive_button"
         android:layout_height="wrap_content"
         android:layout_margin="@dimen/standard_spacer"
@@ -52,7 +52,7 @@
         android:onClick="toggleArchiveClicked"
         android:text="@string/archive_app" />
 
-    <Button
+    <com.google.android.material.button.MaterialButton
         android:id="@+id/update_button"
         android:layout_height="wrap_content"
         android:layout_margin="@dimen/standard_spacer"
@@ -60,7 +60,7 @@
         android:onClick="updateClicked"
         android:text="@string/update_app" />
 
-    <Button
+    <com.google.android.material.button.MaterialButton
         android:clickable="true"
         android:id="@+id/verify_button"
         android:layout_height="wrap_content"
diff --git a/app/res/layout/single_dialog_choice_view.xml b/app/res/layout/single_dialog_choice_view.xml
index 0c9564f332..dce5e6a628 100644
--- a/app/res/layout/single_dialog_choice_view.xml
+++ b/app/res/layout/single_dialog_choice_view.xml
@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Button xmlns:android="http://schemas.android.com/apk/res/android"
+<Button
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/choice_dialog_panel"
-    style="@style/CommCare.Button.Default"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
     android:layout_marginBottom="@dimen/standard_spacer"
+    style="@style/CommCare.Button.Default"
     android:background="@drawable/selector_button_press"
     android:drawablePadding="5dp"
     android:padding="12dp"
diff --git a/app/res/layout/square_button_text.xml b/app/res/layout/square_button_text.xml
index a32331de54..55a44eac64 100644
--- a/app/res/layout/square_button_text.xml
+++ b/app/res/layout/square_button_text.xml
@@ -26,8 +26,8 @@
         android:paddingBottom="@dimen/standard_spacer"
         android:paddingLeft="@dimen/standard_spacer"
         android:paddingRight="@dimen/standard_spacer"
-        android:textSize="@dimen/font_size_large"
-        app:text_size_small="@dimen/font_size_medium"
+        android:textSize="@dimen/font_size_xlarge"
+        app:text_size_small="@dimen/font_size_large"
         android:paddingStart="@dimen/standard_spacer"
         android:paddingEnd="@dimen/standard_spacer" />
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/res/layout/square_card.xml b/app/res/layout/square_card.xml
index 95bbfebae4..f7143ad13d 100644
--- a/app/res/layout/square_card.xml
+++ b/app/res/layout/square_card.xml
@@ -24,14 +24,12 @@
             xmlns:android="http://schemas.android.com/apk/res/android"
             xmlns:app="http://schemas.android.com/apk/res-auto"
             android:layout_width="wrap_content"
-            android:layout_height="170dp">
+            android:layout_height="match_parent">
 
             <org.commcare.views.SquareImageView
                 android:id="@+id/card_image"
-                android:layout_width="130dp"
-                android:layout_centerHorizontal="true"
-                android:paddingVertical="24dp"
-                android:layout_height="150dp"/>
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"/>
 
             <org.commcare.views.ResizingTextView
                 android:id="@+id/card_text"
@@ -43,8 +41,8 @@
                 android:paddingBottom="@dimen/standard_spacer"
                 android:paddingLeft="@dimen/standard_spacer"
                 android:paddingRight="@dimen/standard_spacer"
-                android:textSize="@dimen/font_size_xlarger"
-                app:text_size_small="@dimen/font_size_xlargest"
+                android:textSize="@dimen/font_size_xlarge"
+                app:text_size_small="@dimen/font_size_large"
                 android:paddingStart="@dimen/standard_spacer"
                 android:paddingEnd="@dimen/standard_spacer" />
         </RelativeLayout>
@@ -56,6 +54,6 @@
             android:layout_below="@+id/card"
             android:layout_gravity="end"
             android:padding="@dimen/help_text_padding"
-            android:textSize="@dimen/font_size_small"/>
+            android:textSize="@dimen/font_size_medium"/>
     </RelativeLayout>
 </androidx.cardview.widget.CardView>
\ No newline at end of file
diff --git a/app/res/layout/universal_date_widget.xml b/app/res/layout/universal_date_widget.xml
index de0db435e1..60cd47798b 100644
--- a/app/res/layout/universal_date_widget.xml
+++ b/app/res/layout/universal_date_widget.xml
@@ -17,6 +17,9 @@
             android:id="@+id/dayupbtn"
             android:layout_width="50dp"
             android:layout_height="wrap_content"
+            style="@style/CommCare.Button.Default"
+            android:backgroundTint="@color/cc_brand_color"
+            android:textColor="@color/white"
             android:background="@drawable/date_button_top"
             android:text="+"
             android:textSize="@dimen/text_largest"/>
@@ -37,6 +40,9 @@
             android:layout_height="wrap_content"
             android:layout_below="@id/daytxt"
             android:background="@drawable/date_button_bottom"
+            style="@style/CommCare.Button.Default"
+            android:backgroundTint="@color/cc_brand_color"
+            android:textColor="@color/white"
             android:text="-"
             android:textSize="@dimen/text_largest"/>
 
@@ -49,6 +55,9 @@
             android:background="@drawable/date_button_top"
             android:text="+"
             android:textSize="@dimen/text_largest"
+            style="@style/CommCare.Button.Default"
+            android:backgroundTint="@color/cc_brand_color"
+            android:textColor="@color/white"
             android:layout_toEndOf="@id/dayupbtn"
             android:layout_marginStart="5dp" />
 
@@ -76,6 +85,9 @@
             android:background="@drawable/date_button_bottom"
             android:text="-"
             android:textSize="@dimen/text_largest"
+            style="@style/CommCare.Button.Default"
+            android:backgroundTint="@color/cc_brand_color"
+            android:textColor="@color/white"
             android:layout_toEndOf="@id/daydownbtn"
             android:layout_marginStart="5dp" />
 
@@ -88,6 +100,9 @@
             android:background="@drawable/date_button_top"
             android:text="+"
             android:textSize="@dimen/text_largest"
+            style="@style/CommCare.Button.Default"
+            android:backgroundTint="@color/cc_brand_color"
+            android:textColor="@color/white"
             android:layout_toEndOf="@id/monthupbtn"
             android:layout_marginStart="5dp" />
 
@@ -115,6 +130,9 @@
             android:background="@drawable/date_button_bottom"
             android:text="-"
             android:textSize="@dimen/text_largest"
+            style="@style/CommCare.Button.Default"
+            android:backgroundTint="@color/cc_brand_color"
+            android:textColor="@color/white"
             android:layout_toEndOf="@id/monthdownbtn"
             android:layout_marginStart="5dp" />
     </RelativeLayout>
diff --git a/app/res/layout/update_activity.xml b/app/res/layout/update_activity.xml
index 7ed6f81be1..a69d31f7f1 100644
--- a/app/res/layout/update_activity.xml
+++ b/app/res/layout/update_activity.xml
@@ -95,7 +95,7 @@
                 android:id="@+id/check_for_update_button"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                SquareButtonWithText:backgroundColor="@color/cc_brand_color"
+                SquareButtonWithText:backgroundColor="@color/start_home_button"
                 SquareButtonWithText:img="@drawable/check_update"
                 SquareButtonWithText:subtitle=""
                 SquareButtonWithText:textColor="@color/white"/>
@@ -104,7 +104,7 @@
                 android:id="@+id/stop_update_download_button"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                SquareButtonWithText:backgroundColor="@color/cc_neutral_color"
+                SquareButtonWithText:backgroundColor="@color/start_logout_button"
                 SquareButtonWithText:img="@drawable/install_stop"
                 SquareButtonWithText:subtitle=""
                 SquareButtonWithText:textColor="@color/white"/>
diff --git a/app/res/layout/user_get_available_apps.xml b/app/res/layout/user_get_available_apps.xml
index 47ca892f31..f11acf2442 100644
--- a/app/res/layout/user_get_available_apps.xml
+++ b/app/res/layout/user_get_available_apps.xml
@@ -134,12 +134,12 @@
                     android:layout_marginStart="@dimen/standard_spacer_large"
                     android:layout_marginEnd="@dimen/standard_spacer_large" />
 
-                <Button
+                <com.google.android.material.button.MaterialButton
                     android:id="@+id/get_apps_button"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/see_available_apps"
-                    android:paddingHorizontal="@dimen/standard_spacer_double"
+                    android:paddingHorizontal="@dimen/standard_spacer_large"
                     android:layout_marginTop="@dimen/standard_spacer_double" />
 
                 <TextView
diff --git a/app/res/layout/wifi_direct_main.xml b/app/res/layout/wifi_direct_main.xml
index c5b6f3aa0a..e71981d97e 100644
--- a/app/res/layout/wifi_direct_main.xml
+++ b/app/res/layout/wifi_direct_main.xml
@@ -98,11 +98,11 @@
                 <org.commcare.views.SquareButtonWithText
                     android:id="@+id/send"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
+                    android:layout_height="match_parent"
                     android:layout_margin="4dp"
                     android:layout_weight="1"
                     android:padding="@dimen/content_min_margin"
-                    SquareButtonWithText:backgroundColor="@color/cc_attention_positive_color"
+                    SquareButtonWithText:backgroundColor="@color/start_home_button"
                     SquareButtonWithText:img="@drawable/wifi_direct_transfer"
                     SquareButtonWithText:subtitle=""
                     SquareButtonWithText:textColor="@color/white"/>
@@ -110,11 +110,11 @@
                 <org.commcare.views.SquareButtonWithText
                     android:id="@+id/discover"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
+                    android:layout_height="match_parent"
                     android:layout_margin="4dp"
                     android:layout_weight="1"
                     android:padding="@dimen/content_min_margin"
-                    SquareButtonWithText:backgroundColor="@color/cc_light_cool_accent_color"
+                    SquareButtonWithText:backgroundColor="@color/start_save_button"
                     SquareButtonWithText:img="@drawable/wifi_direct_discover"
                     SquareButtonWithText:subtitle=""
                     SquareButtonWithText:textColor="@color/white"/>
@@ -122,11 +122,11 @@
                 <org.commcare.views.SquareButtonWithText
                     android:id="@+id/submit"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
+                    android:layout_height="match_parent"
                     android:layout_margin="4dp"
                     android:layout_weight="1"
                     android:padding="@dimen/content_min_margin"
-                    SquareButtonWithText:backgroundColor="@color/solid_dark_orange"
+                    SquareButtonWithText:backgroundColor="@color/cc_dark_warm_accent_color"
                     SquareButtonWithText:img="@drawable/wifi_direct_submit"
                     SquareButtonWithText:subtitle=""
                     SquareButtonWithText:textColor="@color/white"/>
@@ -134,11 +134,11 @@
                 <org.commcare.views.SquareButtonWithText
                     android:id="@+id/mode"
                     android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
+                    android:layout_height="match_parent"
                     android:layout_margin="4dp"
                     android:layout_weight="1"
                     android:padding="@dimen/content_min_margin"
-                    SquareButtonWithText:backgroundColor="@color/cc_brand_text"
+                    SquareButtonWithText:backgroundColor="@color/cc_brand_color"
                     SquareButtonWithText:img="@drawable/wifi_direct_change_mode"
                     SquareButtonWithText:subtitle=""
                     SquareButtonWithText:textColor="@color/white"/>
diff --git a/app/res/mipmap-hdpi/commcare_launcher.png b/app/res/mipmap-hdpi/commcare_launcher.png
index 6c39f72697..55a8654128 100644
Binary files a/app/res/mipmap-hdpi/commcare_launcher.png and b/app/res/mipmap-hdpi/commcare_launcher.png differ
diff --git a/app/res/mipmap-mdpi/commcare_launcher.png b/app/res/mipmap-mdpi/commcare_launcher.png
index 18df9e517c..a7f590c5eb 100644
Binary files a/app/res/mipmap-mdpi/commcare_launcher.png and b/app/res/mipmap-mdpi/commcare_launcher.png differ
diff --git a/app/res/mipmap-xhdpi/commcare_launcher.png b/app/res/mipmap-xhdpi/commcare_launcher.png
index 5595298461..f83465e907 100644
Binary files a/app/res/mipmap-xhdpi/commcare_launcher.png and b/app/res/mipmap-xhdpi/commcare_launcher.png differ
diff --git a/app/res/mipmap-xxhdpi/commcare_launcher.png b/app/res/mipmap-xxhdpi/commcare_launcher.png
index 14b748b3b6..7da4e7f1e5 100644
Binary files a/app/res/mipmap-xxhdpi/commcare_launcher.png and b/app/res/mipmap-xxhdpi/commcare_launcher.png differ
diff --git a/app/res/mipmap-xxxhdpi/commcare_launcher.png b/app/res/mipmap-xxxhdpi/commcare_launcher.png
index e6bd659643..303765cd0a 100644
Binary files a/app/res/mipmap-xxxhdpi/commcare_launcher.png and b/app/res/mipmap-xxxhdpi/commcare_launcher.png differ
diff --git a/app/res/values/colors.xml b/app/res/values/colors.xml
index 21d086c516..d9e7aa88b9 100644
--- a/app/res/values/colors.xml
+++ b/app/res/values/colors.xml
@@ -79,7 +79,7 @@
     <color name="cc_core_text">#181715</color>
 
     <!-- Brand -->
-    <color name="cc_brand_color">#004EBC</color>
+    <color name="cc_brand_color">#5D70D2</color>
     <color name="cc_brand_bg">#BCDEFF</color>
     <color name="cc_brand_text">#002C5F</color>
 
@@ -109,7 +109,7 @@
     <color name="cc_light_cool_accent_text">#00799A</color>
 
     <!-- Dark Warm Accent -->
-    <color name="cc_dark_warm_accent_color">#FF8400</color>
+    <color name="cc_dark_warm_accent_color">#FEAF31</color>
     <color name="cc_dark_warm_accent_bg">#FFE3C2</color>
     <color name="cc_dark_warm_accent_text">#994f00</color>
 
@@ -145,16 +145,21 @@
     <color name="red_900">#B71C1C</color>
     
     <!-- Button colors -->
-    <color name="button_primary">#005ab2</color>
-    <color name="button_disabled">#d0e3ff</color>
+    <color name="button_disabled">@color/cc_neutral_bg</color>
+    <color name="button_primary_color">@color/cc_brand_color</color>
 
+    <!-- Square button colours -->
     <color name="start_home_button">#6AB849</color>
     <color name="start_save_button">#1B998B</color>
-    <color name="start_sync_button">#5D70D2</color>
+    <color name="start_sync_button">@color/cc_brand_color</color>
     <color name="start_sync_dark_button">#3b4fb6</color>
     <color name="start_logout_button">#373534</color>
+    <color name="barcode_button_color">#3843D0</color>
+    <color name="url_button_color">#8EA1FF</color>
+    <color name="square_button_icon_color">#FFFFFF</color>
+
 
     <!-- Progress bar colors -->
-    <color name="progress_bar_bg">#33000000</color>
+    <color name="progress_bar_bg">#66000000</color>
 
 </resources>
diff --git a/app/res/values/dimens.xml b/app/res/values/dimens.xml
index cc15c4dbaf..6d1d7d0435 100755
--- a/app/res/values/dimens.xml
+++ b/app/res/values/dimens.xml
@@ -24,6 +24,8 @@
     <dimen name="standard_spacer_large">24dp</dimen>
     <dimen name="standard_title_margin_bottom">20dp</dimen>
     <dimen name="min_button_height">52dp</dimen>
+    <dimen name="min_button_width">88dp</dimen>
+    <dimen name="rounded_button_corner_radius">22dp</dimen>
     <dimen name="spacer">10dp</dimen>
 
     <dimen name="action_icon_size">60dp</dimen>
@@ -103,6 +105,7 @@
     <dimen name="new_progressbar_button_minheight">48dp</dimen>
     <dimen name="new_progressbar_button_minwidth">32dp</dimen>
     <dimen name="new_progressbar_button_padding">24dp</dimen>
+    <dimen name="modern_progressbar_radius">4dp</dimen>
 
     <dimen name="submission_progressbar_height">10dp</dimen>
 
diff --git a/app/res/values/strings.xml b/app/res/values/strings.xml
index 841a2ce818..47c7d42dec 100644
--- a/app/res/values/strings.xml
+++ b/app/res/values/strings.xml
@@ -15,7 +15,7 @@
     <!-- region: All strings for multiple apps and app-agnostic properties -->
 
     <string name="manager_activity_name">App Manager</string>
-    <string name="install_app">Install An App</string>
+    <string name="install_app">Install an App</string>
     <string name="uninstall_app">Uninstall</string>
     <string name="archive_app">Archive</string>
     <string name="unarchive_app">Unarchive</string>
diff --git a/app/res/values/styles.xml b/app/res/values/styles.xml
index b0d745bb15..a57fa7d90f 100644
--- a/app/res/values/styles.xml
+++ b/app/res/values/styles.xml
@@ -270,8 +270,10 @@
     </style>
 
     <style name="MapButton">
-        <item name="backgroundTint">@null</item>
         <item name="android:minWidth">@dimen/map_button_min_width</item>
+        <item name="cornerRadius">@dimen/rounded_button_corner_radius</item>
+        <item name="android:insetBottom">0dp</item>
+        <item name="android:insetTop">0dp</item>
     </style>
 
     <style name="MapButtonColored" parent="MapButton">
@@ -279,15 +281,15 @@
     </style>
 
     <style name="MapButtonGreen" parent="MapButtonColored">
-        <item name="android:background">@drawable/button_green_background</item>
+        <item name="android:backgroundTint">@color/button_green_background</item>
     </style>
 
     <style name="MapButtonRed" parent="MapButtonColored">
-        <item name="android:background">@drawable/button_red_background</item>
+        <item name="android:backgroundTint">@color/button_red_background</item>
     </style>
 
     <style name="MapButtonOrange" parent="MapButtonColored">
-        <item name="android:background">@drawable/button_orange_background</item>
+        <item name="android:backgroundTint">@color/button_orange_background</item>
     </style>
 
     <color name="login_edit_text_color">@color/cc_core_text</color>
@@ -305,4 +307,40 @@
         <item name="android:windowBackground">"@color/black"</item>
         <item name="android:navigationBarColor">@color/black</item>
     </style>
+
+    <style name="AlertDialogButtonStyle" parent="Widget.AppCompat.Button.ButtonBar.AlertDialog">
+        <item name="android:background">@drawable/rounded_button_shape</item>
+        <item name="android:minWidth">@dimen/min_button_width</item>
+        <item name="backgroundTint">@color/cc_brand_color</item>
+    </style>
+
+        <style name="CustomButtonStyle" parent="Widget.MaterialComponents.Button">
+            <item name="backgroundTint">@color/primary_button_background</item>
+            <item name="android:textColor">@color/white</item>
+            <item name="android:textSize">16sp</item>
+            <item name="android:gravity">center</item>
+            <item name="android:padding">12dp</item>
+            <item name="height">40dp</item>
+            <item name="cornerRadius">@dimen/rounded_button_corner_radius</item>
+            <item name="iconPadding">8dp</item>
+            <item name="android:textAllCaps">false</item>
+            <item name="android:textStyle">bold</item>
+            <item name="android:layout_margin">@dimen/spacer_small</item>
+        </style>
+    
+    <style name="NegativeButtonStyle" parent="Widget.MaterialComponents.Button.OutlinedButton">
+        <item name="shapeAppearanceOverlay">@style/NegativeButtonShapeAppearanceStyle</item>
+    </style>
+    <style name="NegativeButtonShapeAppearanceStyle" parent="Widget.MaterialComponents.Button.OutlinedButton">
+        <item name="android:background">@drawable/button_background_white</item>
+        <item name="cornerFamilyTopLeft">rounded</item>
+        <item name="cornerFamilyBottomLeft">rounded</item>
+        <item name="cornerFamilyTopRight">rounded</item>
+        <item name="cornerFamilyBottomRight">rounded</item>
+        <item name="cornerSize">@dimen/rounded_button_corner_radius</item>
+        <item name="strokeColor">@color/cc_brand_color</item>
+        <item name="strokeWidth">2dp</item>
+        <item name="textColor">@color/cc_brand_color</item>
+    </style>
+
 </resources>
diff --git a/app/res/values/themes.xml b/app/res/values/themes.xml
index 4b018153bc..3d3a9e00e8 100644
--- a/app/res/values/themes.xml
+++ b/app/res/values/themes.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
+<resources xmlns:tools="http://schemas.android.com/tools" xmlns:android="http://schemas.android.com/apk/res/android">
 
     <style name="CommonTheme" parent="Theme.MaterialComponents.Light.DarkActionBar.Bridge">
         <item name="colorPrimary">@color/cc_brand_color</item>
         <item name="colorPrimaryDark">@color/cc_brand_text</item>
         <item name="colorAccent">@color/cc_dark_cool_accent_color</item>
-        <item name="colorControlActivated">@color/cc_dark_cool_accent_color</item>
+        <item name="colorControlActivated">@color/cc_brand_color</item>
         <item name="android:textColorSecondary">@color/cc_neutral_text</item>
         <item name="android:textColorPrimary">@color/cc_core_text</item>
         <item name="buttonStyle">@style/Commcare.Button.Primary</item>
-        <item name="buttonBarButtonStyle">@style/Commcare.Button.Primary</item>
+        <item name="materialButtonStyle">@style/Commcare.Button.Primary.Rounded</item>
+        <item name="buttonBarButtonStyle">@style/AlertDialogButtonStyle</item>
         <item name="android:textAppearanceButton">@style/TextAppearance.AppCompat.Medium</item>
         <item name="android:colorBackground">@color/cc_core_bg</item>
         <item name="detail_odd_row_color">@color/cc_neutral_bg</item>
@@ -62,8 +63,7 @@
         <item name="background">@color/cc_brand_color</item>
         <item name="titleTextStyle">@style/ActionBar.TitleTextStyle</item>
         <item name="subtitleTextStyle">@style/ActionBarSubtitleTextStyle</item>
-        <item name="logo">@drawable/actionbar_modern_spacing</item>
-        <item name="actionButtonStyle">@style/ActionButtonStyle</item>
+        <item name="logo">@drawable/commcare_actionbar_logo_spacing</item>
     </style>
 
     <style name="dropDownListView" parent="Widget.AppCompat.ListView.DropDown">
@@ -72,7 +72,8 @@
 
     <style name="ActionBar.TitleTextStyle">
         <item name="android:textColor">@color/white</item>
-        <item name="android:paddingLeft">8dp</item>
+        <item name="android:paddingLeft">16dp</item>
+        <item name="android:textSize">22sp</item>
     </style>
 
     <style name="ActionBarSubtitleTextStyle">
@@ -135,6 +136,8 @@
 
     <style name="Commcare.Button.Primary" parent="commcare_primary_button" />
 
+    <style name="Commcare.Button.Primary.Rounded" parent="CustomButtonStyle" />
+
     <style name="CommCare.Button.Default" parent="Widget.AppCompat.Button">
         <item name="textAllCaps">true</item>
         <item name="backgroundTint">@null</item>
diff --git a/app/src/org/commcare/CommCareNoficationManager.java b/app/src/org/commcare/CommCareNoficationManager.java
index 8020299d6b..d3324f75b8 100644
--- a/app/src/org/commcare/CommCareNoficationManager.java
+++ b/app/src/org/commcare/CommCareNoficationManager.java
@@ -77,7 +77,7 @@ private void updateMessageNotification() {
                 Notification messageNotification = new NotificationCompat.Builder(context, NOTIFICATION_CHANNEL_ERRORS_ID)
                         .setContentTitle(title)
                         .setContentText(Localization.get("notifications.prompt.details", new String[]{additional}))
-                        .setSmallIcon(R.drawable.notification)
+                        .setSmallIcon(R.drawable.commcare_actionbar_logo)
                         .setNumber(pendingMessages.size())
                         .setContentIntent(contentIntent)
                         .setDeleteIntent(PendingIntent.getBroadcast(context, 0, new Intent(context, NotificationClearReceiver.class), intentFlags))
diff --git a/app/src/org/commcare/activities/CommCareActivity.java b/app/src/org/commcare/activities/CommCareActivity.java
index fe513fd95c..d2c876abff 100755
--- a/app/src/org/commcare/activities/CommCareActivity.java
+++ b/app/src/org/commcare/activities/CommCareActivity.java
@@ -162,7 +162,7 @@ protected void onCreate(Bundle savedInstanceState) {
             persistManagedUiState(fm);
 
             if (getSupportActionBar() != null) {
-                getSupportActionBar().setLogo(org.commcare.dalvik.R.mipmap.commcare_launcher);
+                getSupportActionBar().setLogo(org.commcare.dalvik.R.drawable.commcare_actionbar_logo_spacing);
             }
 
             if (shouldShowBreadcrumbBar()) {
diff --git a/app/src/org/commcare/activities/CommCareWiFiDirectActivity.java b/app/src/org/commcare/activities/CommCareWiFiDirectActivity.java
index 5a096dd1c4..d9c665d1b5 100644
--- a/app/src/org/commcare/activities/CommCareWiFiDirectActivity.java
+++ b/app/src/org/commcare/activities/CommCareWiFiDirectActivity.java
@@ -283,7 +283,7 @@ private void showDialog(AppCompatActivity activity, String title, String message
             dismissAlertDialog();
         };
         d.setNeutralButton(localize("wifi.direct.receive.forms"), listener);
-        d.setNegativeButton(localize("wifi.direct.transfer.forms"), listener);
+        d.setNegativeButton(localize("wifi.direct.transfer.forms"), listener, true);
         d.setPositiveButton(localize("wifi.direct.submit.forms"), listener);
         showAlertDialog(d);
     }
diff --git a/app/src/org/commcare/services/CommCareFirebaseMessagingService.java b/app/src/org/commcare/services/CommCareFirebaseMessagingService.java
index f189193956..88349d3c8a 100644
--- a/app/src/org/commcare/services/CommCareFirebaseMessagingService.java
+++ b/app/src/org/commcare/services/CommCareFirebaseMessagingService.java
@@ -103,7 +103,7 @@ private void showNotification(RemoteMessage.Notification notification) {
                 .setContentTitle(notificationTitle)
                 .setContentText(notificationText)
                 .setContentIntent(contentIntent)
-                .setSmallIcon(R.drawable.notification)
+                .setSmallIcon(R.drawable.commcare_actionbar_logo)
                 .setPriority(NotificationCompat.PRIORITY_HIGH)
                 .setWhen(System.currentTimeMillis());
 
diff --git a/app/src/org/commcare/services/CommCareSessionService.java b/app/src/org/commcare/services/CommCareSessionService.java
index ab2543914d..f2d4ecfebe 100644
--- a/app/src/org/commcare/services/CommCareSessionService.java
+++ b/app/src/org/commcare/services/CommCareSessionService.java
@@ -235,7 +235,7 @@ private void showLoggedOutNotification() {
             Notification notification = new NotificationCompat.Builder(this, CommCareNoficationManager.NOTIFICATION_CHANNEL_USER_SESSION_ID)
                     .setContentTitle(this.getString(R.string.expirenotification))
                     .setContentText("Click here to log back into your session")
-                    .setSmallIcon(org.commcare.dalvik.R.drawable.notification)
+                    .setSmallIcon(R.drawable.commcare_actionbar_logo)
                     .setContentIntent(contentIntent)
                     .build();
 
@@ -546,7 +546,7 @@ public void beginSubmissionProcess(int totalItems) {
                         .setContentTitle(getString(notificationId))
                         .setContentInfo(getSubmittedFormCount(1, totalItems))
                         .setContentText("0b transmitted")
-                        .setSmallIcon(org.commcare.dalvik.R.drawable.notification)
+                        .setSmallIcon(org.commcare.dalvik.R.drawable.commcare_actionbar_logo)
                         .setContentIntent(contentIntent)
                         .setOngoing(true)
                         .setWhen(System.currentTimeMillis())
@@ -724,7 +724,7 @@ private Notification createSessionNotification(){
         // Set the icon, scrolling text and timestamp
         NotificationCompat.Builder notificationBuilder = new NotificationCompat.Builder(this, CommCareNoficationManager.NOTIFICATION_CHANNEL_ERRORS_ID)
                 .setContentTitle(notificationText)
-                .setSmallIcon(R.drawable.notification)
+                .setSmallIcon(R.drawable.commcare_actionbar_logo)
                 .setContentIntent(contentIntent);
 
         if (user != null) {
diff --git a/app/src/org/commcare/sync/FormSubmissionWorker.kt b/app/src/org/commcare/sync/FormSubmissionWorker.kt
index b29d31ae7d..cfdf0496a3 100644
--- a/app/src/org/commcare/sync/FormSubmissionWorker.kt
+++ b/app/src/org/commcare/sync/FormSubmissionWorker.kt
@@ -29,7 +29,7 @@ class FormSubmissionWorker(appContext: Context, workerParams: WorkerParameters)
         var notificationBuilder = NotificationCompat.Builder(context,
             CommCareNoficationManager.NOTIFICATION_CHANNEL_SERVER_COMMUNICATIONS_ID)
             .setContentTitle(context.getString(notificationId))
-            .setSmallIcon(R.drawable.notification)
+            .setSmallIcon(R.drawable.commcare_actionbar_logo)
 
         return ForegroundInfo(notificationId, notificationBuilder.build())
     }
diff --git a/app/src/org/commcare/utils/NotificationUtil.java b/app/src/org/commcare/utils/NotificationUtil.java
index 6e1c0e5c6f..afbdc1f957 100644
--- a/app/src/org/commcare/utils/NotificationUtil.java
+++ b/app/src/org/commcare/utils/NotificationUtil.java
@@ -34,7 +34,7 @@ public static void showNotification(Context context, String notificationChannel,
                         .setContentTitle(notificationTitle)
                         .setContentText(notificationText)
                         .setContentIntent(contentIntent)
-                        .setSmallIcon(R.drawable.notification)
+                        .setSmallIcon(R.drawable.commcare_actionbar_logo)
                         .setPriority(NotificationCompat.PRIORITY_HIGH)
                         .setWhen(System.currentTimeMillis());
         ((NotificationManager) context.getSystemService(NOTIFICATION_SERVICE))
diff --git a/app/src/org/commcare/views/DotsHomeView.java b/app/src/org/commcare/views/DotsHomeView.java
index f62bf79905..05d53531b2 100755
--- a/app/src/org/commcare/views/DotsHomeView.java
+++ b/app/src/org/commcare/views/DotsHomeView.java
@@ -11,7 +11,8 @@
 import android.widget.TableRow;
 import android.widget.TextView;
 
-import androidx.appcompat.widget.AppCompatButton;
+import com.google.android.material.button.MaterialButton;
+
 
 import org.commcare.dalvik.R;
 import org.commcare.utils.DotsData;
@@ -86,7 +87,7 @@ private void refresh() {
             table.addView(row);
         }
 
-        Button done = new AppCompatButton(this.getContext());
+        Button done = new MaterialButton(this.getContext());
         done.setId(666);
         done.setText("Finished");
         done.setOnClickListener(v -> listener.doneWithDOTS());
diff --git a/app/src/org/commcare/views/dialogs/PinnedNotificationWithProgress.java b/app/src/org/commcare/views/dialogs/PinnedNotificationWithProgress.java
index b5458c7b27..b42d75c0fe 100644
--- a/app/src/org/commcare/views/dialogs/PinnedNotificationWithProgress.java
+++ b/app/src/org/commcare/views/dialogs/PinnedNotificationWithProgress.java
@@ -49,7 +49,7 @@ public PinnedNotificationWithProgress(Context ctx, String titleText,
                 .setContentText(getProgressText(0, 0))
                 .setContentTitle(Localization.get(titleText))
                 .setProgress(100, 0, false)
-                .setSmallIcon(org.commcare.dalvik.R.drawable.notification)
+                .setSmallIcon(org.commcare.dalvik.R.drawable.commcare_actionbar_logo)
                 .setLargeIcon(largeIcon)
                 .setContentIntent(contentIntent)
                 .setWhen(System.currentTimeMillis())
diff --git a/app/src/org/commcare/views/dialogs/StandardAlertDialog.java b/app/src/org/commcare/views/dialogs/StandardAlertDialog.java
index df4bf7870d..d7fb7766c6 100644
--- a/app/src/org/commcare/views/dialogs/StandardAlertDialog.java
+++ b/app/src/org/commcare/views/dialogs/StandardAlertDialog.java
@@ -88,7 +88,17 @@ public void setPositiveButton(CharSequence displayText, final DialogInterface.On
     }
 
     public void setNegativeButton(CharSequence displayText, final DialogInterface.OnClickListener buttonListener) {
+        setNegativeButton(displayText, buttonListener, false);
+    }
+
+    public void setNegativeButton(CharSequence displayText,
+                                  final DialogInterface.OnClickListener buttonListener,
+                                  boolean usePositiveButtonStyle) {
         Button negativeButton = this.view.findViewById(R.id.negative_button);
+        if (usePositiveButtonStyle) {
+            negativeButton.setTextAppearance(this.view.getContext(), R.style.Commcare_Button_Primary_Rounded);
+            negativeButton.setBackgroundColor(this.view.getResources().getColor(R.color.cc_brand_color));
+        }
         negativeButton.setText(displayText);
         negativeButton.setOnClickListener(v -> buttonListener.onClick(dialog, AlertDialog.BUTTON_NEGATIVE));
         negativeButton.setVisibility(View.VISIBLE);
diff --git a/app/src/org/commcare/views/widgets/AudioWidget.java b/app/src/org/commcare/views/widgets/AudioWidget.java
index 2640903297..1b1ad62899 100644
--- a/app/src/org/commcare/views/widgets/AudioWidget.java
+++ b/app/src/org/commcare/views/widgets/AudioWidget.java
@@ -4,10 +4,13 @@
 import android.content.Context;
 import android.content.Intent;
 import android.provider.MediaStore.Audio;
+import android.view.Gravity;
 import android.view.View;
 import android.widget.Button;
 import android.widget.Toast;
 
+import com.google.android.material.button.MaterialButton;
+
 import org.commcare.activities.components.FormEntryConstants;
 import org.commcare.dalvik.R;
 import org.commcare.logic.PendingCalloutInterface;
@@ -15,7 +18,6 @@
 import org.javarosa.form.api.FormEntryPrompt;
 
 import androidx.appcompat.app.AppCompatActivity;
-import androidx.appcompat.widget.AppCompatButton;
 
 /**
  * Legacy Audio Widget that allows user to capture sounds by performing an intent callout
@@ -32,19 +34,19 @@ public AudioWidget(Context context, final FormEntryPrompt prompt, PendingCallout
     @Override
     protected void initializeButtons() {
         // setup capture button
-        mCaptureButton = new AppCompatButton(getContext());
+        mCaptureButton = new MaterialButton(getContext());
         WidgetUtils.setupButton(mCaptureButton,
                 StringUtils.getStringSpannableRobust(getContext(), R.string.capture_audio),
                 !mPrompt.isReadOnly());
 
         // setup audio filechooser button
-        mChooseButton = new AppCompatButton(getContext());
+        mChooseButton = new MaterialButton(getContext());
         WidgetUtils.setupButton(mChooseButton,
                 StringUtils.getStringSpannableRobust(getContext(), R.string.choose_sound),
                 !mPrompt.isReadOnly());
 
         // setup play button
-        mPlayButton = new AppCompatButton(getContext());
+        mPlayButton = new MaterialButton(getContext());
         WidgetUtils.setupButton(mPlayButton,
                 StringUtils.getStringSpannableRobust(getContext(), R.string.play_audio),
                 !mPrompt.isReadOnly());
diff --git a/app/src/org/commcare/views/widgets/GeoPointWidget.java b/app/src/org/commcare/views/widgets/GeoPointWidget.java
index 3e3d83491e..82d2cbc214 100644
--- a/app/src/org/commcare/views/widgets/GeoPointWidget.java
+++ b/app/src/org/commcare/views/widgets/GeoPointWidget.java
@@ -10,6 +10,8 @@
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
+import com.google.android.material.button.MaterialButton;
+
 import org.commcare.activities.GeoPointActivity;
 import org.commcare.activities.GeoPointMapActivity;
 import org.commcare.activities.components.FormEntryConstants;
@@ -26,7 +28,6 @@
 import java.text.DecimalFormat;
 
 import androidx.appcompat.app.AppCompatActivity;
-import androidx.appcompat.widget.AppCompatButton;
 
 /**
  * GeoPointWidget is the widget that allows the user to get GPS readings.
@@ -86,7 +87,7 @@ public GeoPointWidget(Context context, final FormEntryPrompt prompt, PendingCall
             viewButtonEnabled = false;
         }
 
-        mGetLocationButton = new AppCompatButton(getContext());
+        mGetLocationButton = new MaterialButton(getContext());
         WidgetUtils.setupButton(mGetLocationButton,
                 locButtonText,
                 !prompt.isReadOnly());
@@ -106,7 +107,7 @@ public GeoPointWidget(Context context, final FormEntryPrompt prompt, PendingCall
         });
 
         // setup 'view location' button
-        mViewButton = new AppCompatButton(getContext());
+        mViewButton = new MaterialButton(getContext());
         WidgetUtils.setupButton(mViewButton,
                 StringUtils.getStringSpannableRobust(getContext(), R.string.show_location),
                 viewButtonEnabled);
diff --git a/app/src/org/commcare/views/widgets/ImageWidget.java b/app/src/org/commcare/views/widgets/ImageWidget.java
index 7c23da42b8..95d883a0c4 100644
--- a/app/src/org/commcare/views/widgets/ImageWidget.java
+++ b/app/src/org/commcare/views/widgets/ImageWidget.java
@@ -11,6 +11,7 @@
 import android.provider.MediaStore;
 import android.util.Log;
 import android.view.Display;
+import android.view.Gravity;
 import android.view.View;
 import android.view.WindowManager;
 import android.view.inputmethod.InputMethodManager;
@@ -20,6 +21,8 @@
 import android.widget.TextView;
 import android.widget.Toast;
 
+import com.google.android.material.button.MaterialButton;
+
 import org.commcare.CommCareApplication;
 import org.commcare.activities.FormEntryActivity;
 import org.commcare.activities.components.FormEntryConstants;
@@ -47,7 +50,6 @@
 import javax.crypto.spec.SecretKeySpec;
 
 import androidx.appcompat.app.AppCompatActivity;
-import androidx.appcompat.widget.AppCompatButton;
 
 /**
  * Widget that allows user to take pictures, sounds or video and add them to the form.
@@ -93,7 +95,7 @@ public ImageWidget(final Context context, FormEntryPrompt prompt, PendingCallout
         mErrorTextView.setText("Selected file is not a valid image");
 
         // setup capture button
-        mCaptureButton = new AppCompatButton(getContext());
+        mCaptureButton = new MaterialButton(getContext());
         WidgetUtils.setupButton(mCaptureButton,
                 StringUtils.getStringSpannableRobust(getContext(), R.string.capture_image),
                 !mPrompt.isReadOnly());
@@ -119,7 +121,7 @@ public ImageWidget(final Context context, FormEntryPrompt prompt, PendingCallout
         });
 
         // setup chooser button
-        mChooseButton = new AppCompatButton(getContext());
+        mChooseButton = new MaterialButton(getContext());
         WidgetUtils.setupButton(mChooseButton,
                 StringUtils.getStringSpannableRobust(getContext(), R.string.choose_image),
                 !mPrompt.isReadOnly());
@@ -151,7 +153,7 @@ public ImageWidget(final Context context, FormEntryPrompt prompt, PendingCallout
         });
 
         // setup discard button
-        mDiscardButton = new AppCompatButton(getContext());
+        mDiscardButton = new MaterialButton(getContext());
         WidgetUtils.setupButton(mDiscardButton,
                 StringUtils.getStringSpannableRobust(getContext(), R.string.discard_image),
                 !mPrompt.isReadOnly());
diff --git a/app/src/org/commcare/views/widgets/IntentWidget.java b/app/src/org/commcare/views/widgets/IntentWidget.java
index 67f38d9f22..02f3062bac 100644
--- a/app/src/org/commcare/views/widgets/IntentWidget.java
+++ b/app/src/org/commcare/views/widgets/IntentWidget.java
@@ -1,24 +1,21 @@
 package org.commcare.views.widgets;
 
 import androidx.appcompat.app.AppCompatActivity;
-import androidx.appcompat.widget.AppCompatButton;
 
 import android.content.ActivityNotFoundException;
 import android.content.Context;
 import android.content.Intent;
-import android.os.Build;
 import android.text.Spannable;
 import android.text.SpannableString;
 import android.util.TypedValue;
 import android.view.Gravity;
-import android.view.View;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 import android.widget.Toast;
-
+import com.google.android.material.button.MaterialButton;
 import org.commcare.activities.components.FormEntryConstants;
 import org.commcare.android.javarosa.IntentCallout;
 import org.commcare.logic.PendingCalloutInterface;
@@ -93,7 +90,7 @@ protected IntentWidget(Context context, FormEntryPrompt prompt, Intent in, Inten
         } else {
             mStringAnswer = new TextView(getContext());
         }
-        launchIntentButton = new AppCompatButton(getContext());
+        launchIntentButton = new MaterialButton(getContext());
         setupTextView();
         setupButton();
     }
diff --git a/app/src/org/commcare/views/widgets/SignatureWidget.java b/app/src/org/commcare/views/widgets/SignatureWidget.java
index 55cd397b32..9a84d75eb3 100644
--- a/app/src/org/commcare/views/widgets/SignatureWidget.java
+++ b/app/src/org/commcare/views/widgets/SignatureWidget.java
@@ -22,6 +22,7 @@
 import android.net.Uri;
 import android.util.Log;
 import android.view.Display;
+import android.view.Gravity;
 import android.view.View;
 import android.view.WindowManager;
 import android.view.inputmethod.InputMethodManager;
@@ -31,6 +32,8 @@
 import android.widget.TextView;
 import android.widget.Toast;
 
+import com.google.android.material.button.MaterialButton;
+
 import org.commcare.CommCareApplication;
 import org.commcare.activities.DrawActivity;
 import org.commcare.activities.FormEntryActivity;
@@ -51,7 +54,6 @@
 import javax.annotation.Nullable;
 
 import androidx.appcompat.app.AppCompatActivity;
-import androidx.appcompat.widget.AppCompatButton;
 
 import static org.commcare.views.widgets.ImageWidget.getFileToDisplay;
 
@@ -89,7 +91,7 @@ public SignatureWidget(Context context, FormEntryPrompt prompt, PendingCalloutIn
         mErrorTextView.setText("Selected file is not a valid image");
 
         // setup Blank Image Button
-        mSignButton = new AppCompatButton(getContext());
+        mSignButton = new MaterialButton(getContext());
         WidgetUtils.setupButton(mSignButton,
                 StringUtils.getStringSpannableRobust(getContext(), R.string.sign_button),
                 !prompt.isReadOnly());
diff --git a/app/src/org/commcare/views/widgets/SpinnerMultiWidget.java b/app/src/org/commcare/views/widgets/SpinnerMultiWidget.java
index 8e2b6af41a..beb42e9527 100644
--- a/app/src/org/commcare/views/widgets/SpinnerMultiWidget.java
+++ b/app/src/org/commcare/views/widgets/SpinnerMultiWidget.java
@@ -1,16 +1,17 @@
 package org.commcare.views.widgets;
 
 import androidx.appcompat.app.AlertDialog;
-import androidx.appcompat.widget.AppCompatButton;
 
 import android.content.Context;
-import android.content.DialogInterface;
 import android.util.TypedValue;
+import android.view.Gravity;
 import android.view.View;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.Button;
 import android.widget.TextView;
 
+import com.google.android.material.button.MaterialButton;
+
 import org.commcare.dalvik.R;
 import org.commcare.utils.StringUtils;
 import org.javarosa.core.model.SelectChoice;
@@ -59,7 +60,7 @@ public SpinnerMultiWidget(final Context context, FormEntryPrompt prompt) {
         selections = new boolean[mItems.size()];
         answerItems = new CharSequence[mItems.size()];
         alert_builder = new AlertDialog.Builder(context);
-        button = new AppCompatButton(context);
+        button = new MaterialButton(context);
         selectionText = new TextView(getContext());
 
         // Build View
diff --git a/app/src/org/commcare/views/widgets/VideoWidget.java b/app/src/org/commcare/views/widgets/VideoWidget.java
index 20dea33ce2..cbd58982a3 100644
--- a/app/src/org/commcare/views/widgets/VideoWidget.java
+++ b/app/src/org/commcare/views/widgets/VideoWidget.java
@@ -4,10 +4,13 @@
 import android.content.Context;
 import android.content.Intent;
 import android.provider.MediaStore.Video;
+import android.view.Gravity;
 import android.view.View;
 import android.widget.Button;
 import android.widget.Toast;
 
+import com.google.android.material.button.MaterialButton;
+
 import org.commcare.activities.components.FormEntryConstants;
 import org.commcare.dalvik.R;
 import org.commcare.logic.PendingCalloutInterface;
@@ -15,7 +18,6 @@
 import org.javarosa.form.api.FormEntryPrompt;
 
 import androidx.appcompat.app.AppCompatActivity;
-import androidx.appcompat.widget.AppCompatButton;
 
 /**
  * Widget that allows user to take pictures, sounds or video and add them to the form.
@@ -32,7 +34,7 @@ public VideoWidget(Context context, final FormEntryPrompt prompt, PendingCallout
     @Override
     protected void initializeButtons() {
         // setup capture button
-        mCaptureButton = new AppCompatButton(getContext());
+        mCaptureButton = new MaterialButton(getContext());
         WidgetUtils.setupButton(mCaptureButton,
                 StringUtils.getStringSpannableRobust(getContext(), R.string.capture_video),
                 !mPrompt.isReadOnly());
@@ -55,7 +57,7 @@ protected void initializeButtons() {
         });
 
         // setup capture button
-        mChooseButton = new AppCompatButton(getContext());
+        mChooseButton = new MaterialButton(getContext());
         WidgetUtils.setupButton(mChooseButton,
                 StringUtils.getStringSpannableRobust(getContext(), R.string.choose_video),
                 !mPrompt.isReadOnly());
@@ -77,7 +79,7 @@ protected void initializeButtons() {
         });
 
         // setup play button
-        mPlayButton = new AppCompatButton(getContext());
+        mPlayButton = new MaterialButton(getContext());
         WidgetUtils.setupButton(mPlayButton,
                 StringUtils.getStringSpannableRobust(getContext(), R.string.play_video),
                 !mPrompt.isReadOnly());