startcenter: Tweak Start Center layout

Change-Id: Ia63acef184455f3d515f0da0a90a46d8318fbbe0
Reviewed-on: https://gerrit.libreoffice.org/5901
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

7 files changed, 496 insertions, 325 deletions

diff --git a/sfx2/inc/templatedlg.hxx b/sfx2/inc/templatedlg.hxx
index c5feb96964a7..46c3a96fd16c 100644
--- a/sfx2/inc/templatedlg.hxx
+++ b/sfx2/inc/templatedlg.hxx
@@ -80,6 +80,7 @@ private:
 
     void OnTemplateImport ();
     void OnTemplateSearch ();
+    void OnTemplateLink ();
     void OnTemplateOpen ();
     void OnTemplateEdit ();
     void OnTemplateProperties ();
diff --git a/sfx2/source/dialog/backingwindow.cxx b/sfx2/source/dialog/backingwindow.cxx
index 62760c4a2ce9..8e18ba9697bf 100644
--- a/sfx2/source/dialog/backingwindow.cxx
+++ b/sfx2/source/dialog/backingwindow.cxx
@@ -23,7 +23,6 @@
 #include <vcl/virdev.hxx>
 
 #include <unotools/dynamicmenuoptions.hxx>
-#include <svtools/langhelp.hxx>
 #include <svtools/openfiledroptargetlistener.hxx>
 #include <svtools/colorcfg.hxx>
 
@@ -38,8 +37,6 @@
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <com/sun/star/configuration/theDefaultProvider.hpp>
-#include <com/sun/star/system/SystemShellExecute.hpp>
-#include <com/sun/star/system/SystemShellExecuteFlags.hpp>
 #include <com/sun/star/util/URLTransformer.hpp>
 #include <com/sun/star/task/InteractionHandler.hpp>
 
@@ -82,8 +79,21 @@ BackingWindow::BackingWindow( Window* i_pParent ) :
       "sfx/ui/startcenter.ui",
       "StartCenter" );
 
-    get(mpOpenButton,       "open");
-    get(mpTemplateButton,   "templates");
+    get(mpOpenButton,               "open_all");
+    get(mpOpenWriterButton,         "open_writer");
+    get(mpOpenCalcButton,           "open_calc");
+    get(mpOpenImpressButton,        "open_impress");
+    get(mpOpenDrawButton,           "open_draw");
+    get(mpOpenDatabaseButton,       "open_database");
+    get(mpOpenMathButton,           "open_math");
+
+    get(mpTemplateButton,           "templates_all");
+    get(mpTemplateWriterButton,     "templates_writer");
+    get(mpTemplateCalcButton,       "templates_calc");
+    get(mpTemplateImpressButton,    "templates_impress");
+    get(mpTemplateDrawButton,       "templates_draw");
+    get(mpTemplateDatabaseButton,   "templates_database");
+    get(mpTemplateMathButton,       "templates_math");
 
     get(mpModuleNotebook,   "modules_notebook");
 
@@ -101,10 +111,6 @@ BackingWindow::BackingWindow( Window* i_pParent ) :
     get(mpDBAllButton,      "database_all");
     get(mpMathAllButton,    "math_all");
 
-    get(mpExtensionsButton, "extension");
-    get(mpInfoButton,       "info");
-    get(mpTplRepButton,     "add_temp");
-
     get(mpWriterShowTemplateButton,     "show_writer_template");
     get(mpCalcShowTemplateButton,       "show_calc_template");
     get(mpImpressShowTemplateButton,    "show_impress_template");
@@ -176,19 +182,35 @@ BackingWindow::BackingWindow( Window* i_pParent ) :
     Reference<XDesktop2> xDesktop = Desktop::create( comphelper::getProcessComponentContext() );
     mxDesktopDispatchProvider = xDesktop;
 
-    mpTemplateButton->SetHelpId( ".HelpId:StartCenter:TemplateButton" );
-    mpOpenButton->SetHelpId( ".HelpId:StartCenter:OpenButton" );
-
-    mpWriterButton->SetHelpId( ".HelpId:StartCenter:WriterButton" );
-    mpCalcButton->SetHelpId( ".HelpId:StartCenter:CalcButton" );
-    mpImpressButton->SetHelpId( ".HelpId:StartCenter:ImpressButton" );
-    mpDrawButton->SetHelpId( ".HelpId:StartCenter:DrawButton" );
-    mpDBButton->SetHelpId( ".HelpId:StartCenter:DBButton" );
-    mpMathButton->SetHelpId( ".HelpId:StartCenter:MathButton" );
-
-    mpExtensionsButton->SetHelpId( ".HelpId:StartCenter:Extensions" );
-    mpInfoButton->SetHelpId( ".HelpId:StartCenter:Info" );
-    mpTplRepButton->SetHelpId( ".HelpId:StartCenter:TemplateRepository" );
+    mpOpenButton            ->SetHelpId( ".HelpId:StartCenter:OpenButton" );
+    mpOpenWriterButton      ->SetHelpId( ".HelpId:StartCenter:OpenButton" );
+    mpOpenCalcButton        ->SetHelpId( ".HelpId:StartCenter:OpenButton" );
+    mpOpenImpressButton     ->SetHelpId( ".HelpId:StartCenter:OpenButton" );
+    mpOpenDrawButton        ->SetHelpId( ".HelpId:StartCenter:OpenButton" );
+    mpOpenDatabaseButton    ->SetHelpId( ".HelpId:StartCenter:OpenButton" );
+    mpOpenMathButton        ->SetHelpId( ".HelpId:StartCenter:OpenButton" );
+
+    mpTemplateButton        ->SetHelpId( ".HelpId:StartCenter:TemplateButton" );
+    mpTemplateWriterButton  ->SetHelpId( ".HelpId:StartCenter:TemplateButton" );
+    mpTemplateCalcButton    ->SetHelpId( ".HelpId:StartCenter:TemplateButton" );
+    mpTemplateImpressButton ->SetHelpId( ".HelpId:StartCenter:TemplateButton" );
+    mpTemplateDrawButton    ->SetHelpId( ".HelpId:StartCenter:TemplateButton" );
+    mpTemplateDatabaseButton->SetHelpId( ".HelpId:StartCenter:TemplateButton" );
+    mpTemplateMathButton    ->SetHelpId( ".HelpId:StartCenter:TemplateButton" );
+
+    mpWriterButton      ->SetHelpId( ".HelpId:StartCenter:WriterButton" );
+    mpCalcButton        ->SetHelpId( ".HelpId:StartCenter:CalcButton" );
+    mpImpressButton     ->SetHelpId( ".HelpId:StartCenter:ImpressButton" );
+    mpDrawButton        ->SetHelpId( ".HelpId:StartCenter:DrawButton" );
+    mpDBButton          ->SetHelpId( ".HelpId:StartCenter:DBButton" );
+    mpMathButton        ->SetHelpId( ".HelpId:StartCenter:MathButton" );
+
+    mpWriterAllButton   ->SetHelpId( ".HelpId:StartCenter:WriterButton" );
+    mpCalcAllButton     ->SetHelpId( ".HelpId:StartCenter:CalcButton" );
+    mpImpressAllButton  ->SetHelpId( ".HelpId:StartCenter:ImpressButton" );
+    mpDrawAllButton     ->SetHelpId( ".HelpId:StartCenter:DrawButton" );
+    mpDBAllButton       ->SetHelpId( ".HelpId:StartCenter:DBButton" );
+    mpMathAllButton     ->SetHelpId( ".HelpId:StartCenter:MathButton" );
 
     // init background
     SetBackground();
@@ -286,11 +308,20 @@ void BackingWindow::initControls()
     setupButton( mpMathAllButton );
 
     setupButton( mpOpenButton );
-    setupButton( mpTemplateButton );
+    setupButton( mpOpenWriterButton );
+    setupButton( mpOpenCalcButton );
+    setupButton( mpOpenImpressButton );
+    setupButton( mpOpenDrawButton );
+    setupButton( mpOpenDatabaseButton );
+    setupButton( mpOpenMathButton );
 
-    setupExternalLink( mpExtensionsButton );
-    setupExternalLink( mpInfoButton );
-    setupExternalLink( mpTplRepButton );
+    setupButton( mpTemplateButton );
+    setupButton( mpTemplateWriterButton );
+    setupButton( mpTemplateCalcButton );
+    setupButton( mpTemplateImpressButton );
+    setupButton( mpTemplateDrawButton );
+    setupButton( mpTemplateDatabaseButton );
+    setupButton( mpTemplateMathButton );
 
     setupTemplateView( mpWriterTemplateThumbnails,  FILTER_APP_WRITER,
                        mpWriterShowRecentButton,    mpWriterShowTemplateButton );
@@ -326,14 +357,6 @@ void BackingWindow::setupModuleTab(const OString& rTabName, RecentDocsView* pRec
 void BackingWindow::setupButton( PushButton* pButton )
 {
     pButton->SetClickHdl( LINK( this, BackingWindow, ClickHdl ) );
-
-    // setup text - slighly larger font than normal labels on the texts
-    Font aFont;
-    aFont.SetSize( Size( 0, 11 ) );
-    aFont.SetWeight( WEIGHT_NORMAL );
-
-    pButton->SetFont( aFont );
-    pButton->SetControlFont( aFont );
 }
 
 void BackingWindow::setupTemplateView( TemplateLocalView* pView, FILTER_APPLICATION eFilter,
@@ -356,30 +379,8 @@ void BackingWindow::setupTemplateView( TemplateLocalView* pView, FILTER_APPLICAT
     pRecentButton->SetClickHdl( LINK( this, BackingWindow, RecentTemplateToggleHdl ) );
     pTemplateButton->SetClickHdl( LINK( this, BackingWindow, RecentTemplateToggleHdl ) );
 
-    // button text - slighly larger font than normal labels on the texts
-    Font aFont;
-    aFont.SetSize( Size( 0, 11 ) );
-    aFont.SetWeight( WEIGHT_NORMAL );
-
-    pRecentButton->SetFont( aFont );
-    pRecentButton->SetControlFont( aFont );
-
-    pTemplateButton->SetFont( aFont );
-    pTemplateButton->SetControlFont( aFont );
-
     pRecentButton->Hide();  // hidden by default
 }
-
-void BackingWindow::setupExternalLink( PushButton* pButton )
-{
-    if( mnHideExternalLinks == 0 )
-        pButton->Show();
-    else
-        pButton->Hide();
-
-    pButton->SetClickHdl( LINK( this, BackingWindow, ExtLinkClickHdl ) );
-}
-
 void BackingWindow::Paint( const Rectangle& )
 {
     Resize();
@@ -460,52 +461,6 @@ void BackingWindow::Resize()
         Invalidate();
 }
 
-IMPL_LINK( BackingWindow, ExtLinkClickHdl, Button*, pButton )
-{
-    const char* pNode = NULL;
-
-    if( pButton == mpExtensionsButton )
-        pNode = "AddFeatureURL";
-    else if( pButton == mpInfoButton )
-        pNode = "InfoURL";
-    else if( pButton == mpTplRepButton )
-        pNode = "TemplateRepositoryURL";
-
-    if( pNode )
-    {
-        const char* pNodePath = "/org.openoffice.Office.Common/Help/StartCenter";
-        try
-        {
-            Reference<lang::XMultiServiceFactory> xConfig = configuration::theDefaultProvider::get( comphelper::getProcessComponentContext() );
-            Sequence<Any> args(1);
-            PropertyValue val(
-                "nodepath",
-                0,
-                Any(OUString::createFromAscii(pNodePath)),
-                PropertyState_DIRECT_VALUE);
-            args.getArray()[0] <<= val;
-            Reference<container::XNameAccess> xNameAccess(xConfig->createInstanceWithArguments(SERVICENAME_CFGREADACCESS,args), UNO_QUERY);
-            if( xNameAccess.is() )
-            {
-                OUString sURL;
-                //throws css::container::NoSuchElementException, css::lang::WrappedTargetException
-                Any value( xNameAccess->getByName(OUString::createFromAscii(pNode)) );
-                sURL = value.get<OUString> ();
-                localizeWebserviceURI(sURL);
-
-                Reference< com::sun::star::system::XSystemShellExecute > xSystemShellExecute(
-                    com::sun::star::system::SystemShellExecute::create(comphelper::getProcessComponentContext()));
-                //throws css::lang::IllegalArgumentException, css::system::SystemShellExecuteException
-                xSystemShellExecute->execute( sURL, OUString(), com::sun::star::system::SystemShellExecuteFlags::URIS_ONLY);
-            }
-        }
-        catch (const Exception&)
-        {
-        }
-    }
-    return 0;
-}
-
 IMPL_LINK( BackingWindow, ClickHdl, Button*, pButton )
 {
     // dispatch the appropriate URL and end the dialog
@@ -521,7 +476,10 @@ IMPL_LINK( BackingWindow, ClickHdl, Button*, pButton )
         dispatchURL( BASE_URL );
     else if( pButton == mpMathButton    || pButton == mpMathAllButton )
         dispatchURL( MATH_URL );
-    else if( pButton == mpOpenButton )
+    else if( pButton == mpOpenButton         ||
+             pButton == mpOpenWriterButton   || pButton == mpOpenCalcButton ||
+             pButton == mpOpenImpressButton  || pButton == mpOpenDrawButton ||
+             pButton == mpOpenDatabaseButton || pButton == mpOpenMathButton )
     {
         Reference< XDispatchProvider > xFrame( mxFrame, UNO_QUERY );
 
@@ -532,7 +490,10 @@ IMPL_LINK( BackingWindow, ClickHdl, Button*, pButton )
 
         dispatchURL( OPEN_URL, OUString(), xFrame, aArgs );
     }
-    else if( pButton == mpTemplateButton )
+    else if( pButton == mpTemplateButton            ||
+             pButton == mpTemplateWriterButton      || pButton == mpTemplateCalcButton  ||
+             pButton == mpTemplateImpressButton     || pButton == mpTemplateDrawButton  ||
+             pButton == mpTemplateDatabaseButton    || pButton == mpTemplateMathButton )
     {
         Reference< XDispatchProvider > xFrame( mxFrame, UNO_QUERY );
 
diff --git a/sfx2/source/dialog/backingwindow.hxx b/sfx2/source/dialog/backingwindow.hxx
index 4945e9571575..e03867d19b9f 100644
--- a/sfx2/source/dialog/backingwindow.hxx
+++ b/sfx2/source/dialog/backingwindow.hxx
@@ -55,7 +55,20 @@ class BackingWindow
     com::sun::star::uno::Reference< com::sun::star::datatransfer::dnd::XDropTargetListener > mxDropTargetListener;
 
     PushButton*                     mpOpenButton;
+    PushButton*                     mpOpenWriterButton;
+    PushButton*                     mpOpenCalcButton;
+    PushButton*                     mpOpenImpressButton;
+    PushButton*                     mpOpenDrawButton;
+    PushButton*                     mpOpenDatabaseButton;
+    PushButton*                     mpOpenMathButton;
+
     PushButton*                     mpTemplateButton;
+    PushButton*                     mpTemplateWriterButton;
+    PushButton*                     mpTemplateCalcButton;
+    PushButton*                     mpTemplateImpressButton;
+    PushButton*                     mpTemplateDrawButton;
+    PushButton*                     mpTemplateDatabaseButton;
+    PushButton*                     mpTemplateMathButton;
 
     TabControl*                     mpModuleNotebook;
 
@@ -73,10 +86,6 @@ class BackingWindow
     PushButton*                     mpDBAllButton;
     PushButton*                     mpMathAllButton;
 
-    PushButton*                     mpExtensionsButton;
-    PushButton*                     mpInfoButton;
-    PushButton*                     mpTplRepButton;
-
     PushButton*                     mpWriterShowTemplateButton;
     PushButton*                     mpCalcShowTemplateButton;
     PushButton*                     mpImpressShowTemplateButton;
@@ -114,7 +123,6 @@ class BackingWindow
     void setupButton( PushButton* pButton );
     void setupTemplateView( TemplateLocalView* pView, FILTER_APPLICATION eFilter,
                             PushButton* pRecentButton, PushButton* pTemplateButton );
-    void setupExternalLink( PushButton* pButton );
 
     void dispatchURL( const OUString& i_rURL,
                       const OUString& i_rTarget = OUString( "_default" ),
@@ -125,7 +133,6 @@ class BackingWindow
     DECL_LINK( ClickHdl, Button* );
     DECL_LINK( RecentTemplateToggleHdl, Button* );
     DECL_LINK( OpenTemplateHdl, ThumbnailViewItem* );
-    DECL_LINK( ExtLinkClickHdl, Button* );
 
     void initControls();
 
diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index b083caa3ad6e..4b00ec3b0bd9 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -30,6 +30,7 @@
 #include <sfx2/thumbnailviewitem.hxx>
 #include <sot/storage.hxx>
 #include <svtools/imagemgr.hxx>
+#include <svtools/langhelp.hxx>
 #include <svtools/miscopt.hxx>
 #include <svtools/PlaceEditDialog.hxx>
 #include <tools/urlobj.hxx>
@@ -41,6 +42,7 @@
 #include <vcl/toolbox.hxx>
 
 #include <com/sun/star/beans/PropertyValue.hpp>
+#include <com/sun/star/configuration/theDefaultProvider.hpp>
 #include <com/sun/star/document/MacroExecMode.hpp>
 #include <com/sun/star/document/UpdateDocMode.hpp>
 #include <com/sun/star/embed/XStorage.hpp>
@@ -53,6 +55,8 @@
 #include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>
 #include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
 #include <com/sun/star/ui/dialogs/FolderPicker.hpp>
+#include <com/sun/star/system/SystemShellExecute.hpp>
+#include <com/sun/star/system/SystemShellExecuteFlags.hpp>
 #include <com/sun/star/task/InteractionHandler.hpp>
 
 #include "doc.hrc"
@@ -64,6 +68,8 @@
 #define TM_SETTING_LASTFOLDER "LastFolder"
 #define TM_SETTING_FILTER "SelectedFilter"
 
+const char SERVICENAME_CFGREADACCESS[] = "com.sun.star.configuration.ConfigurationAccess";
+
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::embed;
@@ -448,7 +454,7 @@ void SfxTemplateManagerDlg::Resize()
 
     long nToolbarsHeight = std::max(std::max(aViewSize.getHeight(), aActionSize.getHeight()), aTemplateSize.getHeight());
 
-    aActionSize.setWidth(2.5*aActionSize.getWidth());
+    aActionSize.setWidth(3.35*aActionSize.getWidth());
     aViewSize.setWidth(aWinSize.getWidth()-aActionSize.getWidth()-mpViewBar->GetPosPixel().X());
     aTemplateSize.setWidth(aWinSize.getWidth());
 
@@ -516,6 +522,9 @@ IMPL_LINK_NOARG(SfxTemplateManagerDlg,TBXActionHdl)
     case TBI_TEMPLATE_SEARCH:
         OnTemplateSearch();
         break;
+    case TBI_TEMPLATE_LINK:
+        OnTemplateLink();
+        break;
     default:
         break;
     }
@@ -1175,6 +1184,40 @@ void SfxTemplateManagerDlg::OnTemplateSearch ()
         mpSearchEdit->GrabFocus();
 }
 
+void SfxTemplateManagerDlg::OnTemplateLink ()
+{
+    OUString sNode("TemplateRepositoryURL");
+    OUString sNodePath("/org.openoffice.Office.Common/Help/StartCenter");
+    try
+    {
+        Reference<lang::XMultiServiceFactory> xConfig = configuration::theDefaultProvider::get( comphelper::getProcessComponentContext() );
+        Sequence<Any> args(1);
+        PropertyValue val(
+            "nodepath",
+            0,
+            Any(sNodePath),
+            PropertyState_DIRECT_VALUE);
+        args.getArray()[0] <<= val;
+        Reference<container::XNameAccess> xNameAccess(xConfig->createInstanceWithArguments(SERVICENAME_CFGREADACCESS,args), UNO_QUERY);
+        if( xNameAccess.is() )
+        {
+            OUString sURL;
+            //throws css::container::NoSuchElementException, css::lang::WrappedTargetException
+            Any value( xNameAccess->getByName(sNode) );
+            sURL = value.get<OUString> ();
+            localizeWebserviceURI(sURL);
+
+            Reference< com::sun::star::system::XSystemShellExecute > xSystemShellExecute(
+                com::sun::star::system::SystemShellExecute::create(comphelper::getProcessComponentContext()));
+            //throws css::lang::IllegalArgumentException, css::system::SystemShellExecuteException
+            xSystemShellExecute->execute( sURL, OUString(), com::sun::star::system::SystemShellExecuteFlags::URIS_ONLY);
+        }
+    }
+    catch (const Exception&)
+    {
+    }
+}
+
 void SfxTemplateManagerDlg::OnTemplateOpen ()
 {
     ThumbnailViewItem *pItem = const_cast<ThumbnailViewItem*>(*maSelTemplates.begin());
diff --git a/sfx2/source/doc/templatedlg.hrc b/sfx2/source/doc/templatedlg.hrc
index 40bdfa0565e7..563f79f01e00 100644
--- a/sfx2/source/doc/templatedlg.hrc
+++ b/sfx2/source/doc/templatedlg.hrc
@@ -44,6 +44,7 @@
 #define TBI_TEMPLATE_FOLDER_NEW     29
 
 #define TBI_TEMPLATE_OPEN           30
+#define TBI_TEMPLATE_LINK           31
 
 #define STR_ACTION_REFRESH          263
 #define STR_ACTION_SORT_NAME        264
diff --git a/sfx2/source/doc/templatedlg.src b/sfx2/source/doc/templatedlg.src
index c205b996dbd3..aefd7619c8ef 100644
--- a/sfx2/source/doc/templatedlg.src
+++ b/sfx2/source/doc/templatedlg.src
@@ -215,6 +215,17 @@ TabPage TAB_TEMPLATE_MANAGER
                     ImageBitmap = Bitmap { File = "actionaction013.png" ; };
                 };
             };
+
+            ToolBoxItem
+            {
+                Identifier = TBI_TEMPLATE_LINK;
+                Text [en-US] = "Get more templates for %PRODUCTNAME";
+
+                ItemImage = Image
+                {
+                    ImageBitmap = Bitmap { File = "actionview010.png" ; };
+                };
+            };
         };
     };
 
diff --git a/sfx2/uiconfig/ui/startcenter.ui b/sfx2/uiconfig/ui/startcenter.ui
index f3280d433aab..4e9c5e899e79 100644
--- a/sfx2/uiconfig/ui/startcenter.ui
+++ b/sfx2/uiconfig/ui/startcenter.ui
@@ -1,41 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <!-- interface-requires LibreOffice 1.0 -->
-  <object class="GtkImage" id="add_temp_image">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="pixbuf">framework/res/addtemplate_32.png</property>
-  </object>
-  <object class="GtkImage" id="calc_all_image">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="pixbuf">res/ods_32_8.png</property>
-  </object>
-  <object class="GtkImage" id="calc_image">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="pixbuf">res/ods_32_8.png</property>
-  </object>
-  <object class="GtkImage" id="database_all_image">
+  <!-- interface-requires gtk+ 3.0 -->
+  <object class="GtkImage" id="open_image7">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="pixbuf">res/odb_32_8.png</property>
+    <property name="pixbuf">framework/res/folder_16.png</property>
   </object>
-  <object class="GtkImage" id="database_image">
+  <object class="GtkImage" id="open_image8">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="pixbuf">res/odb_32_8.png</property>
+    <property name="pixbuf">framework/res/folder_16.png</property>
   </object>
-  <object class="GtkImage" id="draw_all_image">
+  <object class="GtkImage" id="open_image9">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="pixbuf">res/odg_32_8.png</property>
-  </object>
-  <object class="GtkImage" id="draw_image">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="pixbuf">res/odg_32_8.png</property>
+    <property name="pixbuf">framework/res/folder_16.png</property>
   </object>
   <object class="GtkBox" id="StartCenter">
     <property name="can_focus">False</property>
@@ -45,7 +25,7 @@
         <property name="can_focus">False</property>
         <property name="hexpand">True</property>
         <property name="vexpand">True</property>
-        <property name="border_width">36</property>
+        <property name="border_width">24</property>
         <property name="row_spacing">12</property>
         <property name="column_spacing">12</property>
         <child>
@@ -60,7 +40,6 @@
                 <property name="can_focus">False</property>
                 <property name="border_width">12</property>
                 <property name="row_spacing">6</property>
-                <property name="column_spacing">6</property>
                 <child>
                   <object class="sfxlo-RecentDocsView" id="all_recent">
                     <property name="visible">True</property>
@@ -79,8 +58,6 @@
                   <object class="GtkGrid" id="grid16">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="hexpand">True</property>
-                    <property name="row_spacing">6</property>
                     <property name="column_spacing">6</property>
                     <child>
                       <object class="GtkButton" id="writer_all">
@@ -89,9 +66,10 @@
                         <property name="receives_default">True</property>
                         <property name="tooltip_text" translatable="yes">New Document</property>
                         <property name="image">writer_all_image</property>
+                        <property name="relief">none</property>
                       </object>
                       <packing>
-                        <property name="left_attach">0</property>
+                        <property name="left_attach">2</property>
                         <property name="top_attach">0</property>
                         <property name="width">1</property>
                         <property name="height">1</property>
@@ -104,9 +82,10 @@
                         <property name="receives_default">True</property>
                         <property name="tooltip_text" translatable="yes">New Spreadsheet</property>
                         <property name="image">calc_all_image</property>
+                        <property name="relief">none</property>
                       </object>
                       <packing>
-                        <property name="left_attach">1</property>
+                        <property name="left_attach">3</property>
                         <property name="top_attach">0</property>
                         <property name="width">1</property>
                         <property name="height">1</property>
@@ -119,9 +98,10 @@
                         <property name="receives_default">True</property>
                         <property name="tooltip_text" translatable="yes">New Presentation</property>
                         <property name="image">impress_all_image</property>
+                        <property name="relief">none</property>
                       </object>
                       <packing>
-                        <property name="left_attach">2</property>
+                        <property name="left_attach">4</property>
                         <property name="top_attach">0</property>
                         <property name="width">1</property>
                         <property name="height">1</property>
@@ -134,9 +114,10 @@
                         <property name="receives_default">True</property>
                         <property name="tooltip_text" translatable="yes">New Drawing</property>
                         <property name="image">draw_all_image</property>
+                        <property name="relief">none</property>
                       </object>
                       <packing>
-                        <property name="left_attach">3</property>
+                        <property name="left_attach">5</property>
                         <property name="top_attach">0</property>
                         <property name="width">1</property>
                         <property name="height">1</property>
@@ -149,9 +130,10 @@
                         <property name="receives_default">True</property>
                         <property name="tooltip_text" translatable="yes">New Database</property>
                         <property name="image">database_all_image</property>
+                        <property name="relief">none</property>
                       </object>
                       <packing>
-                        <property name="left_attach">4</property>
+                        <property name="left_attach">6</property>
                         <property name="top_attach">0</property>
                         <property name="width">1</property>
                         <property name="height">1</property>
@@ -164,9 +146,42 @@
                         <property name="receives_default">True</property>
                         <property name="tooltip_text" translatable="yes">New Formula</property>
                         <property name="image">math_all_image</property>
+                        <property name="relief">none</property>
                       </object>
                       <packing>
-                        <property name="left_attach">5</property>
+                        <property name="left_attach">7</property>
+                        <property name="top_attach">0</property>
+                        <property name="width">1</property>
+                        <property name="height">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkButton" id="open_all">
+                        <property name="label" translatable="yes">Open</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">True</property>
+                        <property name="image">open_image</property>
+                        <property name="relief">none</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">0</property>
+                        <property name="width">1</property>
+                        <property name="height">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkButton" id="templates_all">
+                        <property name="label" translatable="yes">Templates</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">True</property>
+                        <property name="image">templates_image</property>
+                        <property name="relief">none</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">1</property>
                         <property name="top_attach">0</property>
                         <property name="width">1</property>
                         <property name="height">1</property>
@@ -197,13 +212,12 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="border_width">12</property>
-                <property name="row_spacing">12</property>
-                <property name="column_spacing">12</property>
+                <property name="row_spacing">6</property>
                 <child>
                   <object class="GtkGrid" id="grid5">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="column_spacing">12</property>
+                    <property name="column_spacing">6</property>
                     <child>
                       <object class="GtkButton" id="writer">
                         <property name="label" translatable="yes">New Document</property>
@@ -211,9 +225,10 @@
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
                         <property name="image">writer_image</property>
+                        <property name="relief">none</property>
                       </object>
                       <packing>
-                        <property name="left_attach">0</property>
+                        <property name="left_attach">2</property>
                         <property name="top_attach">0</property>
                         <property name="width">1</property>
                         <property name="height">1</property>
@@ -225,9 +240,10 @@
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
+                        <property name="relief">none</property>
                       </object>
                       <packing>
-                        <property name="left_attach">2</property>
+                        <property name="left_attach">4</property>
                         <property name="top_attach">0</property>
                         <property name="width">1</property>
                         <property name="height">1</property>
@@ -239,6 +255,39 @@
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
+                        <property name="relief">none</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">3</property>
+                        <property name="top_attach">0</property>
+                        <property name="width">1</property>
+                        <property name="height">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkButton" id="open_writer">
+                        <property name="label" translatable="yes">Open</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">True</property>
+                        <property name="image">open_image10</property>
+                        <property name="relief">none</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">0</property>
+                        <property name="width">1</property>
+                        <property name="height">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkButton" id="templates_writer">
+                        <property name="label" translatable="yes">Templates</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">True</property>
+                        <property name="image">templates_image1</property>
+                        <property name="relief">none</property>
                       </object>
                       <packing>
                         <property name="left_attach">1</property>
@@ -318,13 +367,12 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="border_width">12</property>
-                <property name="row_spacing">12</property>
-                <property name="column_spacing">12</property>
+                <property name="row_spacing">6</property>
                 <child>
                   <object class="GtkGrid" id="grid7">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="column_spacing">12</property>
+                    <property name="column_spacing">6</property>
                     <child>
                       <object class="GtkButton" id="calc">
                         <property name="label" translatable="yes">New Spreadsheet</property>
@@ -332,9 +380,10 @@
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
                         <property name="image">calc_image</property>
+                        <property name="relief">none</property>
                       </object>
                       <packing>
-                        <property name="left_attach">0</property>
+                        <property name="left_attach">2</property>
                         <property name="top_attach">0</property>
                         <property name="width">1</property>
                         <property name="height">1</property>
@@ -346,9 +395,10 @@
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
+                        <property name="relief">none</property>
                       </object>
                       <packing>
-                        <property name="left_attach">1</property>
+                        <property name="left_attach">3</property>
                         <property name="top_attach">0</property>
                         <property name="width">1</property>
                         <property name="height">1</property>
@@ -360,9 +410,42 @@
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
+                        <property name="relief">none</property>
                       </object>
                       <packing>
-                        <property name="left_attach">2</property>
+                        <property name="left_attach">4</property>
+                        <property name="top_attach">0</property>
+                        <property name="width">1</property>
+                        <property name="height">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkButton" id="open_calc">
+                        <property name="label" translatable="yes">Open</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">True</property>
+                        <property name="image">open_image9</property>
+                        <property name="relief">none</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">0</property>
+                        <property name="width">1</property>
+                        <property name="height">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkButton" id="templates_calc">
+                        <property name="label" translatable="yes">Templates</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">True</property>
+                        <property name="image">templates_image2</property>
+                        <property name="relief">none</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">1</property>
                         <property name="top_attach">0</property>
                         <property name="width">1</property>
                         <property name="height">1</property>
@@ -439,13 +522,12 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="border_width">12</property>
-                <property name="row_spacing">12</property>
-                <property name="column_spacing">12</property>
+                <property name="row_spacing">6</property>
                 <child>
                   <object class="GtkGrid" id="grid9">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="column_spacing">12</property>
+                    <property name="column_spacing">6</property>
                     <child>
                       <object class="GtkButton" id="impress">
                         <property name="label" translatable="yes">New Presentation</property>
@@ -453,9 +535,10 @@
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
                         <property name="image">impress_image</property>
+                        <property name="relief">none</property>
                       </object>
                       <packing>
-                        <property name="left_attach">0</property>
+                        <property name="left_attach">2</property>
                         <property name="top_attach">0</property>
                         <property name="width">1</property>
                         <property name="height">1</property>
@@ -467,9 +550,10 @@
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
+                        <property name="relief">none</property>
                       </object>
                       <packing>
-                        <property name="left_attach">1</property>
+                        <property name="left_attach">3</property>
                         <property name="top_attach">0</property>
                         <property name="width">1</property>
                         <property name="height">1</property>
@@ -481,9 +565,42 @@
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
+                        <property name="relief">none</property>
                       </object>
                       <packing>
-                        <property name="left_attach">2</property>
+                        <property name="left_attach">4</property>
+                        <property name="top_attach">0</property>
+                        <property name="width">1</property>
+                        <property name="height">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkButton" id="open_impress">
+                        <property name="label" translatable="yes">Open</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">True</property>
+                        <property name="image">open_image8</property>
+                        <property name="relief">none</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">0</property>
+                        <property name="width">1</property>
+                        <property name="height">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkButton" id="templates_impress">
+                        <property name="label" translatable="yes">Templates</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">True</property>
+                        <property name="image">templates_image3</property>
+                        <property name="relief">none</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">1</property>
                         <property name="top_attach">0</property>
                         <property name="width">1</property>
                         <property name="height">1</property>
@@ -560,13 +677,12 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="border_width">12</property>
-                <property name="row_spacing">12</property>
-                <property name="column_spacing">12</property>
+                <property name="row_spacing">6</property>
                 <child>
                   <object class="GtkGrid" id="grid11">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="column_spacing">12</property>
+                    <property name="column_spacing">6</property>
                     <child>
                       <object class="GtkButton" id="draw">
                         <property name="label" translatable="yes">New Drawing</property>
@@ -574,9 +690,10 @@
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
                         <property name="image">draw_image</property>
+                        <property name="relief">none</property>
                       </object>
                       <packing>
-                        <property name="left_attach">0</property>
+                        <property name="left_attach">2</property>
                         <property name="top_attach">0</property>
                         <property name="width">1</property>
                         <property name="height">1</property>
@@ -588,9 +705,10 @@
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
+                        <property name="relief">none</property>
                       </object>
                       <packing>
-                        <property name="left_attach">1</property>
+                        <property name="left_attach">3</property>
                         <property name="top_attach">0</property>
                         <property name="width">1</property>
                         <property name="height">1</property>
@@ -602,9 +720,42 @@
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
+                        <property name="relief">none</property>
                       </object>
                       <packing>
-                        <property name="left_attach">2</property>
+                        <property name="left_attach">4</property>
+                        <property name="top_attach">0</property>
+                        <property name="width">1</property>
+                        <property name="height">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkButton" id="open_draw">
+                        <property name="label" translatable="yes">Open</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">True</property>
+                        <property name="image">open_image7</property>
+                        <property name="relief">none</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">0</property>
+                        <property name="top_attach">0</property>
+                        <property name="width">1</property>
+                        <property name="height">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkButton" id="templates_draw">
+                        <property name="label" translatable="yes">Templates</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">True</property>
+                        <property name="image">templates_image4</property>
+                        <property name="relief">none</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">1</property>
                         <property name="top_attach">0</property>
                         <property name="width">1</property>
                         <property name="height">1</property>
@@ -681,12 +832,12 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="border_width">12</property>
-                <property name="row_spacing">12</property>
-                <property name="column_spacing">12</property>
+                <property name="row_spacing">6</property>
                 <child>
                   <object class="GtkGrid" id="grid13">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
+                    <property name="column_spacing">6</property>
                     <child>
                       <object class="GtkButton" id="database">
                         <property name="label" translatable="yes">New Database</property>
@@ -694,6 +845,23 @@
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
                         <property name="image">database_image</property>
+                        <property name="relief">none</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">2</property>
+                        <property name="top_attach">0</property>
+                        <property name="width">1</property>
+                        <property name="height">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkButton" id="open_database">
+                        <property name="label" translatable="yes">Open</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">True</property>
+                        <property name="image">open_image5</property>
+                        <property name="relief">none</property>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
@@ -702,6 +870,22 @@
                         <property name="height">1</property>
                       </packing>
                     </child>
+                    <child>
+                      <object class="GtkButton" id="templates_database">
+                        <property name="label" translatable="yes">Templates</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">True</property>
+                        <property name="image">templates_image5</property>
+                        <property name="relief">none</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="top_attach">0</property>
+                        <property name="width">1</property>
+                        <property name="height">1</property>
+                      </packing>
+                    </child>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
@@ -745,12 +929,12 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="border_width">12</property>
-                <property name="row_spacing">12</property>
-                <property name="column_spacing">12</property>
+                <property name="row_spacing">6</property>
                 <child>
                   <object class="GtkGrid" id="grid15">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
+                    <property name="column_spacing">6</property>
                     <child>
                       <object class="GtkButton" id="math">
                         <property name="label" translatable="yes">New Formula</property>
@@ -758,6 +942,23 @@
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
                         <property name="image">math_image</property>
+                        <property name="relief">none</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">2</property>
+                        <property name="top_attach">0</property>
+                        <property name="width">1</property>
+                        <property name="height">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkButton" id="open_math">
+                        <property name="label" translatable="yes">Open</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">True</property>
+                        <property name="image">open_image6</property>
+                        <property name="relief">none</property>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
@@ -766,6 +967,22 @@
                         <property name="height">1</property>
                       </packing>
                     </child>
+                    <child>
+                      <object class="GtkButton" id="templates_math">
+                        <property name="label" translatable="yes">Templates</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">True</property>
+                        <property name="image">templates_image6</property>
+                        <property name="relief">none</property>
+                      </object>
+                      <packing>
+                        <property name="left_attach">1</property>
+                        <property name="top_attach">0</property>
+                        <property name="width">1</property>
+                        <property name="height">1</property>
+                      </packing>
+                    </child>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
@@ -807,141 +1024,6 @@
           </object>
           <packing>
             <property name="left_attach">0</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkGrid" id="grid17">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="hexpand">True</property>
-            <property name="row_spacing">12</property>
-            <property name="column_spacing">12</property>
-            <child>
-              <object class="GtkLabel" id="label16">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="hexpand">True</property>
-              </object>
-              <packing>
-                <property name="left_attach">1</property>
-                <property name="top_attach">0</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkImage" id="image1">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="pixbuf">sfx2/res/startcenter-logo.png</property>
-              </object>
-              <packing>
-                <property name="left_attach">0</property>
-                <property name="top_attach">0</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkGrid" id="grid3">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="column_spacing">12</property>
-                <child>
-                  <object class="GtkButton" id="open">
-                    <property name="label" translatable="yes">Open</property>
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">True</property>
-                    <property name="image">open_image</property>
-                  </object>
-                  <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">0</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkButton" id="templates">
-                    <property name="label" translatable="yes">Templates</property>
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">True</property>
-                    <property name="image">templates_image</property>
-                  </object>
-                  <packing>
-                    <property name="left_attach">1</property>
-                    <property name="top_attach">0</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkButton" id="add_temp">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">True</property>
-                    <property name="has_tooltip">True</property>
-                    <property name="tooltip_markup" translatable="yes">Get more templates for %PRODUCTNAME</property>
-                    <property name="tooltip_text" translatable="yes">Get more templates for %PRODUCTNAME</property>
-                    <property name="image">add_temp_image</property>
-                  </object>
-                  <packing>
-                    <property name="left_attach">2</property>
-                    <property name="top_attach">0</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkButton" id="extension">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">True</property>
-                    <property name="has_tooltip">True</property>
-                    <property name="tooltip_markup" translatable="yes">Add new features to %PRODUCTNAME</property>
-                    <property name="tooltip_text" translatable="yes">Add new features to %PRODUCTNAME</property>
-                    <property name="image">extension_image</property>
-                  </object>
-                  <packing>
-                    <property name="left_attach">3</property>
-                    <property name="top_attach">0</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkButton" id="info">
-                    <property name="visible">True</property>
-                    <property name="can_focus">True</property>
-                    <property name="receives_default">True</property>
-                    <property name="has_tooltip">True</property>
-                    <property name="tooltip_markup" translatable="yes">Get more information about %PRODUCTNAME</property>
-                    <property name="tooltip_text" translatable="yes">Get more information about %PRODUCTNAME</property>
-                    <property name="image">info_image</property>
-                  </object>
-                  <packing>
-                    <property name="left_attach">4</property>
-                    <property name="top_attach">0</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
-                  </packing>
-                </child>
-              </object>
-              <packing>
-                <property name="left_attach">2</property>
-                <property name="top_attach">0</property>
-                <property name="width">1</property>
-                <property name="height">1</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="left_attach">0</property>
             <property name="top_attach">0</property>
             <property name="width">1</property>
             <property name="height">1</property>
@@ -955,55 +1037,120 @@
       </packing>
     </child>
   </object>
-  <object class="GtkImage" id="extension_image">
+  <object class="GtkImage" id="calc_all_image">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="pixbuf">framework/res/extension.png</property>
+    <property name="pixbuf">res/ods_16_8.png</property>
   </object>
-  <object class="GtkImage" id="impress_all_image">
+  <object class="GtkImage" id="calc_image">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="tooltip_text" translatable="yes">New Presentation</property>
-    <property name="pixbuf">res/odp_32_8.png</property>
+    <property name="pixbuf">res/ods_16_8.png</property>
   </object>
-  <object class="GtkImage" id="impress_image">
+  <object class="GtkImage" id="database_all_image">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="pixbuf">res/odp_32_8.png</property>
+    <property name="pixbuf">res/odb_16_8.png</property>
   </object>
-  <object class="GtkImage" id="info_image">
+  <object class="GtkImage" id="database_image">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="pixbuf">res/odb_16_8.png</property>
+  </object>
+  <object class="GtkImage" id="draw_all_image">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="pixbuf">res/odg_16_8.png</property>
+  </object>
+  <object class="GtkImage" id="draw_image">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="pixbuf">framework/res/info_26.png</property>
+    <property name="pixbuf">res/odg_16_8.png</property>
+  </object>
+  <object class="GtkImage" id="impress_all_image">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="tooltip_text" translatable="yes">New Presentation</property>
+    <property name="pixbuf">res/odp_16_8.png</property>
+  </object>
+  <object class="GtkImage" id="impress_image">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="pixbuf">res/odp_16_8.png</property>
   </object>
   <object class="GtkImage" id="math_all_image">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="pixbuf">res/odf_32_8.png</property>
+    <property name="pixbuf">res/odf_16_8.png</property>
   </object>
   <object class="GtkImage" id="math_image">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="pixbuf">res/odf_32_8.png</property>
+    <property name="pixbuf">res/odf_16_8.png</property>
   </object>
   <object class="GtkImage" id="open_image">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="pixbuf">framework/res/folder_32.png</property>
+    <property name="pixbuf">framework/res/folder_16.png</property>
+  </object>
+  <object class="GtkImage" id="open_image10">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="pixbuf">framework/res/folder_16.png</property>
+  </object>
+  <object class="GtkImage" id="open_image5">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="pixbuf">framework/res/folder_16.png</property>
+  </object>
+  <object class="GtkImage" id="open_image6">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="pixbuf">framework/res/folder_16.png</property>
   </object>
   <object class="GtkImage" id="templates_image">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="pixbuf">framework/res/templates_32.png</property>
+    <property name="pixbuf">framework/res/templates_16.png</property>
+  </object>
+  <object class="GtkImage" id="templates_image1">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="pixbuf">framework/res/templates_16.png</property>
+  </object>
+  <object class="GtkImage" id="templates_image2">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="pixbuf">framework/res/templates_16.png</property>
+  </object>
+  <object class="GtkImage" id="templates_image3">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="pixbuf">framework/res/templates_16.png</property>
+  </object>
+  <object class="GtkImage" id="templates_image4">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="pixbuf">framework/res/templates_16.png</property>
+  </object>
+  <object class="GtkImage" id="templates_image5">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="pixbuf">framework/res/templates_16.png</property>
+  </object>
+  <object class="GtkImage" id="templates_image6">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="pixbuf">framework/res/templates_16.png</property>
   </object>
   <object class="GtkImage" id="writer_all_image">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="pixbuf">res/odt_32_8.png</property>
+    <property name="pixbuf">res/odt_16_8.png</property>
   </object>
   <object class="GtkImage" id="writer_image">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="pixbuf">res/odt_32_8.png</property>
+    <property name="pixbuf">res/odt_16_8.png</property>
   </object>
 </interface>