diff --git a/app/src/main/res/drawable/boost_loading_preference_background.xml b/app/src/main/res/drawable/boost_loading_preference_background.xml
index d7aaf04686..c4d3f48c60 100644
--- a/app/src/main/res/drawable/boost_loading_preference_background.xml
+++ b/app/src/main/res/drawable/boost_loading_preference_background.xml
@@ -2,5 +2,5 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <solid android:color="@color/signal_colorSurface2" />
-    <corners android:radius="18dp" />
+    <corners android:radius="12dp" />
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/subscription_row_item_background.xml b/app/src/main/res/drawable/subscription_row_item_background.xml
index daef74a7c5..6d78a752fc 100644
--- a/app/src/main/res/drawable/subscription_row_item_background.xml
+++ b/app/src/main/res/drawable/subscription_row_item_background.xml
@@ -4,13 +4,13 @@
         <shape android:shape="rectangle" xmlns:android="http://schemas.android.com/apk/res/android">
             <solid android:color="@color/signal_colorSecondaryContainer" />
             <stroke android:color="@color/signal_colorPrimary" android:width="2dp" />
-            <corners android:radius="18dp" />
+            <corners android:radius="12dp" />
         </shape>
     </item>
     <item>
         <shape android:shape="rectangle" xmlns:android="http://schemas.android.com/apk/res/android">
             <solid android:color="@color/signal_colorSurface2" />
-            <corners android:radius="18dp" />
+            <corners android:radius="12dp" />
         </shape>
     </item>
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/boost_loading_preference.xml b/app/src/main/res/layout/boost_loading_preference.xml
index b95600aba6..78272b1f05 100644
--- a/app/src/main/res/layout/boost_loading_preference.xml
+++ b/app/src/main/res/layout/boost_loading_preference.xml
@@ -23,8 +23,8 @@
         android:id="@+id/boost_2"
         android:layout_width="0dp"
         android:layout_height="58sp"
-        android:layout_marginStart="10dp"
-        android:layout_marginEnd="10dp"
+        android:layout_marginStart="20dp"
+        android:layout_marginEnd="20dp"
         android:background="@drawable/boost_loading_preference_background"
         app:layout_constraintEnd_toStartOf="@id/boost_3"
         app:layout_constraintStart_toEndOf="@id/boost_1"
@@ -43,7 +43,7 @@
         android:id="@+id/boost_4"
         android:layout_width="0dp"
         android:layout_height="58sp"
-        android:layout_marginTop="19dp"
+        android:layout_marginTop="24dp"
         android:background="@drawable/boost_loading_preference_background"
         app:layout_constraintEnd_toStartOf="@id/boost_5"
         app:layout_constraintStart_toStartOf="parent"
@@ -53,9 +53,9 @@
         android:id="@+id/boost_5"
         android:layout_width="0dp"
         android:layout_height="58sp"
-        android:layout_marginStart="10dp"
-        android:layout_marginTop="19dp"
-        android:layout_marginEnd="10dp"
+        android:layout_marginStart="20dp"
+        android:layout_marginTop="24dp"
+        android:layout_marginEnd="20dp"
         android:background="@drawable/boost_loading_preference_background"
         app:layout_constraintEnd_toStartOf="@id/boost_6"
         app:layout_constraintStart_toEndOf="@id/boost_4"
@@ -65,7 +65,7 @@
         android:id="@+id/boost_6"
         android:layout_width="0dp"
         android:layout_height="58sp"
-        android:layout_marginTop="19dp"
+        android:layout_marginTop="24dp"
         android:background="@drawable/boost_loading_preference_background"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@id/boost_5"
@@ -75,7 +75,7 @@
         android:id="@+id/boost_custom"
         android:layout_width="0dp"
         android:layout_height="58sp"
-        android:layout_marginTop="19dp"
+        android:layout_marginTop="24dp"
         android:background="@drawable/boost_loading_preference_background"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/boost_preference.xml b/app/src/main/res/layout/boost_preference.xml
index e1876d1a3c..111dad7b17 100644
--- a/app/src/main/res/layout/boost_preference.xml
+++ b/app/src/main/res/layout/boost_preference.xml
@@ -17,7 +17,7 @@
         android:textAppearance="@style/Signal.Text.Body"
         android:textColor="@color/signal_text_primary"
         app:backgroundTint="@color/signal_selectable_button_background_tint"
-        app:cornerRadius="18dp"
+        app:cornerRadius="12dp"
         app:layout_constraintEnd_toStartOf="@id/boost_2"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
@@ -30,12 +30,12 @@
         style="@style/Signal.Widget.Button.Large.Secondary"
         android:layout_width="0dp"
         android:layout_height="58sp"
-        android:layout_marginStart="10dp"
-        android:layout_marginEnd="10dp"
+        android:layout_marginStart="20dp"
+        android:layout_marginEnd="20dp"
         android:textAppearance="@style/Signal.Text.Body"
         android:textColor="@color/signal_text_primary"
         app:backgroundTint="@color/signal_selectable_button_background_tint"
-        app:cornerRadius="18dp"
+        app:cornerRadius="12dp"
         app:layout_constraintEnd_toStartOf="@id/boost_3"
         app:layout_constraintStart_toEndOf="@id/boost_1"
         app:layout_constraintTop_toTopOf="parent"
@@ -51,7 +51,7 @@
         android:textAppearance="@style/Signal.Text.Body"
         android:textColor="@color/signal_text_primary"
         app:backgroundTint="@color/signal_selectable_button_background_tint"
-        app:cornerRadius="18dp"
+        app:cornerRadius="12dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@id/boost_2"
         app:layout_constraintTop_toTopOf="parent"
@@ -64,11 +64,11 @@
         style="@style/Signal.Widget.Button.Large.Secondary"
         android:layout_width="0dp"
         android:layout_height="58sp"
-        android:layout_marginTop="19dp"
+        android:layout_marginTop="24dp"
         android:textAppearance="@style/Signal.Text.Body"
         android:textColor="@color/signal_text_primary"
         app:backgroundTint="@color/signal_selectable_button_background_tint"
-        app:cornerRadius="18dp"
+        app:cornerRadius="12dp"
         app:layout_constraintEnd_toStartOf="@id/boost_5"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/boost_1"
@@ -81,13 +81,13 @@
         style="@style/Signal.Widget.Button.Large.Secondary"
         android:layout_width="0dp"
         android:layout_height="58sp"
-        android:layout_marginStart="10dp"
-        android:layout_marginTop="19dp"
-        android:layout_marginEnd="10dp"
+        android:layout_marginStart="20dp"
+        android:layout_marginTop="24dp"
+        android:layout_marginEnd="20dp"
         android:textAppearance="@style/Signal.Text.Body"
         android:textColor="@color/signal_text_primary"
         app:backgroundTint="@color/signal_selectable_button_background_tint"
-        app:cornerRadius="18dp"
+        app:cornerRadius="12dp"
         app:layout_constraintEnd_toStartOf="@id/boost_6"
         app:layout_constraintStart_toEndOf="@id/boost_4"
         app:layout_constraintTop_toBottomOf="@id/boost_2"
@@ -100,12 +100,12 @@
         style="@style/Signal.Widget.Button.Large.Secondary"
         android:layout_width="0dp"
         android:layout_height="58sp"
-        android:layout_marginTop="19dp"
+        android:layout_marginTop="24dp"
         android:gravity="center"
         android:textAppearance="@style/Signal.Text.Body"
         android:textColor="@color/signal_text_primary"
         app:backgroundTint="@color/signal_selectable_button_background_tint"
-        app:cornerRadius="18dp"
+        app:cornerRadius="12dp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@id/boost_5"
         app:layout_constraintTop_toBottomOf="@id/boost_3"
@@ -117,7 +117,7 @@
         android:id="@+id/boost_custom"
         android:layout_width="0dp"
         android:layout_height="58sp"
-        android:layout_marginTop="19dp"
+        android:layout_marginTop="24dp"
         android:background="@drawable/custom_donation_amount_background"
         android:gravity="center"
         android:hint="@string/Boost__enter_custom_amount"