diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedStrengthSelector.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedStrengthSelector.qml
index dd603df195..54f005bb9e 100644
--- a/resources/qml/PrintSetupSelector/Recommended/RecommendedStrengthSelector.qml
+++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedStrengthSelector.qml
@@ -3,8 +3,9 @@
 
 import QtQuick 2.7
 import QtQuick.Controls 2.15
+import QtQuick.Layouts 2.10
 
-import UM 1.5 as UM
+import UM 1.7 as UM
 import Cura 1.7 as Cura
 
 
@@ -63,12 +64,34 @@ RecommendedSettingSection
         {
             settingName: catalog.i18nc("@action:label", "Shell Thickness")
 
-            settingControl: Cura.SingleSettingTextField
+            settingControl: RowLayout
             {
-                width: parent.width
-                settingName: "wall_thickness"
-                validator: Cura.FloatValidator {}
-                unitText: catalog.i18nc("@label", "mm")
+                anchors.fill: parent
+                spacing: UM.Theme.getSize("default_margin").width
+                UM.ComponentWithIcon
+                {
+                    Layout.fillWidth: true
+                    source: UM.Theme.getIcon("PrintWalls")
+                    displayComponent: Cura.SingleSettingTextField
+                    {
+                        width: parent.width
+                        settingName: "wall_thickness"
+                        validator: Cura.FloatValidator {}
+                        unitText: catalog.i18nc("@label", "mm")
+                    }
+                }
+                UM.ComponentWithIcon
+                {
+                    Layout.fillWidth: true
+                    source: UM.Theme.getIcon("PrintTopBottom")
+                    displayComponent: Cura.SingleSettingTextField
+                    {
+                        width: parent.width
+                        settingName: "top_bottom_thickness"
+                        validator: Cura.FloatValidator {}
+                        unitText: catalog.i18nc("@label", "mm")
+                    }
+                }
             }
         }
     ]
diff --git a/resources/themes/cura-light/icons/default/PrintWalls.svg b/resources/themes/cura-light/icons/default/PrintWalls.svg
new file mode 100644
index 0000000000..156a87177d
--- /dev/null
+++ b/resources/themes/cura-light/icons/default/PrintWalls.svg
@@ -0,0 +1,12 @@
+<svg width="24" height="25" viewBox="0 0 24 25" xmlns="http://www.w3.org/2000/svg">
+<path d="M15 10.0619C15 10.6142 15.4477 11.0619 16 11.0619C16.5523 11.0619 17 10.6142 17 10.0619C17 9.5096 16.5523 9.06189 16 9.06189C15.4477 9.06189 15 9.5096 15 10.0619Z" fill="black"/>
+<path d="M15 14.0619C15 14.6142 15.4477 15.0619 16 15.0619C16.5523 15.0619 17 14.6142 17 14.0619C17 13.5096 16.5523 13.0619 16 13.0619C15.4477 13.0619 15 13.5096 15 14.0619Z" fill="black"/>
+<path d="M15 18.0619C15 18.6142 15.4477 19.0619 16 19.0619C16.5523 19.0619 17 18.6142 17 18.0619C17 17.5096 16.5523 17.0619 16 17.0619C15.4477 17.0619 15 17.5096 15 18.0619Z" fill="black"/>
+<path d="M7 18.0619C7 18.6142 7.44772 19.0619 8 19.0619C8.55228 19.0619 9 18.6142 9 18.0619C9 17.5096 8.55228 17.0619 8 17.0619C7.44772 17.0619 7 17.5096 7 18.0619Z" fill="black"/>
+<path d="M7 14.0619C7 14.6142 7.44772 15.0619 8 15.0619C8.55228 15.0619 9 14.6142 9 14.0619C9 13.5096 8.55228 13.0619 8 13.0619C7.44772 13.0619 7 13.5096 7 14.0619Z" fill="black"/>
+<path d="M7 10.0619C7 10.6142 7.44772 11.0619 8 11.0619C8.55228 11.0619 9 10.6142 9 10.0619C9 9.5096 8.55228 9.06189 8 9.06189C7.44772 9.06189 7 9.5096 7 10.0619Z" fill="black"/>
+<path d="M7 6.06189C7 6.61417 7.44772 7.06189 8 7.06189C8.55228 7.06189 9 6.61417 9 6.06189C9 5.5096 8.55228 5.06189 8 5.06189C7.44772 5.06189 7 5.5096 7 6.06189Z" fill="black"/>
+<path d="M15 6.06189C15 6.61417 15.4477 7.06189 16 7.06189C16.5523 7.06189 17 6.61417 17 6.06189C17 5.5096 16.5523 5.06189 16 5.06189C15.4477 5.06189 15 5.5096 15 6.06189Z" fill="black"/>
+<path d="M19 6.06189L19 20.8819C19.5835 20.6756 20.089 20.2938 20.4471 19.789C20.8051 19.2841 20.9983 18.6808 21 18.0619L21 6.06189C20.9983 5.44295 20.8051 4.83969 20.4471 4.33482C20.089 3.82996 19.5835 3.4482 19 3.24189L19 6.06189Z" fill="black"/>
+<path d="M5 19.0619L5 3.24189C4.41645 3.4482 3.911 3.82996 3.55294 4.33482C3.19488 4.83969 3.00174 5.44295 3 6.06189L3 18.0619C3.00174 18.6808 3.19488 19.2841 3.55294 19.789C3.911 20.2938 4.41645 20.6756 5 20.8819L5 19.0619Z" fill="black"/>
+</svg>