diff --git a/omnipod/src/main/res/values/strings.xml b/omnipod/src/main/res/values/strings.xml
index 65cd921044..9a3fad5066 100644
--- a/omnipod/src/main/res/values/strings.xml
+++ b/omnipod/src/main/res/values/strings.xml
@@ -44,7 +44,7 @@
     <string name="omnipod_config_suspend_delivery_button_enabled">Show Suspend Delivery button in Omnipod tab</string>
     <string name="omnipod_config_pulse_log_button_enabled">Show Pulse Log button in Pod Management menu</string>
     <string name="omnipod_config_rileylink_stats_button_enabled">Show RileyLink Stats button in Pod Management menu</string>
-    <string name="omnipod_config_use_riley_link_battery_level">Use battery level reported by EmaLink/OrangeLink</string>
+    <string name="omnipod_config_use_riley_link_battery_level">Use battery level reported by OrangeLink/EmaLink</string>
     <string name="omnipod_config_use_riley_link_battery_level_summary">DOES NOT work with the original RileyLink. May not work with other RileyLink alternatives.</string>
     <string name="omnipod_config_time_change_enabled">DST/Time zone detection enabled</string>
     <string name="omnipod_config_expiration_reminder_enabled">Expiration reminder enabled</string>
diff --git a/rileylink/src/main/res/layout/rileylink_status_general.xml b/rileylink/src/main/res/layout/rileylink_status_general.xml
index 38048a2e42..dfa5f94d82 100644
--- a/rileylink/src/main/res/layout/rileylink_status_general.xml
+++ b/rileylink/src/main/res/layout/rileylink_status_general.xml
@@ -30,7 +30,9 @@
 
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="16pt"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="5dp"
+                android:layout_marginBottom="5dp"
                 android:gravity="center_vertical"
                 android:orientation="horizontal">
 
@@ -56,7 +58,9 @@
 
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="16pt"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="5dp"
+                android:layout_marginBottom="5dp"
                 android:gravity="center_vertical"
                 android:orientation="horizontal">
 
@@ -83,7 +87,9 @@
 
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="16pt"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="5dp"
+                android:layout_marginBottom="5dp"
                 android:gravity="center_vertical"
                 android:orientation="horizontal">
 
@@ -110,7 +116,9 @@
 
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="16pt"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="5dp"
+                android:layout_marginBottom="5dp"
                 android:gravity="center_vertical"
                 android:orientation="horizontal">
 
@@ -136,7 +144,9 @@
 
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="16pt"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="5dp"
+                android:layout_marginBottom="5dp"
                 android:gravity="center_vertical"
                 android:orientation="horizontal">
 
@@ -177,7 +187,9 @@
 
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="16pt"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="5dp"
+                android:layout_marginBottom="5dp"
                 android:gravity="center_vertical"
                 android:orientation="horizontal">
 
@@ -204,7 +216,9 @@
 
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="16pt"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="5dp"
+                android:layout_marginBottom="5dp"
                 android:gravity="center_vertical"
                 android:orientation="horizontal">
 
@@ -231,7 +245,9 @@
 
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="16pt"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="5dp"
+                android:layout_marginBottom="5dp"
                 android:gravity="center_vertical"
                 android:orientation="horizontal">
 
@@ -258,7 +274,9 @@
 
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="16pt"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="5dp"
+                android:layout_marginBottom="5dp"
                 android:gravity="center_vertical"
                 android:orientation="horizontal">
 
@@ -284,7 +302,9 @@
 
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="16pt"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="5dp"
+                android:layout_marginBottom="5dp"
                 android:gravity="center_vertical"
                 android:orientation="horizontal">
 
@@ -311,7 +331,9 @@
 
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="16pt"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="5dp"
+                android:layout_marginBottom="5dp"
                 android:gravity="center_vertical"
                 android:orientation="horizontal">