diff --git a/app/src/main/java/info/nightscout/androidaps/db/DatabaseHelper.java b/app/src/main/java/info/nightscout/androidaps/db/DatabaseHelper.java
index 5704add8e5..ff5a6d74df 100644
--- a/app/src/main/java/info/nightscout/androidaps/db/DatabaseHelper.java
+++ b/app/src/main/java/info/nightscout/androidaps/db/DatabaseHelper.java
@@ -528,8 +528,8 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
                         if (historyChange) {
                             updateEarliestDataChange(oldDate);
                             updateEarliestDataChange(old.date);
-                            scheduleTreatmentChange();
                         }
+                        scheduleTreatmentChange();
                         return true;
                     }
                     return false;
@@ -553,8 +553,8 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
                             if (historyChange) {
                                 updateEarliestDataChange(oldDate);
                                 updateEarliestDataChange(old.date);
-                                scheduleTreatmentChange();
                             }
+                            scheduleTreatmentChange();
                             return true;
                         }
                     }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/fragments/TreatmentsBolusFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/fragments/TreatmentsBolusFragment.java
index c2bbd123e3..5f6ff02950 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/fragments/TreatmentsBolusFragment.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/Treatments/fragments/TreatmentsBolusFragment.java
@@ -32,6 +32,7 @@ import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.Services.Intents;
 import info.nightscout.androidaps.data.Iob;
+import info.nightscout.androidaps.db.Source;
 import info.nightscout.androidaps.db.Treatment;
 import info.nightscout.androidaps.events.EventNewBG;
 import info.nightscout.androidaps.events.EventTreatmentChange;
@@ -73,18 +74,21 @@ public class TreatmentsBolusFragment extends Fragment implements View.OnClickLis
             Profile profile = MainApp.getConfigBuilder().getProfile();
             if (profile == null)
                 return;
-            holder.date.setText(DateUtil.dateAndTimeString(treatments.get(position).date));
-            holder.insulin.setText(DecimalFormatter.to2Decimal(treatments.get(position).insulin) + " U");
-            holder.carbs.setText(DecimalFormatter.to0Decimal(treatments.get(position).carbs) + " g");
-            Iob iob = treatments.get(position).iobCalc(new Date().getTime(), profile.getDia());
+            Treatment t = treatments.get(position);
+            holder.date.setText(DateUtil.dateAndTimeString(t.date));
+            holder.insulin.setText(DecimalFormatter.to2Decimal(t.insulin) + " U");
+            holder.carbs.setText(DecimalFormatter.to0Decimal(t.carbs) + " g");
+            Iob iob = t.iobCalc(new Date().getTime(), profile.getDia());
             holder.iob.setText(DecimalFormatter.to2Decimal(iob.iobContrib) + " U");
             holder.activity.setText(DecimalFormatter.to3Decimal(iob.activityContrib) + " U");
-            holder.mealOrCorrection.setText(treatments.get(position).mealBolus ? MainApp.sResources.getString(R.string.mealbolus) : MainApp.sResources.getString(R.string.correctionbous));
+            holder.mealOrCorrection.setText(t.mealBolus ? MainApp.sResources.getString(R.string.mealbolus) : MainApp.sResources.getString(R.string.correctionbous));
+            holder.ph.setVisibility(t.source == Source.PUMP ? View.VISIBLE : View.GONE);
+            holder.ns.setVisibility(t._id != null ? View.VISIBLE : View.GONE);
             if (iob.iobContrib != 0)
                 holder.iob.setTextColor(ContextCompat.getColor(MainApp.instance(), R.color.colorActive));
             else
                 holder.iob.setTextColor(holder.carbs.getCurrentTextColor());
-            holder.remove.setTag(treatments.get(position));
+            holder.remove.setTag(t);
         }
 
         @Override
@@ -106,6 +110,8 @@ public class TreatmentsBolusFragment extends Fragment implements View.OnClickLis
             TextView activity;
             TextView mealOrCorrection;
             TextView remove;
+            TextView ph;
+            TextView ns;
 
             TreatmentsViewHolder(View itemView) {
                 super(itemView);
@@ -116,6 +122,8 @@ public class TreatmentsBolusFragment extends Fragment implements View.OnClickLis
                 iob = (TextView) itemView.findViewById(R.id.treatments_iob);
                 activity = (TextView) itemView.findViewById(R.id.treatments_activity);
                 mealOrCorrection = (TextView) itemView.findViewById(R.id.treatments_mealorcorrection);
+                ph = (TextView) itemView.findViewById(R.id.pump_sign);
+                ns = (TextView) itemView.findViewById(R.id.ns_sign);
                 remove = (TextView) itemView.findViewById(R.id.treatments_remove);
                 remove.setOnClickListener(this);
                 remove.setPaintFlags(remove.getPaintFlags() | Paint.UNDERLINE_TEXT_FLAG);
diff --git a/app/src/main/res/layout/treatments_bolus_item.xml b/app/src/main/res/layout/treatments_bolus_item.xml
index d2a30aa0aa..d79b7a0efd 100644
--- a/app/src/main/res/layout/treatments_bolus_item.xml
+++ b/app/src/main/res/layout/treatments_bolus_item.xml
@@ -82,6 +82,32 @@
                 android:layout_gravity="center_vertical"
                 android:layout_marginRight="30dp"
                 android:textStyle="bold" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginRight="10dp"
+                android:layout_weight="1"
+                android:text="" />
+
+            <TextView
+                android:id="@+id/pump_sign"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginRight="10dp"
+                android:text="PH"
+                android:textAlignment="viewEnd"
+                android:textColor="@color/colorSetTempButton" />
+
+            <TextView
+                android:id="@+id/ns_sign"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginRight="10dp"
+                android:text="NS"
+                android:textAlignment="viewEnd"
+                android:textColor="@color/colorSetTempButton" />
+
         </LinearLayout>
 
         <LinearLayout