startcenter: Rework completely according to the new design.

Only the background bitmap that will show behind the buttons is missing at the
moment, will come later.

Change-Id: I60e8f74ab28383ce1e891367ba5d2aff23d787ff

3 files changed, 237 insertions, 1352 deletions

diff --git a/sfx2/source/dialog/backingwindow.cxx b/sfx2/source/dialog/backingwindow.cxx
index fa3408f21fff..1b50bf3accf1 100644
--- a/sfx2/source/dialog/backingwindow.cxx
+++ b/sfx2/source/dialog/backingwindow.cxx
@@ -62,6 +62,9 @@ const int nTemplateItemPadding = 5;
 const int nTemplateItemMaxTextLength = 20;
 const int nTemplateItemThumbnailMaxHeight = 96;
 
+const Color aButtonsBackground(114, 168, 84); // TDF green
+const Color aButtonsText(COL_WHITE);
+
 BackingWindow::BackingWindow( Window* i_pParent ) :
     Window( i_pParent ),
     mxDesktop( Desktop::create(comphelper::getProcessComponentContext()) ),
@@ -69,76 +72,31 @@ BackingWindow::BackingWindow( Window* i_pParent ) :
     mnHideExternalLinks( 0 ),
     mpAccExec( NULL )
 {
-    m_pUIBuilder = new VclBuilder(this, getUIRootDir(),
-      "sfx/ui/startcenter.ui",
-      "StartCenter" );
-
-    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");
-
-    get(mpWriterButton,     "writer");
-    get(mpCalcButton,       "calc");
-    get(mpImpressButton,    "impress");
-    get(mpDrawButton,       "draw");
-    get(mpDBButton,         "database");
-    get(mpMathButton,       "math");
-
-    get(mpWriterAllButton,  "writer_all");
-    get(mpCalcAllButton,    "calc_all");
+    m_pUIBuilder = new VclBuilder(this, getUIRootDir(), "sfx/ui/startcenter.ui", "StartCenter" );
+
+    get(mpOpenButton, "open_all");
+    get(mpTemplateButton, "templates_all");
+
+    get(mpCreateLabel, "create_label");
+
+    get(mpWriterAllButton, "writer_all");
+    get(mpCalcAllButton, "calc_all");
     get(mpImpressAllButton, "impress_all");
-    get(mpDrawAllButton,    "draw_all");
-    get(mpDBAllButton,      "database_all");
-    get(mpMathAllButton,    "math_all");
-
-    get(mpWriterShowTemplateButton,     "show_writer_template");
-    get(mpCalcShowTemplateButton,       "show_calc_template");
-    get(mpImpressShowTemplateButton,    "show_impress_template");
-    get(mpDrawShowTemplateButton,       "show_draw_template");
-
-    get(mpWriterShowRecentButton,       "show_writer_recent");
-    get(mpCalcShowRecentButton,         "show_calc_recent");
-    get(mpImpressShowRecentButton,      "show_impress_recent");
-    get(mpDrawShowRecentButton,         "show_draw_recent");
-
-    get( mpAllRecentThumbnails,         "all_recent");
-    get( mpWriterRecentThumbnails,      "writer_recent");
-    get( mpCalcRecentThumbnails,        "calc_recent");
-    get( mpImpressRecentThumbnails,     "impress_recent");
-    get( mpDrawRecentThumbnails,        "draw_recent");
-    get( mpDatabaseRecentThumbnails,    "database_recent");
-    get( mpMathRecentThumbnails,        "math_recent");
-
-    get( mpWriterTemplateThumbnails,    "writer_templates");
-    get( mpCalcTemplateThumbnails,      "calc_templates");
-    get( mpImpressTemplateThumbnails,   "impress_templates");
-    get( mpDrawTemplateThumbnails,      "draw_templates");
+    get(mpDrawAllButton, "draw_all");
+    get(mpDBAllButton, "database_all");
+    get(mpMathAllButton, "math_all");
+
+    get(mpHelpButton, "help");
+    get(mpExtensionsButton, "extensions");
+
+    get(mpAllButtonsBox, "all_buttons_box");
+    get(mpPictureBox, "picture_box");
+    get(mpButtonsBox, "buttons_box");
+    get(mpSmallButtonsBox, "small_buttons_box");
+
+    get(mpAllRecentThumbnails, "all_recent");
 
     maDndWindows.push_back(mpAllRecentThumbnails);
-    maDndWindows.push_back(mpWriterRecentThumbnails);
-    maDndWindows.push_back(mpCalcRecentThumbnails);
-    maDndWindows.push_back(mpImpressRecentThumbnails);
-    maDndWindows.push_back(mpDrawRecentThumbnails);
-    maDndWindows.push_back(mpDatabaseRecentThumbnails);
-    maDndWindows.push_back(mpMathRecentThumbnails);
-    maDndWindows.push_back(mpWriterTemplateThumbnails);
-    maDndWindows.push_back(mpCalcTemplateThumbnails);
-    maDndWindows.push_back(mpImpressTemplateThumbnails);
-    maDndWindows.push_back(mpDrawTemplateThumbnails);
 
     try
     {
@@ -176,35 +134,15 @@ BackingWindow::BackingWindow( Window* i_pParent ) :
     Reference<XDesktop2> xDesktop = Desktop::create( comphelper::getProcessComponentContext() );
     mxDesktopDispatchProvider = xDesktop;
 
-    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" );
+    mpOpenButton->SetHelpId( ".HelpId:StartCenter:OpenButton" );
+    mpTemplateButton->SetHelpId( ".HelpId:StartCenter:TemplateButton" );
+
+    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();
@@ -213,11 +151,6 @@ BackingWindow::BackingWindow( Window* i_pParent ) :
 
 BackingWindow::~BackingWindow()
 {
-    mpWriterTemplateThumbnails  ->setOpenTemplateHdl(Link());
-    mpCalcTemplateThumbnails    ->setOpenTemplateHdl(Link());
-    mpImpressTemplateThumbnails ->setOpenTemplateHdl(Link());
-    mpDrawTemplateThumbnails    ->setOpenTemplateHdl(Link());
-
     // deregister drag&drop helper
     if (mxDropTargetListener.is())
     {
@@ -235,7 +168,6 @@ BackingWindow::~BackingWindow()
         }
         mxDropTargetListener = css::uno::Reference< css::datatransfer::dnd::XDropTargetListener >();
     }
-
 }
 
 void BackingWindow::initControls()
@@ -262,37 +194,32 @@ void BackingWindow::initControls()
             aFileNewAppsAvailable.insert( sURL );
     }
 
-    setupModuleTab( "tab_writer", mpWriterRecentThumbnails, TYPE_WRITER,
-        WRITER_URL, aFileNewAppsAvailable, aModuleOptions,
-        SvtModuleOptions::E_SWRITER );
-    setupModuleTab( "tab_calc", mpCalcRecentThumbnails, TYPE_CALC,
-        DRAW_URL, aFileNewAppsAvailable, aModuleOptions,
-        SvtModuleOptions::E_SDRAW );
-    setupModuleTab( "tab_impress", mpImpressRecentThumbnails, TYPE_IMPRESS,
-        CALC_URL, aFileNewAppsAvailable, aModuleOptions,
-        SvtModuleOptions::E_SCALC );
-    setupModuleTab( "tab_draw", mpDrawRecentThumbnails, TYPE_DRAW,
-        BASE_URL, aFileNewAppsAvailable, aModuleOptions,
-        SvtModuleOptions::E_SDATABASE );
-    setupModuleTab( "tab_database", mpDatabaseRecentThumbnails, TYPE_DATABASE,
-        IMPRESS_WIZARD_URL, aFileNewAppsAvailable, aModuleOptions,
-        SvtModuleOptions::E_SIMPRESS );
-    setupModuleTab( "tab_math", mpMathRecentThumbnails, TYPE_MATH,
-        MATH_URL, aFileNewAppsAvailable, aModuleOptions,
-        SvtModuleOptions::E_SMATH );
-
-    // File types for mpAllRecentThumbnails are added in the above calls
-    // of setupModuleTab. TYPE_OTHER is always added.
+    if (aModuleOptions.IsModuleInstalled(SvtModuleOptions::E_SWRITER))
+        mpAllRecentThumbnails->mnFileTypes |= TYPE_WRITER;
+
+    if (aModuleOptions.IsModuleInstalled(SvtModuleOptions::E_SCALC))
+        mpAllRecentThumbnails->mnFileTypes |= TYPE_CALC;
+
+    if (aModuleOptions.IsModuleInstalled(SvtModuleOptions::E_SIMPRESS))
+        mpAllRecentThumbnails->mnFileTypes |= TYPE_IMPRESS;
+
+    if (aModuleOptions.IsModuleInstalled(SvtModuleOptions::E_SDRAW))
+        mpAllRecentThumbnails->mnFileTypes |= TYPE_DRAW;
+
+    if (aModuleOptions.IsModuleInstalled(SvtModuleOptions::E_SDATABASE))
+        mpAllRecentThumbnails->mnFileTypes |= TYPE_DATABASE;
+
+    if (aModuleOptions.IsModuleInstalled(SvtModuleOptions::E_SMATH))
+        mpAllRecentThumbnails->mnFileTypes |= TYPE_MATH;
+
     mpAllRecentThumbnails->mnFileTypes |= TYPE_OTHER;
     mpAllRecentThumbnails->loadRecentDocs();
     mpAllRecentThumbnails->ShowTooltips( true );
 
-    setupButton( mpWriterButton );
-    setupButton( mpDrawButton );
-    setupButton( mpCalcButton );
-    setupButton( mpDBButton );
-    setupButton( mpImpressButton );
-    setupButton( mpMathButton );
+    setupButton( mpOpenButton );
+    setupButton( mpTemplateButton );
+
+    mpCreateLabel->SetControlForeground(aButtonsText);
 
     setupButton( mpWriterAllButton );
     setupButton( mpDrawAllButton );
@@ -301,88 +228,30 @@ void BackingWindow::initControls()
     setupButton( mpImpressAllButton );
     setupButton( mpMathAllButton );
 
-    setupButton( mpOpenButton );
-    setupButton( mpOpenWriterButton );
-    setupButton( mpOpenCalcButton );
-    setupButton( mpOpenImpressButton );
-    setupButton( mpOpenDrawButton );
-    setupButton( mpOpenDatabaseButton );
-    setupButton( mpOpenMathButton );
+    mpHelpButton->SetControlForeground(aButtonsText);
+    mpExtensionsButton->SetControlForeground(aButtonsText);
 
-    setupButton( mpTemplateButton );
-    setupButton( mpTemplateWriterButton );
-    setupButton( mpTemplateCalcButton );
-    setupButton( mpTemplateImpressButton );
-    setupButton( mpTemplateDrawButton );
-    setupButton( mpTemplateDatabaseButton );
-    setupButton( mpTemplateMathButton );
-
-    setupTemplateView( mpWriterTemplateThumbnails,  FILTER_APP_WRITER,
-                       mpWriterShowRecentButton,    mpWriterShowTemplateButton );
-    setupTemplateView( mpCalcTemplateThumbnails,    FILTER_APP_CALC,
-                       mpCalcShowRecentButton,      mpCalcShowTemplateButton );
-    setupTemplateView( mpImpressTemplateThumbnails, FILTER_APP_IMPRESS,
-                       mpImpressShowRecentButton,   mpImpressShowTemplateButton );
-    setupTemplateView( mpDrawTemplateThumbnails,    FILTER_APP_DRAW,
-                       mpDrawShowRecentButton,      mpDrawShowTemplateButton );
+    mpAllButtonsBox->SetBackground(aButtonsBackground);
+    mpPictureBox->SetBackground(aButtonsBackground);
+    mpButtonsBox->SetBackground(aButtonsBackground);
+    mpSmallButtonsBox->SetBackground(aButtonsBackground);
 
     Resize();
 }
 
-void BackingWindow::setupModuleTab(const OString& rTabName, RecentDocsView* pRecView, int nFileTypes,
-    const OUString &rURL, const std::set<OUString>& rURLS, SvtModuleOptions& rOpt,
-    SvtModuleOptions::EModule eMod)
-{
-    if( !rURL.isEmpty() && (!rOpt.IsModuleInstalled( eMod ) || rURLS.find( rURL ) == rURLS.end()) )
-    {
-        // disable the parts that are not installed
-        mpModuleNotebook->RemovePage( mpModuleNotebook->GetPageId(rTabName) );
-    }
-    else
-    {
-        // if a module is installed, add that filetype to the "All" page
-        mpAllRecentThumbnails-> mnFileTypes |= nFileTypes;
-        pRecView->mnFileTypes |= nFileTypes;
-        pRecView->loadRecentDocs();
-        pRecView->ShowTooltips( true );
-    }
-}
-
 void BackingWindow::setupButton( PushButton* pButton )
 {
-    pButton->SetClickHdl( LINK( this, BackingWindow, ClickHdl ) );
-}
+    // the buttons should have a bit bigger font
+    Font aFont(pButton->GetControlFont());
+    aFont.SetHeight(15);
+    pButton->SetControlFont(aFont);
 
-void BackingWindow::setupTemplateView( TemplateLocalView* pView, FILTER_APPLICATION eFilter,
-                                       PushButton* pRecentButton, PushButton* pTemplateButton )
-{
-    // setup view
-    pView->SetStyle(pView->GetStyle() | WB_VSCROLL);
-    pView->setItemMaxTextLength(nTemplateItemMaxTextLength);
-
-    pView->setItemDimensions(nTemplateItemMaxWidth, nTemplateItemThumbnailMaxHeight,
-                              nTemplateItemMaxHeight-nTemplateItemThumbnailMaxHeight,
-                              nTemplateItemPadding);
-    pView->filterItems(ViewFilter_Application(eFilter));
-    pView->Populate();
-    pView->Hide(); // hidden by default
-    pView->showRootRegion();
-    pView->setOpenTemplateHdl( LINK( this, BackingWindow, OpenTemplateHdl ) );
-
-    if( pView->HasUnfilteredItems(eFilter) )
-    {
-        // setup buttons
-        pRecentButton->SetClickHdl( LINK( this, BackingWindow, RecentTemplateToggleHdl ) );
-        pTemplateButton->SetClickHdl( LINK( this, BackingWindow, RecentTemplateToggleHdl ) );
+    // color that fits the theme
+    pButton->SetControlForeground(aButtonsText);
 
-        pRecentButton->Hide();  // hidden by default
-    }
-    else // no templates, hide toggle button
-    {
-        pTemplateButton->Hide();
-        pRecentButton->Hide();
-    }
+    pButton->SetClickHdl( LINK( this, BackingWindow, ClickHdl ) );
 }
+
 void BackingWindow::Paint( const Rectangle& )
 {
     Resize();
@@ -466,22 +335,19 @@ void BackingWindow::Resize()
 IMPL_LINK( BackingWindow, ClickHdl, Button*, pButton )
 {
     // dispatch the appropriate URL and end the dialog
-    if( pButton == mpWriterButton       || pButton == mpWriterAllButton )
+    if( pButton == mpWriterAllButton )
         dispatchURL( WRITER_URL );
-    else if( pButton == mpCalcButton    || pButton == mpCalcAllButton )
+    else if( pButton == mpCalcAllButton )
         dispatchURL( CALC_URL );
-    else if( pButton == mpImpressButton || pButton == mpImpressAllButton )
+    else if( pButton == mpImpressAllButton )
         dispatchURL( IMPRESS_WIZARD_URL );
-    else if( pButton == mpDrawButton    || pButton == mpDrawAllButton )
+    else if( pButton == mpDrawAllButton )
         dispatchURL( DRAW_URL );
-    else if( pButton == mpDBButton      || pButton == mpDBAllButton )
+    else if( pButton == mpDBAllButton )
         dispatchURL( BASE_URL );
-    else if( pButton == mpMathButton    || pButton == mpMathAllButton )
+    else if( pButton == mpMathAllButton )
         dispatchURL( MATH_URL );
-    else if( pButton == mpOpenButton         ||
-             pButton == mpOpenWriterButton   || pButton == mpOpenCalcButton ||
-             pButton == mpOpenImpressButton  || pButton == mpOpenDrawButton ||
-             pButton == mpOpenDatabaseButton || pButton == mpOpenMathButton )
+    else if( pButton == mpOpenButton )
     {
         Reference< XDispatchProvider > xFrame( mxFrame, UNO_QUERY );
 
@@ -492,10 +358,7 @@ IMPL_LINK( BackingWindow, ClickHdl, Button*, pButton )
 
         dispatchURL( OPEN_URL, OUString(), xFrame, aArgs );
     }
-    else if( pButton == mpTemplateButton            ||
-             pButton == mpTemplateWriterButton      || pButton == mpTemplateCalcButton  ||
-             pButton == mpTemplateImpressButton     || pButton == mpTemplateDrawButton  ||
-             pButton == mpTemplateDatabaseButton    || pButton == mpTemplateMathButton )
+    else if( pButton == mpTemplateButton )
     {
         Reference< XDispatchProvider > xFrame( mxFrame, UNO_QUERY );
 
@@ -509,79 +372,6 @@ IMPL_LINK( BackingWindow, ClickHdl, Button*, pButton )
     return 0;
 }
 
-IMPL_LINK( BackingWindow, RecentTemplateToggleHdl, Button*, pButton )
-{
-    // writer
-    if( pButton == mpWriterShowTemplateButton )
-    {
-        mpWriterRecentThumbnails->Hide();
-        mpWriterShowTemplateButton->Hide();
-        mpWriterTemplateThumbnails->Show();
-        mpWriterShowRecentButton->Show();
-        mpWriterShowRecentButton->GrabFocus();
-    }
-    else if( pButton == mpWriterShowRecentButton )
-    {
-        mpWriterTemplateThumbnails->Hide();
-        mpWriterShowRecentButton->Hide();
-        mpWriterRecentThumbnails->Show();
-        mpWriterShowTemplateButton->Show();
-        mpWriterShowTemplateButton->GrabFocus();
-    }
-    // calc
-    else if( pButton == mpCalcShowTemplateButton )
-    {
-        mpCalcRecentThumbnails->Hide();
-        mpCalcShowTemplateButton->Hide();
-        mpCalcTemplateThumbnails->Show();
-        mpCalcShowRecentButton->Show();
-        mpCalcShowRecentButton->GrabFocus();
-    }
-    else if( pButton == mpCalcShowRecentButton )
-    {
-        mpCalcTemplateThumbnails->Hide();
-        mpCalcShowRecentButton->Hide();
-        mpCalcRecentThumbnails->Show();
-        mpCalcShowTemplateButton->Show();
-        mpCalcShowTemplateButton->GrabFocus();
-    }
-    // impress
-    else if( pButton == mpImpressShowTemplateButton )
-    {
-        mpImpressRecentThumbnails->Hide();
-        mpImpressShowTemplateButton->Hide();
-        mpImpressTemplateThumbnails->Show();
-        mpImpressShowRecentButton->Show();
-        mpImpressShowRecentButton->GrabFocus();
-    }
-    else if( pButton == mpImpressShowRecentButton )
-    {
-        mpImpressTemplateThumbnails->Hide();
-        mpImpressShowRecentButton->Hide();
-        mpImpressRecentThumbnails->Show();
-        mpImpressShowTemplateButton->Show();
-        mpImpressShowTemplateButton->GrabFocus();
-    }
-    // draw
-    else if( pButton == mpDrawShowTemplateButton )
-    {
-        mpDrawRecentThumbnails->Hide();
-        mpDrawShowTemplateButton->Hide();
-        mpDrawTemplateThumbnails->Show();
-        mpDrawShowRecentButton->Show();
-        mpDrawShowRecentButton->GrabFocus();
-    }
-    else if( pButton == mpDrawShowRecentButton )
-    {
-        mpDrawTemplateThumbnails->Hide();
-        mpDrawShowRecentButton->Hide();
-        mpDrawRecentThumbnails->Show();
-        mpDrawShowTemplateButton->Show();
-        mpDrawShowTemplateButton->GrabFocus();
-    }
-    return 0;
-}
-
 IMPL_LINK( BackingWindow, OpenTemplateHdl, ThumbnailViewItem*, pItem)
 {
     uno::Sequence< PropertyValue > aArgs(4);
diff --git a/sfx2/source/dialog/backingwindow.hxx b/sfx2/source/dialog/backingwindow.hxx
index 7cb516a348a3..518aca323fda 100644
--- a/sfx2/source/dialog/backingwindow.hxx
+++ b/sfx2/source/dialog/backingwindow.hxx
@@ -55,29 +55,9 @@ 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;
-
-    PushButton*                     mpWriterButton;
-    PushButton*                     mpCalcButton;
-    PushButton*                     mpImpressButton;
-    PushButton*                     mpDrawButton;
-    PushButton*                     mpDBButton;
-    PushButton*                     mpMathButton;
+
+    FixedText*                      mpCreateLabel;
 
     PushButton*                     mpWriterAllButton;
     PushButton*                     mpCalcAllButton;
@@ -86,28 +66,15 @@ class BackingWindow
     PushButton*                     mpDBAllButton;
     PushButton*                     mpMathAllButton;
 
-    PushButton*                     mpWriterShowTemplateButton;
-    PushButton*                     mpCalcShowTemplateButton;
-    PushButton*                     mpImpressShowTemplateButton;
-    PushButton*                     mpDrawShowTemplateButton;
+    PushButton*                     mpHelpButton;
+    PushButton*                     mpExtensionsButton;
 
-    PushButton*                     mpWriterShowRecentButton;
-    PushButton*                     mpCalcShowRecentButton;
-    PushButton*                     mpImpressShowRecentButton;
-    PushButton*                     mpDrawShowRecentButton;
+    VclBox*                         mpAllButtonsBox;
+    VclBox*                         mpPictureBox;
+    VclBox*                         mpButtonsBox;
+    VclBox*                         mpSmallButtonsBox;
 
     RecentDocsView*                 mpAllRecentThumbnails;
-    RecentDocsView*                 mpWriterRecentThumbnails;
-    RecentDocsView*                 mpCalcRecentThumbnails;
-    RecentDocsView*                 mpImpressRecentThumbnails;
-    RecentDocsView*                 mpDrawRecentThumbnails;
-    RecentDocsView*                 mpDatabaseRecentThumbnails;
-    RecentDocsView*                 mpMathRecentThumbnails;
-
-    TemplateLocalView*              mpWriterTemplateThumbnails;
-    TemplateLocalView*              mpCalcTemplateThumbnails;
-    TemplateLocalView*              mpImpressTemplateThumbnails;
-    TemplateLocalView*              mpDrawTemplateThumbnails;
 
     std::vector<Window*>            maDndWindows;
 
@@ -117,12 +84,7 @@ class BackingWindow
     sal_Int32                       mnHideExternalLinks;
     svt::AcceleratorExecute*        mpAccExec;
 
-    void setupModuleTab( const OString& rTabName, RecentDocsView* pRecView, int nFileTypes,
-        const OUString& rURL, const std::set<OUString>& rURLS, SvtModuleOptions& rOpt,
-        SvtModuleOptions::EModule eMod );
     void setupButton( PushButton* pButton );
-    void setupTemplateView( TemplateLocalView* pView, FILTER_APPLICATION eFilter,
-                            PushButton* pRecentButton, PushButton* pTemplateButton );
 
     void dispatchURL( const OUString& i_rURL,
                       const OUString& i_rTarget = OUString( "_default" ),
@@ -131,7 +93,6 @@ class BackingWindow
                       );
 
     DECL_LINK( ClickHdl, Button* );
-    DECL_LINK( RecentTemplateToggleHdl, Button* );
     DECL_LINK( OpenTemplateHdl, ThumbnailViewItem* );
 
     void initControls();
diff --git a/sfx2/uiconfig/ui/startcenter.ui b/sfx2/uiconfig/ui/startcenter.ui
index fd3acadba3e2..6907417be4cf 100644
--- a/sfx2/uiconfig/ui/startcenter.ui
+++ b/sfx2/uiconfig/ui/startcenter.ui
@@ -1,1084 +1,283 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires LibreOffice 1.0 -->
   <!-- interface-requires gtk+ 3.0 -->
-  <object class="GtkImage" id="calc_all_image">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="pixbuf">res/ods_16_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_16_8.png</property>
-  </object>
-  <object class="GtkImage" id="database_all_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="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_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_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="open_image5">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="pixbuf">cmd/sc_open.png</property>
-  </object>
+  <!-- interface-requires LibreOffice 1.0 -->
   <object class="GtkBox" id="StartCenter">
     <property name="can_focus">False</property>
     <child>
-      <object class="GtkGrid" id="grid1">
+      <object class="GtkBox" id="box1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="hexpand">True</property>
         <property name="vexpand">True</property>
-        <property name="border_width">24</property>
-        <property name="row_spacing">12</property>
-        <property name="column_spacing">12</property>
+        <property name="border_width">12</property>
         <child>
-          <object class="GtkNotebook" id="modules_notebook">
+          <object class="GtkBox" id="all_buttons_box">
             <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="hexpand">True</property>
-            <property name="vexpand">True</property>
+            <property name="can_focus">False</property>
+            <property name="orientation">vertical</property>
             <child>
-              <object class="GtkGrid" id="grid2">
+              <object class="GtkBox" id="picture_box">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="border_width">12</property>
-                <property name="row_spacing">6</property>
-                <child>
-                  <object class="sfxlo-RecentDocsView" id="all_recent">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="hexpand">True</property>
-                    <property name="vexpand">True</property>
-                  </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>
+                <property name="hexpand">True</property>
+                <property name="vexpand">True</property>
+                <property name="orientation">vertical</property>
                 <child>
-                  <object class="GtkGrid" id="grid16">
+                  <object class="GtkBox" id="buttons_box">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="column_spacing">6</property>
-                    <child>
-                      <object class="GtkButton" id="writer_all">
-                        <property name="label" translatable="yes">Text _Document</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <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>
-                        <property name="use_underline">True</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="calc_all">
-                        <property name="label" translatable="yes">_Spreadsheet</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <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>
-                        <property name="use_underline">True</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="impress_all">
-                        <property name="label" translatable="yes">_Presentation</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <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>
-                        <property name="use_underline">True</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>
-                    <child>
-                      <object class="GtkButton" id="draw_all">
-                        <property name="label" translatable="yes">D_rawing</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <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>
-                        <property name="use_underline">True</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">5</property>
-                        <property name="top_attach">0</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkButton" id="database_all">
-                        <property name="label" translatable="yes">D_atabase</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <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>
-                        <property name="use_underline">True</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">6</property>
-                        <property name="top_attach">0</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkButton" id="math_all">
-                        <property name="label" translatable="yes">F_ormula</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <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>
-                        <property name="use_underline">True</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">7</property>
-                        <property name="top_attach">0</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
-                      </packing>
-                    </child>
+                    <property name="margin_left">6</property>
+                    <property name="margin_right">6</property>
+                    <property name="margin_top">6</property>
+                    <property name="margin_bottom">6</property>
+                    <property name="orientation">vertical</property>
                     <child>
                       <object class="GtkButton" id="open_all">
-                        <property name="label" translatable="yes">Ope_n</property>
+                        <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>
                         <property name="use_underline">True</property>
+                        <property name="xalign">0</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>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">0</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkButton" id="templates_all">
-                        <property name="label" translatable="yes">Te_mplates</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>
-                        <property name="use_underline">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>
-                  </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>
-              </object>
-            </child>
-            <child type="tab">
-              <object class="GtkLabel" id="tab_all">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes">All Recent</property>
-              </object>
-              <packing>
-                <property name="tab_fill">False</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkGrid" id="grid4">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="border_width">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">6</property>
-                    <child>
-                      <object class="GtkButton" id="writer">
-                        <property name="label" translatable="yes">Text _Document</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">True</property>
-                        <property name="image">writer_image</property>
-                        <property name="relief">none</property>
-                        <property name="use_underline">True</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="show_writer_recent">
-                        <property name="label" translatable="yes">Show Recent</property>
-                        <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">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="show_writer_template">
-                        <property name="label" translatable="yes">Show Templates</property>
-                        <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">Ope_n</property>
+                        <property name="label" translatable="yes">T_emplates</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>
                         <property name="use_underline">True</property>
+                        <property name="xalign">0</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>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">1</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkButton" id="templates_writer">
-                        <property name="label" translatable="yes">Te_mplates</property>
+                      <object class="GtkLabel" id="create_label">
                         <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>
-                        <property name="use_underline">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="margin_left">6</property>
+                        <property name="margin_top">12</property>
+                        <property name="xalign">0</property>
+                        <property name="label" translatable="yes">Create</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>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">2</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>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkGrid" id="grid21">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="hexpand">True</property>
-                    <property name="vexpand">True</property>
                     <child>
-                      <object class="sfxlo-RecentDocsView" id="writer_recent">
+                      <object class="GtkSeparator" id="separator1">
                         <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="hexpand">True</property>
-                        <property name="vexpand">True</property>
+                        <property name="can_focus">False</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>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">3</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="sfxlo-TemplateLocalView" id="writer_templates">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="hexpand">True</property>
-                        <property name="vexpand">True</property>
-                      </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>
-                  </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>
-              </object>
-              <packing>
-                <property name="position">1</property>
-              </packing>
-            </child>
-            <child type="tab">
-              <object class="GtkLabel" id="tab_writer">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Documents</property>
-              </object>
-              <packing>
-                <property name="position">1</property>
-                <property name="tab_fill">False</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkGrid" id="grid6">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="border_width">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">6</property>
-                    <child>
-                      <object class="GtkButton" id="calc">
-                        <property name="label" translatable="yes">_Spreadsheet</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">True</property>
-                        <property name="image">calc_image</property>
-                        <property name="relief">none</property>
-                        <property name="use_underline">True</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="show_calc_template">
-                        <property name="label" translatable="yes">Show Templates</property>
-                        <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="show_calc_recent">
-                        <property name="label" translatable="yes">Show Recent</property>
-                        <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">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">Ope_n</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>
-                        <property name="use_underline">True</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">Te_mplates</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>
-                        <property name="use_underline">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>
-                  </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="grid20">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="hexpand">True</property>
-                    <property name="vexpand">True</property>
-                    <child>
-                      <object class="sfxlo-RecentDocsView" id="calc_recent">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="hexpand">True</property>
-                        <property name="vexpand">True</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="sfxlo-TemplateLocalView" id="calc_templates">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="hexpand">True</property>
-                        <property name="vexpand">True</property>
-                      </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>
-                  </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>
-              </object>
-              <packing>
-                <property name="position">2</property>
-              </packing>
-            </child>
-            <child type="tab">
-              <object class="GtkLabel" id="tab_calc">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Spreadsheets</property>
-              </object>
-              <packing>
-                <property name="position">2</property>
-                <property name="tab_fill">False</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkGrid" id="grid8">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="border_width">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">6</property>
-                    <child>
-                      <object class="GtkButton" id="impress">
-                        <property name="label" translatable="yes">_Presentation</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">True</property>
-                        <property name="image">impress_image</property>
-                        <property name="relief">none</property>
-                        <property name="use_underline">True</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="show_impress_template">
-                        <property name="label" translatable="yes">Show Templates</property>
-                        <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="show_impress_recent">
-                        <property name="label" translatable="yes">Show Recent</property>
-                        <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">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">Ope_n</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>
-                        <property name="use_underline">True</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">Te_mplates</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>
-                        <property name="use_underline">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>
-                  </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="grid18">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="hexpand">True</property>
-                    <property name="vexpand">True</property>
-                    <child>
-                      <object class="sfxlo-RecentDocsView" id="impress_recent">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="hexpand">True</property>
-                        <property name="vexpand">True</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="sfxlo-TemplateLocalView" id="impress_templates">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="hexpand">True</property>
-                        <property name="vexpand">True</property>
-                      </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>
-                  </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>
-              </object>
-              <packing>
-                <property name="position">3</property>
-              </packing>
-            </child>
-            <child type="tab">
-              <object class="GtkLabel" id="tab_impress">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Presentations</property>
-              </object>
-              <packing>
-                <property name="position">3</property>
-                <property name="tab_fill">False</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkGrid" id="grid10">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="border_width">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">6</property>
-                    <child>
-                      <object class="GtkButton" id="draw">
-                        <property name="label" translatable="yes">D_rawing</property>
+                      <object class="GtkButton" id="writer_all">
+                        <property name="label" translatable="yes">New _Document</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
-                        <property name="image">draw_image</property>
+                        <property name="has_tooltip">True</property>
+                        <property name="image">writer_all_image</property>
                         <property name="relief">none</property>
                         <property name="use_underline">True</property>
+                        <property name="xalign">0</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="show_draw_template">
-                        <property name="label" translatable="yes">Show Templates</property>
-                        <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="show_draw_recent">
-                        <property name="label" translatable="yes">Show Recent</property>
-                        <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">4</property>
-                        <property name="top_attach">0</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">4</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkButton" id="open_draw">
-                        <property name="label" translatable="yes">Ope_n</property>
+                      <object class="GtkButton" id="calc_all">
+                        <property name="label" translatable="yes">New _Spreadsheet</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="has_tooltip">True</property>
+                        <property name="image">calc_all_image</property>
                         <property name="relief">none</property>
                         <property name="use_underline">True</property>
+                        <property name="xalign">0</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>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">5</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkButton" id="templates_draw">
-                        <property name="label" translatable="yes">Te_mplates</property>
+                      <object class="GtkButton" id="impress_all">
+                        <property name="label" translatable="yes">New _Presentation</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="has_tooltip">True</property>
+                        <property name="image">impress_all_image</property>
                         <property name="relief">none</property>
                         <property name="use_underline">True</property>
+                        <property name="xalign">0</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>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">6</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>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkGrid" id="grid19">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="hexpand">True</property>
-                    <property name="vexpand">True</property>
                     <child>
-                      <object class="sfxlo-RecentDocsView" id="draw_recent">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="hexpand">True</property>
-                        <property name="vexpand">True</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="sfxlo-TemplateLocalView" id="draw_templates">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="hexpand">True</property>
-                        <property name="vexpand">True</property>
-                      </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>
-                  </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>
-              </object>
-              <packing>
-                <property name="position">4</property>
-              </packing>
-            </child>
-            <child type="tab">
-              <object class="GtkLabel" id="tab_draw">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Drawings</property>
-              </object>
-              <packing>
-                <property name="position">4</property>
-                <property name="tab_fill">False</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkGrid" id="grid12">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="border_width">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">D_atabase</property>
+                      <object class="GtkButton" id="draw_all">
+                        <property name="label" translatable="yes">New D_rawing</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
-                        <property name="image">database_image</property>
+                        <property name="has_tooltip">True</property>
+                        <property name="image">draw_all_image</property>
                         <property name="relief">none</property>
                         <property name="use_underline">True</property>
+                        <property name="xalign">0</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>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">7</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkButton" id="open_database">
-                        <property name="label" translatable="yes">Ope_n</property>
+                      <object class="GtkButton" id="math_all">
+                        <property name="label" translatable="yes">New For_mula</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="has_tooltip">True</property>
+                        <property name="image">math_all_image</property>
                         <property name="relief">none</property>
                         <property name="use_underline">True</property>
+                        <property name="xalign">0</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>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">8</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkButton" id="templates_database">
-                        <property name="label" translatable="yes">Te_mplates</property>
+                      <object class="GtkButton" id="database_all">
+                        <property name="label" translatable="yes">New D_atabase</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="has_tooltip">True</property>
+                        <property name="image">database_all_image</property>
                         <property name="relief">none</property>
                         <property name="use_underline">True</property>
+                        <property name="xalign">0</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>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">9</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>
-                  </packing>
-                </child>
-                <child>
-                  <object class="sfxlo-RecentDocsView" id="database_recent">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="hexpand">True</property>
-                    <property name="vexpand">True</property>
-                  </object>
-                  <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">1</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
                   </packing>
                 </child>
               </object>
               <packing>
-                <property name="position">5</property>
-              </packing>
-            </child>
-            <child type="tab">
-              <object class="GtkLabel" id="tab_database">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Databases</property>
-              </object>
-              <packing>
-                <property name="position">5</property>
-                <property name="tab_fill">False</property>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
               </packing>
             </child>
             <child>
-              <object class="GtkGrid" id="grid14">
+              <object class="GtkBox" id="small_buttons_box">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="border_width">12</property>
-                <property name="row_spacing">6</property>
+                <property name="margin_left">6</property>
+                <property name="margin_right">6</property>
+                <property name="margin_top">6</property>
+                <property name="margin_bottom">6</property>
+                <property name="homogeneous">True</property>
                 <child>
-                  <object class="GtkGrid" id="grid15">
+                  <object class="GtkButton" id="help">
+                    <property name="label" translatable="yes">_Help</property>
                     <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">F_ormula</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">True</property>
-                        <property name="image">math_image</property>
-                        <property name="relief">none</property>
-                        <property name="use_underline">True</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">Ope_n</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>
-                        <property name="use_underline">True</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_math">
-                        <property name="label" translatable="yes">Te_mplates</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>
-                        <property name="use_underline">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>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">True</property>
+                    <property name="has_tooltip">True</property>
+                    <property name="relief">none</property>
+                    <property name="use_underline">True</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>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
                   </packing>
                 </child>
                 <child>
-                  <object class="sfxlo-RecentDocsView" id="math_recent">
+                  <object class="GtkButton" id="extensions">
+                    <property name="label" translatable="yes">_Extensions</property>
                     <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="hexpand">True</property>
-                    <property name="vexpand">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">True</property>
+                    <property name="has_tooltip">True</property>
+                    <property name="relief">none</property>
+                    <property name="use_underline">True</property>
                   </object>
                   <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">1</property>
-                    <property name="width">1</property>
-                    <property name="height">1</property>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
                   </packing>
                 </child>
               </object>
               <packing>
-                <property name="position">6</property>
-              </packing>
-            </child>
-            <child type="tab">
-              <object class="GtkLabel" id="tab_math">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-                <property name="label" translatable="yes">Formulas</property>
-              </object>
-              <packing>
-                <property name="position">6</property>
-                <property name="tab_fill">False</property>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">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>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="sfxlo-RecentDocsView" id="all_recent">
+            <property name="visible">True</property>
+            <property name="can_focus">True</property>
+            <property name="hexpand">True</property>
+            <property name="vexpand">True</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
           </packing>
         </child>
       </object>
@@ -1089,100 +288,35 @@
       </packing>
     </child>
   </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_image">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="pixbuf">res/odf_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_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">cmd/sc_open.png</property>
-  </object>
-  <object class="GtkImage" id="open_image10">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="pixbuf">cmd/sc_open.png</property>
-  </object>
-  <object class="GtkImage" id="open_image6">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="pixbuf">cmd/sc_open.png</property>
-  </object>
-  <object class="GtkImage" id="open_image7">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="pixbuf">cmd/sc_open.png</property>
-  </object>
-  <object class="GtkImage" id="open_image8">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="pixbuf">cmd/sc_open.png</property>
-  </object>
-  <object class="GtkImage" id="open_image9">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="pixbuf">cmd/sc_open.png</property>
-  </object>
-  <object class="GtkImage" id="templates_image">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="pixbuf">cmd/sc_newdoc.png</property>
-  </object>
-  <object class="GtkImage" id="templates_image1">
-    <property name="visible">True</property>
-    <property name="can_focus">False</property>
-    <property name="pixbuf">cmd/sc_newdoc.png</property>
-  </object>
-  <object class="GtkImage" id="templates_image2">
+  <object class="GtkImage" id="calc_all_image">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="pixbuf">cmd/sc_newdoc.png</property>
+    <property name="pixbuf">res/ods_32_8.png</property>
   </object>
-  <object class="GtkImage" id="templates_image3">
+  <object class="GtkImage" id="database_all_image">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="pixbuf">cmd/sc_newdoc.png</property>
+    <property name="pixbuf">res/odb_32_8.png</property>
   </object>
-  <object class="GtkImage" id="templates_image4">
+  <object class="GtkImage" id="draw_all_image">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="pixbuf">cmd/sc_newdoc.png</property>
+    <property name="pixbuf">res/odg_32_8.png</property>
   </object>
-  <object class="GtkImage" id="templates_image5">
+  <object class="GtkImage" id="impress_all_image">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="pixbuf">cmd/sc_newdoc.png</property>
+    <property name="tooltip_text" translatable="yes">New Presentation</property>
+    <property name="pixbuf">res/odp_32_8.png</property>
   </object>
-  <object class="GtkImage" id="templates_image6">
+  <object class="GtkImage" id="math_all_image">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="pixbuf">cmd/sc_newdoc.png</property>
+    <property name="pixbuf">res/odf_32_8.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_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_16_8.png</property>
+    <property name="pixbuf">res/odt_32_8.png</property>
   </object>
 </interface>