diff --git a/include/svx/srchdlg.hxx b/include/svx/srchdlg.hxx
old mode 100644
new mode 100755
index 400d370e8da9..570d795144e5
--- a/include/svx/srchdlg.hxx
+++ b/include/svx/srchdlg.hxx
@@ -98,6 +98,7 @@ public:
     virtual ~SvxSearchDialogWrapper ();
     SvxSearchDialog *getDialog () { return dialog;}
     static void SetSearchLabel(const SearchLabel& rSL);
+    static void SetSearchLabel(const OUString& sStr);
     SFX_DECL_CHILDWINDOW_WITHID(SvxSearchDialogWrapper);
 };
 
@@ -161,7 +162,8 @@ private:
     VclPtr<ListBox>        m_pReplaceTmplLB;
     VclPtr<FixedText>      m_pReplaceAttrText;
 
-    VclPtr<PushButton>    m_pSearchBtn;
+    VclPtr<PushButton>     m_pSearchBtn;
+    VclPtr<PushButton>     m_pBackSearchBtn;
     VclPtr<PushButton>     m_pSearchAllBtn;
     VclPtr<PushButton>     m_pReplaceBtn;
     VclPtr<PushButton>     m_pReplaceAllBtn;
@@ -178,7 +180,6 @@ private:
     VclPtr<CheckBox>       m_pIgnoreDiacritics;
     VclPtr<CheckBox>       m_pIgnoreKashida;
     VclPtr<CheckBox>       m_pSelectionBtn;
-    VclPtr<CheckBox>       m_pBackwardsBtn;
     VclPtr<CheckBox>       m_pRegExpBtn;
     VclPtr<CheckBox>       m_pWildcardBtn;
     VclPtr<CheckBox>       m_pSimilarityBox;
@@ -187,6 +188,7 @@ private:
     VclPtr<CheckBox>       m_pNotesBtn;
     VclPtr<CheckBox>       m_pJapMatchFullHalfWidthCB;
     VclPtr<CheckBox>       m_pJapOptionsCB;
+    VclPtr<CheckBox>       m_pReplaceBackwardsCB;
     VclPtr<PushButton>     m_pJapOptionsBtn;
 
     VclPtr<PushButton>     m_pAttributeBtn;
@@ -205,6 +207,7 @@ private:
     bool            bWriter;
     bool            bSearch;
     bool            bFormat;
+    bool            bReplaceBackwards;
     SearchOptionFlags  nOptions;
     bool            bSet;
     bool            bConstruct;
diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx
old mode 100644
new mode 100755
index a53e915361b6..3ff920eb0790
--- a/svx/source/dialog/srchdlg.cxx
+++ b/svx/source/dialog/srchdlg.cxx
@@ -252,6 +252,7 @@ SvxSearchDialog::SvxSearchDialog( vcl::Window* pParent, SfxChildWindow* pChildWi
     , bWriter(false)
     , bSearch(true)
     , bFormat(false)
+    , bReplaceBackwards(false)
     , nOptions(SearchOptionFlags::ALL)
     , bSet(false)
     , bConstruct(true)
@@ -272,10 +273,11 @@ SvxSearchDialog::SvxSearchDialog( vcl::Window* pParent, SfxChildWindow* pChildWi
     get(m_pSearchTmplLB, "searchlist");
     m_pSearchTmplLB->SetStyle(m_pSearchTmplLB->GetStyle() | WB_SORT);
     get(m_pSearchBtn, "search");
+    get(m_pBackSearchBtn, "backsearch");
     get(m_pSearchAllBtn, "searchall");
     get(m_pSearchAttrText, "searchdesc");
     m_pSearchAttrText->SetStyle(m_pSearchAttrText->GetStyle() | WB_PATHELLIPSIS);
-    m_pSearchAttrText->Show();
+    m_pSearchAttrText->Hide();
     get(m_pSearchLabel, "searchlabel");
     m_pSearchLabel->SetStyle(m_pSearchLabel->GetStyle() | WB_PATHELLIPSIS);
     m_pSearchLabel->Show();
@@ -288,7 +290,7 @@ SvxSearchDialog::SvxSearchDialog( vcl::Window* pParent, SfxChildWindow* pChildWi
     get(m_pReplaceAllBtn, "replaceall");
     get(m_pReplaceAttrText, "replacedesc");
     m_pReplaceAttrText->SetStyle(m_pReplaceAttrText->GetStyle() | WB_PATHELLIPSIS);
-    m_pReplaceAttrText->Show();
+    m_pReplaceAttrText->Hide();
 
     get(m_pComponentFrame, "componentframe");
     get(m_pSearchComponent1PB, "component1");
@@ -304,7 +306,7 @@ SvxSearchDialog::SvxSearchDialog( vcl::Window* pParent, SfxChildWindow* pChildWi
     get(m_pIgnoreDiacritics, "ignorediacritics");
     get(m_pIgnoreKashida, "ignorekashida");
     get(m_pSelectionBtn, "selection");
-    get(m_pBackwardsBtn, "backwards");
+    get(m_pReplaceBackwardsCB, "replace_backwards");
     get(m_pRegExpBtn, "regexp");
     get(m_pWildcardBtn, "wildcard");
     get(m_pSimilarityBox, "similarity");
@@ -372,6 +374,7 @@ void SvxSearchDialog::dispose()
     m_pReplaceTmplLB.clear();
     m_pReplaceAttrText.clear();
     m_pSearchBtn.clear();
+    m_pBackSearchBtn.clear();
     m_pSearchAllBtn.clear();
     m_pReplaceBtn.clear();
     m_pReplaceAllBtn.clear();
@@ -385,7 +388,7 @@ void SvxSearchDialog::dispose()
     m_pIgnoreDiacritics.clear();
     m_pIgnoreKashida.clear();
     m_pSelectionBtn.clear();
-    m_pBackwardsBtn.clear();
+    m_pReplaceBackwardsCB.clear();
     m_pRegExpBtn.clear();
     m_pWildcardBtn.clear();
     m_pSimilarityBox.clear();
@@ -554,7 +557,7 @@ bool SvxSearchDialog::Close()
     // save settings to configuration
     SvtSearchOptions aOpt;
     aOpt.SetWholeWordsOnly          ( m_pWordBtn->IsChecked() );
-    aOpt.SetBackwards               ( m_pBackwardsBtn->IsChecked() );
+    aOpt.SetBackwards               ( m_pReplaceBackwardsCB->IsChecked() );
     aOpt.SetUseRegularExpression    ( m_pRegExpBtn->IsChecked() );
     aOpt.SetUseWildcard             ( m_pWildcardBtn->IsChecked() );
     aOpt.SetSearchForStyles         ( m_pLayoutBtn->IsChecked() );
@@ -642,6 +645,7 @@ void SvxSearchDialog::InitControls_Impl()
 
     Link<Button*,void> aLink2 = LINK( this, SvxSearchDialog, CommandHdl_Impl );
     m_pSearchBtn->SetClickHdl( aLink2 );
+    m_pBackSearchBtn->SetClickHdl( aLink2 );
     m_pSearchAllBtn->SetClickHdl( aLink2 );
     m_pReplaceBtn->SetClickHdl( aLink2 );
     m_pReplaceAllBtn->SetClickHdl( aLink2 );
@@ -652,12 +656,12 @@ void SvxSearchDialog::InitControls_Impl()
     m_pSearchComponent2PB->SetClickHdl( aLink2 );
 
     aLink2 = LINK( this, SvxSearchDialog, FlagHdl_Impl );
+    m_pReplaceBackwardsCB->SetClickHdl( aLink2 );
     m_pWordBtn->SetClickHdl( aLink2 );
     m_pSelectionBtn->SetClickHdl( aLink2 );
     m_pMatchCaseCB->SetClickHdl( aLink2 );
     m_pRegExpBtn->SetClickHdl( aLink2 );
     m_pWildcardBtn->SetClickHdl( aLink2 );
-    m_pBackwardsBtn->SetClickHdl( aLink2 );
     m_pNotesBtn->SetClickHdl( aLink2 );
     m_pSimilarityBox->SetClickHdl( aLink2 );
     m_pJapOptionsCB->SetClickHdl( aLink2 );
@@ -710,9 +714,9 @@ void SvxSearchDialog::ShowOptionalControls_Impl()
 
     m_pLayoutBtn->Show(!bDrawApp);
     m_pNotesBtn->Show(bWriterApp);
-    m_pBackwardsBtn->Show();
     m_pRegExpBtn->Show(!bDrawApp);
     m_pWildcardBtn->Show(bCalcApp); /* TODO:WILDCARD enable for other apps if hey handle it */
+    m_pReplaceBackwardsCB->Show();
     m_pSimilarityBox->Show();
     m_pSimilarityBtn->Show();
     m_pSelectionBtn->Show();
@@ -780,7 +784,7 @@ void SvxSearchDialog::Init_Impl( bool bSearchPattern )
     if ( ( nModifyFlag & MODIFY_EXACT ) == 0 )
         m_pMatchCaseCB->Check( pSearchItem->GetExact() );
     if ( ( nModifyFlag & MODIFY_BACKWARDS ) == 0 )
-        m_pBackwardsBtn->Check( pSearchItem->GetBackward() );
+        m_pReplaceBackwardsCB->Check( bReplaceBackwards ); //adjustment to replace backwards
     if ( ( nModifyFlag & MODIFY_NOTES ) == 0 )
         m_pNotesBtn->Check( pSearchItem->GetNotes() );
     if ( ( nModifyFlag & MODIFY_SELECTION ) == 0 )
@@ -1009,6 +1013,7 @@ void SvxSearchDialog::Init_Impl( bool bSearchPattern )
     if ( bDisableSearch )
     {
         m_pSearchBtn->Disable();
+        m_pBackSearchBtn->Disable();
         m_pSearchAllBtn->Disable();
         m_pReplaceBtn->Disable();
         m_pReplaceAllBtn->Disable();
@@ -1017,6 +1022,7 @@ void SvxSearchDialog::Init_Impl( bool bSearchPattern )
     else
     {
         EnableControl_Impl(m_pSearchBtn);
+        EnableControl_Impl(m_pBackSearchBtn);
         EnableControl_Impl(m_pReplaceBtn);
         if (!bWriter || !m_pNotesBtn->IsChecked())
         {
@@ -1087,7 +1093,10 @@ void SvxSearchDialog::InitAttrList_Impl( const SfxItemSet* pSSet,
             m_pSearchAttrText->SetText( BuildAttrText_Impl( aDesc, true ) );
 
             if ( !aDesc.isEmpty() )
+            {
+                m_pSearchAttrText->Show();
                 bFormat |= true;
+            }
         }
     }
 
@@ -1103,7 +1112,10 @@ void SvxSearchDialog::InitAttrList_Impl( const SfxItemSet* pSSet,
             m_pReplaceAttrText->SetText( BuildAttrText_Impl( aDesc, false ) );
 
             if ( !aDesc.isEmpty() )
+            {
+                m_pReplaceAttrText->Show();
                 bFormat |= true;
+            }
         }
     }
 }
@@ -1194,6 +1206,7 @@ void SvxSearchDialog::ClickHdl_Impl(void* pCtrl)
             if ( m_pSearchTmplLB->GetEntryCount() )
             {
                 EnableControl_Impl(m_pSearchBtn);
+                EnableControl_Impl(m_pBackSearchBtn);
                 EnableControl_Impl(m_pSearchAllBtn);
                 EnableControl_Impl(m_pReplaceBtn);
                 EnableControl_Impl(m_pReplaceAllBtn);
@@ -1260,6 +1273,7 @@ IMPL_LINK_TYPED( SvxSearchDialog, CommandHdl_Impl, Button *, pBtn, void )
     bool bInclusive = ( m_pLayoutBtn->GetText() == aLayoutStr );
 
     if ( ( pBtn == m_pSearchBtn )   ||
+        (pBtn == m_pBackSearchBtn)  ||
          ( pBtn == m_pSearchAllBtn )||
          ( pBtn == m_pReplaceBtn )  ||
          ( pBtn == m_pReplaceAllBtn ) )
@@ -1296,7 +1310,20 @@ IMPL_LINK_TYPED( SvxSearchDialog, CommandHdl_Impl, Button *, pBtn, void )
             pSearchItem->SetLevenshtein( true );
 
         pSearchItem->SetWordOnly(GetCheckBoxValue(m_pWordBtn));
-        pSearchItem->SetBackward(GetCheckBoxValue(m_pBackwardsBtn));
+
+        bool bSetBackwards = false;
+        if( pBtn == m_pBackSearchBtn)
+        {
+            bSetBackwards = true;
+        }
+        else if( pBtn == m_pReplaceBtn)
+        {
+            bSetBackwards = GetCheckBoxValue(m_pReplaceBackwardsCB);
+            bReplaceBackwards = GetCheckBoxValue(m_pReplaceBackwardsCB);
+        }
+
+        pSearchItem->SetBackward(bSetBackwards);
+
         pSearchItem->SetNotes(GetCheckBoxValue(m_pNotesBtn));
         pSearchItem->SetPattern(GetCheckBoxValue(m_pLayoutBtn));
         pSearchItem->SetSelection(GetCheckBoxValue(m_pSelectionBtn));
@@ -1321,7 +1348,7 @@ IMPL_LINK_TYPED( SvxSearchDialog, CommandHdl_Impl, Button *, pBtn, void )
             pSearchItem->SetSearchFormatted( m_pSearchFormattedCB->IsChecked() );
         }
 
-        if (pBtn == m_pSearchBtn)
+        if ((pBtn == m_pSearchBtn) ||  (pBtn == m_pBackSearchBtn))
             pSearchItem->SetCommand( SvxSearchCmd::FIND );
         else if ( pBtn == m_pSearchAllBtn )
             pSearchItem->SetCommand( SvxSearchCmd::FIND_ALL );
@@ -1442,6 +1469,7 @@ IMPL_LINK_TYPED( SvxSearchDialog, ModifyHdl_Impl, Edit&, rEd, void )
         if (nSrchTxtLen || nReplTxtLen || nAttrTxtLen)
         {
             EnableControl_Impl(m_pSearchBtn);
+            EnableControl_Impl(m_pBackSearchBtn);
             EnableControl_Impl(m_pReplaceBtn);
             if (!bWriter || !m_pNotesBtn->IsChecked())
             {
@@ -1453,6 +1481,7 @@ IMPL_LINK_TYPED( SvxSearchDialog, ModifyHdl_Impl, Edit&, rEd, void )
         {
             m_pComponentFrame->Enable(false);
             m_pSearchBtn->Disable();
+            m_pBackSearchBtn->Disable();
             m_pSearchAllBtn->Disable();
             m_pReplaceBtn->Disable();
             m_pReplaceAllBtn->Disable();
@@ -1512,6 +1541,12 @@ IMPL_LINK_NOARG_TYPED(SvxSearchDialog, TemplateHdl_Impl, Button*, void)
 
             m_pSearchAttrText->SetText( sDesc );
             m_pReplaceAttrText->SetText( sDesc );
+
+            if(!sDesc.isEmpty())
+            {
+                m_pSearchAttrText->Show();
+                m_pReplaceAttrText->Show();
+            }
         }
         m_pFormatBtn->Disable();
         m_pNoFormatBtn->Disable();
@@ -1534,6 +1569,12 @@ IMPL_LINK_NOARG_TYPED(SvxSearchDialog, TemplateHdl_Impl, Button*, void)
         m_pSearchAttrText->SetText( BuildAttrText_Impl( sDesc, true ) );
         m_pReplaceAttrText->SetText( BuildAttrText_Impl( sDesc, false ) );
 
+        if(!sDesc.isEmpty())
+        {
+            m_pSearchAttrText->Show();
+            m_pReplaceAttrText->Show();
+        }
+
         EnableControl_Impl(m_pFormatBtn);
         EnableControl_Impl(m_pAttributeBtn);
         EnableControl_Impl(m_pSimilarityBox);
@@ -1607,6 +1648,7 @@ void SvxSearchDialog::TemplatesChanged_Impl( SfxStyleSheetBasePool& rPool )
     if ( m_pSearchTmplLB->GetEntryCount() )
     {
         EnableControl_Impl(m_pSearchBtn);
+        EnableControl_Impl(m_pBackSearchBtn);
         EnableControl_Impl(m_pSearchAllBtn);
         EnableControl_Impl(m_pReplaceBtn);
         EnableControl_Impl(m_pReplaceAllBtn);
@@ -1635,6 +1677,7 @@ void SvxSearchDialog::EnableControls_Impl( const SearchOptionFlags nFlags )
 
     bool bEnableSearch = bool( SearchOptionFlags::SEARCH & nOptions );
     m_pSearchBtn->Enable(bEnableSearch);
+    m_pBackSearchBtn->Enable(bEnableSearch);
 
     if( bEnableSearch )
         bNoSearch = false;
@@ -1671,6 +1714,7 @@ void SvxSearchDialog::EnableControls_Impl( const SearchOptionFlags nFlags )
         m_pReplaceAllBtn->Disable();
     m_pComponentFrame->Enable(!bNoSearch);
     m_pSearchBtn->Enable( !bNoSearch );
+    m_pBackSearchBtn->Enable( !bNoSearch );
     m_pSearchFrame->get_label_widget()->Enable( !bNoSearch );
     m_pSearchLB->Enable( !bNoSearch );
     m_pNotesBtn->Enable();
@@ -1680,9 +1724,15 @@ void SvxSearchDialog::EnableControls_Impl( const SearchOptionFlags nFlags )
     else
         m_pWordBtn->Disable();
     if ( ( SearchOptionFlags::BACKWARDS & nOptions ) )
-        m_pBackwardsBtn->Enable();
+    {
+        m_pBackSearchBtn->Enable();
+        m_pReplaceBackwardsCB->Enable();
+    }
     else
-        m_pBackwardsBtn->Disable();
+    {
+        m_pBackSearchBtn->Disable();
+        m_pReplaceBackwardsCB->Disable();
+    }
     if ( ( SearchOptionFlags::REG_EXP & nOptions ) )
         m_pRegExpBtn->Enable();
     else
@@ -1763,10 +1813,18 @@ void SvxSearchDialog::EnableControl_Impl( Control* pCtrl )
         m_pWordBtn->Enable();
         return;
     }
-    if ( m_pBackwardsBtn == pCtrl && ( SearchOptionFlags::BACKWARDS & nOptions ) )
+    if ( SearchOptionFlags::BACKWARDS & nOptions )
     {
-        m_pBackwardsBtn->Enable();
-        return;
+        if( m_pBackSearchBtn == pCtrl )
+        {
+            m_pBackSearchBtn->Enable();
+            return;
+        }
+        else if ( m_pReplaceBackwardsCB == pCtrl )
+        {
+            m_pReplaceBackwardsCB->Enable();
+            return;
+        }
     }
     if (m_pNotesBtn == pCtrl)
     {
@@ -2020,14 +2078,17 @@ IMPL_LINK_NOARG_TYPED(SvxSearchDialog, NoFormatHdl_Impl, Button*, void)
 
     if ( bSearch )
     {
-        m_pSearchAttrText->SetText( "" );
         pSearchList->Clear();
+        m_pSearchAttrText->SetText( "" );
+        m_pSearchAttrText->Hide();
     }
     else
     {
-        m_pReplaceAttrText->SetText( "" );
         pReplaceList->Clear();
+        m_pReplaceAttrText->SetText( "" );
+        m_pReplaceAttrText->Hide();
     }
+
     pImpl->bSaveToModule = false;
     TemplateHdl_Impl(m_pLayoutBtn);
     pImpl->bSaveToModule = true;
@@ -2149,11 +2210,17 @@ void SvxSearchDialog::PaintAttrText_Impl()
     if ( bSearch )
     {
         m_pSearchAttrText->SetText( aDesc );
+        if(!aDesc.isEmpty())
+            m_pSearchAttrText->Show();
+
         FocusHdl_Impl(*m_pSearchLB);
     }
     else
     {
         m_pReplaceAttrText->SetText( aDesc );
+        if(!aDesc.isEmpty())
+            m_pReplaceAttrText->Show();
+
         FocusHdl_Impl(*m_pReplaceLB);
     }
 }
@@ -2169,7 +2236,7 @@ void SvxSearchDialog::SetModifyFlag_Impl( const Control* pCtrl )
         nModifyFlag |= MODIFY_WORD;
     else if ( m_pMatchCaseCB == pCtrl )
         nModifyFlag |= MODIFY_EXACT;
-    else if ( m_pBackwardsBtn == pCtrl )
+    else if ( m_pReplaceBackwardsCB == pCtrl )
         nModifyFlag |= MODIFY_BACKWARDS;
     else if ( m_pNotesBtn == pCtrl )
         nModifyFlag |= MODIFY_NOTES;
@@ -2226,7 +2293,7 @@ void SvxSearchDialog::SaveToModule_Impl()
         pSearchItem->SetLevenshtein( true );
 
     pSearchItem->SetWordOnly(GetCheckBoxValue(m_pWordBtn));
-    pSearchItem->SetBackward(GetCheckBoxValue(m_pBackwardsBtn));
+    pSearchItem->SetBackward(GetCheckBoxValue(m_pReplaceBackwardsCB));
     pSearchItem->SetNotes(GetCheckBoxValue(m_pNotesBtn));
     pSearchItem->SetPattern(GetCheckBoxValue(m_pLayoutBtn));
     pSearchItem->SetSelection(GetCheckBoxValue(m_pSelectionBtn));
@@ -2355,4 +2422,22 @@ void SvxSearchDialogWrapper::SetSearchLabel(const SearchLabel& rSL)
         pWrp->getDialog()->SetSearchLabel(sStr);
 }
 
+void SvxSearchDialogWrapper::SetSearchLabel(const OUString& sStr)
+{
+
+    if (vcl::Window *pSearchLabel = lcl_GetSearchLabelWindow())
+    {
+        if (sStr.isEmpty())
+            pSearchLabel->Hide();
+        else
+        {
+            pSearchLabel->SetText(sStr);
+            pSearchLabel->Show();
+        }
+    }
+    if (SvxSearchDialogWrapper *pWrp = static_cast<SvxSearchDialogWrapper*>( SfxViewFrame::Current()->
+            GetChildWindow( SvxSearchDialogWrapper::GetChildWindowId() )))
+        pWrp->getDialog()->SetSearchLabel(sStr);
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/uiconfig/ui/findreplacedialog.ui b/svx/uiconfig/ui/findreplacedialog.ui
index 1168e74afab3..976a23162e10 100644
--- a/svx/uiconfig/ui/findreplacedialog.ui
+++ b/svx/uiconfig/ui/findreplacedialog.ui
@@ -11,7 +11,7 @@
       <object class="GtkBox" id="dialog-vbox3">
         <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
-        <property name="spacing">12</property>
+        <property name="spacing">6</property>
         <child internal-child="action_area">
           <object class="GtkButtonBox" id="dialog-action_area3">
             <property name="can_focus">False</property>
@@ -55,12 +55,12 @@
           </packing>
         </child>
         <child>
-          <object class="GtkBox" id="box1">
+          <object class="GtkBox" id="parent _container_box">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="hexpand">True</property>
             <property name="orientation">vertical</property>
-            <property name="spacing">12</property>
+            <property name="spacing">6</property>
             <child>
               <object class="GtkFrame" id="searchframe">
                 <property name="visible">True</property>
@@ -69,96 +69,76 @@
                 <property name="label_xalign">0</property>
                 <property name="shadow_type">none</property>
                 <child>
-                  <object class="GtkAlignment" id="alignment1">
+                  <object class="GtkAlignment" id="alignment_srch">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="hexpand">True</property>
                     <property name="top_padding">6</property>
                     <property name="left_padding">12</property>
                     <child>
-                      <object class="GtkGrid" id="grid2">
+                      <object class="GtkGrid" id="search_grid">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="hexpand">True</property>
                         <property name="row_spacing">6</property>
+                        <property name="column_spacing">12</property>
                         <child>
-                          <object class="GtkGrid" id="grid5">
+                          <object class="GtkGrid" id="grid12">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
+                            <property name="valign">center</property>
+                            <property name="margin_right">6</property>
                             <property name="hexpand">True</property>
-                            <property name="row_spacing">6</property>
-                            <property name="column_spacing">12</property>
                             <child>
-                              <object class="GtkButton" id="search">
-                                <property name="label" translatable="yes">_Find Next</property>
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="can_default">True</property>
-                                <property name="has_default">True</property>
-                                <property name="receives_default">True</property>
-                                <property name="use_underline">True</property>
-                              </object>
-                              <packing>
-                                <property name="left_attach">1</property>
-                                <property name="top_attach">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkButton" id="searchall">
-                                <property name="label" translatable="yes">Find _All</property>
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">True</property>
-                                <property name="use_underline">True</property>
-                              </object>
-                              <packing>
-                                <property name="left_attach">1</property>
-                                <property name="top_attach">1</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkGrid" id="grid12">
+                              <object class="GtkComboBox" id="searchterm">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="valign">center</property>
                                 <property name="hexpand">True</property>
-                                <child>
-                                  <object class="GtkComboBox" id="searchterm">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="valign">center</property>
-                                    <property name="hexpand">True</property>
-                                    <property name="has_entry">True</property>
-                                    <child internal-child="entry">
-                                      <object class="GtkEntry" id="combobox-entry">
-                                        <property name="can_focus">False</property>
-                                        <property name="invisible_char">●</property>
-                                      </object>
-                                    </child>
+                                <property name="has_entry">True</property>
+                                <child internal-child="entry">
+                                  <object class="GtkEntry" id="combobox-entry">
+                                    <property name="can_focus">True</property>
                                   </object>
-                                  <packing>
-                                    <property name="left_attach">0</property>
-                                    <property name="top_attach">0</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkComboBox" id="searchlist">
-                                    <property name="can_focus">False</property>
-                                    <property name="no_show_all">True</property>
-                                    <property name="hexpand">True</property>
-                                  </object>
-                                  <packing>
-                                    <property name="left_attach">0</property>
-                                    <property name="top_attach">1</property>
-                                  </packing>
                                 </child>
                               </object>
                               <packing>
                                 <property name="left_attach">0</property>
                                 <property name="top_attach">0</property>
-                                <property name="height">2</property>
                               </packing>
                             </child>
+                            <child>
+                              <object class="GtkComboBox" id="searchlist">
+                                <property name="can_focus">False</property>
+                                <property name="no_show_all">True</property>
+                                <property name="hexpand">True</property>
+                              </object>
+                              <packing>
+                                <property name="left_attach">0</property>
+                                <property name="top_attach">1</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left_attach">1</property>
+                            <property name="top_attach">0</property>
+                            <property name="height">2</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkLabel" id="label4">
+                            <property name="width_request">80</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="halign">start</property>
+                            <property name="valign">center</property>
+                            <property name="xalign">0</property>
+                            <property name="yalign">0.40000000596046448</property>
+                            <property name="label" translatable="yes">_Find:</property>
+                            <property name="use_underline">True</property>
+                            <attributes>
+                              <attribute name="weight" value="bold"/>
+                            </attributes>
                           </object>
                           <packing>
                             <property name="left_attach">0</property>
@@ -166,19 +146,47 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkBox" id="box4">
+                          <object class="GtkLabel" id="searchdesc">
+                            <property name="can_focus">False</property>
+                            <property name="no_show_all">True</property>
+                            <property name="hexpand">True</property>
+                            <property name="xalign">0</property>
+                            <property name="yalign">0.55000001192092896</property>
+                            <property name="wrap">True</property>
+                          </object>
+                          <packing>
+                            <property name="left_attach">1</property>
+                            <property name="top_attach">2</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkLabel" id="searchlabel">
+                            <property name="can_focus">False</property>
+                            <property name="no_show_all">True</property>
+                            <property name="hexpand">True</property>
+                            <property name="xalign">0</property>
+                            <property name="wrap">True</property>
+                            <property name="ellipsize">start</property>
+                          </object>
+                          <packing>
+                            <property name="left_attach">1</property>
+                            <property name="top_attach">4</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkBox" id="checkboxrow">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
-                            <property name="hexpand">True</property>
-                            <property name="orientation">vertical</property>
+                            <property name="spacing">12</property>
                             <child>
-                              <object class="GtkLabel" id="searchdesc">
-                                <property name="can_focus">False</property>
-                                <property name="no_show_all">True</property>
-                                <property name="hexpand">True</property>
+                              <object class="GtkCheckButton" id="matchcase">
+                                <property name="label" translatable="yes">Ma_tch case</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">False</property>
+                                <property name="use_underline">True</property>
                                 <property name="xalign">0</property>
-                                <property name="yalign">0.55000001192092896</property>
-                                <property name="wrap">True</property>
+                                <property name="draw_indicator">True</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -187,12 +195,13 @@
                               </packing>
                             </child>
                             <child>
-                              <object class="GtkLabel" id="searchlabel">
-                                <property name="can_focus">False</property>
-                                <property name="no_show_all">True</property>
-                                <property name="hexpand">True</property>
+                              <object class="GtkCheckButton" id="searchformatted">
+                                <property name="label" translatable="yes">Formatted display</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">False</property>
                                 <property name="xalign">0</property>
-                                <property name="wrap">True</property>
+                                <property name="draw_indicator">True</property>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -200,10 +209,66 @@
                                 <property name="position">1</property>
                               </packing>
                             </child>
+                            <child>
+                              <object class="GtkBox" id="box6">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <child>
+                                  <object class="GtkCheckButton" id="wholewords">
+                                    <property name="label" translatable="yes">Whole wor_ds only</property>
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="receives_default">False</property>
+                                    <property name="use_underline">True</property>
+                                    <property name="xalign">0</property>
+                                    <property name="draw_indicator">True</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">0</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkLabel" id="entirecells">
+                                    <property name="can_focus">False</property>
+                                    <property name="no_show_all">True</property>
+                                    <property name="label" translatable="yes">_Entire cells</property>
+                                    <property name="use_underline">True</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">1</property>
+                                  </packing>
+                                </child>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">2</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkCheckButton" id="allsheets">
+                                <property name="label" translatable="yes">All sheets</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">False</property>
+                                <property name="no_show_all">True</property>
+                                <property name="use_underline">True</property>
+                                <property name="xalign">0</property>
+                                <property name="draw_indicator">True</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">3</property>
+                              </packing>
+                            </child>
                           </object>
                           <packing>
-                            <property name="left_attach">0</property>
-                            <property name="top_attach">1</property>
+                            <property name="left_attach">1</property>
+                            <property name="top_attach">3</property>
                           </packing>
                         </child>
                       </object>
@@ -212,7 +277,6 @@
                 </child>
                 <child type="label">
                   <object class="GtkLabel" id="label1">
-                    <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="label" translatable="yes">_Search For</property>
                     <property name="use_underline">True</property>
@@ -236,94 +300,75 @@
                 <property name="label_xalign">0</property>
                 <property name="shadow_type">none</property>
                 <child>
-                  <object class="GtkAlignment" id="alignment2">
+                  <object class="GtkAlignment" id="alignment_rep">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="hexpand">True</property>
-                    <property name="top_padding">6</property>
                     <property name="left_padding">12</property>
                     <child>
-                      <object class="GtkGrid" id="grid1">
+                      <object class="GtkGrid" id="replace_grid">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="hexpand">True</property>
+                        <property name="orientation">vertical</property>
                         <property name="row_spacing">6</property>
+                        <property name="column_spacing">12</property>
                         <child>
-                          <object class="GtkGrid" id="grid9">
+                          <object class="GtkGrid" id="grid11">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
+                            <property name="valign">center</property>
+                            <property name="margin_right">6</property>
                             <property name="hexpand">True</property>
-                            <property name="row_spacing">6</property>
-                            <property name="column_spacing">12</property>
                             <child>
-                              <object class="GtkButton" id="replace">
-                                <property name="label" translatable="yes">_Replace</property>
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">True</property>
-                                <property name="use_underline">True</property>
-                              </object>
-                              <packing>
-                                <property name="left_attach">1</property>
-                                <property name="top_attach">0</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkButton" id="replaceall">
-                                <property name="label" translatable="yes">Replace A_ll</property>
-                                <property name="visible">True</property>
-                                <property name="can_focus">True</property>
-                                <property name="receives_default">True</property>
-                                <property name="use_underline">True</property>
-                              </object>
-                              <packing>
-                                <property name="left_attach">1</property>
-                                <property name="top_attach">1</property>
-                              </packing>
-                            </child>
-                            <child>
-                              <object class="GtkGrid" id="grid11">
+                              <object class="GtkComboBox" id="replaceterm">
                                 <property name="visible">True</property>
                                 <property name="can_focus">False</property>
                                 <property name="valign">center</property>
                                 <property name="hexpand">True</property>
-                                <child>
-                                  <object class="GtkComboBox" id="replaceterm">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="valign">center</property>
-                                    <property name="hexpand">True</property>
-                                    <property name="has_entry">True</property>
-                                    <child internal-child="entry">
-                                      <object class="GtkEntry" id="combobox-entry2">
-                                        <property name="can_focus">False</property>
-                                        <property name="invisible_char">●</property>
-                                      </object>
-                                    </child>
+                                <property name="has_entry">True</property>
+                                <child internal-child="entry">
+                                  <object class="GtkEntry" id="combobox-entry2">
+                                    <property name="can_focus">True</property>
                                   </object>
-                                  <packing>
-                                    <property name="left_attach">0</property>
-                                    <property name="top_attach">0</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkComboBox" id="replacelist">
-                                    <property name="can_focus">False</property>
-                                    <property name="no_show_all">True</property>
-                                    <property name="hexpand">True</property>
-                                  </object>
-                                  <packing>
-                                    <property name="left_attach">0</property>
-                                    <property name="top_attach">1</property>
-                                  </packing>
                                 </child>
                               </object>
                               <packing>
                                 <property name="left_attach">0</property>
                                 <property name="top_attach">0</property>
-                                <property name="height">2</property>
                               </packing>
                             </child>
+                            <child>
+                              <object class="GtkComboBox" id="replacelist">
+                                <property name="can_focus">False</property>
+                                <property name="no_show_all">True</property>
+                                <property name="hexpand">True</property>
+                              </object>
+                              <packing>
+                                <property name="left_attach">0</property>
+                                <property name="top_attach">1</property>
+                              </packing>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="left_attach">1</property>
+                            <property name="top_attach">0</property>
+                            <property name="height">2</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkLabel" id="label5">
+                            <property name="width_request">80</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="halign">start</property>
+                            <property name="valign">center</property>
+                            <property name="xalign">0</property>
+                            <property name="label" translatable="yes">Re_place:</property>
+                            <property name="use_underline">True</property>
+                            <attributes>
+                              <attribute name="weight" value="bold"/>
+                            </attributes>
                           </object>
                           <packing>
                             <property name="left_attach">0</property>
@@ -331,30 +376,17 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkBox" id="box5">
-                            <property name="visible">True</property>
+                          <object class="GtkLabel" id="replacedesc">
+                            <property name="width_request">1</property>
                             <property name="can_focus">False</property>
+                            <property name="no_show_all">True</property>
                             <property name="hexpand">True</property>
-                            <property name="orientation">vertical</property>
-                            <child>
-                              <object class="GtkLabel" id="replacedesc">
-                                <property name="width_request">1</property>
-                                <property name="can_focus">False</property>
-                                <property name="no_show_all">True</property>
-                                <property name="hexpand">True</property>
-                                <property name="xalign">0</property>
-                                <property name="wrap">True</property>
-                              </object>
-                              <packing>
-                                <property name="expand">False</property>
-                                <property name="fill">True</property>
-                                <property name="position">0</property>
-                              </packing>
-                            </child>
+                            <property name="xalign">0</property>
+                            <property name="wrap">True</property>
                           </object>
                           <packing>
-                            <property name="left_attach">0</property>
-                            <property name="top_attach">1</property>
+                            <property name="left_attach">1</property>
+                            <property name="top_attach">2</property>
                           </packing>
                         </child>
                       </object>
@@ -363,7 +395,6 @@
                 </child>
                 <child type="label">
                   <object class="GtkLabel" id="label2">
-                    <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="label" translatable="yes">Re_place With</property>
                     <property name="use_underline">True</property>
@@ -379,49 +410,166 @@
                 <property name="position">1</property>
               </packing>
             </child>
+            <child>
+              <object class="GtkBox" id="controlbox">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="halign">center</property>
+                <property name="margin_left">10</property>
+                <property name="margin_right">10</property>
+                <property name="margin_top">15</property>
+                <property name="spacing">12</property>
+                <property name="homogeneous">True</property>
+                <child>
+                  <object class="GtkButton" id="searchall">
+                    <property name="label" translatable="yes">Find _All</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">True</property>
+                    <property name="use_underline">True</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkButton" id="backsearch">
+                    <property name="label" translatable="yes">Find Previous</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">True</property>
+                    <property name="use_underline">True</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkButton" id="search">
+                    <property name="label" translatable="yes">_Find Next</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="can_default">True</property>
+                    <property name="has_default">True</property>
+                    <property name="receives_default">True</property>
+                    <property name="use_underline">True</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">2</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkButton" id="replace">
+                    <property name="label" translatable="yes">_Replace</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">True</property>
+                    <property name="use_underline">True</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">3</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkButton" id="replaceall">
+                    <property name="label" translatable="yes">Replace A_ll</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">True</property>
+                    <property name="use_underline">True</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">4</property>
+                  </packing>
+                </child>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">2</property>
+              </packing>
+            </child>
             <child>
               <object class="GtkFrame" id="componentframe">
                 <property name="can_focus">False</property>
                 <property name="no_show_all">True</property>
+                <property name="margin_top">6</property>
                 <property name="hexpand">True</property>
                 <property name="label_xalign">0</property>
                 <property name="shadow_type">none</property>
                 <child>
-                  <object class="GtkAlignment" id="alignment3">
+                  <object class="GtkAlignment" id="alignment_cmp">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="hexpand">True</property>
                     <property name="top_padding">6</property>
                     <property name="left_padding">12</property>
                     <child>
-                      <object class="GtkGrid" id="grid10">
+                      <object class="GtkBox" id="component_box">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="hexpand">True</property>
-                        <property name="row_spacing">6</property>
-                        <property name="column_spacing">12</property>
+                        <property name="spacing">18</property>
                         <child>
-                          <object class="GtkButton" id="component1">
-                            <property name="label" translatable="no">component button 1</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">True</property>
-                            <property name="no_show_all">True</property>
+                          <object class="GtkLabel" id="label7">
+                            <property name="can_focus">False</property>
+                            <property name="label">Component Label</property>
+                            <property name="use_underline">True</property>
+                            <attributes>
+                              <attribute name="weight" value="bold"/>
+                            </attributes>
                           </object>
                           <packing>
-                            <property name="left_attach">0</property>
-                            <property name="top_attach">0</property>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">1</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkButton" id="component2">
-                            <property name="label" translatable="no">component button 2</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">True</property>
-                            <property name="no_show_all">True</property>
+                          <object class="GtkBox" id="box1">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="spacing">12</property>
+                            <child>
+                              <object class="GtkButton" id="component1">
+                                <property name="label">component button 1</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">True</property>
+                                <property name="no_show_all">True</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkButton" id="component2">
+                                <property name="label">component button 2</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">True</property>
+                                <property name="no_show_all">True</property>
+                              </object>
+                              <packing>
+                                <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">1</property>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">2</property>
                           </packing>
                         </child>
                       </object>
@@ -430,9 +578,8 @@
                 </child>
                 <child type="label">
                   <object class="GtkLabel" id="label6">
-                    <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="label" translatable="no">Component Label</property>
+                    <property name="label">Component Label</property>
                     <property name="use_underline">True</property>
                     <attributes>
                       <attribute name="weight" value="bold"/>
@@ -443,24 +590,26 @@
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">True</property>
-                <property name="position">2</property>
+                <property name="position">3</property>
               </packing>
             </child>
             <child>
-              <object class="GtkGrid" id="grid3">
+              <object class="GtkGrid" id="optionsgrid">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
+                <property name="margin_top">10</property>
                 <property name="hexpand">True</property>
-                <property name="row_spacing">6</property>
                 <child>
-                  <object class="GtkExpander" id="expander1">
+                  <object class="GtkExpander" id="OptionsExpander">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
+                    <property name="margin_left">6</property>
                     <property name="margin_top">1</property>
                     <property name="margin_bottom">1</property>
                     <property name="hexpand">True</property>
+                    <property name="label_fill">True</property>
                     <child>
-                      <object class="GtkAlignment" id="alignment4">
+                      <object class="GtkAlignment" id="alignment5">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="top_padding">6</property>
@@ -479,6 +628,7 @@
                                 <property name="hexpand">True</property>
                                 <property name="row_spacing">6</property>
                                 <property name="column_spacing">12</property>
+                                <property name="column_homogeneous">True</property>
                                 <child>
                                   <object class="GtkCheckButton" id="selection">
                                     <property name="label" translatable="yes">C_urrent selection only</property>
@@ -509,21 +659,6 @@
                                     <property name="top_attach">1</property>
                                   </packing>
                                 </child>
-                                <child>
-                                  <object class="GtkCheckButton" id="wildcard">
-                                    <property name="label" translatable="yes">Wil_dcards</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="receives_default">False</property>
-                                    <property name="no_show_all">True</property>
-                                    <property name="use_underline">True</property>
-                                    <property name="xalign">0</property>
-                                    <property name="draw_indicator">True</property>
-                                  </object>
-                                  <packing>
-                                    <property name="left_attach">0</property>
-                                    <property name="top_attach">2</property>
-                                  </packing>
-                                </child>
                                 <child>
                                   <object class="GtkButtonBox" id="buttonbox1">
                                     <property name="visible">True</property>
@@ -576,25 +711,10 @@
                                   </object>
                                   <packing>
                                     <property name="left_attach">0</property>
-                                    <property name="top_attach">6</property>
+                                    <property name="top_attach">5</property>
                                     <property name="width">2</property>
                                   </packing>
                                 </child>
-                                <child>
-                                  <object class="GtkCheckButton" id="backwards">
-                                    <property name="label" translatable="yes">Bac_kwards</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="receives_default">False</property>
-                                    <property name="no_show_all">True</property>
-                                    <property name="use_underline">True</property>
-                                    <property name="xalign">0</property>
-                                    <property name="draw_indicator">True</property>
-                                  </object>
-                                  <packing>
-                                    <property name="left_attach">1</property>
-                                    <property name="top_attach">0</property>
-                                  </packing>
-                                </child>
                                 <child>
                                   <object class="GtkCheckButton" id="layout">
                                     <property name="label" translatable="yes">Search for st_yles</property>
@@ -612,7 +732,7 @@
                                 </child>
                                 <child>
                                   <object class="GtkCheckButton" id="ignorediacritics">
-                                    <property name="label" translatable="yes">Ignore diacritics CTL</property>
+                                    <property name="label" translatable="yes">Ignore diac_ritics CTL</property>
                                     <property name="visible">True</property>
                                     <property name="can_focus">True</property>
                                     <property name="receives_default">False</property>
@@ -622,156 +742,6 @@
                                   </object>
                                   <packing>
                                     <property name="left_attach">0</property>
-                                    <property name="top_attach">5</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkGrid" id="grid6">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="row_spacing">6</property>
-                                    <property name="column_spacing">12</property>
-                                    <child>
-                                      <object class="GtkCheckButton" id="similarity">
-                                        <property name="label" translatable="yes">S_imilarity search</property>
-                                        <property name="can_focus">True</property>
-                                        <property name="receives_default">False</property>
-                                        <property name="no_show_all">True</property>
-                                        <property name="use_underline">True</property>
-                                        <property name="xalign">0</property>
-                                        <property name="draw_indicator">True</property>
-                                        <accessibility>
-                                          <relation type="label-for" target="similaritybtn"/>
-                                        </accessibility>
-                                      </object>
-                                      <packing>
-                                        <property name="left_attach">0</property>
-                                        <property name="top_attach">0</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkButton" id="similaritybtn">
-                                        <property name="label" translatable="yes">Similarities...</property>
-                                        <property name="can_focus">True</property>
-                                        <property name="receives_default">True</property>
-                                        <property name="no_show_all">True</property>
-                                        <property name="halign">start</property>
-                                        <property name="hexpand">True</property>
-                                        <property name="use_underline">True</property>
-                                      </object>
-                                      <packing>
-                                        <property name="left_attach">1</property>
-                                        <property name="top_attach">0</property>
-                                      </packing>
-                                    </child>
-                                  </object>
-                                  <packing>
-                                    <property name="left_attach">0</property>
-                                    <property name="top_attach">3</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkBox" id="box7">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <child>
-                                      <object class="GtkCheckButton" id="notes">
-                                        <property name="label" translatable="yes">Comments</property>
-                                        <property name="visible">True</property>
-                                        <property name="can_focus">True</property>
-                                        <property name="receives_default">False</property>
-                                        <property name="use_underline">True</property>
-                                        <property name="xalign">0</property>
-                                        <property name="draw_indicator">True</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="fill">True</property>
-                                        <property name="position">0</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkCheckButton" id="allsheets">
-                                        <property name="label" translatable="yes">All sheets</property>
-                                        <property name="can_focus">True</property>
-                                        <property name="receives_default">False</property>
-                                        <property name="no_show_all">True</property>
-                                        <property name="use_underline">True</property>
-                                        <property name="xalign">0</property>
-                                        <property name="draw_indicator">True</property>
-                                      </object>
-                                      <packing>
-                                        <property name="expand">False</property>
-                                        <property name="fill">True</property>
-                                        <property name="position">1</property>
-                                      </packing>
-                                    </child>
-                                  </object>
-                                  <packing>
-                                    <property name="left_attach">1</property>
-                                    <property name="top_attach">2</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkGrid" id="grid8">
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">False</property>
-                                    <property name="row_spacing">6</property>
-                                    <property name="column_spacing">12</property>
-                                    <child>
-                                      <object class="GtkCheckButton" id="soundslike">
-                                        <property name="label" translatable="yes">Sounds like (Japanese)</property>
-                                        <property name="can_focus">True</property>
-                                        <property name="receives_default">False</property>
-                                        <property name="no_show_all">True</property>
-                                        <property name="use_underline">True</property>
-                                        <property name="xalign">0</property>
-                                        <property name="draw_indicator">True</property>
-                                        <accessibility>
-                                          <relation type="label-for" target="soundslikebtn"/>
-                                        </accessibility>
-                                      </object>
-                                      <packing>
-                                        <property name="left_attach">0</property>
-                                        <property name="top_attach">0</property>
-                                      </packing>
-                                    </child>
-                                    <child>
-                                      <object class="GtkButton" id="soundslikebtn">
-                                        <property name="label" translatable="yes">Sounds...</property>
-                                        <property name="can_focus">True</property>
-                                        <property name="receives_default">True</property>
-                                        <property name="no_show_all">True</property>
-                                        <property name="halign">start</property>
-                                        <property name="hexpand">True</property>
-                                        <property name="use_underline">True</property>
-                                        <accessibility>
-                                          <relation type="labelled-by" target="soundslike"/>
-                                        </accessibility>
-                                      </object>
-                                      <packing>
-                                        <property name="left_attach">1</property>
-                                        <property name="top_attach">0</property>
-                                      </packing>
-                                    </child>
-                                  </object>
-                                  <packing>
-                                    <property name="left_attach">0</property>
-                                    <property name="top_attach">4</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkCheckButton" id="matchcharwidth">
-                                    <property name="label" translatable="yes">Match character width</property>
-                                    <property name="visible">True</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="receives_default">False</property>
-                                    <property name="use_underline">True</property>
-                                    <property name="xalign">0</property>
-                                    <property name="draw_indicator">True</property>
-                                  </object>
-                                  <packing>
-                                    <property name="left_attach">1</property>
                                     <property name="top_attach">4</property>
                                   </packing>
                                 </child>
@@ -787,7 +757,166 @@
                                   </object>
                                   <packing>
                                     <property name="left_attach">1</property>
-                                    <property name="top_attach">5</property>
+                                    <property name="top_attach">4</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkCheckButton" id="matchcharwidth">
+                                    <property name="label" translatable="yes">Match character _width</property>
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="receives_default">False</property>
+                                    <property name="use_underline">True</property>
+                                    <property name="xalign">0</property>
+                                    <property name="draw_indicator">True</property>
+                                  </object>
+                                  <packing>
+                                    <property name="left_attach">1</property>
+                                    <property name="top_attach">2</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkBox" id="box3">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="spacing">12</property>
+                                    <child>
+                                      <object class="GtkCheckButton" id="similarity">
+                                        <property name="label" translatable="yes">S_imilarity search</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="receives_default">False</property>
+                                        <property name="no_show_all">True</property>
+                                        <property name="use_underline">True</property>
+                                        <property name="xalign">0</property>
+                                        <property name="draw_indicator">True</property>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">0</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkButton" id="similaritybtn">
+                                        <property name="label" translatable="yes">Similarities...</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="receives_default">True</property>
+                                        <property name="no_show_all">True</property>
+                                        <property name="halign">end</property>
+                                        <property name="hexpand">True</property>
+                                        <property name="use_underline">True</property>
+                                      </object>
+                                      <packing>
+                                        <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">2</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkBox" id="box5">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="spacing">12</property>
+                                    <child>
+                                      <object class="GtkCheckButton" id="soundslike">
+                                        <property name="label" translatable="yes">_Sounds like (Japanese)</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="receives_default">False</property>
+                                        <property name="no_show_all">True</property>
+                                        <property name="use_underline">True</property>
+                                        <property name="xalign">0</property>
+                                        <property name="draw_indicator">True</property>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">0</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkButton" id="soundslikebtn">
+                                        <property name="label" translatable="yes">Sounds...</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="receives_default">True</property>
+                                        <property name="no_show_all">True</property>
+                                        <property name="halign">end</property>
+                                        <property name="margin_right">25</property>
+                                        <property name="hexpand">True</property>
+                                        <property name="use_underline">True</property>
+                                      </object>
+                                      <packing>
+                                        <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">3</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkBox" id="box7">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <child>
+                                      <object class="GtkCheckButton" id="wildcard">
+                                        <property name="label" translatable="yes">Wil_dcards</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="receives_default">False</property>
+                                        <property name="no_show_all">True</property>
+                                        <property name="use_underline">True</property>
+                                        <property name="xalign">0</property>
+                                        <property name="draw_indicator">True</property>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">0</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkCheckButton" id="notes">
+                                        <property name="label" translatable="yes">_Comments</property>
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="receives_default">False</property>
+                                        <property name="use_underline">True</property>
+                                        <property name="xalign">0</property>
+                                        <property name="draw_indicator">True</property>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">1</property>
+                                      </packing>
+                                    </child>
+                                  </object>
+                                  <packing>
+                                    <property name="left_attach">1</property>
+                                    <property name="top_attach">3</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkCheckButton" id="replace_backwards">
+                                    <property name="label" translatable="yes">Replace Bac_kwards</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="receives_default">False</property>
+                                    <property name="no_show_all">True</property>
+                                    <property name="use_underline">True</property>
+                                    <property name="xalign">0</property>
+                                    <property name="draw_indicator">True</property>
+                                  </object>
+                                  <packing>
+                                    <property name="left_attach">1</property>
+                                    <property name="top_attach">0</property>
                                   </packing>
                                 </child>
                               </object>
@@ -801,32 +930,44 @@
                               <object class="GtkGrid" id="calcgrid">
                                 <property name="can_focus">False</property>
                                 <property name="no_show_all">True</property>
-                                <property name="halign">start</property>
                                 <property name="row_spacing">6</property>
                                 <property name="column_spacing">12</property>
+                                <property name="column_homogeneous">True</property>
                                 <child>
-                                  <object class="GtkLabel" id="searchinlabel">
+                                  <object class="GtkBox" id="searchin_box">
+                                    <property name="visible">True</property>
                                     <property name="can_focus">False</property>
-                                    <property name="no_show_all">True</property>
-                                    <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">Search i_n:</property>
-                                    <property name="use_underline">True</property>
-                                    <property name="mnemonic_widget">calcsearchin</property>
-                                  </object>
-                                  <packing>
-                                    <property name="left_attach">0</property>
-                                    <property name="top_attach">0</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkComboBoxText" id="calcsearchin">
-                                    <property name="can_focus">False</property>
-                                    <property name="no_show_all">True</property>
-                                    <items>
-                                      <item translatable="yes">Formulas</item>
-                                      <item translatable="yes">Values</item>
-                                      <item translatable="yes">Notes</item>
-                                    </items>
+                                    <property name="spacing">15</property>
+                                    <child>
+                                      <object class="GtkLabel" id="searchinlabel">
+                                        <property name="can_focus">False</property>
+                                        <property name="no_show_all">True</property>
+                                        <property name="xalign">0</property>
+                                        <property name="label" translatable="yes">Search i_n:</property>
+                                        <property name="use_underline">True</property>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">0</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkComboBoxText" id="calcsearchin">
+                                        <property name="can_focus">False</property>
+                                        <property name="no_show_all">True</property>
+                                        <items>
+                                          <item translatable="yes">Formulas</item>
+                                          <item translatable="yes">Values</item>
+                                          <item translatable="yes">Notes</item>
+                                        </items>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">1</property>
+                                      </packing>
+                                    </child>
                                   </object>
                                   <packing>
                                     <property name="left_attach">1</property>
@@ -834,62 +975,82 @@
                                   </packing>
                                 </child>
                                 <child>
-                                  <object class="GtkLabel" id="searchdir">
+                                  <object class="GtkBox" id="searchdirection_box">
+                                    <property name="visible">True</property>
                                     <property name="can_focus">False</property>
-                                    <property name="no_show_all">True</property>
-                                    <property name="xalign">0</property>
-                                    <property name="label" translatable="yes">Search direction:</property>
-                                    <property name="use_underline">True</property>
-                                    <property name="mnemonic_widget">calcsearchin</property>
+                                    <property name="margin_left">4</property>
+                                    <property name="spacing">15</property>
+                                    <child>
+                                      <object class="GtkLabel" id="searchdir">
+                                        <property name="can_focus">False</property>
+                                        <property name="no_show_all">True</property>
+                                        <property name="xalign">0</property>
+                                        <property name="label" translatable="yes">Direction:</property>
+                                        <property name="use_underline">True</property>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">0</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkBox" id="box4">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
+                                        <property name="spacing">15</property>
+                                        <child>
+                                          <object class="GtkRadioButton" id="rows">
+                                            <property name="label" translatable="yes">Ro_ws</property>
+                                            <property name="can_focus">True</property>
+                                            <property name="receives_default">False</property>
+                                            <property name="no_show_all">True</property>
+                                            <property name="use_underline">True</property>
+                                            <property name="xalign">0</property>
+                                            <property name="active">True</property>
+                                            <property name="draw_indicator">True</property>
+                                            <accessibility>
+                                              <relation type="member-of" target="searchdir"/>
+                                            </accessibility>
+                                          </object>
+                                          <packing>
+                                            <property name="expand">False</property>
+                                            <property name="fill">True</property>
+                                            <property name="position">0</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkRadioButton" id="cols">
+                                            <property name="label" translatable="yes">Colu_mns</property>
+                                            <property name="can_focus">True</property>
+                                            <property name="receives_default">False</property>
+                                            <property name="no_show_all">True</property>
+                                            <property name="use_underline">True</property>
+                                            <property name="xalign">0</property>
+                                            <property name="draw_indicator">True</property>
+                                            <accessibility>
+                                              <relation type="member-of" target="searchdir"/>
+                                            </accessibility>
+                                          </object>
+                                          <packing>
+                                            <property name="expand">False</property>
+                                            <property name="fill">True</property>
+                                            <property name="position">1</property>
+                                          </packing>
+                                        </child>
+                                      </object>
+                                      <packing>
+                                        <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">1</property>
+                                    <property name="top_attach">0</property>
                                   </packing>
                                 </child>
-                                <child>
-                                  <object class="GtkRadioButton" id="rows">
-                                    <property name="label" translatable="yes">Ro_ws</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="receives_default">False</property>
-                                    <property name="no_show_all">True</property>
-                                    <property name="use_underline">True</property>
-                                    <property name="xalign">0</property>
-                                    <property name="active">True</property>
-                                    <property name="draw_indicator">True</property>
-                                    <property name="group">cols</property>
-                                    <accessibility>
-                                      <relation type="member-of" target="searchdir"/>
-                                    </accessibility>
-                                  </object>
-                                  <packing>
-                                    <property name="left_attach">1</property>
-                                    <property name="top_attach">1</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <object class="GtkRadioButton" id="cols">
-                                    <property name="label" translatable="yes">Colu_mns</property>
-                                    <property name="can_focus">True</property>
-                                    <property name="receives_default">False</property>
-                                    <property name="no_show_all">True</property>
-                                    <property name="use_underline">True</property>
-                                    <property name="xalign">0</property>
-                                    <property name="active">True</property>
-                                    <property name="draw_indicator">True</property>
-                                    <property name="group">rows</property>
-                                    <accessibility>
-                                      <relation type="member-of" target="searchdir"/>
-                                    </accessibility>
-                                  </object>
-                                  <packing>
-                                    <property name="left_attach">1</property>
-                                    <property name="top_attach">2</property>
-                                  </packing>
-                                </child>
-                                <child>
-                                  <placeholder/>
-                                </child>
                               </object>
                               <packing>
                                 <property name="expand">False</property>
@@ -905,91 +1066,15 @@
                       <object class="GtkLabel" id="label3">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
+                        <property name="halign">start</property>
                         <property name="label" translatable="yes">Other _options</property>
                         <property name="use_underline">True</property>
+                        <attributes>
+                          <attribute name="weight" value="bold"/>
+                        </attributes>
                       </object>
                     </child>
                   </object>
-                  <packing>
-                    <property name="left_attach">0</property>
-                    <property name="top_attach">1</property>
-                  </packing>
-                </child>
-                <child>
-                  <object class="GtkGrid" id="grid13">
-                    <property name="visible">True</property>
-                    <property name="can_focus">False</property>
-                    <property name="column_spacing">12</property>
-                    <child>
-                      <object class="GtkCheckButton" id="matchcase">
-                        <property name="label" translatable="yes">Ma_tch case</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
-                        <property name="use_underline">True</property>
-                        <property name="xalign">0</property>
-                        <property name="draw_indicator">True</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">0</property>
-                        <property name="top_attach">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkCheckButton" id="searchformatted">
-                        <property name="label" translatable="yes">Formatted display</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="receives_default">False</property>
-                        <property name="use_underline">False</property>
-                        <property name="xalign">0</property>
-                        <property name="draw_indicator">True</property>
-                      </object>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="top_attach">0</property>
-                      </packing>
-                    </child>
-                    <child>
-                      <object class="GtkBox" id="box6">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <child>
-                          <object class="GtkCheckButton" id="wholewords">
-                            <property name="label" translatable="yes">Whole wor_ds only</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">False</property>
-                            <property name="use_underline">True</property>
-                            <property name="xalign">0</property>
-                            <property name="draw_indicator">True</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="entirecells">
-                            <property name="can_focus">False</property>
-                            <property name="no_show_all">True</property>
-                            <property name="label" translatable="yes">_Entire cells</property>
-                            <property name="use_underline">True</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">True</property>
-                            <property name="position">1</property>
-                          </packing>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="left_attach">2</property>
-                        <property name="top_attach">0</property>
-                      </packing>
-                    </child>
-                  </object>
                   <packing>
                     <property name="left_attach">0</property>
                     <property name="top_attach">0</property>
@@ -1016,20 +1101,7 @@
       <action-widget response="0">close</action-widget>
     </action-widgets>
   </object>
-  <object class="GtkSizeGroup" id="sizegroup1">
-    <widgets>
-      <widget name="search"/>
-      <widget name="searchall"/>
-      <widget name="replace"/>
-      <widget name="replaceall"/>
-    </widgets>
-  </object>
   <object class="GtkSizeGroup" id="sizegroup2">
     <property name="ignore_hidden">True</property>
-    <widgets>
-      <widget name="similarity"/>
-      <widget name="soundslike"/>
-    </widgets>
   </object>
-  <object class="GtkSizeGroup" id="sizegroup3"/>
 </interface>
diff --git a/sw/source/uibase/uiview/viewsrch.cxx b/sw/source/uibase/uiview/viewsrch.cxx
index 23283de9d6b0..58012322104b 100644
--- a/sw/source/uibase/uiview/viewsrch.cxx
+++ b/sw/source/uibase/uiview/viewsrch.cxx
@@ -85,11 +85,6 @@ struct SwSearchOptions
     SwSearchOptions( SwWrtShell* pSh, bool bBackward );
 };
 
-static vcl::Window* GetParentWindow( SvxSearchDialog* pSrchDlg )
-{
-    return pSrchDlg && pSrchDlg->IsVisible() ? pSrchDlg : nullptr;
-}
-
 /// Adds rMatches using rKey as a key to the rTree tree.
 static void lcl_addContainerToJson(boost::property_tree::ptree& rTree, const OString& rKey, const std::vector<OString>& rMatches)
 {
@@ -193,7 +188,7 @@ void SwView::ExecSearch(SfxRequest& rReq)
             {
                 // We will remember the search-/replace items.
                 const SearchAttrItemList* pList = pSrchDlg->GetSearchItemList();
-                if( pList && pList->Count() )
+                if( nullptr != pList && pList->Count() )
                     m_pSrchList = new SearchAttrItemList( *pList );
 
                 pList = pSrchDlg->GetReplaceItemList();
@@ -218,7 +213,7 @@ void SwView::ExecSearch(SfxRequest& rReq)
                 DELETEZ( m_pReplList );
 
                 const SearchAttrItemList* pList = pSrchDlg->GetSearchItemList();
-                if( pList && pList->Count() )
+                if( nullptr != pList && pList->Count() )
                     m_pSrchList = new SearchAttrItemList( *pList );
 
                 pList = pSrchDlg->GetReplaceItemList();
@@ -414,11 +409,9 @@ void SwView::ExecSearch(SfxRequest& rReq)
 
                     if( !bQuiet && ULONG_MAX != nFound)
                     {
-                        OUString aText( SW_RES( STR_NB_REPLACED ) );
-                        aText = aText.replaceFirst("XX", OUString::number( nFound ));
-                        pSrchDlg = GetSearchDialog();
-                        vcl::Window* pParentWindow = GetParentWindow(pSrchDlg);
-                        ScopedVclPtr<InfoBox>::Create( pParentWindow, aText )->Execute();
+                        OUString sText( SW_RES( STR_NB_REPLACED ) );
+                        sText = sText.replaceFirst("XX", OUString::number( nFound ));
+                        SvxSearchDialogWrapper::SetSearchLabel(sText);
                     }
                 }
 #if HAVE_FEATURE_DESKTOP