diff --git a/sfx2/uiconfig/ui/charmapcontrol.ui b/sfx2/uiconfig/ui/charmapcontrol.ui
index 111288ab81b0..d875d384fe6e 100644
--- a/sfx2/uiconfig/ui/charmapcontrol.ui
+++ b/sfx2/uiconfig/ui/charmapcontrol.ui
@@ -13,6 +13,10 @@
       <object class="GtkBox" id="box1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="margin_left">3</property>
+        <property name="margin_right">3</property>
+        <property name="margin_top">3</property>
+        <property name="margin_bottom">3</property>
         <property name="resize_mode">queue</property>
         <property name="orientation">vertical</property>
         <property name="spacing">6</property>
@@ -20,7 +24,7 @@
           <object class="GtkLabel" id="label1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes" context="charmapcontrol|label1">Recent Characters</property>
+            <property name="label" translatable="yes" context="charmapcontrol|label1">Favorites</property>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -32,13 +36,12 @@
           <object class="GtkGrid" id="grid1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="row_homogeneous">True</property>
-            <property name="column_homogeneous">True</property>
             <child>
-              <object class="sfxlo-SvxCharView" id="viewchar1">
+              <object class="sfxlo-SvxCharView" id="favchar1">
                 <property name="width_request">35</property>
                 <property name="height_request">35</property>
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
               </object>
               <packing>
                 <property name="left_attach">0</property>
@@ -46,10 +49,11 @@
               </packing>
             </child>
             <child>
-              <object class="sfxlo-SvxCharView" id="viewchar2">
+              <object class="sfxlo-SvxCharView" id="favchar2">
                 <property name="width_request">35</property>
                 <property name="height_request">35</property>
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
               </object>
               <packing>
                 <property name="left_attach">1</property>
@@ -57,10 +61,11 @@
               </packing>
             </child>
             <child>
-              <object class="sfxlo-SvxCharView" id="viewchar4">
+              <object class="sfxlo-SvxCharView" id="favchar4">
                 <property name="width_request">35</property>
                 <property name="height_request">35</property>
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
               </object>
               <packing>
                 <property name="left_attach">3</property>
@@ -68,10 +73,11 @@
               </packing>
             </child>
             <child>
-              <object class="sfxlo-SvxCharView" id="viewchar3">
+              <object class="sfxlo-SvxCharView" id="favchar3">
                 <property name="width_request">35</property>
                 <property name="height_request">35</property>
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
               </object>
               <packing>
                 <property name="left_attach">2</property>
@@ -79,43 +85,35 @@
               </packing>
             </child>
             <child>
-              <object class="sfxlo-SvxCharView" id="viewchar12">
+              <object class="sfxlo-SvxCharView" id="favchar5">
                 <property name="width_request">35</property>
                 <property name="height_request">35</property>
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
               </object>
               <packing>
-                <property name="left_attach">3</property>
-                <property name="top_attach">1</property>
+                <property name="left_attach">4</property>
+                <property name="top_attach">0</property>
               </packing>
             </child>
             <child>
-              <object class="sfxlo-SvxCharView" id="viewchar11">
+              <object class="sfxlo-SvxCharView" id="favchar6">
                 <property name="width_request">35</property>
                 <property name="height_request">35</property>
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
               </object>
               <packing>
-                <property name="left_attach">2</property>
-                <property name="top_attach">1</property>
+                <property name="left_attach">5</property>
+                <property name="top_attach">0</property>
               </packing>
             </child>
             <child>
-              <object class="sfxlo-SvxCharView" id="viewchar10">
-                <property name="width_request">35</property>
-                <property name="height_request">35</property>
-                <property name="visible">True</property>
-              </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="sfxlo-SvxCharView" id="viewchar9">
+              <object class="sfxlo-SvxCharView" id="favchar7">
                 <property name="width_request">35</property>
                 <property name="height_request">35</property>
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
               </object>
               <packing>
                 <property name="left_attach">0</property>
@@ -123,54 +121,47 @@
               </packing>
             </child>
             <child>
-              <object class="sfxlo-SvxCharView" id="viewchar5">
+              <object class="sfxlo-SvxCharView" id="favchar8">
                 <property name="width_request">35</property>
                 <property name="height_request">35</property>
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
               </object>
               <packing>
-                <property name="left_attach">4</property>
-                <property name="top_attach">0</property>
+                <property name="left_attach">1</property>
+                <property name="top_attach">1</property>
               </packing>
             </child>
             <child>
-              <object class="sfxlo-SvxCharView" id="viewchar6">
+              <object class="sfxlo-SvxCharView" id="favchar9">
                 <property name="width_request">35</property>
                 <property name="height_request">35</property>
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
               </object>
               <packing>
-                <property name="left_attach">5</property>
-                <property name="top_attach">0</property>
+                <property name="left_attach">2</property>
+                <property name="top_attach">1</property>
               </packing>
             </child>
             <child>
-              <object class="sfxlo-SvxCharView" id="viewchar7">
+              <object class="sfxlo-SvxCharView" id="favchar10">
                 <property name="width_request">35</property>
                 <property name="height_request">35</property>
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
               </object>
               <packing>
-                <property name="left_attach">6</property>
-                <property name="top_attach">0</property>
+                <property name="left_attach">3</property>
+                <property name="top_attach">1</property>
               </packing>
             </child>
             <child>
-              <object class="sfxlo-SvxCharView" id="viewchar8">
-                <property name="width_request">35</property>
-                <property name="height_request">35</property>
-                <property name="visible">True</property>
-              </object>
-              <packing>
-                <property name="left_attach">7</property>
-                <property name="top_attach">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="sfxlo-SvxCharView" id="viewchar13">
+              <object class="sfxlo-SvxCharView" id="favchar11">
                 <property name="width_request">35</property>
                 <property name="height_request">35</property>
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
               </object>
               <packing>
                 <property name="left_attach">4</property>
@@ -178,10 +169,11 @@
               </packing>
             </child>
             <child>
-              <object class="sfxlo-SvxCharView" id="viewchar14">
+              <object class="sfxlo-SvxCharView" id="favchar12">
                 <property name="width_request">35</property>
                 <property name="height_request">35</property>
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
               </object>
               <packing>
                 <property name="left_attach">5</property>
@@ -189,27 +181,59 @@
               </packing>
             </child>
             <child>
-              <object class="sfxlo-SvxCharView" id="viewchar15">
+              <object class="sfxlo-SvxCharView" id="favchar13">
                 <property name="width_request">35</property>
                 <property name="height_request">35</property>
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
               </object>
               <packing>
-                <property name="left_attach">6</property>
-                <property name="top_attach">1</property>
+                <property name="left_attach">0</property>
+                <property name="top_attach">2</property>
               </packing>
             </child>
             <child>
-              <object class="sfxlo-SvxCharView" id="viewchar16">
+              <object class="sfxlo-SvxCharView" id="favchar14">
                 <property name="width_request">35</property>
                 <property name="height_request">35</property>
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
               </object>
               <packing>
-                <property name="left_attach">7</property>
-                <property name="top_attach">1</property>
+                <property name="left_attach">1</property>
+                <property name="top_attach">2</property>
               </packing>
             </child>
+            <child>
+              <object class="sfxlo-SvxCharView" id="favchar15">
+                <property name="width_request">35</property>
+                <property name="height_request">35</property>
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+              </object>
+              <packing>
+                <property name="left_attach">2</property>
+                <property name="top_attach">2</property>
+              </packing>
+            </child>
+            <child>
+              <object class="sfxlo-SvxCharView" id="favchar16">
+                <property name="width_request">35</property>
+                <property name="height_request">35</property>
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+              </object>
+              <packing>
+                <property name="left_attach">3</property>
+                <property name="top_attach">2</property>
+              </packing>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -221,7 +245,7 @@
           <object class="GtkLabel" id="label2">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes" context="charmapcontrol|label2">Favourites</property>
+            <property name="label" translatable="yes" context="charmapcontrol|label2">Recent</property>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -233,11 +257,14 @@
           <object class="GtkGrid" id="grid2">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
+            <property name="row_homogeneous">True</property>
+            <property name="column_homogeneous">True</property>
             <child>
-              <object class="sfxlo-SvxCharView" id="favchar1">
+              <object class="sfxlo-SvxCharView" id="viewchar1">
                 <property name="width_request">35</property>
                 <property name="height_request">35</property>
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
               </object>
               <packing>
                 <property name="left_attach">0</property>
@@ -245,10 +272,11 @@
               </packing>
             </child>
             <child>
-              <object class="sfxlo-SvxCharView" id="favchar2">
+              <object class="sfxlo-SvxCharView" id="viewchar2">
                 <property name="width_request">35</property>
                 <property name="height_request">35</property>
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
               </object>
               <packing>
                 <property name="left_attach">1</property>
@@ -256,10 +284,11 @@
               </packing>
             </child>
             <child>
-              <object class="sfxlo-SvxCharView" id="favchar4">
+              <object class="sfxlo-SvxCharView" id="viewchar4">
                 <property name="width_request">35</property>
                 <property name="height_request">35</property>
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
               </object>
               <packing>
                 <property name="left_attach">3</property>
@@ -267,10 +296,11 @@
               </packing>
             </child>
             <child>
-              <object class="sfxlo-SvxCharView" id="favchar3">
+              <object class="sfxlo-SvxCharView" id="viewchar3">
                 <property name="width_request">35</property>
                 <property name="height_request">35</property>
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
               </object>
               <packing>
                 <property name="left_attach">2</property>
@@ -278,10 +308,107 @@
               </packing>
             </child>
             <child>
-              <object class="sfxlo-SvxCharView" id="favchar12">
+              <object class="sfxlo-SvxCharView" id="viewchar5">
                 <property name="width_request">35</property>
                 <property name="height_request">35</property>
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
+              </object>
+              <packing>
+                <property name="left_attach">4</property>
+                <property name="top_attach">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="sfxlo-SvxCharView" id="viewchar6">
+                <property name="width_request">35</property>
+                <property name="height_request">35</property>
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+              </object>
+              <packing>
+                <property name="left_attach">5</property>
+                <property name="top_attach">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="sfxlo-SvxCharView" id="viewchar16">
+                <property name="width_request">35</property>
+                <property name="height_request">35</property>
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+              </object>
+              <packing>
+                <property name="left_attach">3</property>
+                <property name="top_attach">2</property>
+              </packing>
+            </child>
+            <child>
+              <object class="sfxlo-SvxCharView" id="viewchar15">
+                <property name="width_request">35</property>
+                <property name="height_request">35</property>
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+              </object>
+              <packing>
+                <property name="left_attach">2</property>
+                <property name="top_attach">2</property>
+              </packing>
+            </child>
+            <child>
+              <object class="sfxlo-SvxCharView" id="viewchar14">
+                <property name="width_request">35</property>
+                <property name="height_request">35</property>
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="top_attach">2</property>
+              </packing>
+            </child>
+            <child>
+              <object class="sfxlo-SvxCharView" id="viewchar13">
+                <property name="width_request">35</property>
+                <property name="height_request">35</property>
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+              </object>
+              <packing>
+                <property name="left_attach">0</property>
+                <property name="top_attach">2</property>
+              </packing>
+            </child>
+            <child>
+              <object class="sfxlo-SvxCharView" id="viewchar12">
+                <property name="width_request">35</property>
+                <property name="height_request">35</property>
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+              </object>
+              <packing>
+                <property name="left_attach">5</property>
+                <property name="top_attach">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="sfxlo-SvxCharView" id="viewchar11">
+                <property name="width_request">35</property>
+                <property name="height_request">35</property>
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+              </object>
+              <packing>
+                <property name="left_attach">4</property>
+                <property name="top_attach">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="sfxlo-SvxCharView" id="viewchar10">
+                <property name="width_request">35</property>
+                <property name="height_request">35</property>
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
               </object>
               <packing>
                 <property name="left_attach">3</property>
@@ -289,10 +416,11 @@
               </packing>
             </child>
             <child>
-              <object class="sfxlo-SvxCharView" id="favchar11">
+              <object class="sfxlo-SvxCharView" id="viewchar9">
                 <property name="width_request">35</property>
                 <property name="height_request">35</property>
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
               </object>
               <packing>
                 <property name="left_attach">2</property>
@@ -300,10 +428,11 @@
               </packing>
             </child>
             <child>
-              <object class="sfxlo-SvxCharView" id="favchar10">
+              <object class="sfxlo-SvxCharView" id="viewchar8">
                 <property name="width_request">35</property>
                 <property name="height_request">35</property>
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
               </object>
               <packing>
                 <property name="left_attach">1</property>
@@ -311,10 +440,11 @@
               </packing>
             </child>
             <child>
-              <object class="sfxlo-SvxCharView" id="favchar9">
+              <object class="sfxlo-SvxCharView" id="viewchar7">
                 <property name="width_request">35</property>
                 <property name="height_request">35</property>
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
               </object>
               <packing>
                 <property name="left_attach">0</property>
@@ -322,92 +452,10 @@
               </packing>
             </child>
             <child>
-              <object class="sfxlo-SvxCharView" id="favchar5">
-                <property name="width_request">35</property>
-                <property name="height_request">35</property>
-                <property name="visible">True</property>
-              </object>
-              <packing>
-                <property name="left_attach">4</property>
-                <property name="top_attach">0</property>
-              </packing>
+              <placeholder/>
             </child>
             <child>
-              <object class="sfxlo-SvxCharView" id="favchar6">
-                <property name="width_request">35</property>
-                <property name="height_request">35</property>
-                <property name="visible">True</property>
-              </object>
-              <packing>
-                <property name="left_attach">5</property>
-                <property name="top_attach">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="sfxlo-SvxCharView" id="favchar7">
-                <property name="width_request">35</property>
-                <property name="height_request">35</property>
-                <property name="visible">True</property>
-              </object>
-              <packing>
-                <property name="left_attach">6</property>
-                <property name="top_attach">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="sfxlo-SvxCharView" id="favchar8">
-                <property name="width_request">35</property>
-                <property name="height_request">35</property>
-                <property name="visible">True</property>
-              </object>
-              <packing>
-                <property name="left_attach">7</property>
-                <property name="top_attach">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="sfxlo-SvxCharView" id="favchar13">
-                <property name="width_request">35</property>
-                <property name="height_request">35</property>
-                <property name="visible">True</property>
-              </object>
-              <packing>
-                <property name="left_attach">4</property>
-                <property name="top_attach">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="sfxlo-SvxCharView" id="favchar14">
-                <property name="width_request">35</property>
-                <property name="height_request">35</property>
-                <property name="visible">True</property>
-              </object>
-              <packing>
-                <property name="left_attach">5</property>
-                <property name="top_attach">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="sfxlo-SvxCharView" id="favchar15">
-                <property name="width_request">35</property>
-                <property name="height_request">35</property>
-                <property name="visible">True</property>
-              </object>
-              <packing>
-                <property name="left_attach">6</property>
-                <property name="top_attach">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="sfxlo-SvxCharView" id="favchar16">
-                <property name="width_request">35</property>
-                <property name="height_request">35</property>
-                <property name="visible">True</property>
-              </object>
-              <packing>
-                <property name="left_attach">7</property>
-                <property name="top_attach">1</property>
-              </packing>
+              <placeholder/>
             </child>
           </object>
           <packing>
@@ -418,7 +466,7 @@
         </child>
         <child>
           <object class="GtkButton" id="specialchardlg">
-            <property name="label" translatable="yes" context="charmapcontrol|specialchardlg">Launch Dialog</property>
+            <property name="label" translatable="yes" context="charmapcontrol|specialchardlg">More Characters…</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="receives_default">True</property>