diff --git a/app/src/main/java/com/erikraft/drop/AboutActivity.java b/app/src/main/java/com/erikraft/drop/AboutActivity.java
index 96bd014d2..f69d34aaa 100644
--- a/app/src/main/java/com/erikraft/drop/AboutActivity.java
+++ b/app/src/main/java/com/erikraft/drop/AboutActivity.java
@@ -13,7 +13,6 @@
 import com.google.android.material.appbar.MaterialToolbar;
 import com.google.android.material.button.MaterialButton;
 import com.google.android.material.card.MaterialCardView;
-import com.google.android.material.chip.Chip;
 
 /** Stable, self-contained About screen with transparent dependency and attribution information. */
 public class AboutActivity extends DropPipActivity {
@@ -37,20 +36,8 @@ protected void onCreate(Bundle savedInstanceState) {
         int pad = dp(20);
         content.setPadding(pad, dp(18), pad, dp(32));
 
-        LinearLayout appTitleRow = new LinearLayout(this);
-        appTitleRow.setOrientation(LinearLayout.HORIZONTAL);
-        appTitleRow.setGravity(Gravity.CENTER_VERTICAL);
         TextView appName = text(getString(R.string.app_name_long), 28);
-        appTitleRow.addView(appName, new LinearLayout.LayoutParams(0, -2, 1f));
-
-        Chip betaBadge = new Chip(this);
-        betaBadge.setText(R.string.beta_badge_label);
-        betaBadge.setCheckable(false);
-        betaBadge.setClickable(false);
-        betaBadge.setFocusable(false);
-        betaBadge.setEnsureMinTouchTargetSize(false);
-        appTitleRow.addView(betaBadge, new LinearLayout.LayoutParams(-2, -2));
-        content.addView(appTitleRow);
+        content.addView(appName);
 
         TextView version = text(
                 getString(R.string.about_version_format, BuildConfig.VERSION_NAME, BuildConfig.VERSION_CODE),
@@ -123,7 +110,8 @@ private void addWifiProjectSection(LinearLayout parent) {
         LinearLayout.LayoutParams titleParams = new LinearLayout.LayoutParams(0, -2, 1f);
         titleParams.setMargins(dp(12), 0, 0, 0);
         headingRow.addView(title, titleParams);
-        section.addView(headingRow);
+        headingRow.addView(getLayoutInflater().inflate(R.layout.beta_badge, headingRow, false));
+        section.addView(headingRow, new LinearLayout.LayoutParams(-1, -2));
 
         TextView description = text(getString(R.string.about_wifi_description), 15);
         description.setPadding(0, dp(10), 0, dp(8));
diff --git a/app/src/main/res/layout/beta_badge.xml b/app/src/main/res/layout/beta_badge.xml
new file mode 100644
index 000000000..ffe74df1a
--- /dev/null
+++ b/app/src/main/res/layout/beta_badge.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:layout_marginStart="8dp"
+    android:background="@drawable/beta_badge_background"
+    android:gravity="center"
+    android:orientation="horizontal"
+    android:paddingStart="6dp"
+    android:paddingTop="3dp"
+    android:paddingEnd="6dp"
+    android:paddingBottom="3dp">
+
+    <ImageView
+        android:layout_width="14dp"
+        android:layout_height="14dp"
+        android:contentDescription="@null"
+        android:src="@drawable/labs_24" />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="3dp"
+        android:text="@string/beta_badge_label"
+        android:textColor="?attr/colorPrimary"
+        android:textSize="10sp"
+        android:textStyle="bold" />
+</LinearLayout>
diff --git a/app/src/main/res/layout/preference_category_beta.xml b/app/src/main/res/layout/preference_category_beta.xml
index 2414a50ce..8604e52a5 100644
--- a/app/src/main/res/layout/preference_category_beta.xml
+++ b/app/src/main/res/layout/preference_category_beta.xml
@@ -19,31 +19,8 @@
         android:textSize="14sp"
         android:textStyle="bold" />
 
-    <LinearLayout
+    <include
+        layout="@layout/beta_badge"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="8dp"
-        android:background="@drawable/beta_badge_background"
-        android:gravity="center"
-        android:orientation="horizontal"
-        android:paddingStart="6dp"
-        android:paddingTop="3dp"
-        android:paddingEnd="6dp"
-        android:paddingBottom="3dp">
-
-        <ImageView
-            android:layout_width="14dp"
-            android:layout_height="14dp"
-            android:contentDescription="@null"
-            android:src="@drawable/labs_24" />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="3dp"
-            android:text="@string/beta_badge_label"
-            android:textColor="?attr/colorPrimary"
-            android:textSize="10sp"
-            android:textStyle="bold" />
-    </LinearLayout>
+        android:layout_height="wrap_content" />
 </LinearLayout>