diff --git a/sc/uiconfig/scalc/toolbar/formcontrols.xml b/sc/uiconfig/scalc/toolbar/formcontrols.xml
index 3a5cbb2b889b..70b962a73894 100644
--- a/sc/uiconfig/scalc/toolbar/formcontrols.xml
+++ b/sc/uiconfig/scalc/toolbar/formcontrols.xml
@@ -21,26 +21,29 @@
  <toolbar:toolbaritem xlink:href=".uno:SelectObject"/>
  <toolbar:toolbaritem xlink:href=".uno:SwitchControlDesignMode"/>
  <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:ControlProperties"/>
- <toolbar:toolbaritem xlink:href=".uno:FormProperties"/>
+ <toolbar:toolbaritem xlink:href=".uno:ControlProperties" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:FormProperties" toolbar:visible="false"/>
  <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:CheckBox"/>
+ <toolbar:toolbaritem xlink:href=".uno:Label"/>
  <toolbar:toolbaritem xlink:href=".uno:Edit"/>
  <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:FormattedField"/>
- <toolbar:toolbaritem xlink:href=".uno:Pushbutton"/>
- <toolbar:toolbarbreak/>
+ <toolbar:toolbaritem xlink:href=".uno:CheckBox"/>
  <toolbar:toolbaritem xlink:href=".uno:RadioButton"/>
- <toolbar:toolbaritem xlink:href=".uno:ListBox"/>
  <toolbar:toolbarbreak/>
+ <toolbar:toolbaritem xlink:href=".uno:ListBox"/>
  <toolbar:toolbaritem xlink:href=".uno:ComboBox"/>
- <toolbar:toolbaritem xlink:href=".uno:Label"/>
+ <toolbar:toolbarbreak/>
+ <toolbar:toolbaritem xlink:href=".uno:Pushbutton"/>
+ <toolbar:toolbaritem xlink:href=".uno:Imagebutton"/>
+ <toolbar:toolbarbreak/>
+ <toolbar:toolbaritem xlink:href=".uno:FormattedField"/>
+ <toolbar:toolbaritem xlink:href=".uno:GroupBox"/>
  <toolbar:toolbarbreak/>
  <toolbar:toolbaritem xlink:href=".uno:SpinButton"/>
  <toolbar:toolbaritem xlink:href=".uno:ScrollBar"/>
  <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:FormDesignTools"/>
  <toolbar:toolbaritem xlink:href=".uno:MoreControls"/>
+ <toolbar:toolbaritem xlink:href=".uno:FormDesignTools"/>
  <toolbar:toolbarbreak/>
  <toolbar:toolbaritem xlink:href=".uno:UseWizards"/>
 </toolbar:toolbar>
diff --git a/sc/uiconfig/scalc/toolbar/moreformcontrols.xml b/sc/uiconfig/scalc/toolbar/moreformcontrols.xml
index 796529fd550d..70bd84f6db41 100644
--- a/sc/uiconfig/scalc/toolbar/moreformcontrols.xml
+++ b/sc/uiconfig/scalc/toolbar/moreformcontrols.xml
@@ -18,20 +18,15 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 -->
 <toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink" toolbar:id="toolbar">
- <toolbar:toolbaritem xlink:href=".uno:Imagebutton"/>
- <toolbar:toolbaritem xlink:href=".uno:ImageControl"/>
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:FileControl"/>
  <toolbar:toolbaritem xlink:href=".uno:DateField"/>
- <toolbar:toolbarbreak/>
  <toolbar:toolbaritem xlink:href=".uno:TimeField"/>
+ <toolbar:toolbarbreak/>
  <toolbar:toolbaritem xlink:href=".uno:NumericField"/>
- <toolbar:toolbarbreak/>
  <toolbar:toolbaritem xlink:href=".uno:CurrencyField"/>
+ <toolbar:toolbarbreak/>
  <toolbar:toolbaritem xlink:href=".uno:PatternField"/>
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:GroupBox"/>
- <toolbar:toolbaritem xlink:href=".uno:Grid"/>
- <toolbar:toolbarbreak/>
  <toolbar:toolbaritem xlink:href=".uno:NavigationBar"/>
-</toolbar:toolbar>
\ No newline at end of file
+ <toolbar:toolbarbreak/>
+ <toolbar:toolbaritem xlink:href=".uno:ImageControl"/>
+ <toolbar:toolbaritem xlink:href=".uno:FileControl"/>
+</toolbar:toolbar>
diff --git a/sd/uiconfig/sdraw/toolbar/formcontrols.xml b/sd/uiconfig/sdraw/toolbar/formcontrols.xml
index 3905ded90a70..f40d374ec59a 100644
--- a/sd/uiconfig/sdraw/toolbar/formcontrols.xml
+++ b/sd/uiconfig/sdraw/toolbar/formcontrols.xml
@@ -21,23 +21,29 @@
  <toolbar:toolbaritem xlink:href=".uno:SelectObject"/>
  <toolbar:toolbaritem xlink:href=".uno:SwitchControlDesignMode"/>
  <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:ControlProperties"/>
- <toolbar:toolbaritem xlink:href=".uno:FormProperties"/>
+ <toolbar:toolbaritem xlink:href=".uno:ControlProperties" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:FormProperties" toolbar:visible="false"/>
  <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:CheckBox"/>
+ <toolbar:toolbaritem xlink:href=".uno:Label"/>
  <toolbar:toolbaritem xlink:href=".uno:Edit"/>
  <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:FormattedField"/>
- <toolbar:toolbaritem xlink:href=".uno:Pushbutton"/>
- <toolbar:toolbarbreak/>
+ <toolbar:toolbaritem xlink:href=".uno:CheckBox"/>
  <toolbar:toolbaritem xlink:href=".uno:RadioButton"/>
+ <toolbar:toolbarbreak/>
  <toolbar:toolbaritem xlink:href=".uno:ListBox"/>
- <toolbar:toolbarbreak/>
  <toolbar:toolbaritem xlink:href=".uno:ComboBox"/>
- <toolbar:toolbaritem xlink:href=".uno:Label"/>
  <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:FormDesignTools"/>
+ <toolbar:toolbaritem xlink:href=".uno:Pushbutton"/>
+ <toolbar:toolbaritem xlink:href=".uno:Imagebutton"/>
+ <toolbar:toolbarbreak/>
+ <toolbar:toolbaritem xlink:href=".uno:FormattedField"/>
+ <toolbar:toolbaritem xlink:href=".uno:DateField"/>
+ <toolbar:toolbarbreak/>
+ <toolbar:toolbaritem xlink:href=".uno:NumericField"/>
+ <toolbar:toolbaritem xlink:href=".uno:GroupBox"/>
+ <toolbar:toolbarbreak/>
  <toolbar:toolbaritem xlink:href=".uno:MoreControls"/>
+ <toolbar:toolbaritem xlink:href=".uno:FormDesignTools"/>
  <toolbar:toolbarbreak/>
  <toolbar:toolbaritem xlink:href=".uno:UseWizards"/>
 </toolbar:toolbar>
diff --git a/sd/uiconfig/sdraw/toolbar/moreformcontrols.xml b/sd/uiconfig/sdraw/toolbar/moreformcontrols.xml
index 1b1bbcef1b61..14f2d133dc05 100644
--- a/sd/uiconfig/sdraw/toolbar/moreformcontrols.xml
+++ b/sd/uiconfig/sdraw/toolbar/moreformcontrols.xml
@@ -18,23 +18,15 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 -->
 <toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink" toolbar:id="toolbar">
- <toolbar:toolbaritem xlink:href=".uno:SpinButton"/>
- <toolbar:toolbaritem xlink:href=".uno:ScrollBar"/>
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:Imagebutton"/>
- <toolbar:toolbaritem xlink:href=".uno:ImageControl"/>
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:FileControl"/>
- <toolbar:toolbaritem xlink:href=".uno:DateField"/>
- <toolbar:toolbarbreak/>
  <toolbar:toolbaritem xlink:href=".uno:TimeField"/>
- <toolbar:toolbaritem xlink:href=".uno:NumericField"/>
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:CurrencyField"/>
- <toolbar:toolbaritem xlink:href=".uno:PatternField"/>
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:GroupBox"/>
- <toolbar:toolbaritem xlink:href=".uno:Grid"/>
- <toolbar:toolbarbreak/>
  <toolbar:toolbaritem xlink:href=".uno:NavigationBar"/>
-</toolbar:toolbar>
\ No newline at end of file
+ <toolbar:toolbarbreak/>
+ <toolbar:toolbaritem xlink:href=".uno:PatternField"/>
+ <toolbar:toolbaritem xlink:href=".uno:CurrencyField"/>
+ <toolbar:toolbarbreak/>
+ <toolbar:toolbaritem xlink:href=".uno:ImageControl"/>
+ <toolbar:toolbaritem xlink:href=".uno:FileControl"/>
+ <toolbar:toolbarbreak/>
+ <toolbar:toolbaritem xlink:href=".uno:SpinButton" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:ScrollBar" toolbar:visible="false"/>
+</toolbar:toolbar>
diff --git a/sd/uiconfig/simpress/toolbar/formcontrols.xml b/sd/uiconfig/simpress/toolbar/formcontrols.xml
index 3905ded90a70..f40d374ec59a 100644
--- a/sd/uiconfig/simpress/toolbar/formcontrols.xml
+++ b/sd/uiconfig/simpress/toolbar/formcontrols.xml
@@ -21,23 +21,29 @@
  <toolbar:toolbaritem xlink:href=".uno:SelectObject"/>
  <toolbar:toolbaritem xlink:href=".uno:SwitchControlDesignMode"/>
  <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:ControlProperties"/>
- <toolbar:toolbaritem xlink:href=".uno:FormProperties"/>
+ <toolbar:toolbaritem xlink:href=".uno:ControlProperties" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:FormProperties" toolbar:visible="false"/>
  <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:CheckBox"/>
+ <toolbar:toolbaritem xlink:href=".uno:Label"/>
  <toolbar:toolbaritem xlink:href=".uno:Edit"/>
  <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:FormattedField"/>
- <toolbar:toolbaritem xlink:href=".uno:Pushbutton"/>
- <toolbar:toolbarbreak/>
+ <toolbar:toolbaritem xlink:href=".uno:CheckBox"/>
  <toolbar:toolbaritem xlink:href=".uno:RadioButton"/>
+ <toolbar:toolbarbreak/>
  <toolbar:toolbaritem xlink:href=".uno:ListBox"/>
- <toolbar:toolbarbreak/>
  <toolbar:toolbaritem xlink:href=".uno:ComboBox"/>
- <toolbar:toolbaritem xlink:href=".uno:Label"/>
  <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:FormDesignTools"/>
+ <toolbar:toolbaritem xlink:href=".uno:Pushbutton"/>
+ <toolbar:toolbaritem xlink:href=".uno:Imagebutton"/>
+ <toolbar:toolbarbreak/>
+ <toolbar:toolbaritem xlink:href=".uno:FormattedField"/>
+ <toolbar:toolbaritem xlink:href=".uno:DateField"/>
+ <toolbar:toolbarbreak/>
+ <toolbar:toolbaritem xlink:href=".uno:NumericField"/>
+ <toolbar:toolbaritem xlink:href=".uno:GroupBox"/>
+ <toolbar:toolbarbreak/>
  <toolbar:toolbaritem xlink:href=".uno:MoreControls"/>
+ <toolbar:toolbaritem xlink:href=".uno:FormDesignTools"/>
  <toolbar:toolbarbreak/>
  <toolbar:toolbaritem xlink:href=".uno:UseWizards"/>
 </toolbar:toolbar>
diff --git a/sd/uiconfig/simpress/toolbar/moreformcontrols.xml b/sd/uiconfig/simpress/toolbar/moreformcontrols.xml
index 1b1bbcef1b61..14f2d133dc05 100644
--- a/sd/uiconfig/simpress/toolbar/moreformcontrols.xml
+++ b/sd/uiconfig/simpress/toolbar/moreformcontrols.xml
@@ -18,23 +18,15 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 -->
 <toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink" toolbar:id="toolbar">
- <toolbar:toolbaritem xlink:href=".uno:SpinButton"/>
- <toolbar:toolbaritem xlink:href=".uno:ScrollBar"/>
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:Imagebutton"/>
- <toolbar:toolbaritem xlink:href=".uno:ImageControl"/>
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:FileControl"/>
- <toolbar:toolbaritem xlink:href=".uno:DateField"/>
- <toolbar:toolbarbreak/>
  <toolbar:toolbaritem xlink:href=".uno:TimeField"/>
- <toolbar:toolbaritem xlink:href=".uno:NumericField"/>
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:CurrencyField"/>
- <toolbar:toolbaritem xlink:href=".uno:PatternField"/>
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:GroupBox"/>
- <toolbar:toolbaritem xlink:href=".uno:Grid"/>
- <toolbar:toolbarbreak/>
  <toolbar:toolbaritem xlink:href=".uno:NavigationBar"/>
-</toolbar:toolbar>
\ No newline at end of file
+ <toolbar:toolbarbreak/>
+ <toolbar:toolbaritem xlink:href=".uno:PatternField"/>
+ <toolbar:toolbaritem xlink:href=".uno:CurrencyField"/>
+ <toolbar:toolbarbreak/>
+ <toolbar:toolbaritem xlink:href=".uno:ImageControl"/>
+ <toolbar:toolbaritem xlink:href=".uno:FileControl"/>
+ <toolbar:toolbarbreak/>
+ <toolbar:toolbaritem xlink:href=".uno:SpinButton" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:ScrollBar" toolbar:visible="false"/>
+</toolbar:toolbar>
diff --git a/sw/uiconfig/sglobal/toolbar/formcontrols.xml b/sw/uiconfig/sglobal/toolbar/formcontrols.xml
index 17eaa87e0f27..f40d374ec59a 100644
--- a/sw/uiconfig/sglobal/toolbar/formcontrols.xml
+++ b/sw/uiconfig/sglobal/toolbar/formcontrols.xml
@@ -21,20 +21,26 @@
  <toolbar:toolbaritem xlink:href=".uno:SelectObject"/>
  <toolbar:toolbaritem xlink:href=".uno:SwitchControlDesignMode"/>
  <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:ControlProperties"/>
- <toolbar:toolbaritem xlink:href=".uno:FormProperties"/>
+ <toolbar:toolbaritem xlink:href=".uno:ControlProperties" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:FormProperties" toolbar:visible="false"/>
  <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:CheckBox"/>
+ <toolbar:toolbaritem xlink:href=".uno:Label"/>
  <toolbar:toolbaritem xlink:href=".uno:Edit"/>
  <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:FormattedField"/>
- <toolbar:toolbaritem xlink:href=".uno:Pushbutton"/>
- <toolbar:toolbarbreak/>
+ <toolbar:toolbaritem xlink:href=".uno:CheckBox"/>
  <toolbar:toolbaritem xlink:href=".uno:RadioButton"/>
- <toolbar:toolbaritem xlink:href=".uno:ListBox"/>
  <toolbar:toolbarbreak/>
+ <toolbar:toolbaritem xlink:href=".uno:ListBox"/>
  <toolbar:toolbaritem xlink:href=".uno:ComboBox"/>
- <toolbar:toolbaritem xlink:href=".uno:Label"/>
+ <toolbar:toolbarbreak/>
+ <toolbar:toolbaritem xlink:href=".uno:Pushbutton"/>
+ <toolbar:toolbaritem xlink:href=".uno:Imagebutton"/>
+ <toolbar:toolbarbreak/>
+ <toolbar:toolbaritem xlink:href=".uno:FormattedField"/>
+ <toolbar:toolbaritem xlink:href=".uno:DateField"/>
+ <toolbar:toolbarbreak/>
+ <toolbar:toolbaritem xlink:href=".uno:NumericField"/>
+ <toolbar:toolbaritem xlink:href=".uno:GroupBox"/>
  <toolbar:toolbarbreak/>
  <toolbar:toolbaritem xlink:href=".uno:MoreControls"/>
  <toolbar:toolbaritem xlink:href=".uno:FormDesignTools"/>
diff --git a/sw/uiconfig/sglobal/toolbar/moreformcontrols.xml b/sw/uiconfig/sglobal/toolbar/moreformcontrols.xml
index 1b1bbcef1b61..bb170f6ed9bc 100644
--- a/sw/uiconfig/sglobal/toolbar/moreformcontrols.xml
+++ b/sw/uiconfig/sglobal/toolbar/moreformcontrols.xml
@@ -18,23 +18,15 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 -->
 <toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink" toolbar:id="toolbar">
- <toolbar:toolbaritem xlink:href=".uno:SpinButton"/>
- <toolbar:toolbaritem xlink:href=".uno:ScrollBar"/>
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:Imagebutton"/>
- <toolbar:toolbaritem xlink:href=".uno:ImageControl"/>
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:FileControl"/>
- <toolbar:toolbaritem xlink:href=".uno:DateField"/>
- <toolbar:toolbarbreak/>
  <toolbar:toolbaritem xlink:href=".uno:TimeField"/>
- <toolbar:toolbaritem xlink:href=".uno:NumericField"/>
- <toolbar:toolbarbreak/>
  <toolbar:toolbaritem xlink:href=".uno:CurrencyField"/>
+ <toolbar:toolbarbreak/>
  <toolbar:toolbaritem xlink:href=".uno:PatternField"/>
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:GroupBox"/>
- <toolbar:toolbaritem xlink:href=".uno:Grid"/>
- <toolbar:toolbarbreak/>
  <toolbar:toolbaritem xlink:href=".uno:NavigationBar"/>
-</toolbar:toolbar>
\ No newline at end of file
+ <toolbar:toolbarbreak/>
+ <toolbar:toolbaritem xlink:href=".uno:ImageControl"/>
+ <toolbar:toolbaritem xlink:href=".uno:FileControl"/>
+ <toolbar:toolbarbreak/>
+ <toolbar:toolbaritem xlink:href=".uno:SpinButton" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:ScrollBar" toolbar:visible="false"/>
+</toolbar:toolbar>
diff --git a/sw/uiconfig/swform/toolbar/formcontrols.xml b/sw/uiconfig/swform/toolbar/formcontrols.xml
index 17eaa87e0f27..f40d374ec59a 100644
--- a/sw/uiconfig/swform/toolbar/formcontrols.xml
+++ b/sw/uiconfig/swform/toolbar/formcontrols.xml
@@ -21,20 +21,26 @@
  <toolbar:toolbaritem xlink:href=".uno:SelectObject"/>
  <toolbar:toolbaritem xlink:href=".uno:SwitchControlDesignMode"/>
  <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:ControlProperties"/>
- <toolbar:toolbaritem xlink:href=".uno:FormProperties"/>
+ <toolbar:toolbaritem xlink:href=".uno:ControlProperties" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:FormProperties" toolbar:visible="false"/>
  <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:CheckBox"/>
+ <toolbar:toolbaritem xlink:href=".uno:Label"/>
  <toolbar:toolbaritem xlink:href=".uno:Edit"/>
  <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:FormattedField"/>
- <toolbar:toolbaritem xlink:href=".uno:Pushbutton"/>
- <toolbar:toolbarbreak/>
+ <toolbar:toolbaritem xlink:href=".uno:CheckBox"/>
  <toolbar:toolbaritem xlink:href=".uno:RadioButton"/>
- <toolbar:toolbaritem xlink:href=".uno:ListBox"/>
  <toolbar:toolbarbreak/>
+ <toolbar:toolbaritem xlink:href=".uno:ListBox"/>
  <toolbar:toolbaritem xlink:href=".uno:ComboBox"/>
- <toolbar:toolbaritem xlink:href=".uno:Label"/>
+ <toolbar:toolbarbreak/>
+ <toolbar:toolbaritem xlink:href=".uno:Pushbutton"/>
+ <toolbar:toolbaritem xlink:href=".uno:Imagebutton"/>
+ <toolbar:toolbarbreak/>
+ <toolbar:toolbaritem xlink:href=".uno:FormattedField"/>
+ <toolbar:toolbaritem xlink:href=".uno:DateField"/>
+ <toolbar:toolbarbreak/>
+ <toolbar:toolbaritem xlink:href=".uno:NumericField"/>
+ <toolbar:toolbaritem xlink:href=".uno:GroupBox"/>
  <toolbar:toolbarbreak/>
  <toolbar:toolbaritem xlink:href=".uno:MoreControls"/>
  <toolbar:toolbaritem xlink:href=".uno:FormDesignTools"/>
diff --git a/sw/uiconfig/swform/toolbar/moreformcontrols.xml b/sw/uiconfig/swform/toolbar/moreformcontrols.xml
index cc72c87e75af..bb170f6ed9bc 100644
--- a/sw/uiconfig/swform/toolbar/moreformcontrols.xml
+++ b/sw/uiconfig/swform/toolbar/moreformcontrols.xml
@@ -18,23 +18,15 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 -->
 <toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink" toolbar:id="toolbar">
- <toolbar:toolbaritem xlink:href=".uno:SpinButton"/>
- <toolbar:toolbaritem xlink:href=".uno:ScrollBar"/>
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:Imagebutton"/>
- <toolbar:toolbaritem xlink:href=".uno:ImageControl"/>
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:DateField"/>
  <toolbar:toolbaritem xlink:href=".uno:TimeField"/>
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:FileControl"/>
- <toolbar:toolbaritem xlink:href=".uno:NumericField"/>
- <toolbar:toolbarbreak/>
  <toolbar:toolbaritem xlink:href=".uno:CurrencyField"/>
+ <toolbar:toolbarbreak/>
  <toolbar:toolbaritem xlink:href=".uno:PatternField"/>
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:GroupBox"/>
- <toolbar:toolbaritem xlink:href=".uno:Grid"/>
- <toolbar:toolbarbreak/>
  <toolbar:toolbaritem xlink:href=".uno:NavigationBar"/>
-</toolbar:toolbar>
\ No newline at end of file
+ <toolbar:toolbarbreak/>
+ <toolbar:toolbaritem xlink:href=".uno:ImageControl"/>
+ <toolbar:toolbaritem xlink:href=".uno:FileControl"/>
+ <toolbar:toolbarbreak/>
+ <toolbar:toolbaritem xlink:href=".uno:SpinButton" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:ScrollBar" toolbar:visible="false"/>
+</toolbar:toolbar>
diff --git a/sw/uiconfig/swreport/toolbar/formcontrols.xml b/sw/uiconfig/swreport/toolbar/formcontrols.xml
index 17eaa87e0f27..f40d374ec59a 100644
--- a/sw/uiconfig/swreport/toolbar/formcontrols.xml
+++ b/sw/uiconfig/swreport/toolbar/formcontrols.xml
@@ -21,20 +21,26 @@
  <toolbar:toolbaritem xlink:href=".uno:SelectObject"/>
  <toolbar:toolbaritem xlink:href=".uno:SwitchControlDesignMode"/>
  <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:ControlProperties"/>
- <toolbar:toolbaritem xlink:href=".uno:FormProperties"/>
+ <toolbar:toolbaritem xlink:href=".uno:ControlProperties" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:FormProperties" toolbar:visible="false"/>
  <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:CheckBox"/>
+ <toolbar:toolbaritem xlink:href=".uno:Label"/>
  <toolbar:toolbaritem xlink:href=".uno:Edit"/>
  <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:FormattedField"/>
- <toolbar:toolbaritem xlink:href=".uno:Pushbutton"/>
- <toolbar:toolbarbreak/>
+ <toolbar:toolbaritem xlink:href=".uno:CheckBox"/>
  <toolbar:toolbaritem xlink:href=".uno:RadioButton"/>
- <toolbar:toolbaritem xlink:href=".uno:ListBox"/>
  <toolbar:toolbarbreak/>
+ <toolbar:toolbaritem xlink:href=".uno:ListBox"/>
  <toolbar:toolbaritem xlink:href=".uno:ComboBox"/>
- <toolbar:toolbaritem xlink:href=".uno:Label"/>
+ <toolbar:toolbarbreak/>
+ <toolbar:toolbaritem xlink:href=".uno:Pushbutton"/>
+ <toolbar:toolbaritem xlink:href=".uno:Imagebutton"/>
+ <toolbar:toolbarbreak/>
+ <toolbar:toolbaritem xlink:href=".uno:FormattedField"/>
+ <toolbar:toolbaritem xlink:href=".uno:DateField"/>
+ <toolbar:toolbarbreak/>
+ <toolbar:toolbaritem xlink:href=".uno:NumericField"/>
+ <toolbar:toolbaritem xlink:href=".uno:GroupBox"/>
  <toolbar:toolbarbreak/>
  <toolbar:toolbaritem xlink:href=".uno:MoreControls"/>
  <toolbar:toolbaritem xlink:href=".uno:FormDesignTools"/>
diff --git a/sw/uiconfig/swreport/toolbar/moreformcontrols.xml b/sw/uiconfig/swreport/toolbar/moreformcontrols.xml
index cc72c87e75af..bb170f6ed9bc 100644
--- a/sw/uiconfig/swreport/toolbar/moreformcontrols.xml
+++ b/sw/uiconfig/swreport/toolbar/moreformcontrols.xml
@@ -18,23 +18,15 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 -->
 <toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink" toolbar:id="toolbar">
- <toolbar:toolbaritem xlink:href=".uno:SpinButton"/>
- <toolbar:toolbaritem xlink:href=".uno:ScrollBar"/>
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:Imagebutton"/>
- <toolbar:toolbaritem xlink:href=".uno:ImageControl"/>
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:DateField"/>
  <toolbar:toolbaritem xlink:href=".uno:TimeField"/>
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:FileControl"/>
- <toolbar:toolbaritem xlink:href=".uno:NumericField"/>
- <toolbar:toolbarbreak/>
  <toolbar:toolbaritem xlink:href=".uno:CurrencyField"/>
+ <toolbar:toolbarbreak/>
  <toolbar:toolbaritem xlink:href=".uno:PatternField"/>
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:GroupBox"/>
- <toolbar:toolbaritem xlink:href=".uno:Grid"/>
- <toolbar:toolbarbreak/>
  <toolbar:toolbaritem xlink:href=".uno:NavigationBar"/>
-</toolbar:toolbar>
\ No newline at end of file
+ <toolbar:toolbarbreak/>
+ <toolbar:toolbaritem xlink:href=".uno:ImageControl"/>
+ <toolbar:toolbaritem xlink:href=".uno:FileControl"/>
+ <toolbar:toolbarbreak/>
+ <toolbar:toolbaritem xlink:href=".uno:SpinButton" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:ScrollBar" toolbar:visible="false"/>
+</toolbar:toolbar>
diff --git a/sw/uiconfig/swriter/toolbar/formcontrols.xml b/sw/uiconfig/swriter/toolbar/formcontrols.xml
index 17eaa87e0f27..f40d374ec59a 100644
--- a/sw/uiconfig/swriter/toolbar/formcontrols.xml
+++ b/sw/uiconfig/swriter/toolbar/formcontrols.xml
@@ -21,20 +21,26 @@
  <toolbar:toolbaritem xlink:href=".uno:SelectObject"/>
  <toolbar:toolbaritem xlink:href=".uno:SwitchControlDesignMode"/>
  <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:ControlProperties"/>
- <toolbar:toolbaritem xlink:href=".uno:FormProperties"/>
+ <toolbar:toolbaritem xlink:href=".uno:ControlProperties" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:FormProperties" toolbar:visible="false"/>
  <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:CheckBox"/>
+ <toolbar:toolbaritem xlink:href=".uno:Label"/>
  <toolbar:toolbaritem xlink:href=".uno:Edit"/>
  <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:FormattedField"/>
- <toolbar:toolbaritem xlink:href=".uno:Pushbutton"/>
- <toolbar:toolbarbreak/>
+ <toolbar:toolbaritem xlink:href=".uno:CheckBox"/>
  <toolbar:toolbaritem xlink:href=".uno:RadioButton"/>
- <toolbar:toolbaritem xlink:href=".uno:ListBox"/>
  <toolbar:toolbarbreak/>
+ <toolbar:toolbaritem xlink:href=".uno:ListBox"/>
  <toolbar:toolbaritem xlink:href=".uno:ComboBox"/>
- <toolbar:toolbaritem xlink:href=".uno:Label"/>
+ <toolbar:toolbarbreak/>
+ <toolbar:toolbaritem xlink:href=".uno:Pushbutton"/>
+ <toolbar:toolbaritem xlink:href=".uno:Imagebutton"/>
+ <toolbar:toolbarbreak/>
+ <toolbar:toolbaritem xlink:href=".uno:FormattedField"/>
+ <toolbar:toolbaritem xlink:href=".uno:DateField"/>
+ <toolbar:toolbarbreak/>
+ <toolbar:toolbaritem xlink:href=".uno:NumericField"/>
+ <toolbar:toolbaritem xlink:href=".uno:GroupBox"/>
  <toolbar:toolbarbreak/>
  <toolbar:toolbaritem xlink:href=".uno:MoreControls"/>
  <toolbar:toolbaritem xlink:href=".uno:FormDesignTools"/>
diff --git a/sw/uiconfig/swriter/toolbar/moreformcontrols.xml b/sw/uiconfig/swriter/toolbar/moreformcontrols.xml
index cc72c87e75af..bb170f6ed9bc 100644
--- a/sw/uiconfig/swriter/toolbar/moreformcontrols.xml
+++ b/sw/uiconfig/swriter/toolbar/moreformcontrols.xml
@@ -18,23 +18,15 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 -->
 <toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink" toolbar:id="toolbar">
- <toolbar:toolbaritem xlink:href=".uno:SpinButton"/>
- <toolbar:toolbaritem xlink:href=".uno:ScrollBar"/>
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:Imagebutton"/>
- <toolbar:toolbaritem xlink:href=".uno:ImageControl"/>
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:DateField"/>
  <toolbar:toolbaritem xlink:href=".uno:TimeField"/>
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:FileControl"/>
- <toolbar:toolbaritem xlink:href=".uno:NumericField"/>
- <toolbar:toolbarbreak/>
  <toolbar:toolbaritem xlink:href=".uno:CurrencyField"/>
+ <toolbar:toolbarbreak/>
  <toolbar:toolbaritem xlink:href=".uno:PatternField"/>
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:GroupBox"/>
- <toolbar:toolbaritem xlink:href=".uno:Grid"/>
- <toolbar:toolbarbreak/>
  <toolbar:toolbaritem xlink:href=".uno:NavigationBar"/>
-</toolbar:toolbar>
\ No newline at end of file
+ <toolbar:toolbarbreak/>
+ <toolbar:toolbaritem xlink:href=".uno:ImageControl"/>
+ <toolbar:toolbaritem xlink:href=".uno:FileControl"/>
+ <toolbar:toolbarbreak/>
+ <toolbar:toolbaritem xlink:href=".uno:SpinButton" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:ScrollBar" toolbar:visible="false"/>
+</toolbar:toolbar>
diff --git a/sw/uiconfig/swxform/toolbar/formcontrols.xml b/sw/uiconfig/swxform/toolbar/formcontrols.xml
index e832c916367d..f40d374ec59a 100644
--- a/sw/uiconfig/swxform/toolbar/formcontrols.xml
+++ b/sw/uiconfig/swxform/toolbar/formcontrols.xml
@@ -19,22 +19,31 @@
 -->
 <toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink" toolbar:id="toolbar">
  <toolbar:toolbaritem xlink:href=".uno:SelectObject"/>
- <toolbar:toolbaritem xlink:href=".uno:SwitchXFormsDesignMode"/>
+ <toolbar:toolbaritem xlink:href=".uno:SwitchControlDesignMode"/>
  <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:ControlProperties"/>
+ <toolbar:toolbaritem xlink:href=".uno:ControlProperties" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:FormProperties" toolbar:visible="false"/>
  <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:CheckBox"/>
+ <toolbar:toolbaritem xlink:href=".uno:Label"/>
  <toolbar:toolbaritem xlink:href=".uno:Edit"/>
  <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:FormattedField"/>
- <toolbar:toolbaritem xlink:href=".uno:Pushbutton"/>
- <toolbar:toolbarbreak/>
+ <toolbar:toolbaritem xlink:href=".uno:CheckBox"/>
  <toolbar:toolbaritem xlink:href=".uno:RadioButton"/>
- <toolbar:toolbaritem xlink:href=".uno:ListBox"/>
  <toolbar:toolbarbreak/>
+ <toolbar:toolbaritem xlink:href=".uno:ListBox"/>
  <toolbar:toolbaritem xlink:href=".uno:ComboBox"/>
- <toolbar:toolbaritem xlink:href=".uno:Label"/>
+ <toolbar:toolbarbreak/>
+ <toolbar:toolbaritem xlink:href=".uno:Pushbutton"/>
+ <toolbar:toolbaritem xlink:href=".uno:Imagebutton"/>
+ <toolbar:toolbarbreak/>
+ <toolbar:toolbaritem xlink:href=".uno:FormattedField"/>
+ <toolbar:toolbaritem xlink:href=".uno:DateField"/>
+ <toolbar:toolbarbreak/>
+ <toolbar:toolbaritem xlink:href=".uno:NumericField"/>
+ <toolbar:toolbaritem xlink:href=".uno:GroupBox"/>
  <toolbar:toolbarbreak/>
  <toolbar:toolbaritem xlink:href=".uno:MoreControls"/>
  <toolbar:toolbaritem xlink:href=".uno:FormDesignTools"/>
+ <toolbar:toolbarbreak/>
+ <toolbar:toolbaritem xlink:href=".uno:UseWizards"/>
 </toolbar:toolbar>
diff --git a/sw/uiconfig/swxform/toolbar/moreformcontrols.xml b/sw/uiconfig/swxform/toolbar/moreformcontrols.xml
index 16d1e58f6b39..bb170f6ed9bc 100644
--- a/sw/uiconfig/swxform/toolbar/moreformcontrols.xml
+++ b/sw/uiconfig/swxform/toolbar/moreformcontrols.xml
@@ -18,12 +18,15 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 -->
 <toolbar:toolbar xmlns:toolbar="http://openoffice.org/2001/toolbar" xmlns:xlink="http://www.w3.org/1999/xlink" toolbar:id="toolbar">
- <toolbar:toolbaritem xlink:href=".uno:SpinButton"/>
- <toolbar:toolbaritem xlink:href=".uno:Imagebutton"/>
- <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:DateField"/>
  <toolbar:toolbaritem xlink:href=".uno:TimeField"/>
+ <toolbar:toolbaritem xlink:href=".uno:CurrencyField"/>
  <toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:NumericField"/>
- <toolbar:toolbaritem xlink:href=".uno:GroupBox"/>
-</toolbar:toolbar>
\ No newline at end of file
+ <toolbar:toolbaritem xlink:href=".uno:PatternField"/>
+ <toolbar:toolbaritem xlink:href=".uno:NavigationBar"/>
+ <toolbar:toolbarbreak/>
+ <toolbar:toolbaritem xlink:href=".uno:ImageControl"/>
+ <toolbar:toolbaritem xlink:href=".uno:FileControl"/>
+ <toolbar:toolbarbreak/>
+ <toolbar:toolbaritem xlink:href=".uno:SpinButton" toolbar:visible="false"/>
+ <toolbar:toolbaritem xlink:href=".uno:ScrollBar" toolbar:visible="false"/>
+</toolbar:toolbar>