diff --git a/sc/uiconfig/scalc/ui/notebookbar.ui b/sc/uiconfig/scalc/ui/notebookbar.ui
index 57aec5fd2db0..6c9351fcd2aa 100644
--- a/sc/uiconfig/scalc/ui/notebookbar.ui
+++ b/sc/uiconfig/scalc/ui/notebookbar.ui
@@ -7939,7 +7939,7 @@
                     <property name="vexpand">True</property>
                     <child>
                       <!-- n-columns=2 n-rows=3 -->
-                      <object class="GtkGrid" id="gdViewFreeze">
+                      <object class="GtkGrid" id="gdViewPanes">
                         <property name="visible">True</property>
                         <property name="can-focus">False</property>
                         <property name="margin-start">6</property>
@@ -7949,16 +7949,16 @@
                         <property name="row-spacing">3</property>
                         <property name="column-spacing">3</property>
                         <child>
-                          <object class="GtkLabel" id="lbViewFreeze">
+                          <object class="GtkLabel" id="lbViewPanes">
                             <property name="visible">True</property>
                             <property name="can-focus">False</property>
-                            <property name="label" translatable="yes" context="TabbedCalc|labelViewFreeze">Freeze</property>
+                            <property name="label" translatable="yes" context="TabbedCalc|labelViewPanes">Panes</property>
                             <attributes>
                               <attribute name="style" value="italic"/>
                               <attribute name="scale" value="0.9"/>
                             </attributes>
                             <accessibility>
-                              <relation type="label-for" target="gdViewFreeze"/>
+                              <relation type="label-for" target="gdViewPanes"/>
                             </accessibility>
                           </object>
                           <packing>
@@ -8016,7 +8016,7 @@
                           </packing>
                         </child>
                         <accessibility>
-                          <relation type="labelled-by" target="lbViewFreeze"/>
+                          <relation type="labelled-by" target="lbViewPanes"/>
                         </accessibility>
                       </object>
                       <packing>
@@ -8174,7 +8174,232 @@
                       </packing>
                     </child>
                     <child>
-                      <!-- n-columns=7 n-rows=3 -->
+                      <!-- n-columns=5 n-rows=3 -->
+                      <object class="GtkGrid" id="gdViewView">
+                        <property name="visible">True</property>
+                        <property name="can-focus">False</property>
+                        <property name="margin-start">3</property>
+                        <property name="margin-end">3</property>
+                        <property name="margin-top">6</property>
+                        <property name="margin-bottom">6</property>
+                        <property name="row-spacing">3</property>
+                        <property name="column-spacing">3</property>
+                        <child>
+                          <object class="GtkLabel" id="lbViewView">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="label" translatable="yes" context="TabbedCalc|labelViewView">View</property>
+                            <attributes>
+                              <attribute name="style" value="italic"/>
+                              <attribute name="scale" value="0.9"/>
+                            </attributes>
+                            <accessibility>
+                              <relation type="label-for" target="gdViewView"/>
+                            </accessibility>
+                          </object>
+                          <packing>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">2</property>
+                            <property name="width">4</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkSeparator">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="orientation">vertical</property>
+                          </object>
+                          <packing>
+                            <property name="left-attach">4</property>
+                            <property name="top-attach">0</property>
+                            <property name="height">3</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxViewViewRowColumnHeaders">
+                            <property name="visible">True</property>
+                            <property name="can-focus">True</property>
+                            <property name="valign">center</property>
+                            <property name="vexpand">True</property>
+                            <property name="toolbar-style">both-horiz</property>
+                            <property name="show-arrow">False</property>
+                            <child>
+                              <object class="GtkToolButton" id="btnViewViewRowColumnHeaders">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:ViewRowColumnHeaders</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">False</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">1</property>
+                            <property name="top-attach">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxViewToggleSheetGrid">
+                            <property name="visible">True</property>
+                            <property name="can-focus">True</property>
+                            <property name="valign">center</property>
+                            <property name="vexpand">True</property>
+                            <property name="toolbar-style">both-horiz</property>
+                            <property name="show-arrow">False</property>
+                            <child>
+                              <object class="GtkToolButton" id="btnViewToggleSheetGrid">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:ToggleSheetGrid</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">False</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">1</property>
+                            <property name="top-attach">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxViewMenubar">
+                            <property name="visible">True</property>
+                            <property name="can-focus">True</property>
+                            <property name="valign">center</property>
+                            <property name="vexpand">True</property>
+                            <property name="toolbar-style">both-horiz</property>
+                            <property name="show-arrow">False</property>
+                            <child>
+                              <object class="GtkToolButton" id="btnViewMenubar">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:Menubar</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">2</property>
+                            <property name="top-attach">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxViewInputLineVisible">
+                            <property name="visible">True</property>
+                            <property name="can-focus">True</property>
+                            <property name="valign">center</property>
+                            <property name="vexpand">True</property>
+                            <property name="toolbar-style">both-horiz</property>
+                            <property name="show-arrow">False</property>
+                            <child>
+                              <object class="GtkToolButton" id="btnViewInputLineVisible">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:InputLineVisible</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">2</property>
+                            <property name="top-attach">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxViewViewValueHighlighting">
+                            <property name="visible">True</property>
+                            <property name="can-focus">True</property>
+                            <property name="toolbar-style">both-horiz</property>
+                            <property name="show-arrow">False</property>
+                            <child>
+                              <object class="GtkToolButton" id="btnViewViewValueHighlighting">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:ViewValueHighlighting</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">3</property>
+                            <property name="top-attach">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxViewToggleFormula">
+                            <property name="visible">True</property>
+                            <property name="can-focus">True</property>
+                            <property name="toolbar-style">both-horiz</property>
+                            <property name="show-arrow">False</property>
+                            <child>
+                              <object class="GtkToolButton" id="btnViewToggleFormula">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:ToggleFormula</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">3</property>
+                            <property name="top-attach">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxViewChangeTheme">
+                            <property name="visible">True</property>
+                            <property name="can-focus">True</property>
+                            <property name="valign">center</property>
+                            <property name="vexpand">True</property>
+                            <property name="toolbar-style">both</property>
+                            <property name="show-arrow">False</property>
+                            <property name="icon_size">3</property>
+                            <child>
+                              <object class="GtkToolButton" id="btnViewChangeTheme">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:ChangeTheme</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">0</property>
+                            <property name="height">2</property>
+                          </packing>
+                        </child>
+                        <accessibility>
+                          <relation type="labelled-by" target="lbViewView"/>
+                        </accessibility>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">2</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <!-- n-columns=3 n-rows=3 -->
                       <object class="GtkGrid" id="gdViewOptions">
                         <property name="visible">True</property>
                         <property name="can-focus">False</property>
@@ -8200,7 +8425,7 @@
                           <packing>
                             <property name="left-attach">0</property>
                             <property name="top-attach">2</property>
-                            <property name="width">6</property>
+                            <property name="width">2</property>
                           </packing>
                         </child>
                         <child>
@@ -8210,11 +8435,80 @@
                             <property name="orientation">vertical</property>
                           </object>
                           <packing>
-                            <property name="left-attach">6</property>
+                            <property name="left-attach">2</property>
                             <property name="top-attach">0</property>
                             <property name="height">3</property>
                           </packing>
                         </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxViewViewColumnRowHighlighting">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="toolbar-style">both-horiz</property>
+                            <property name="show-arrow">False</property>
+                            <child>
+                              <object class="GtkToolButton" id="btnViewViewColumnRowHighlighting">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:ViewColumnRowHighlighting</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">1</property>
+                            <property name="top-attach">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxViewViewHiddenColRow">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="toolbar-style">both-horiz</property>
+                            <property name="show-arrow">False</property>
+                            <child>
+                              <object class="GtkToolButton" id="btnViewViewHiddenColRow">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:ViewHiddenColRow</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">1</property>
+                            <property name="top-attach">1</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="sfxlo-NotebookbarToolBox" id="bxInsertDesignerDialog">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="toolbar-style">both-horiz</property>
+                            <property name="show-arrow">False</property>
+                            <child>
+                              <object class="GtkToolButton" id="btnInsertDesignerDialog">
+                                <property name="visible">True</property>
+                                <property name="can-focus">False</property>
+                                <property name="action-name">.uno:DesignerDialog</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="homogeneous">True</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left-attach">0</property>
+                            <property name="top-attach">1</property>
+                          </packing>
+                        </child>
                         <child>
                           <object class="sfxlo-NotebookbarToolBox" id="bxViewSidebar">
                             <property name="visible">True</property>
@@ -8226,6 +8520,7 @@
                             <child>
                               <object class="GtkToolButton" id="btnViewSidebar">
                                 <property name="visible">True</property>
+                                <property name="can-focus">False</property>
                                 <property name="action-name">.uno:Sidebar</property>
                               </object>
                               <packing>
@@ -8234,241 +8529,9 @@
                               </packing>
                             </child>
                           </object>
-                          <packing>
-                            <property name="left-attach">1</property>
-                            <property name="top-attach">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="bxViewViewRowColumnHeaders">
-                            <property name="visible">True</property>
-                            <property name="can-focus">True</property>
-                            <property name="valign">center</property>
-                            <property name="vexpand">True</property>
-                            <property name="toolbar-style">both-horiz</property>
-                            <property name="show-arrow">False</property>
-                            <child>
-                              <object class="GtkToolButton" id="btnViewViewRowColumnHeaders">
-                                <property name="visible">True</property>
-                                <property name="action-name">.uno:ViewRowColumnHeaders</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="homogeneous">False</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="left-attach">2</property>
-                            <property name="top-attach">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="bxViewToggleSheetGrid">
-                            <property name="visible">True</property>
-                            <property name="can-focus">True</property>
-                            <property name="valign">center</property>
-                            <property name="vexpand">True</property>
-                            <property name="toolbar-style">both-horiz</property>
-                            <property name="show-arrow">False</property>
-                            <child>
-                              <object class="GtkToolButton" id="btnViewToggleSheetGrid">
-                                <property name="visible">True</property>
-                                <property name="action-name">.uno:ToggleSheetGrid</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="homogeneous">False</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="left-attach">2</property>
-                            <property name="top-attach">1</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="bxViewMenubar">
-                            <property name="visible">True</property>
-                            <property name="can-focus">True</property>
-                            <property name="valign">center</property>
-                            <property name="vexpand">True</property>
-                            <property name="toolbar-style">both-horiz</property>
-                            <property name="show-arrow">False</property>
-                            <child>
-                              <object class="GtkToolButton" id="btnViewMenubar">
-                                <property name="visible">True</property>
-                                <property name="action-name">.uno:Menubar</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="homogeneous">True</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="left-attach">3</property>
-                            <property name="top-attach">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="bxViewInputLineVisible">
-                            <property name="visible">True</property>
-                            <property name="can-focus">True</property>
-                            <property name="valign">center</property>
-                            <property name="vexpand">True</property>
-                            <property name="toolbar-style">both-horiz</property>
-                            <property name="show-arrow">False</property>
-                            <child>
-                              <object class="GtkToolButton" id="btnViewInputLineVisible">
-                                <property name="visible">True</property>
-                                <property name="action-name">.uno:InputLineVisible</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="homogeneous">True</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="left-attach">3</property>
-                            <property name="top-attach">1</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="bxViewViewValueHighlighting">
-                            <property name="visible">True</property>
-                            <property name="can-focus">True</property>
-                            <property name="toolbar-style">both-horiz</property>
-                            <property name="show-arrow">False</property>
-                            <child>
-                              <object class="GtkToolButton" id="btnViewViewValueHighlighting">
-                                <property name="visible">True</property>
-                                <property name="action-name">.uno:ViewValueHighlighting</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="homogeneous">True</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="left-attach">4</property>
-                            <property name="top-attach">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="bxViewToggleFormula">
-                            <property name="visible">True</property>
-                            <property name="can-focus">True</property>
-                            <property name="toolbar-style">both-horiz</property>
-                            <property name="show-arrow">False</property>
-                            <child>
-                              <object class="GtkToolButton" id="btnViewToggleFormula">
-                                <property name="visible">True</property>
-                                <property name="action-name">.uno:ToggleFormula</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="homogeneous">True</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="left-attach">4</property>
-                            <property name="top-attach">1</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="bxViewViewColumnRowHighlighting">
-                            <property name="visible">True</property>
-                            <property name="can-focus">False</property>
-                            <property name="toolbar-style">both-horiz</property>
-                            <property name="show-arrow">False</property>
-                            <child>
-                              <object class="GtkToolButton" id="btnViewViewColumnRowHighlighting">
-                                <property name="visible">True</property>
-                                <property name="action-name">.uno:ViewColumnRowHighlighting</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="homogeneous">True</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="left-attach">5</property>
-                            <property name="top-attach">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="bxViewViewHiddenColRow">
-                            <property name="visible">True</property>
-                            <property name="can-focus">False</property>
-                            <property name="toolbar-style">both-horiz</property>
-                            <property name="show-arrow">False</property>
-                            <child>
-                              <object class="GtkToolButton" id="btnViewViewHiddenColRow">
-                                <property name="visible">True</property>
-                                <property name="action-name">.uno:ViewHiddenColRow</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="homogeneous">True</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="left-attach">5</property>
-                            <property name="top-attach">1</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="bxInsertFunctionBox">
-                            <property name="visible">True</property>
-                            <property name="can-focus">False</property>
-                            <property name="toolbar-style">both-horiz</property>
-                            <property name="show-arrow">False</property>
-                            <child>
-                              <object class="GtkToolButton" id="btnInsertFunctionBox1">
-                                <property name="visible">True</property>
-                                <property name="action-name">.uno:FunctionBox</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="homogeneous">True</property>
-                              </packing>
-                            </child>
-                          </object>
-                          <packing>
-                            <property name="left-attach">1</property>
-                            <property name="top-attach">1</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="sfxlo-NotebookbarToolBox" id="bxViewChangeTheme">
-                            <property name="visible">True</property>
-                            <property name="can-focus">True</property>
-                            <property name="valign">center</property>
-                            <property name="vexpand">True</property>
-                            <property name="toolbar-style">both</property>
-                            <property name="show-arrow">False</property>
-                            <property name="icon_size">3</property>
-                            <child>
-                              <object class="GtkToolButton" id="btnViewChangeTheme">
-                                <property name="visible">True</property>
-                                <property name="action-name">.uno:ChangeTheme</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="homogeneous">True</property>
-                              </packing>
-                            </child>
-                          </object>
                           <packing>
                             <property name="left-attach">0</property>
                             <property name="top-attach">0</property>
-                            <property name="height">2</property>
                           </packing>
                         </child>
                         <accessibility>
diff --git a/solenv/sanitizers/ui/modules/scalc.suppr b/solenv/sanitizers/ui/modules/scalc.suppr
index e8d96743e968..7e1e5efaf612 100644
--- a/solenv/sanitizers/ui/modules/scalc.suppr
+++ b/solenv/sanitizers/ui/modules/scalc.suppr
@@ -542,7 +542,7 @@ sc/uiconfig/scalc/ui/notebookbar.ui://GtkToolButton[@id='btnReviewRedactDoc'] bu
 sc/uiconfig/scalc/ui/notebookbar.ui://GtkToolButton[@id='btnReviewAcceptChanges'] button-no-label
 sc/uiconfig/scalc/ui/notebookbar.ui://GtkToolButton[@id='btnViewViewColumnRowHighlighting'] button-no-label
 sc/uiconfig/scalc/ui/notebookbar.ui://GtkToolButton[@id='btnViewViewHiddenColRow'] button-no-label
-sc/uiconfig/scalc/ui/notebookbar.ui://GtkToolButton[@id='btnInsertFunctionBox1'] button-no-label
+sc/uiconfig/scalc/ui/notebookbar.ui://GtkToolButton[@id='btnInsertDesignerDialog'] button-no-label
 sc/uiconfig/scalc/ui/notebookbar.ui://GtkToolButton[@id='btnViewViewValueHighlighting'] button-no-label
 sc/uiconfig/scalc/ui/notebookbar.ui://GtkToolButton[@id='btnViewToggleFormula'] button-no-label
 sc/uiconfig/scalc/ui/notebookbar.ui://GtkToolButton[@id='btnViewChangeTheme'] button-no-label