diff --git a/app/src/main/java/info/nightscout/androidaps/dialogs/WizardDialog.kt b/app/src/main/java/info/nightscout/androidaps/dialogs/WizardDialog.kt
index e2eeed4393..6398decd2f 100644
--- a/app/src/main/java/info/nightscout/androidaps/dialogs/WizardDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dialogs/WizardDialog.kt
@@ -64,6 +64,8 @@ class WizardDialog : DaggerDialogFragment() {
     private var calculatedPercentage = 100.0
     private var calculatedCorrection = 0.0
     private var correctionPercent = false
+    private var carbsPassedIntoWizard = 0.0
+    private var notesPassedIntoWizard = ""
 
     //one shot guards
     private var okClicked: Boolean = false
@@ -110,6 +112,11 @@ class WizardDialog : DaggerDialogFragment() {
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
                               savedInstanceState: Bundle?): View {
+        this.arguments?.let { bundle ->
+            carbsPassedIntoWizard = bundle.getInt("carbs_input")?.toDouble()
+            notesPassedIntoWizard = bundle.getString("notes_input").toString()
+        }
+
         dialog?.window?.requestFeature(Window.FEATURE_NO_TITLE)
         dialog?.window?.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_STATE_HIDDEN)
         isCancelable = true
@@ -274,6 +281,12 @@ class WizardDialog : DaggerDialogFragment() {
         else DecimalFormatter.to1Decimal(value * Constants.MGDL_TO_MMOLL)
 
     private fun initDialog() {
+        if(carbsPassedIntoWizard != 0.0) {
+            binding.carbsInput.value = carbsPassedIntoWizard
+        }
+        if(!notesPassedIntoWizard.isBlank()) {
+            binding.notes.setText(notesPassedIntoWizard.toString())
+        }
         val profile = profileFunction.getProfile()
         val profileStore = activePlugin.activeProfileSource.profile
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/food/FoodFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/food/FoodFragment.kt
index 054b85be8e..4507d85ab3 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/food/FoodFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/food/FoodFragment.kt
@@ -22,6 +22,7 @@ import info.nightscout.androidaps.database.entities.ValueWithUnit
 import info.nightscout.androidaps.database.transactions.InvalidateFoodTransaction
 import info.nightscout.androidaps.databinding.FoodFragmentBinding
 import info.nightscout.androidaps.databinding.FoodItemBinding
+import info.nightscout.androidaps.dialogs.WizardDialog
 import info.nightscout.androidaps.events.EventFoodDatabaseChanged
 import info.nightscout.shared.logging.AAPSLogger
 import info.nightscout.shared.logging.LTag
@@ -31,8 +32,10 @@ import info.nightscout.androidaps.plugins.general.nsclient.events.EventNSClientR
 import info.nightscout.androidaps.utils.FabricPrivacy
 import info.nightscout.androidaps.utils.alertDialogs.OKDialog
 import info.nightscout.androidaps.extensions.toVisibility
+import info.nightscout.androidaps.utils.protection.ProtectionCheck
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.androidaps.utils.rx.AapsSchedulers
+import info.nightscout.androidaps.utils.ui.UIRunnable
 import io.reactivex.Completable
 import io.reactivex.disposables.CompositeDisposable
 import io.reactivex.rxkotlin.plusAssign
@@ -51,6 +54,7 @@ class FoodFragment : DaggerFragment() {
     @Inject lateinit var fabricPrivacy: FabricPrivacy
     @Inject lateinit var repository: AppRepository
     @Inject lateinit var uel: UserEntryLogger
+    @Inject lateinit var protectionCheck: ProtectionCheck
 
     private val disposable = CompositeDisposable()
     private var unfiltered: List<Food> = arrayListOf()
@@ -229,7 +233,6 @@ class FoodFragment : DaggerFragment() {
         @SuppressLint("SetTextI18n")
         override fun onBindViewHolder(holder: FoodsViewHolder, position: Int) {
             val food = foodList[position]
-            holder.binding.nsSign.visibility = (food.interfaceIDs.nightscoutId != null).toVisibility()
             holder.binding.name.text = food.name
             holder.binding.portion.text = food.portion.toString() + food.unit
             holder.binding.carbs.text = food.carbs.toString() + rh.gs(R.string.shortgramm)
@@ -239,7 +242,9 @@ class FoodFragment : DaggerFragment() {
             holder.binding.protein.visibility = food.protein.isNotZero().toVisibility()
             holder.binding.energy.text = rh.gs(R.string.shortenergy) + ": " + food.energy + rh.gs(R.string.shortkilojoul)
             holder.binding.energy.visibility = food.energy.isNotZero().toVisibility()
-            holder.binding.remove.tag = food
+            holder.binding.icRemove.tag = food
+            holder.binding.foodItem.tag = food
+            holder.binding.icCalculator.tag = food
         }
 
         override fun getItemCount(): Int = foodList.size
@@ -249,7 +254,7 @@ class FoodFragment : DaggerFragment() {
             val binding = FoodItemBinding.bind(itemView)
 
             init {
-                binding.remove.setOnClickListener { v: View ->
+                binding.icRemove.setOnClickListener { v: View ->
                     val food = v.tag as Food
                     activity?.let { activity ->
                         OKDialog.showConfirmation(activity, rh.gs(R.string.removerecord) + "\n" + food.name, {
@@ -262,7 +267,21 @@ class FoodFragment : DaggerFragment() {
                         }, null)
                     }
                 }
-                binding.remove.paintFlags = binding.remove.paintFlags or Paint.UNDERLINE_TEXT_FLAG
+                binding.icCalculator.setOnClickListener { v:View ->
+                    val food = v.tag as Food
+                    activity?.let { activity ->
+                        protectionCheck.queryProtection(activity, ProtectionCheck.Protection.BOLUS, UIRunnable {
+                            if (isAdded) {
+                                val wizardDialog = WizardDialog()
+                                val bundle = Bundle()
+                                bundle.putInt("carbs_input", food.carbs)
+                                bundle.putString("notes_input", " ${food.name} - ${food.carbs}g")
+                                wizardDialog.setArguments(bundle)
+                                wizardDialog.show(childFragmentManager, "Food Item")
+                            }
+                        })
+                    }
+                }
             }
         }
     }
diff --git a/app/src/main/res/layout/food_item.xml b/app/src/main/res/layout/food_item.xml
index 1c2191ee9c..66d49be1f7 100644
--- a/app/src/main/res/layout/food_item.xml
+++ b/app/src/main/res/layout/food_item.xml
@@ -8,102 +8,130 @@
     card_view:cardBackgroundColor="?android:colorBackground">
 
     <LinearLayout
+        android:id="@+id/food_item"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical">
 
         <LinearLayout
+            android:id="@+id/left_right_split"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:gravity="center"
-            android:orientation="horizontal">
+            android:orientation="horizontal"
+            android:paddingLeft="3dp"
+            android:paddingRight="3dp">
 
-            <TextView
-                android:id="@+id/name"
-                android:layout_width="0dp"
+            <LinearLayout
+                android:id="@+id/name_and_info_container"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:orientation="vertical"
                 android:layout_weight="1"
-                android:text="Name"
-                android:textStyle="bold"
-                tools:ignore="HardcodedText" />
+                android:gravity="start">
 
-            <TextView
-                android:id="@+id/portion"
-                android:layout_width="60dp"
-                android:layout_height="wrap_content"
-                android:gravity="end"
-                android:text="Portion"
-                tools:ignore="HardcodedText" />
+                <LinearLayout
+                    android:id="@+id/name_container"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:gravity="center"
+                    android:orientation="horizontal">
 
-            <TextView
-                android:id="@+id/carbs"
-                android:layout_width="50dp"
-                android:layout_height="wrap_content"
-                android:gravity="end"
-                android:text="Carbs"
-                tools:ignore="HardcodedText" />
+                    <TextView
+                        android:id="@+id/name"
+                        android:layout_width="0dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:text="Name"
+                        android:textStyle="bold"
+                        android:textSize="@dimen/twenty_four_dp"
+                        tools:ignore="HardcodedText" />
 
+                </LinearLayout>
+
+                <LinearLayout
+                    android:id="@+id/info_container"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:gravity="start"
+                    android:orientation="horizontal"
+                    android:layout_marginLeft="5dp">
+
+                    <TextView
+                        android:id="@+id/carbs"
+                        android:layout_width="50dp"
+                        android:layout_height="wrap_content"
+                        android:gravity="center"
+                        android:text="Carbs"
+                        tools:ignore="HardcodedText" />
+
+                    <TextView
+                        android:id="@+id/portion"
+                        android:layout_width="50dp"
+                        android:layout_height="wrap_content"
+                        android:gravity="center"
+                        android:text="Portion"
+                        tools:ignore="HardcodedText" />
+
+                    <TextView
+                        android:id="@+id/fat"
+                        android:layout_width="50dp"
+                        android:layout_height="wrap_content"
+                        android:gravity="center"
+                        android:text="Fat"
+                        tools:ignore="HardcodedText" />
+
+                    <TextView
+                        android:id="@+id/protein"
+                        android:layout_width="50dp"
+                        android:layout_height="wrap_content"
+                        android:gravity="center"
+                        android:text="Protein"
+                        tools:ignore="HardcodedText" />
+
+                    <TextView
+                        android:id="@+id/energy"
+                        android:layout_width="50dp"
+                        android:layout_height="wrap_content"
+                        android:gravity="center"
+                        android:text="Energy"
+                        tools:ignore="HardcodedText" />
+                </LinearLayout>
+            </LinearLayout>
+
+            <LinearLayout
+                android:id="@+id/buttons_container"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:orientation="horizontal"
+                android:gravity="end">
+
+                <ImageView
+                    android:id="@+id/ic_calculator"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:layout_gravity="center"
+                    android:padding="2dp"
+                    android:orientation="horizontal"
+                    android:src="@drawable/ic_calculator" />
+                <ImageView
+                    android:id="@+id/ic_remove"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:layout_gravity="center"
+                    android:padding="2dp"
+                    android:orientation="horizontal"
+                    android:src="@drawable/ic_trash_outline" />
+
+            </LinearLayout>
         </LinearLayout>
 
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_weight="1"
-            android:gravity="end"
-            android:orientation="horizontal">
 
-            <TextView
-                android:id="@+id/fat"
-                android:layout_width="70dp"
-                android:layout_height="wrap_content"
-                android:gravity="end"
-                android:text="Fat"
-                tools:ignore="HardcodedText" />
-
-            <TextView
-                android:id="@+id/protein"
-                android:layout_width="70dp"
-                android:layout_height="wrap_content"
-                android:gravity="end"
-                android:text="Protein"
-                tools:ignore="HardcodedText" />
-
-            <TextView
-                android:id="@+id/energy"
-                android:layout_width="70dp"
-                android:layout_height="wrap_content"
-                android:gravity="end"
-                android:text="Energy"
-                tools:ignore="HardcodedText" />
-
-            <TextView
-                android:id="@+id/ns_sign"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:width="30dp"
-                android:text="NS"
-                android:textAlignment="viewEnd"
-                android:textColor="@color/colorSetTempButton"
-                tools:ignore="HardcodedText" />
-
-            <TextView
-                android:id="@+id/remove"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:paddingEnd="5dp"
-                android:paddingStart="10dp"
-                android:text="@string/remove_button"
-                android:textAlignment="viewEnd"
-                android:textColor="@android:color/holo_orange_light" />
-
-        </LinearLayout>
 
         <View
             android:layout_width="fill_parent"
             android:layout_height="2dip"
             android:layout_marginBottom="5dp"
-            android:layout_marginLeft="5dp"
-            android:layout_marginRight="5dp"
             android:layout_marginTop="5dp"
             android:background="@color/list_delimiter" />