diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/actions/ActionsFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/actions/ActionsFragment.kt
index 60500b3f04..9ef905195d 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/actions/ActionsFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/actions/ActionsFragment.kt
@@ -19,7 +19,6 @@ import info.nightscout.androidaps.database.ValueWrapper
 import info.nightscout.androidaps.database.entities.UserEntry.Action
 import info.nightscout.androidaps.database.entities.UserEntry.Sources
 import info.nightscout.androidaps.databinding.ActionsFragmentBinding
-import info.nightscout.androidaps.diaconn.DiaconnG8Plugin
 import info.nightscout.androidaps.dialogs.*
 import info.nightscout.androidaps.events.EventCustomActionsChanged
 import info.nightscout.androidaps.events.EventExtendedBolusChange
@@ -35,7 +34,6 @@ import info.nightscout.androidaps.logging.UserEntryLogger
 import info.nightscout.androidaps.plugins.bus.RxBus
 import info.nightscout.androidaps.plugins.general.actions.defs.CustomAction
 import info.nightscout.androidaps.plugins.general.overview.StatusLightHandler
-import info.nightscout.androidaps.plugins.pump.omnipod.eros.OmnipodErosPumpPlugin
 import info.nightscout.androidaps.queue.Callback
 import info.nightscout.androidaps.skins.SkinProvider
 import info.nightscout.androidaps.utils.DateUtil
@@ -283,19 +281,21 @@ class ActionsFragment : DaggerFragment() {
         binding.tempTarget.visibility = (profile != null && !loop.isDisconnected).toVisibility()
         binding.tddStats.visibility = pump.pumpDescription.supportsTDDs.toVisibility()
         val isPatchPump = pump.pumpDescription.isPatchPump
-        binding.cannulaOrPatch.text = if (isPatchPump) rh.gs(R.string.patch_pump) else rh.gs(R.string.cannula)
-        val imageResource = if (isPatchPump) R.drawable.ic_patch_pump_outline else R.drawable.ic_cp_age_cannula
-        binding.cannulaOrPatch.setCompoundDrawablesWithIntrinsicBounds(imageResource, 0, 0, 0)
-        binding.batteryLayout.visibility = (!isPatchPump || pump.pumpDescription.useHardwareLink).toVisibility()
+        binding.status.apply {
+            cannulaOrPatch.text = if (isPatchPump) rh.gs(R.string.patch_pump) else rh.gs(R.string.cannula)
+            val imageResource = if (isPatchPump) R.drawable.ic_patch_pump_outline else R.drawable.ic_cp_age_cannula
+            cannulaOrPatch.setCompoundDrawablesWithIntrinsicBounds(imageResource, 0, 0, 0)
+            batteryLayout.visibility = (!isPatchPump || pump.pumpDescription.useHardwareLink).toVisibility()
 
-        if (!config.NSCLIENT) {
-            statusLightHandler.updateStatusLights(stats.cannulaAge, stats.insulinAge, stats.reservoirLevel, stats.sensorAge, stats.sensorLevel, stats.pbAge, stats.batteryLevel)
-            stats.sensorLevelLabel.text = if (activeBgSource.sensorBatteryLevel == -1) "" else rh.gs(R.string.careportal_level_label)
-        } else {
-            statusLightHandler.updateStatusLights(stats.cannulaAge, stats.insulinAge, null, stats.sensorAge, null, stats.pbAge, null)
-            stats.sensorLevelLabel.text = ""
-            stats.insulinLevelLabel.text = ""
-            stats.pbLevelLabel.text = ""
+            if (!config.NSCLIENT) {
+                statusLightHandler.updateStatusLights(cannulaAge, insulinAge, reservoirLevel, sensorAge, sensorLevel, pbAge, batteryLevel)
+                sensorLevelLabel.text = if (activeBgSource.sensorBatteryLevel == -1) "" else rh.gs(R.string.careportal_level_label)
+            } else {
+                statusLightHandler.updateStatusLights(cannulaAge, insulinAge, null, sensorAge, null, pbAge, null)
+                sensorLevelLabel.text = ""
+                insulinLevelLabel.text = ""
+                pbLevelLabel.text = ""
+            }
         }
         checkPumpCustomActions()
 
diff --git a/app/src/main/java/info/nightscout/androidaps/skins/SkinLowRes.kt b/app/src/main/java/info/nightscout/androidaps/skins/SkinLowRes.kt
index a875f9c812..45ba680275 100644
--- a/app/src/main/java/info/nightscout/androidaps/skins/SkinLowRes.kt
+++ b/app/src/main/java/info/nightscout/androidaps/skins/SkinLowRes.kt
@@ -22,7 +22,7 @@ class SkinLowRes @Inject constructor(private val config: Config) : SkinInterface
         val isLandscape = screenHeight < screenWidth
 
         if (!isLandscape) {
-            binding.stats.apply {
+            binding.status.apply {
                 sensorAgeLabel.visibility = GONE
                 sensorAgeLabel.visibility = GONE
                 sensorLevelLabel.visibility = GONE
diff --git a/app/src/main/res/layout/actions_fragment.xml b/app/src/main/res/layout/actions_fragment.xml
index 3272362088..e8362b0524 100644
--- a/app/src/main/res/layout/actions_fragment.xml
+++ b/app/src/main/res/layout/actions_fragment.xml
@@ -127,7 +127,7 @@
             android:text="@string/careportal" />
 
         <include
-            android:id="@+id/stats"
+            android:id="@+id/status"
             layout="@layout/careportal_stats_fragment"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"