diff --git a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/OmnipodPumpPlugin.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/OmnipodPumpPlugin.java
index c7afc04cf1..3e6b0bef6c 100644
--- a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/OmnipodPumpPlugin.java
+++ b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/OmnipodPumpPlugin.java
@@ -309,6 +309,8 @@ public class OmnipodPumpPlugin extends PumpPluginBase implements PumpInterface,
                             event.isChanged(getResourceHelper(), R.string.key_omnipod_smb_beeps_enabled) ||
                             event.isChanged(getResourceHelper(), R.string.key_omnipod_suspend_delivery_button_enabled) ||
                             event.isChanged(getResourceHelper(), R.string.key_omnipod_pulse_log_button_enabled) ||
+                            event.isChanged(getResourceHelper(), R.string.key_omnipod_rileylink_stats_button_enabled) ||
+                            event.isChanged(getResourceHelper(), R.string.key_omnipod_test_beep_button_enabled) ||
                             event.isChanged(getResourceHelper(), R.string.key_omnipod_time_change_event_enabled) ||
                             event.isChanged(getResourceHelper(), R.string.key_omnipod_notification_uncertain_tbr_sound_enabled) ||
                             event.isChanged(getResourceHelper(), R.string.key_omnipod_notification_uncertain_smb_sound_enabled) ||
diff --git a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/definition/OmnipodStorageKeys.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/definition/OmnipodStorageKeys.java
index 5a373177fe..b1e6a2c9be 100644
--- a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/definition/OmnipodStorageKeys.java
+++ b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/definition/OmnipodStorageKeys.java
@@ -12,6 +12,7 @@ public class OmnipodStorageKeys {
         public static final int TBR_BEEPS_ENABLED = R.string.key_omnipod_tbr_beeps_enabled;
         public static final int SUSPEND_DELIVERY_BUTTON_ENABLED = R.string.key_omnipod_suspend_delivery_button_enabled;
         public static final int PULSE_LOG_BUTTON_ENABLED = R.string.key_omnipod_pulse_log_button_enabled;
+        public static final int TEST_BEEP_BUTTON_ENABLED = R.string.key_omnipod_test_beep_button_enabled;
         public static final int TIME_CHANGE_EVENT_ENABLED = R.string.key_omnipod_time_change_event_enabled;
         public static final int EXPIRATION_REMINDER_ENABLED = R.string.key_omnipod_expiration_reminder_enabled;
         public static final int EXPIRATION_REMINDER_HOURS_BEFORE_SHUTDOWN = R.string.key_omnipod_expiration_reminder_hours_before_shutdown;
@@ -21,6 +22,7 @@ public class OmnipodStorageKeys {
         public static final int NOTIFICATION_UNCERTAIN_SMB_SOUND_ENABLED = R.string.key_omnipod_notification_uncertain_smb_sound_enabled;
         public static final int NOTIFICATION_UNCERTAIN_BOLUS_SOUND_ENABLED = R.string.key_omnipod_notification_uncertain_bolus_sound_enabled;
         public static final int AUTOMATICALLY_ACKNOWLEDGE_ALERTS_ENABLED = R.string.key_omnipod_automatically_acknowledge_alerts_enabled;
+        public static final int RILEYLINK_STATS_BUTTON_ENABLED = R.string.key_omnipod_rileylink_stats_button_enabled;
     }
 
     public static class Statistics {
diff --git a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/manager/AapsOmnipodManager.java b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/manager/AapsOmnipodManager.java
index 9f5333330c..65474891e3 100644
--- a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/manager/AapsOmnipodManager.java
+++ b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/manager/AapsOmnipodManager.java
@@ -115,6 +115,8 @@ public class AapsOmnipodManager {
     private boolean notificationUncertainSmbSoundEnabled;
     private boolean notificationUncertainBolusSoundEnabled;
     private boolean automaticallyAcknowledgeAlertsEnabled;
+    private boolean testBeepButtonEnabled;
+    private boolean rileylinkStatsButtonEnabled;
 
     @Inject
     public AapsOmnipodManager(OmnipodRileyLinkCommunicationManager communicationService,
@@ -156,6 +158,8 @@ public class AapsOmnipodManager {
         tbrBeepsEnabled = sp.getBoolean(OmnipodStorageKeys.Preferences.TBR_BEEPS_ENABLED, true);
         suspendDeliveryButtonEnabled = sp.getBoolean(OmnipodStorageKeys.Preferences.SUSPEND_DELIVERY_BUTTON_ENABLED, false);
         pulseLogButtonEnabled = sp.getBoolean(OmnipodStorageKeys.Preferences.PULSE_LOG_BUTTON_ENABLED, false);
+        testBeepButtonEnabled = sp.getBoolean(OmnipodStorageKeys.Preferences.TEST_BEEP_BUTTON_ENABLED, true);
+        rileylinkStatsButtonEnabled = sp.getBoolean(OmnipodStorageKeys.Preferences.RILEYLINK_STATS_BUTTON_ENABLED, false);
         timeChangeEventEnabled = sp.getBoolean(OmnipodStorageKeys.Preferences.TIME_CHANGE_EVENT_ENABLED, true);
         notificationUncertainTbrSoundEnabled = sp.getBoolean(OmnipodStorageKeys.Preferences.NOTIFICATION_UNCERTAIN_TBR_SOUND_ENABLED, true);
         notificationUncertainSmbSoundEnabled = sp.getBoolean(OmnipodStorageKeys.Preferences.NOTIFICATION_UNCERTAIN_SMB_SOUND_ENABLED, true);
@@ -629,6 +633,13 @@ public class AapsOmnipodManager {
         return pulseLogButtonEnabled;
     }
 
+    public boolean isTestBeepButtonEnabled() {
+        return testBeepButtonEnabled; }
+
+    public boolean isRileylinkStatsButtonEnabled() {
+        return rileylinkStatsButtonEnabled;
+    }
+
     public boolean isTimeChangeEventEnabled() {
         return timeChangeEventEnabled;
     }
diff --git a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/OmnipodOverviewFragment.kt b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/OmnipodOverviewFragment.kt
index 3fd3b27472..bb9123033a 100644
--- a/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/OmnipodOverviewFragment.kt
+++ b/omnipod/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/ui/OmnipodOverviewFragment.kt
@@ -24,6 +24,7 @@ import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.Riley
 import info.nightscout.androidaps.plugins.pump.omnipod.OmnipodPumpPlugin
 import info.nightscout.androidaps.plugins.pump.omnipod.R
 import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.ActivationProgress
+import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.BeepConfigType
 import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.OmnipodConstants
 import info.nightscout.androidaps.plugins.pump.omnipod.driver.definition.PodProgressStatus
 import info.nightscout.androidaps.plugins.pump.omnipod.driver.manager.PodStateManager
@@ -119,6 +120,12 @@ class OmnipodOverviewFragment : DaggerFragment() {
                 DisplayResultDialogCallback(resourceHelper.gs(R.string.omnipod_error_failed_to_refresh_status), false))
         }
 
+        omnipod_overview_button_test_beep.setOnClickListener {
+            disablePodActionButtons()
+            commandQueue.customCommand(CommandPlayTestBeep(BeepConfigType.BIP_BIP),
+                DisplayResultDialogCallback(resourceHelper.gs(R.string.omnipod_error_failed_to_play_test_beep), false))
+        }
+
         omnipod_overview_button_rileylink_stats.setOnClickListener {
             if (omnipodPumpPlugin.rileyLinkService?.verifyConfiguration() == true) {
                 startActivity(Intent(context, RileyLinkStatusActivity::class.java))
@@ -448,8 +455,11 @@ class OmnipodOverviewFragment : DaggerFragment() {
         updateSuspendDeliveryButton()
         updateSetTimeButton()
         updatePulseLogButton()
+        updateTestBeepButton()
+        updateRileylinkStatsButton()
     }
 
+
     private fun disablePodActionButtons() {
         omnipod_overview_button_acknowledge_active_alerts.isEnabled = false
         omnipod_overview_button_resume_delivery.isEnabled = false
@@ -457,6 +467,7 @@ class OmnipodOverviewFragment : DaggerFragment() {
         omnipod_overview_button_set_time.isEnabled = false
         omnipod_overview_button_refresh_status.isEnabled = false
         omnipod_overview_button_pulse_log.isEnabled = false
+        omnipod_overview_button_test_beep.isEnabled = false
     }
 
     private fun updateRefreshStatusButton() {
@@ -510,6 +521,24 @@ class OmnipodOverviewFragment : DaggerFragment() {
         }
     }
 
+    private fun updateRileylinkStatsButton() {
+        if (omnipodManager.isRileylinkStatsButtonEnabled) {
+            omnipod_overview_button_rileylink_stats.visibility = View.VISIBLE
+            omnipod_overview_button_rileylink_stats.isEnabled = true
+        } else {
+            omnipod_overview_button_rileylink_stats.visibility = View.GONE
+        }
+    }
+
+    private fun updateTestBeepButton() {
+        if (omnipodManager.isTestBeepButtonEnabled) {
+            omnipod_overview_button_test_beep.visibility = View.VISIBLE
+            omnipod_overview_button_test_beep.isEnabled = podStateManager.isPodActivationCompleted && rileyLinkServiceData.rileyLinkServiceState.isReady && isQueueEmpty()
+        } else {
+            omnipod_overview_button_test_beep.visibility = View.GONE
+        }
+    }
+
     private fun displayNotConfiguredDialog() {
         context?.let {
             UIRunnable(Runnable {
diff --git a/omnipod/src/main/res/drawable/ic_speaker_icon.xml b/omnipod/src/main/res/drawable/ic_speaker_icon.xml
new file mode 100644
index 0000000000..e642e65ab3
--- /dev/null
+++ b/omnipod/src/main/res/drawable/ic_speaker_icon.xml
@@ -0,0 +1,14 @@
+<vector
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:height="48dp"
+    android:viewportHeight="75"
+    android:viewportWidth="75"
+    android:width="48dp"
+    >
+    <path android:fillColor="#4CAF50"
+        android:pathData="M39.389,13.769L22.235,28.606L6,28.606L6,47.699L21.989,47.699L39.389,62.75L39.389,13.769z"
+        android:strokeColor="#4CAF50" android:strokeLineJoin="round" android:strokeWidth="5"/>
+    <path android:fillColor="#00000000"
+        android:pathData="M48,27.6a19.5,19.5 0,0 1,0 21.4M55.1,20.5a30,30 0,0 1,0 35.6M61.6,14a38.8,38.8 0,0 1,0 48.6"
+        android:strokeColor="#4CAF50" android:strokeLineCap="round" android:strokeWidth="5"/>
+</vector>
diff --git a/omnipod/src/main/res/layout/omnipod_overview.xml b/omnipod/src/main/res/layout/omnipod_overview.xml
index ff36031400..2088ac3e4f 100644
--- a/omnipod/src/main/res/layout/omnipod_overview.xml
+++ b/omnipod/src/main/res/layout/omnipod_overview.xml
@@ -779,28 +779,6 @@
                     android:paddingRight="0dp"
                     android:text="@string/omnipod_overview_button_acknowledge_active_alerts" />
 
-                <Button
-                    android:id="@+id/omnipod_overview_button_rileylink_stats"
-                    style="@style/ButtonSmallFontStyle"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1"
-                    android:drawableTop="@drawable/ic_danarstats"
-                    android:paddingLeft="0dp"
-                    android:paddingRight="0dp"
-                    android:text="@string/omnipod_overview_button_riley_link_stats" />
-
-                <Button
-                    android:id="@+id/omnipod_overview_button_pulse_log"
-                    style="@style/ButtonSmallFontStyle"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1"
-                    android:drawableTop="@drawable/ic_cp_bolus_correction"
-                    android:paddingLeft="0dp"
-                    android:paddingRight="0dp"
-                    android:text="@string/omnipod_overview_button_read_pulse_log"
-                    android:visibility="gone" />
 
                 <Button
                     android:id="@+id/omnipod_overview_button_set_time"
@@ -838,6 +816,42 @@
                     android:text="@string/omnipod_overview_button_suspend_delivery"
                     android:visibility="gone" />
 
+                <Button
+                    android:id="@+id/omnipod_overview_button_test_beep"
+                    style="@style/ButtonSmallFontStyle"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:drawableTop="@drawable/ic_speaker_icon"
+                    android:paddingLeft="0dp"
+                    android:paddingRight="0dp"
+                    android:text="@string/omnipod_overview_button_test_beep"
+                     />
+
+                <Button
+                    android:id="@+id/omnipod_overview_button_pulse_log"
+                    style="@style/ButtonSmallFontStyle"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:drawableTop="@drawable/ic_cp_bolus_correction"
+                    android:paddingLeft="0dp"
+                    android:paddingRight="0dp"
+                    android:text="@string/omnipod_overview_button_read_pulse_log"
+                    android:visibility="gone" />
+
+                <Button
+                    android:id="@+id/omnipod_overview_button_rileylink_stats"
+                    style="@style/ButtonSmallFontStyle"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:drawableTop="@drawable/ic_danarstats"
+                    android:paddingLeft="0dp"
+                    android:paddingRight="0dp"
+                    android:text="@string/omnipod_overview_button_riley_link_stats"
+                    android:visibility="gone" />
+
             </LinearLayout>
 
         </LinearLayout>
diff --git a/omnipod/src/main/res/values/strings.xml b/omnipod/src/main/res/values/strings.xml
index 6bc4cc2b11..f3c7a6b9df 100644
--- a/omnipod/src/main/res/values/strings.xml
+++ b/omnipod/src/main/res/values/strings.xml
@@ -257,6 +257,12 @@
     <string name="omnipod_time_ago">%1$s ago</string>
     <string name="omnipod_cmd_beep_config">Beep config</string>
     <string name="omnipod_cmd_play_test_beep">Play test beep</string>
+    <string name="key_omnipod_test_beep_button_enabled">AAPS.Omnipod.test_beep_button_enabled</string>
+    <string name="omnipod_config_test_beep_button_enabled">Test beep button enabled</string>
+    <string name="omnipod_overview_button_test_beep">Test beep</string>
+    <string name="omnipod_config_rileylink_stats_button_enabled">RileyLink Stats button enabled</string>
+    <string name="key_omnipod_rileylink_stats_button_enabled">AAPS.Omnipod.rileylink_stats_button_enabled</string>
+    <string name="omnipod_error_failed_to_play_test_beep">Failed to play test beep</string>
     <plurals name="omnipod_minutes">
         <item quantity="one">%1$d minute</item>
         <item quantity="other">%1$d minutes</item>
diff --git a/omnipod/src/main/res/xml/pref_omnipod.xml b/omnipod/src/main/res/xml/pref_omnipod.xml
index cc0d7a33cd..ed28832ea6 100644
--- a/omnipod/src/main/res/xml/pref_omnipod.xml
+++ b/omnipod/src/main/res/xml/pref_omnipod.xml
@@ -105,16 +105,28 @@
             android:key="@string/key_omnipod_suspend_delivery_button_enabled"
             android:title="@string/omnipod_config_suspend_delivery_button_enabled" />
 
+        <SwitchPreference
+            android:defaultValue="true"
+            android:key="@string/key_omnipod_test_beep_button_enabled"
+            android:title="@string/omnipod_config_test_beep_button_enabled" />
+
         <SwitchPreference
             android:defaultValue="false"
             android:key="@string/key_omnipod_pulse_log_button_enabled"
             android:title="@string/omnipod_config_pulse_log_button_enabled" />
 
+        <SwitchPreference
+            android:defaultValue="false"
+            android:key="@string/key_omnipod_rileylink_stats_button_enabled"
+            android:title="@string/omnipod_config_rileylink_stats_button_enabled" />
+
         <SwitchPreference
             android:defaultValue="true"
             android:key="@string/key_omnipod_time_change_event_enabled"
             android:title="@string/omnipod_config_time_change_enabled" />
 
+
+
     </PreferenceCategory>
 
 </androidx.preference.PreferenceScreen>
\ No newline at end of file