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 4af1ba4fff..b0ff0ef435 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
@@ -162,7 +162,7 @@ public class AapsOmnipodManager {
basalBeepsEnabled = sp.getBoolean(OmnipodStorageKeys.Preferences.BASAL_BEEPS_ENABLED, true);
bolusBeepsEnabled = sp.getBoolean(OmnipodStorageKeys.Preferences.BOLUS_BEEPS_ENABLED, true);
smbBeepsEnabled = sp.getBoolean(OmnipodStorageKeys.Preferences.SMB_BEEPS_ENABLED, true);
- tbrBeepsEnabled = sp.getBoolean(OmnipodStorageKeys.Preferences.TBR_BEEPS_ENABLED, true);
+ tbrBeepsEnabled = sp.getBoolean(OmnipodStorageKeys.Preferences.TBR_BEEPS_ENABLED, false);
suspendDeliveryButtonEnabled = sp.getBoolean(OmnipodStorageKeys.Preferences.SUSPEND_DELIVERY_BUTTON_ENABLED, false);
pulseLogButtonEnabled = sp.getBoolean(OmnipodStorageKeys.Preferences.PULSE_LOG_BUTTON_ENABLED, false);
rileylinkStatsButtonEnabled = sp.getBoolean(OmnipodStorageKeys.Preferences.RILEYLINK_STATS_BUTTON_ENABLED, false);
diff --git a/omnipod/src/main/res/drawable/ic_deactivate_pod.xml b/omnipod/src/main/res/drawable/ic_deactivate_pod.xml
index 638e1b65db..7eef8975c0 100644
--- a/omnipod/src/main/res/drawable/ic_deactivate_pod.xml
+++ b/omnipod/src/main/res/drawable/ic_deactivate_pod.xml
@@ -1,5 +1,5 @@
-
-
+
+
diff --git a/omnipod/src/main/res/drawable/ic_pod_management.xml b/omnipod/src/main/res/drawable/ic_pod_management.xml
index 22758ccf63..55ed07f4fc 100644
--- a/omnipod/src/main/res/drawable/ic_pod_management.xml
+++ b/omnipod/src/main/res/drawable/ic_pod_management.xml
@@ -1,5 +1,5 @@
-
-
+
+
diff --git a/omnipod/src/main/res/drawable/ic_suspend_delivery.xml b/omnipod/src/main/res/drawable/ic_suspend_delivery.xml
index c3a5b67771..fb0a216bd6 100644
--- a/omnipod/src/main/res/drawable/ic_suspend_delivery.xml
+++ b/omnipod/src/main/res/drawable/ic_suspend_delivery.xml
@@ -1,5 +1,5 @@
-
-
+
+
diff --git a/omnipod/src/main/res/xml/pref_omnipod.xml b/omnipod/src/main/res/xml/pref_omnipod.xml
index 7ea50ddde3..8b59e41416 100644
--- a/omnipod/src/main/res/xml/pref_omnipod.xml
+++ b/omnipod/src/main/res/xml/pref_omnipod.xml
@@ -32,7 +32,7 @@
android:title="@string/omnipod_config_smb_beeps_enabled" />