diff --git a/app/src/main/res/layout/nsprofileviewer_fragment.xml b/app/src/main/res/layout/nsprofileviewer_fragment.xml
index 9aaf0d8c54..f3c0d65886 100644
--- a/app/src/main/res/layout/nsprofileviewer_fragment.xml
+++ b/app/src/main/res/layout/nsprofileviewer_fragment.xml
@@ -23,96 +23,320 @@
                 android:textStyle="bold"
                 android:gravity="center_horizontal" />
 
-            <TextView
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="@string/nsprofileview_activeprofile_label"
-                android:textAppearance="?android:attr/textAppearanceLarge"
-                android:layout_marginLeft="10dp" />
+                android:orientation="horizontal">
 
-            <TextView
-                android:id="@+id/profileview_activeprofile"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="25dp" />
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:gravity="end"
+                    android:paddingRight="5dp"
+                    android:text="@string/nsprofileview_activeprofile_label"
+                    android:textSize="14sp" />
 
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/nsprofileview_units_label"
-                android:textAppearance="?android:attr/textAppearanceLarge"
-                android:layout_marginLeft="10dp" />
+                <TextView
+                    android:layout_width="5dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="0"
+                    android:gravity="center_horizontal"
+                    android:paddingEnd="2dp"
+                    android:paddingStart="2dp"
+                    android:text=":"
+                    android:textSize="14sp" />
 
-            <TextView
-                android:id="@+id/profileview_units"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="25dp" />
+                <TextView
+                    android:id="@+id/profileview_activeprofile"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:gravity="start"
+                    android:paddingLeft="5dp"
+                    android:textColor="@android:color/white"
+                    android:textSize="14sp" />
 
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/nsprofileview_dia_label"
-                android:textAppearance="?android:attr/textAppearanceLarge"
-                android:layout_marginLeft="10dp" />
+            </LinearLayout>
 
-            <TextView
-                android:id="@+id/profileview_dia"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="25dp" />
+            <View
+                android:layout_width="fill_parent"
+                android:layout_height="2dip"
+                android:layout_marginBottom="5dp"
+                android:layout_marginLeft="20dp"
+                android:layout_marginRight="20dp"
+                android:layout_marginTop="5dp"
+                android:background="@color/listdelimiter" />
 
-            <TextView
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="@string/nsprofileview_ic_label"
-                android:textAppearance="?android:attr/textAppearanceLarge"
-                android:layout_marginLeft="10dp" />
+                android:orientation="horizontal">
 
-            <TextView
-                android:id="@+id/profileview_ic"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="25dp" />
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:gravity="end"
+                    android:paddingRight="5dp"
+                    android:text="@string/nsprofileview_units_label"
+                    android:textSize="14sp" />
 
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/nsprofileview_isf_label"
-                android:textAppearance="?android:attr/textAppearanceLarge"
-                android:layout_marginLeft="10dp" />
+                <TextView
+                    android:layout_width="5dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="0"
+                    android:gravity="center_horizontal"
+                    android:paddingEnd="2dp"
+                    android:paddingStart="2dp"
+                    android:text=":"
+                    android:textSize="14sp" />
 
-            <TextView
-                android:id="@+id/profileview_isf"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="25dp" />
+                <TextView
+                    android:id="@+id/profileview_units"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:gravity="start"
+                    android:paddingLeft="5dp"
+                    android:textColor="@android:color/white"
+                    android:textSize="14sp" />
 
-            <TextView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/nsprofileview_basal_label"
-                android:textAppearance="?android:attr/textAppearanceLarge"
-                android:layout_marginLeft="10dp" />
+            </LinearLayout>
 
-            <TextView
-                android:id="@+id/profileview_basal"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="25dp" />
+            <View
+                android:layout_width="fill_parent"
+                android:layout_height="2dip"
+                android:layout_marginBottom="5dp"
+                android:layout_marginLeft="20dp"
+                android:layout_marginRight="20dp"
+                android:layout_marginTop="5dp"
+                android:background="@color/listdelimiter" />
 
-            <TextView
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="@string/nsprofileview_target_label"
-                android:textAppearance="?android:attr/textAppearanceLarge"
-                android:layout_marginLeft="10dp" />
+                android:orientation="horizontal">
 
-            <TextView
-                android:id="@+id/profileview_target"
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:gravity="end"
+                    android:paddingRight="5dp"
+                    android:text="@string/nsprofileview_dia_label"
+                    android:textSize="14sp" />
+
+                <TextView
+                    android:layout_width="5dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="0"
+                    android:gravity="center_horizontal"
+                    android:paddingEnd="2dp"
+                    android:paddingStart="2dp"
+                    android:text=":"
+                    android:textSize="14sp" />
+
+                <TextView
+                    android:id="@+id/profileview_dia"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:gravity="start"
+                    android:paddingLeft="5dp"
+                    android:textColor="@android:color/white"
+                    android:textSize="14sp" />
+
+            </LinearLayout>
+
+            <View
+                android:layout_width="fill_parent"
+                android:layout_height="2dip"
+                android:layout_marginBottom="5dp"
+                android:layout_marginLeft="20dp"
+                android:layout_marginRight="20dp"
+                android:layout_marginTop="5dp"
+                android:background="@color/listdelimiter" />
+
+            <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="15dp" />
+                android:orientation="horizontal">
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:gravity="end"
+                    android:paddingRight="5dp"
+                    android:text="@string/nsprofileview_ic_label"
+                    android:textSize="14sp" />
+
+                <TextView
+                    android:layout_width="5dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="0"
+                    android:gravity="center_horizontal"
+                    android:paddingEnd="2dp"
+                    android:paddingStart="2dp"
+                    android:text=":"
+                    android:textSize="14sp" />
+
+                <TextView
+                    android:id="@+id/profileview_ic"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:gravity="start"
+                    android:paddingLeft="5dp"
+                    android:textColor="@android:color/white"
+                    android:textSize="14sp" />
+
+            </LinearLayout>
+
+            <View
+                android:layout_width="fill_parent"
+                android:layout_height="2dip"
+                android:layout_marginBottom="5dp"
+                android:layout_marginLeft="20dp"
+                android:layout_marginRight="20dp"
+                android:layout_marginTop="5dp"
+                android:background="@color/listdelimiter" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:gravity="end"
+                    android:paddingRight="5dp"
+                    android:text="@string/nsprofileview_isf_label"
+                    android:textSize="14sp" />
+
+                <TextView
+                    android:layout_width="5dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="0"
+                    android:gravity="center_horizontal"
+                    android:paddingEnd="2dp"
+                    android:paddingStart="2dp"
+                    android:text=":"
+                    android:textSize="14sp" />
+
+                <TextView
+                    android:id="@+id/profileview_isf"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:gravity="start"
+                    android:paddingLeft="5dp"
+                    android:textColor="@android:color/white"
+                    android:textSize="14sp" />
+
+            </LinearLayout>
+
+            <View
+                android:layout_width="fill_parent"
+                android:layout_height="2dip"
+                android:layout_marginBottom="5dp"
+                android:layout_marginLeft="20dp"
+                android:layout_marginRight="20dp"
+                android:layout_marginTop="5dp"
+                android:background="@color/listdelimiter" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:gravity="end"
+                    android:paddingRight="5dp"
+                    android:text="@string/nsprofileview_basal_label"
+                    android:textSize="14sp" />
+
+                <TextView
+                    android:layout_width="5dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="0"
+                    android:gravity="center_horizontal"
+                    android:paddingEnd="2dp"
+                    android:paddingStart="2dp"
+                    android:text=":"
+                    android:textSize="14sp" />
+
+                <TextView
+                    android:id="@+id/profileview_basal"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:gravity="start"
+                    android:paddingLeft="5dp"
+                    android:textColor="@android:color/white"
+                    android:textSize="14sp" />
+
+            </LinearLayout>
+
+            <View
+                android:layout_width="fill_parent"
+                android:layout_height="2dip"
+                android:layout_marginBottom="5dp"
+                android:layout_marginLeft="20dp"
+                android:layout_marginRight="20dp"
+                android:layout_marginTop="5dp"
+                android:background="@color/listdelimiter" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:gravity="end"
+                    android:paddingRight="5dp"
+                    android:text="@string/nsprofileview_target_label"
+                    android:textSize="14sp" />
+
+                <TextView
+                    android:layout_width="5dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="0"
+                    android:gravity="center_horizontal"
+                    android:paddingEnd="2dp"
+                    android:paddingStart="2dp"
+                    android:text=":"
+                    android:textSize="14sp" />
+
+                <TextView
+                    android:id="@+id/profileview_target"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:gravity="start"
+                    android:paddingLeft="5dp"
+                    android:textColor="@android:color/white"
+                    android:textSize="14sp" />
+
+            </LinearLayout>
+
+            <View
+                android:layout_width="fill_parent"
+                android:layout_height="2dip"
+                android:layout_marginBottom="5dp"
+                android:layout_marginLeft="20dp"
+                android:layout_marginRight="20dp"
+                android:layout_marginTop="5dp"
+                android:background="@color/listdelimiter" />
 
             <Button
                 android:layout_width="wrap_content"
diff --git a/app/src/main/res/values-bg/strings.xml b/app/src/main/res/values-bg/strings.xml
index 4e77d363b7..a45d652431 100644
--- a/app/src/main/res/values-bg/strings.xml
+++ b/app/src/main/res/values-bg/strings.xml
@@ -84,13 +84,13 @@
     <string name="noprofile">Не е зареден профил от NS</string>
     <string name="ns_sync_use_absolute_title">Използване на абсолютни стойности</string>
     <string name="nsclient">NSClient</string>
-    <string name="nsprofileview_activeprofile_label">Активен профил:</string>
+    <string name="nsprofileview_activeprofile_label">Активен профил</string>
     <string name="nsprofileview_basal_label">Базални стойности:</string>
     <string name="nsprofileview_dia_label">DIA (Време на действие на инсулина):</string>
     <string name="nsprofileview_ic_label">IC (Инсулин/въглехидр.):</string>
     <string name="noprofileset">НЕ Е ЗАДАДЕН ПРОФИЛ</string>
     <string name="nsprofileview_target_label">Целeва КЗ:</string>
-    <string name="nsprofileview_units_label">Единици:</string>
+    <string name="nsprofileview_units_label">Единици</string>
     <string name="objectives">Цели</string>
     <string name="objectives_button_start">Старт</string>
     <string name="objectives_button_verify">Проверка</string>
diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml
index 0ef84e446b..650c27d120 100644
--- a/app/src/main/res/values-cs/strings.xml
+++ b/app/src/main/res/values-cs/strings.xml
@@ -84,13 +84,13 @@
     <string name="noprofile">Dosud nebyl načten profil z NS</string>
     <string name="ns_sync_use_absolute_title">Vždy použít absolutní hodnoty bazálu</string>
     <string name="nsclient">NSClient</string>
-    <string name="nsprofileview_activeprofile_label">Aktivní profil:</string>
-    <string name="nsprofileview_basal_label">Bazál:</string>
-    <string name="nsprofileview_dia_label">Trvání inzulínu:</string>
-    <string name="nsprofileview_ic_label">Inzulínosacharidový poměr:</string>
+    <string name="nsprofileview_activeprofile_label">Aktivní profil</string>
+    <string name="nsprofileview_basal_label">Bazál</string>
+    <string name="nsprofileview_dia_label">Doba působnosti inzulínu</string>
+    <string name="nsprofileview_ic_label">Inzulínosacharidový poměr</string>
     <string name="noprofileset">ŽÁDNÝ PROFIL NENASTAVEN</string>
-    <string name="nsprofileview_target_label">Cíl:</string>
-    <string name="nsprofileview_units_label">Jednotky:</string>
+    <string name="nsprofileview_target_label">Cíl</string>
+    <string name="nsprofileview_units_label">Jednotky</string>
     <string name="objectives">Cíle</string>
     <string name="objectives_button_start">Začátek</string>
     <string name="objectives_button_verify">Kontrola</string>
@@ -395,24 +395,24 @@
     <string name="short_avgdelta">Krátkodobý průměr</string>
     <string name="temptargetrange">Dočasný cíl</string>
     <string name="temptargetrange_refreshfromnightscout">Obnovit dočasné cíle z NS</string>
-    <string name="actions_shortname">" "</string>
-    <string name="wear_shortname">" "</string>
-    <string name="virtualpump_shortname">ViPu</string>
-    <string name="treatments_shortname">Oš</string>
-    <string name="temptargetrange_shortname">" "</string>
-    <string name="tempbasals_shortname">" "</string>
+    <string name="actions_shortname">"AKCE"</string>
+    <string name="wear_shortname">"WEAR"</string>
+    <string name="virtualpump_shortname">VPUM</string>
+    <string name="treatments_shortname">OŠET</string>
+    <string name="temptargetrange_shortname">"CROZ"</string>
+    <string name="tempbasals_shortname">"DBAZ"</string>
     <string name="smscommunicator_shortname">SMS</string>
-    <string name="simpleprofile_shortname">JP</string>
-    <string name="profileviewer_shortname">" "</string>
-    <string name="overview_shortname">Přehl</string>
-    <string name="objectives_shortname">Cíle</string>
-    <string name="oaps_shortname">" "</string>
-    <string name="loop_shortname">Smyč</string>
-    <string name="localprofile_shortname">LP</string>
-    <string name="danarpump_shortname">Dana</string>
-    <string name="configbuilder_shortname">Konf</string>
+    <string name="simpleprofile_shortname">JPRO</string>
+    <string name="profileviewer_shortname">"PROF"</string>
+    <string name="overview_shortname">PŘEH</string>
+    <string name="objectives_shortname">CÍLE</string>
+    <string name="oaps_shortname">"OAPS"</string>
+    <string name="loop_shortname">SMYČ</string>
+    <string name="localprofile_shortname">MPRF</string>
+    <string name="danarpump_shortname">DANA</string>
+    <string name="configbuilder_shortname">KONF</string>
     <string name="circadian_percentage_profile_shortname">CPP</string>
-    <string name="careportal_shortname">Péče</string>
+    <string name="careportal_shortname">PÉČE</string>
     <string name="advancedsettings_title">Rozšířené nastavení</string>
     <string name="always_use_shortavg">Vždy používat krátkodobý průměrný rozdíl glykémií místo rozdílu posledních 2 hodnot</string>
     <string name="always_use_shortavg_summary">Výhodné, pokud data z xDripu obsahují velký šum</string>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 545c988a42..46c86bb015 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -63,13 +63,13 @@
     <string name="nav_backup">Backup</string>
     <string name="nav_preferences">Einstellungen</string>
     <string name="nsclient">NSClient</string>
-    <string name="nsprofileview_activeprofile_label">Aktives Profil:</string>
+    <string name="nsprofileview_activeprofile_label">Aktives Profil</string>
     <string name="nsprofileview_basal_label">Basal</string>
-    <string name="nsprofileview_dia_label">DIA:</string>
-    <string name="nsprofileview_ic_label">IC:</string>
-    <string name="nsprofileview_isf_label">ISF:</string>
-    <string name="nsprofileview_target_label">Ziel:</string>
-    <string name="nsprofileview_units_label">Einheiten:</string>
+    <string name="nsprofileview_dia_label">DIA</string>
+    <string name="nsprofileview_ic_label">IC</string>
+    <string name="nsprofileview_isf_label">ISF</string>
+    <string name="nsprofileview_target_label">Ziel</string>
+    <string name="nsprofileview_units_label">Einheiten</string>
     <string name="objectives_button_start">Start</string>
     <string name="objectives_button_verify">Verifizieren</string>
     <string name="openapsma">OpenAPS MA</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 04537e4f03..ea92edb2a3 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -17,13 +17,13 @@
     <string name="objectives_gate_label_string">Meta:</string>
     <string name="objectives_button_start">Inicio</string>
     <string name="objectives_button_verify">Verificar</string>
-    <string name="nsprofileview_units_label">Unidades:</string>
-    <string name="nsprofileview_dia_label">DIA (Duración Insulina Activa):</string>
-    <string name="nsprofileview_activeprofile_label">Perfil activo:</string>
-    <string name="nsprofileview_ic_label">IC (Insulina/Carbohidratos Ratio):</string>
-    <string name="nsprofileview_isf_label">ISF (Factor Sensibilidad Insulina):</string>
-    <string name="nsprofileview_basal_label">Dosis Basal:</string>
-    <string name="nsprofileview_target_label">Objetivo:</string>
+    <string name="nsprofileview_units_label">Unidades</string>
+    <string name="nsprofileview_dia_label">DIA (Duración Insulina Activa)</string>
+    <string name="nsprofileview_activeprofile_label">Perfil activo</string>
+    <string name="nsprofileview_ic_label">IC (Insulina/Carbohidratos Ratio)</string>
+    <string name="nsprofileview_isf_label">ISF (Factor Sensibilidad Insulina)</string>
+    <string name="nsprofileview_basal_label">Dosis Basal</string>
+    <string name="nsprofileview_target_label">Objetivo</string>
     <string name="noprofileset">PERFIL NO ACTIVO</string>
     <string name="treatments_insulin_label_string">Insulina:</string>
     <string name="treatments_carbs_label_string">Carbohidratos:</string>
diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml
index b8c84883cb..9dc0237017 100644
--- a/app/src/main/res/values-ko/strings.xml
+++ b/app/src/main/res/values-ko/strings.xml
@@ -18,9 +18,9 @@
     <string name="objectives_gate_label_string">방법:</string>
     <string name="objectives_button_start">시작</string>
     <string name="objectives_button_verify">확인</string>
-    <string name="nsprofileview_units_label">단위:</string>
+    <string name="nsprofileview_units_label">단위</string>
     <string name="nsprofileview_dia_label">인슐린활동시간(DIA):</string>
-    <string name="nsprofileview_activeprofile_label">활성 프로파일:</string>
+    <string name="nsprofileview_activeprofile_label">활성 프로파일</string>
     <string name="nsprofileview_ic_label">인슐린 대 탄수화물 비율(IC):</string>
     <string name="nsprofileview_isf_label">인슐린 민감도(ISF):</string>
     <string name="nsprofileview_basal_label">기초주입:</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 027ae451b9..bac764a26f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -19,13 +19,13 @@
     <string name="objectives_gate_label_string">Gate:</string>
     <string name="objectives_button_start">Start</string>
     <string name="objectives_button_verify">Verify</string>
-    <string name="nsprofileview_units_label">Units:</string>
-    <string name="nsprofileview_dia_label">DIA:</string>
-    <string name="nsprofileview_activeprofile_label">Active profile:</string>
-    <string name="nsprofileview_ic_label">IC:</string>
-    <string name="nsprofileview_isf_label">ISF:</string>
-    <string name="nsprofileview_basal_label">Basal:</string>
-    <string name="nsprofileview_target_label">Target:</string>
+    <string name="nsprofileview_units_label">Units</string>
+    <string name="nsprofileview_dia_label">DIA</string>
+    <string name="nsprofileview_activeprofile_label">Active profile</string>
+    <string name="nsprofileview_ic_label">IC</string>
+    <string name="nsprofileview_isf_label">ISF</string>
+    <string name="nsprofileview_basal_label">Basal</string>
+    <string name="nsprofileview_target_label">Target</string>
     <string name="noprofileset">NO PROFILE SET</string>
     <string name="treatments_insulin_label_string">Insulin:</string>
     <string name="treatments_carbs_label_string">Carbs:</string>