diff --git a/crates/rnote-ui/data/ui/penssidebar/shaperpage.ui b/crates/rnote-ui/data/ui/penssidebar/shaperpage.ui
index 3604af205e..c04d36ecbe 100644
--- a/crates/rnote-ui/data/ui/penssidebar/shaperpage.ui
+++ b/crates/rnote-ui/data/ui/penssidebar/shaperpage.ui
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8" ?>
 <interface>
   <template class="RnShaperPage" parent="GtkWidget">
     <property name="layout-manager">
@@ -26,11 +26,23 @@
           </object>
         </child>
         <child>
-          <object class="GtkMenuButton" id="shapeconfig_menubutton">
+          <object class="GtkMenuButton" id="shapestyling_menubutton">
+            <property name="icon-name">pen-shaper-style-smooth-symbolic</property>
+            <property name="direction">left</property>
+            <property name="tooltip_text" translatable="yes">Shape Styling</property>
+            <property name="popover">shapestyling_popover</property>
+            <style>
+              <class name="flat" />
+              <class name="sidebar_action_button" />
+            </style>s
+          </object>
+        </child>
+        <child>
+          <object class="GtkMenuButton" id="shaperconfig_menubutton">
             <property name="icon-name">settings-symbolic</property>
             <property name="direction">left</property>
-            <property name="tooltip_text" translatable="yes">Shape Configuration</property>
-            <property name="popover">shapeconfig_popover</property>
+            <property name="tooltip_text" translatable="yes">Shaper Configuration</property>
+            <property name="popover">shaperconfig_popover</property>
             <style>
               <class name="flat" />
             </style>
@@ -53,8 +65,8 @@
       </object>
     </child>
 
-    <!-- Shape config -->
-    <object class="GtkPopover" id="shapeconfig_popover">
+    <!-- Shape styling -->
+    <object class="GtkPopover" id="shapestyling_popover">
       <child>
         <object class="GtkBox">
           <property name="orientation">vertical</property>
@@ -68,7 +80,7 @@
             <object class="GtkBox">
               <child>
                 <object class="GtkLabel">
-                  <property name="label" translatable="yes">Shape Configuration</property>
+                  <property name="label" translatable="yes">Shape Styling</property>
                   <property name="hexpand">true</property>
                   <property name="halign">center</property>
                   <style>
@@ -77,7 +89,7 @@
                 </object>
               </child>
               <child>
-                <object class="GtkButton" id="shapeconfig_popover_close_button">
+                <object class="GtkButton" id="shapestyling_popover_close_button">
                   <property name="icon-name">window-close-symbolic</property>
                   <style>
                     <class name="flat" />
@@ -126,41 +138,12 @@
             </object>
           </child>
 
-          <!-- Highlighting -->
-          <child>
-            <object class="AdwPreferencesGroup">
-              <property name="title" translatable="yes">Highlighting</property>
-              <child>
-                <object class="AdwSwitchRow" id="highlight_mode_row">
-                  <property name="title" translatable="yes">Highlight-Mode</property>
-                  <property name="subtitle" translatable="yes">Fade active color</property>
-                </object>
-              </child>
-              <child>
-                <object class="AdwSpinRow" id="highlight_opacity_row">
-                  <property name="title" translatable="yes">Highlight-Opacity</property>
-                  <property name="subtitle" translatable="yes">Modify the highlight opacity (%)</property>
-                  <property name="adjustment">
-                    <object class="GtkAdjustment">
-                      <property name="lower">0</property>
-                      <property name="upper">100</property>
-                      <property name="value">50</property>
-                      <property name="step-increment">1</property>
-                    </object>
-                  </property>
-                  <property name="numeric">true</property>
-                  <property name="digits">0</property>
-                </object>
-              </child>
-            </object>
-          </child>
-
           <!-- Smooth options -->
           <child>
-            <object class="AdwPreferencesGroup" id="smoothstyle_group">
-              <property name="title" translatable="yes">Smooth Style</property>
+            <object class="AdwPreferencesGroup" id="smoothoptions_group">
+              <property name="title" translatable="yes">Smooth Options</property>
               <child>
-                <object class="AdwComboRow" id="smoothstyle_line_cap_row">
+                <object class="AdwComboRow" id="smoothoptions_line_cap_row">
                   <property name="title" translatable="yes">Line Cap</property>
                   <property name="subtitle" translatable="yes">Choose a line cap</property>
                   <property name="model">
@@ -174,7 +157,7 @@
                 </object>
               </child>
               <child>
-                <object class="AdwComboRow" id="smoothstyle_line_style_row">
+                <object class="AdwComboRow" id="smoothoptions_line_style_row">
                   <property name="title" translatable="yes">Line Style</property>
                   <property name="subtitle" translatable="yes">Choose a line style</property>
                   <property name="model">
@@ -195,10 +178,10 @@
 
           <!-- Rough options -->
           <child>
-            <object class="AdwPreferencesGroup" id="roughstyle_group">
-              <property name="title" translatable="yes">Rough Style</property>
+            <object class="AdwPreferencesGroup" id="roughoptions_group">
+              <property name="title" translatable="yes">Rough Options</property>
               <child>
-                <object class="AdwComboRow" id="roughstyle_fillstyle_row">
+                <object class="AdwComboRow" id="roughoptions_fillstyle_row">
                   <property name="title" translatable="yes">Fill Style</property>
                   <property name="subtitle" translatable="yes">Choose a fill style</property>
                   <property name="model">
@@ -217,7 +200,7 @@
                 </object>
               </child>
               <child>
-                <object class="AdwSpinRow" id="roughstyle_hachure_angle_row">
+                <object class="AdwSpinRow" id="roughoptions_hachure_angle_row">
                   <property name="title" translatable="yes">Hachure Angle</property>
                   <property name="subtitle" translatable="yes">Set the angle of hachure fills</property>
                   <property name="adjustment">
@@ -234,41 +217,98 @@
               </child>
             </object>
           </child>
+        </object>
+      </child>
+    </object>
+
+    <!-- Shaper Config -->
+    <object class="GtkPopover" id="shaperconfig_popover">
+      <child>
+        <object class="GtkBox">
+          <property name="orientation">vertical</property>
+          <property name="margin-top">6</property>
+          <property name="margin-bottom">6</property>
+          <property name="margin-start">6</property>
+          <property name="margin-end">6</property>
+          <property name="spacing">12</property>
+          <property name="width-request">300</property>
+          <child>
+            <object class="GtkBox">
+              <child>
+                <object class="GtkLabel">
+                  <property name="label" translatable="yes">Shaper Configuration</property>
+                  <property name="hexpand">true</property>
+                  <property name="halign">center</property>
+                  <style>
+                    <class name="title-3" />
+                  </style>
+                </object>
+              </child>
+              <child>
+                <object class="GtkButton" id="shaperconfig_popover_close_button">
+                  <property name="icon-name">window-close-symbolic</property>
+                  <style>
+                    <class name="flat" />
+                    <class name="circular" />
+                  </style>
+                </object>
+              </child>
+            </object>
+          </child>
+
+          <!-- Highlighting -->
+          <child>
+            <object class="AdwPreferencesGroup">
+              <property name="title" translatable="yes">Highlighting</property>
+              <child>
+                <object class="AdwSwitchRow" id="highlight_mode_row">
+                  <property name="title" translatable="yes">Highlight-Mode</property>
+                  <property name="subtitle" translatable="yes">Fade active color</property>
+                </object>
+              </child>
+              <child>
+                <object class="AdwSpinRow" id="highlight_opacity_row">
+                  <property name="title" translatable="yes">Highlight-Opacity</property>
+                  <property name="subtitle" translatable="yes">Modify the highlight opacity (%)</property>
+                  <property name="adjustment">
+                    <object class="GtkAdjustment">
+                      <property name="lower">0</property>
+                      <property name="upper">100</property>
+                      <property name="value">50</property>
+                      <property name="step-increment">1</property>
+                    </object>
+                  </property>
+                  <property name="numeric">true</property>
+                  <property name="digits">0</property>
+                </object>
+              </child>
+            </object>
+          </child>
 
           <!-- Constraints -->
           <child>
             <object class="AdwPreferencesGroup">
               <property name="title" translatable="yes">Constraints</property>
               <child>
-                <object class="GtkListBox">
-                  <property name="width-request">300</property>
-                  <property name="selection-mode">none</property>
-                  <style>
-                    <class name="content" />
-                    <class name="medium" />
-                  </style>
-                  <child>
-                    <object class="AdwSwitchRow" id="constraint_enabled_row">
-                      <property name="title" translatable="yes">Enabled</property>
-                      <property name="subtitle" translatable="yes">Hold Ctrl to temporarily enable/disable
+                <object class="AdwSwitchRow" id="constraint_enabled_row">
+                  <property name="title" translatable="yes">Enabled</property>
+                  <property name="subtitle" translatable="yes">Hold Ctrl to temporarily enable/disable
 constraints when this switch is off/on</property>
-                    </object>
-                  </child>
-                  <child>
-                    <object class="AdwSwitchRow" id="constraint_one_to_one_row">
-                      <property name="title" translatable="yes">1:1</property>
-                    </object>
-                  </child>
-                  <child>
-                    <object class="AdwSwitchRow" id="constraint_three_to_two_row">
-                      <property name="title" translatable="yes">3:2</property>
-                    </object>
-                  </child>
-                  <child>
-                    <object class="AdwSwitchRow" id="constraint_golden_row">
-                      <property name="title" translatable="yes">Golden Ratio (1:1.618)</property>
-                    </object>
-                  </child>
+                </object>
+              </child>
+              <child>
+                <object class="AdwSwitchRow" id="constraint_one_to_one_row">
+                  <property name="title" translatable="yes">1:1</property>
+                </object>
+              </child>
+              <child>
+                <object class="AdwSwitchRow" id="constraint_three_to_two_row">
+                  <property name="title" translatable="yes">3:2</property>
+                </object>
+              </child>
+              <child>
+                <object class="AdwSwitchRow" id="constraint_golden_row">
+                  <property name="title" translatable="yes">Golden Ratio (1:1.618)</property>
                 </object>
               </child>
             </object>
@@ -319,4 +359,4 @@ constraints when this switch is off/on</property>
       </child>
     </object>
   </template>
-</interface>
\ No newline at end of file
+</interface>
diff --git a/crates/rnote-ui/src/appwindow/imp.rs b/crates/rnote-ui/src/appwindow/imp.rs
index c2da89c122..fd8287fad7 100644
--- a/crates/rnote-ui/src/appwindow/imp.rs
+++ b/crates/rnote-ui/src/appwindow/imp.rs
@@ -706,7 +706,12 @@ impl RnAppWindow {
             obj.overlays()
                 .penssidebar()
                 .shaper_page()
-                .shapeconfig_menubutton()
+                .shapestyling_menubutton()
+                .set_direction(ArrowType::Right);
+            obj.overlays()
+                .penssidebar()
+                .shaper_page()
+                .shaperconfig_menubutton()
                 .set_direction(ArrowType::Right);
             obj.overlays()
                 .penssidebar()
@@ -823,7 +828,7 @@ impl RnAppWindow {
             obj.overlays()
                 .penssidebar()
                 .shaper_page()
-                .shapeconfig_menubutton()
+                .shapestyling_menubutton()
                 .set_direction(ArrowType::Left);
             obj.overlays()
                 .penssidebar()
diff --git a/crates/rnote-ui/src/penssidebar/shaperpage.rs b/crates/rnote-ui/src/penssidebar/shaperpage.rs
index 669c6fc34d..5fe4dd10db 100644
--- a/crates/rnote-ui/src/penssidebar/shaperpage.rs
+++ b/crates/rnote-ui/src/penssidebar/shaperpage.rs
@@ -32,11 +32,11 @@ mod imp {
         pub(crate) shapebuildertype_picker: TemplateChild<RnGroupedIconPicker>,
 
         #[template_child]
-        pub(crate) shapeconfig_menubutton: TemplateChild<MenuButton>,
+        pub(crate) shapestyling_menubutton: TemplateChild<MenuButton>,
         #[template_child]
-        pub(crate) shapeconfig_popover: TemplateChild<Popover>,
+        pub(crate) shapestyling_popover: TemplateChild<Popover>,
         #[template_child]
-        pub(crate) shapeconfig_popover_close_button: TemplateChild<Button>,
+        pub(crate) shapestyling_popover_close_button: TemplateChild<Button>,
         #[template_child]
         pub(crate) shaperstyle_listbox: TemplateChild<ListBox>,
         #[template_child]
@@ -44,21 +44,28 @@ mod imp {
         #[template_child]
         pub(crate) shaperstyle_rough_row: TemplateChild<adw::ActionRow>,
         #[template_child]
-        pub(crate) highlight_mode_row: TemplateChild<adw::SwitchRow>,
+        pub(crate) smoothoptions_group: TemplateChild<adw::PreferencesGroup>,
         #[template_child]
-        pub(crate) highlight_opacity_row: TemplateChild<adw::SpinRow>,
+        pub(crate) smoothoptions_line_cap_row: TemplateChild<adw::ComboRow>,
         #[template_child]
-        pub(crate) smoothstyle_group: TemplateChild<adw::PreferencesGroup>,
+        pub(crate) smoothoptions_line_style_row: TemplateChild<adw::ComboRow>,
         #[template_child]
-        pub(crate) smoothstyle_line_cap_row: TemplateChild<adw::ComboRow>,
+        pub(crate) roughoptions_group: TemplateChild<adw::PreferencesGroup>,
         #[template_child]
-        pub(crate) smoothstyle_line_style_row: TemplateChild<adw::ComboRow>,
+        pub(crate) roughoptions_fillstyle_row: TemplateChild<adw::ComboRow>,
         #[template_child]
-        pub(crate) roughstyle_group: TemplateChild<adw::PreferencesGroup>,
+        pub(crate) roughoptions_hachure_angle_row: TemplateChild<adw::SpinRow>,
+
         #[template_child]
-        pub(crate) roughstyle_fillstyle_row: TemplateChild<adw::ComboRow>,
+        pub(crate) shaperconfig_menubutton: TemplateChild<MenuButton>,
         #[template_child]
-        pub(crate) roughstyle_hachure_angle_row: TemplateChild<adw::SpinRow>,
+        pub(crate) shaperconfig_popover: TemplateChild<Popover>,
+        #[template_child]
+        pub(crate) shaperconfig_popover_close_button: TemplateChild<Button>,
+        #[template_child]
+        pub(crate) highlight_mode_row: TemplateChild<adw::SwitchRow>,
+        #[template_child]
+        pub(crate) highlight_opacity_row: TemplateChild<adw::SpinRow>,
         #[template_child]
         pub(crate) constraint_enabled_row: TemplateChild<adw::SwitchRow>,
         #[template_child]
@@ -120,8 +127,12 @@ impl RnShaperPage {
         glib::Object::new()
     }
 
-    pub(crate) fn shapeconfig_menubutton(&self) -> MenuButton {
-        self.imp().shapeconfig_menubutton.get()
+    pub(crate) fn shapestyling_menubutton(&self) -> MenuButton {
+        self.imp().shapestyling_menubutton.get()
+    }
+
+    pub(crate) fn shaperconfig_menubutton(&self) -> MenuButton {
+        self.imp().shaperconfig_menubutton.get()
     }
 
     pub(crate) fn shapebuildertype_menubutton(&self) -> MenuButton {
@@ -156,23 +167,23 @@ impl RnShaperPage {
             .set_picked(Some(builder_type.to_icon_name()));
     }
 
-    pub(crate) fn smoothstyle_line_cap(&self) -> LineCap {
-        LineCap::try_from(self.imp().smoothstyle_line_cap_row.get().selected()).unwrap()
+    pub(crate) fn smoothoptions_line_cap(&self) -> LineCap {
+        LineCap::try_from(self.imp().smoothoptions_line_cap_row.get().selected()).unwrap()
     }
 
-    pub(crate) fn smoothstyle_line_style(&self) -> LineStyle {
-        LineStyle::try_from(self.imp().smoothstyle_line_style_row.get().selected()).unwrap()
+    pub(crate) fn smoothoptions_line_style(&self) -> LineStyle {
+        LineStyle::try_from(self.imp().smoothoptions_line_style_row.get().selected()).unwrap()
     }
 
-    pub(crate) fn roughstyle_fillstyle(&self) -> FillStyle {
-        FillStyle::try_from(self.imp().roughstyle_fillstyle_row.get().selected()).unwrap()
+    pub(crate) fn roughoptions_fillstyle(&self) -> FillStyle {
+        FillStyle::try_from(self.imp().roughoptions_fillstyle_row.get().selected()).unwrap()
     }
 
-    pub(crate) fn set_roughstyle_fillstyle(&self, fill_style: FillStyle) {
+    pub(crate) fn set_roughoptions_fillstyle(&self, fill_style: FillStyle) {
         let position = fill_style.to_u32().unwrap();
 
         self.imp()
-            .roughstyle_fillstyle_row
+            .roughoptions_fillstyle_row
             .get()
             .set_selected(position);
     }
@@ -183,17 +194,28 @@ impl RnShaperPage {
 
     pub(crate) fn init(&self, appwindow: &RnAppWindow) {
         let imp = self.imp();
-        let shapeconfig_popover = imp.shapeconfig_popover.get();
+        let shapestyling_popover = imp.shapestyling_popover.get();
+        let shaperconfig_popover = imp.shaperconfig_popover.get();
         let shapebuildertype_popover = imp.shapebuildertype_popover.get();
 
         // Popovers
-        imp.shapeconfig_popover_close_button.connect_clicked(clone!(
-            #[weak]
-            shapeconfig_popover,
-            move |_| {
-                shapeconfig_popover.popdown();
-            }
-        ));
+        imp.shapestyling_popover_close_button
+            .connect_clicked(clone!(
+                #[weak]
+                shapestyling_popover,
+                move |_| {
+                    shapestyling_popover.popdown();
+                }
+            ));
+
+        imp.shaperconfig_popover_close_button
+            .connect_clicked(clone!(
+                #[weak]
+                shaperconfig_popover,
+                move |_| {
+                    shaperconfig_popover.popdown();
+                }
+            ));
 
         imp.shapebuildertype_popover_close_button
             .connect_clicked(clone!(
@@ -279,8 +301,10 @@ impl RnShaperPage {
                                 .smooth_options
                                 .stroke_width;
                             let page = shaperpage.imp();
-                            page.roughstyle_group.set_visible(false);
-                            page.smoothstyle_group.set_visible(true);
+                            page.shapestyling_menubutton
+                                .set_icon_name("pen-shaper-style-smooth-symbolic");
+                            page.roughoptions_group.set_visible(false);
+                            page.smoothoptions_group.set_visible(true);
                             page.stroke_width_picker.set_stroke_width(stroke_width);
                         }
                         ShaperStyle::Rough => {
@@ -292,8 +316,10 @@ impl RnShaperPage {
                                 .rough_options
                                 .stroke_width;
                             let page = shaperpage.imp();
-                            page.smoothstyle_group.set_visible(false);
-                            page.roughstyle_group.set_visible(true);
+                            page.shapestyling_menubutton
+                                .set_icon_name("pen-shaper-style-rough-symbolic");
+                            page.smoothoptions_group.set_visible(false);
+                            page.roughoptions_group.set_visible(true);
                             page.stroke_width_picker.set_stroke_width(stroke_width);
                         }
                     }
@@ -301,36 +327,9 @@ impl RnShaperPage {
             }
         ));
 
-        // Highlighter options
-        imp.highlight_mode_row.connect_active_notify(clone!(
-            #[weak]
-            appwindow,
-            move |row| {
-                appwindow
-                    .engine_config()
-                    .write()
-                    .pens_config
-                    .shaper_config
-                    .highlight_mode = row.is_active();
-            }
-        ));
-
-        imp.highlight_opacity_row.connect_changed(clone!(
-            #[weak]
-            appwindow,
-            move |row| {
-                appwindow
-                    .engine_config()
-                    .write()
-                    .pens_config
-                    .shaper_config
-                    .highlight_opacity = row.value().round() / 100.0;
-            }
-        ));
-
         // Smooth style
         // Line cap
-        imp.smoothstyle_line_cap_row
+        imp.smoothoptions_line_cap_row
             .get()
             .connect_selected_notify(clone!(
                 #[weak(rename_to=shaperpage)]
@@ -338,15 +337,15 @@ impl RnShaperPage {
                 #[weak]
                 appwindow,
                 move |_| {
-                    let line_cap = shaperpage.smoothstyle_line_cap();
+                    let line_cap = shaperpage.smoothoptions_line_cap();
 
                     // If the user has selected a straight line cap while the line style was dotted, then we update the line style to be straight
                     if line_cap == LineCap::Straight
-                        && shaperpage.smoothstyle_line_style().is_dotted()
+                        && shaperpage.smoothoptions_line_style().is_dotted()
                     {
                         shaperpage
                             .imp()
-                            .smoothstyle_line_style_row
+                            .smoothoptions_line_style_row
                             .set_selected(LineStyle::Solid.to_u32().unwrap())
                     }
                     appwindow
@@ -360,7 +359,7 @@ impl RnShaperPage {
             ));
 
         // Line style
-        imp.smoothstyle_line_style_row
+        imp.smoothoptions_line_style_row
             .get()
             .connect_selected_notify(clone!(
                 #[weak(rename_to=shaperpage)]
@@ -368,13 +367,13 @@ impl RnShaperPage {
                 #[weak]
                 appwindow,
                 move |_| {
-                    let line_style = shaperpage.smoothstyle_line_style();
+                    let line_style = shaperpage.smoothoptions_line_style();
 
                     // If the user has selected a dotted line style, then we update the line cap to be rounded
                     if line_style.is_dotted() {
                         shaperpage
                             .imp()
-                            .smoothstyle_line_cap_row
+                            .smoothoptions_line_cap_row
                             .set_selected(LineCap::Rounded.to_u32().unwrap());
                     }
                     appwindow
@@ -389,7 +388,7 @@ impl RnShaperPage {
 
         // Rough style
         // Fill style
-        imp.roughstyle_fillstyle_row
+        imp.roughoptions_fillstyle_row
             .get()
             .connect_selected_notify(clone!(
                 #[weak(rename_to=shaperpage)]
@@ -403,12 +402,12 @@ impl RnShaperPage {
                         .pens_config
                         .shaper_config
                         .rough_options
-                        .fill_style = shaperpage.roughstyle_fillstyle();
+                        .fill_style = shaperpage.roughoptions_fillstyle();
                 }
             ));
 
         // Hachure angle
-        imp.roughstyle_hachure_angle_row
+        imp.roughoptions_hachure_angle_row
             .get()
             .connect_changed(clone!(
                 #[weak]
@@ -428,37 +427,33 @@ impl RnShaperPage {
                 }
             ));
 
-        // shape builder type
-        imp.shapebuildertype_picker.set_groups(
-            shape_builder_type_icons_get_groups(),
-            shape_builder_type_icons_to_display_name,
-        );
+        // Shaper extra
+        // Highlighter options
+        imp.highlight_mode_row.connect_active_notify(clone!(
+            #[weak]
+            appwindow,
+            move |row| {
+                appwindow
+                    .engine_config()
+                    .write()
+                    .pens_config
+                    .shaper_config
+                    .highlight_mode = row.is_active();
+            }
+        ));
 
-        imp.shapebuildertype_picker.connect_notify_local(
-            Some("picked"),
-            clone!(
-                #[weak(rename_to=shaperpage)]
-                self,
-                #[weak]
-                appwindow,
-                move |picker, _| {
-                    if let Some(buildertype) = shaperpage.shapebuildertype()
-                        && let Some(icon_name) = picker.picked()
-                    {
-                        appwindow
-                            .engine_config()
-                            .write()
-                            .pens_config
-                            .shaper_config
-                            .builder_type = buildertype;
-                        shaperpage
-                            .imp()
-                            .shapebuildertype_menubutton
-                            .set_icon_name(&icon_name);
-                    }
-                }
-            ),
-        );
+        imp.highlight_opacity_row.connect_changed(clone!(
+            #[weak]
+            appwindow,
+            move |row| {
+                appwindow
+                    .engine_config()
+                    .write()
+                    .pens_config
+                    .shaper_config
+                    .highlight_opacity = row.value().round() / 100.0;
+            }
+        ));
 
         // Constraints
         imp.constraint_enabled_row
@@ -560,6 +555,38 @@ impl RnShaperPage {
                     }
                 }
             ));
+
+        // shape builder type
+        imp.shapebuildertype_picker.set_groups(
+            shape_builder_type_icons_get_groups(),
+            shape_builder_type_icons_to_display_name,
+        );
+
+        imp.shapebuildertype_picker.connect_notify_local(
+            Some("picked"),
+            clone!(
+                #[weak(rename_to=shaperpage)]
+                self,
+                #[weak]
+                appwindow,
+                move |picker, _| {
+                    if let Some(buildertype) = shaperpage.shapebuildertype()
+                        && let Some(icon_name) = picker.picked()
+                    {
+                        appwindow
+                            .engine_config()
+                            .write()
+                            .pens_config
+                            .shaper_config
+                            .builder_type = buildertype;
+                        shaperpage
+                            .imp()
+                            .shapebuildertype_menubutton
+                            .set_icon_name(&icon_name);
+                    }
+                }
+            ),
+        );
     }
 
     pub(crate) fn refresh_ui(&self, appwindow: &RnAppWindow) {
@@ -589,14 +616,14 @@ impl RnShaperPage {
         self.set_shapebuildertype(shaper_config.builder_type);
 
         // Smooth style
-        imp.smoothstyle_line_cap_row
+        imp.smoothoptions_line_cap_row
             .set_selected(shaper_config.smooth_options.line_cap.to_u32().unwrap());
-        imp.smoothstyle_line_style_row
+        imp.smoothoptions_line_style_row
             .set_selected(shaper_config.smooth_options.line_style.to_u32().unwrap());
 
         // Rough style
-        self.set_roughstyle_fillstyle(shaper_config.rough_options.fill_style);
-        imp.roughstyle_hachure_angle_row
+        self.set_roughoptions_fillstyle(shaper_config.rough_options.fill_style);
+        imp.roughoptions_hachure_angle_row
             .set_value(shaper_config.rough_options.hachure_angle.to_degrees());
 
         // Highlighter opacity