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 7d55c33782..86a120a1d6 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
@@ -239,14 +239,29 @@ class ActionsFragment : DaggerFragment() {
         actions_pumpbatterychange?.visibility = pump.pumpDescription.isBatteryReplaceable.toVisibility()
         actions_temptarget?.visibility = (profile != null && config.APS).toVisibility()
         actions_tddstats?.visibility = pump.pumpDescription.supportsTDDs.toVisibility()
+        val shortlabel = sp.getBoolean(R.string.key_short_cp_label,false)
+        if (shortlabel) {
+            careportal_pblabel?.text = resourceHelper.gs(R.string.pump)
+            careportal_sensoragelabel?.text = ""
+            careportal_insulinagelabel?.text = ""
+            careportal_canulaagelabel?.text = ""
+            careportal_pbagelabel?.text = ""
+        } else {
+            careportal_pblabel.text = resourceHelper.gs(R.string.careportal_pb_label)
+            careportal_sensoragelabel.text = resourceHelper.gs(R.string.careportal_age_label)
+            careportal_insulinagelabel.text =resourceHelper.gs(R.string.careportal_age_label)
+            careportal_canulaagelabel.text =resourceHelper.gs(R.string.careportal_age_label)
+            careportal_pbagelabel.text =resourceHelper.gs(R.string.careportal_age_label)
+        }
+
         if (!config.NSCLIENT) {
             statusLightHandler.updateStatusLights(careportal_canulaage, careportal_insulinage, careportal_reservoirlevel, careportal_sensorage, careportal_sensorlevel, careportal_pbage, careportal_batterylevel)
             if (activeBgSource.sensorBatteryLevel == -1)
                 careportal_senslevellabel?.text = ""
             else
-                careportal_senslevellabel?.text = resourceHelper.gs(R.string.careportal_level_label)
-            careportal_inslevellabel?.text = resourceHelper.gs(R.string.careportal_level_label)
-            careportal_pblevellabel?.text = resourceHelper.gs(R.string.careportal_level_label)
+                careportal_senslevellabel?.text = if (shortlabel) "|" else  resourceHelper.gs(R.string.careportal_level_label)
+            careportal_inslevellabel?.text = if (shortlabel) "|" else resourceHelper.gs(R.string.careportal_level_label)
+            careportal_pblevellabel?.text = if (shortlabel) "|" else resourceHelper.gs(R.string.careportal_level_label)
         } else {
             statusLightHandler.updateStatusLights(careportal_canulaage, careportal_insulinage, null, careportal_sensorage, null, careportal_pbage, null)
             careportal_senslevellabel?.text = ""
diff --git a/app/src/main/res/layout/careportal_stats_fragment.xml b/app/src/main/res/layout/careportal_stats_fragment.xml
index 7e6bcf4d74..87ce0f6719 100644
--- a/app/src/main/res/layout/careportal_stats_fragment.xml
+++ b/app/src/main/res/layout/careportal_stats_fragment.xml
@@ -25,6 +25,7 @@
 
 
             <TextView
+                android:id="@+id/careportal_sensoragelabel"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:gravity="center_vertical"
@@ -97,6 +98,7 @@
 
 
             <TextView
+                android:id="@+id/careportal_insulinagelabel"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:gravity="center_vertical"
@@ -167,8 +169,8 @@
                 android:text="@string/careportal_canula_label"
                 android:textSize="14sp" />
 
-
             <TextView
+                android:id="@+id/careportal_canulaagelabel"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:gravity="center_vertical"
@@ -227,6 +229,7 @@
             android:layout_height="wrap_content">
 
             <TextView
+                android:id="@+id/careportal_pblabel"
                 android:layout_width="wrap_content"
                 android:layout_height="25dp"
                 android:drawableLeft="@drawable/ic_cp_age_battery"
@@ -238,6 +241,7 @@
 
 
             <TextView
+                android:id="@+id/careportal_pbagelabel"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:gravity="center_vertical"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 231997b66c..38304e695b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -403,6 +403,7 @@
     <string name="wear_shortname">WEAR</string>
     <string name="smscommunicator_shortname">SMS</string>
     <string name="short_tabtitles">Shorten tab titles</string>
+    <string name="short_cp_label">Shorten Careportal labels in Actions tab</string>
     <string name="always_use_shortavg">Always use short average delta instead of simple delta</string>
     <string name="always_use_shortavg_summary">Useful when data from unfiltered sources like xDrip gets noisy.</string>
     <string name="key_advancedsettings" translatable="false">key_advancedsettings</string>
@@ -1031,6 +1032,7 @@
     <string name="loop_openmode_min_change">Minimal request change [%]</string>
     <string name="loop_openmode_min_change_summary" formatted="false">Open Loop will popup new change request only if change is bigger than this value in %. Default value is 20%</string>
     <string name="key_short_tabtitles" translatable="false">short_tabtitles</string>
+    <string name="key_short_cp_label" translatable="false">short_cplabel</string>
     <string name="searching_for_devices">Searching for devices…</string>
     <string name="pairing_completed">Pairing completed</string>
     <string name="code_compare">Do the codes displayed on this device and on your pump match?</string>
diff --git a/app/src/main/res/xml/pref_overview.xml b/app/src/main/res/xml/pref_overview.xml
index 75f81c96c4..907d82d026 100644
--- a/app/src/main/res/xml/pref_overview.xml
+++ b/app/src/main/res/xml/pref_overview.xml
@@ -282,6 +282,11 @@
                 android:key="@string/key_show_statuslights"
                 android:title="@string/show_statuslights" />
 
+            <SwitchPreference
+                android:defaultValue="false"
+                android:key="@string/key_short_cp_label"
+                android:title="@string/short_cp_label" />
+
             <info.nightscout.androidaps.utils.textValidator.ValidatingEditTextPreference
                 android:defaultValue="48"
                 android:dependency="@string/key_show_statuslights"