diff --git a/app/src/main/res/layout/dialog_wizard.xml b/app/src/main/res/layout/dialog_wizard.xml
index 56f8d240da..af09f2a436 100644
--- a/app/src/main/res/layout/dialog_wizard.xml
+++ b/app/src/main/res/layout/dialog_wizard.xml
@@ -250,49 +250,37 @@
             android:orientation="horizontal"
             android:padding="0dp">
 
-            <ImageView
+            <CheckBox
                 android:id="@+id/bg_checkbox_icon"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:paddingStart="5dp"
-                android:paddingEnd="5dp"
-                android:scaleX="0.7"
-                android:scaleY="0.7"
-                app:srcCompat="@drawable/ic_xdrip" />
+                android:layout_height="fill_parent"
+                android:button="@drawable/checkbox_bg_icon"
+                android:checked="true"
+                android:contentDescription="@string/treatments_wizard_bg_label" />
 
-            <ImageView
+            <CheckBox
                 android:id="@+id/trend_checkbox_icon"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:paddingStart="5dp"
-                android:paddingEnd="5dp"
-                android:scaleX="0.7"
-                android:scaleY="0.7"
-                app:srcCompat="@drawable/ic_fortyfiveup" />
+                android:layout_height="fill_parent"
+                android:button="@drawable/checkbox_trend_icon"
+                android:checked="true"
+                android:contentDescription="@string/bg_trend_label" />
 
-            <ImageView
-                android:id="@+id/cob_checkbox_icon"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:paddingStart="5dp"
-                android:paddingEnd="5dp"
-                android:scaleX="0.9"
-                android:scaleY="0.9"
-                app:srcCompat="@drawable/ic_cp_bolus_carbs" />
-
-            <ImageView
+            <CheckBox
                 android:id="@+id/iob_checkbox_icon"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center_vertical"
-                android:paddingStart="5dp"
-                android:paddingEnd="5dp"
-                android:scaleX="0.7"
-                android:scaleY="0.7"
-                app:srcCompat="@drawable/ic_bolus" />
+                android:layout_height="fill_parent"
+                android:button="@drawable/checkbox_iob_icon"
+                android:checked="true"
+                android:contentDescription="@string/iob" />
+
+            <CheckBox
+                android:id="@+id/cob_checkbox_icon"
+                android:layout_width="wrap_content"
+                android:layout_height="fill_parent"
+                android:button="@drawable/checkbox_cob_icon"
+                android:checked="true"
+                android:contentDescription="@string/treatments_wizard_cob_label" />
 
         </LinearLayout>