diff --git a/src/viewer/searchbar.cpp b/src/viewer/searchbar.cpp
index a5f0f69f..bd79fe66 100644
--- a/src/viewer/searchbar.cpp
+++ b/src/viewer/searchbar.cpp
@@ -1,269 +1,271 @@
 /*
   This program is free software; you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation; either version 2 of the License, or
   (at your option) any later version.
 */
 
 /*
   Copyright (C) 2005 Renchi Raju <renchi@pooh.tam.uiuc.edu>
   Copyright (C) 2006 Peter Simonsson <psn@linux.se>
 */
 
 #include "searchbar.h"
 
 #include "application.h"
 
 #include <QFocusEvent>
 #include <QTimer>
 #include <QShortcut>
 
 #include <KActionCollection>
 #include <KColorScheme>
 #include <KStandardAction>
 #include <QMenu>
 
 
 SearchBar::SearchBar(QWidget* parent)
-: QWidget(parent), m_goUpSearch("go-up-search"), m_goDownSearch("go-down-search")
+: QWidget(parent),
+  m_goUpSearch(QIcon::fromTheme("go-up-search")),
+  m_goDownSearch(QIcon::fromTheme("go-down-search"))
 {
     setupUi(this);
 
     foreach(QWidget* widget, findChildren<QWidget*>())
         widget->installEventFilter(this);
 
     parent->installEventFilter(this); // HACK See notes in SearchBar::eventFilter
 
     m_searchFoward = false;
     m_matchCase = false;
     m_wholeWords = false;
     m_fromCursor = false;
 
     setFocusProxy(m_searchEdit);
     m_closeButton->setIcon(QIcon::fromTheme("dialog-close"));
     m_findNextButton->setIcon(m_goUpSearch);
     m_findPreviousButton->setIcon(m_goDownSearch);
     Application* konvApp = Application::instance();
     konvApp->getMainWindow()->actionCollection()->action(KStandardAction::name(KStandardAction::FindNext))->setIcon(m_goUpSearch);
     konvApp->getMainWindow()->actionCollection()->action(KStandardAction::name(KStandardAction::FindPrev))->setIcon(m_goDownSearch);
 
     m_timer = new QTimer(this);
     m_timer->setSingleShot(true);
 
     m_closeShortcut = new QShortcut(QKeySequence(Qt::Key_Escape), this, SLOT(hide()));
     m_closeShortcut->setEnabled(false);
 
     connect(m_timer, &QTimer::timeout, this, &SearchBar::slotFind);
     connect(m_searchEdit, &KLineEdit::textChanged, this, &SearchBar::slotTextChanged);
     connect(m_searchEdit, &KLineEdit::returnPressed, this, &SearchBar::slotFindNext);
     connect(m_findNextButton, &QPushButton::clicked, this, &SearchBar::slotFindNext);
     connect(m_findPreviousButton, &QPushButton::clicked, this, &SearchBar::slotFindPrevious);
     connect(m_closeButton, &QToolButton::clicked, this, &SearchBar::hide);
     connect(m_optionsButton, &QToolButton::clicked, this, &SearchBar::showOptionsMenu);
 
     QAction *action = 0;
     m_optionsMenu = new QMenu(m_optionsButton);
     action = m_optionsMenu->addAction(i18n("Find Forward"));
     action->setCheckable(true);
     connect(action, &QAction::toggled, this, &SearchBar::toggleSearchFoward);
     action = m_optionsMenu->addAction(i18n("Match Case"));
     action->setCheckable(true);
     connect(action, &QAction::toggled, this, &SearchBar::toggleMatchCase);
     action = m_optionsMenu->addAction(i18n("Whole Words Only"));
     action->setCheckable(true);
     connect(action, &QAction::toggled, this, &SearchBar::toggleWholeWords);
     action = m_optionsMenu->addAction(i18n("From Cursor"));
     action->setCheckable(true);
     connect(action, &QAction::toggled, this, &SearchBar::toggleFromCursor);
 
     m_optionsButton->setMenu(m_optionsMenu);
 }
 
 SearchBar::~SearchBar()
 {
 }
 
 bool SearchBar::eventFilter(QObject* object, QEvent* e)
 {
     QFocusEvent* focusEvent = 0;
 
     // HACK This event comes from the ViewContainer when
     // updateViewActions is called. ViewContainer can't
     // check the status of the search box, and so tramples
     // on the QAction we're managing - that is until the
     // ambiguous shortcut dialog box pops up, at which point
     // a focus event is sent to the searchbar and the other
     // stanza in this method is triggered.
     // 414 was the time of day when I named the event.
     bool hack = (object == parent() && e->type() == QEvent::User+414);
     if (hack && hasFocus())
         focusEvent = new QFocusEvent(QEvent::FocusIn);
     else
         focusEvent = dynamic_cast<QFocusEvent*>(e);
 
     if (focusEvent)
     {
         Application* konvApp = Application::instance();
         QAction * action = static_cast<QAction*>(konvApp->getMainWindow()->actionCollection()->action("focus_input_box"));
 
         if (action->shortcut().matches(QKeySequence(Qt::Key_Escape)))
         {
             action->setEnabled(focusEvent->lostFocus());
             m_closeShortcut->setEnabled(focusEvent->gotFocus());
         }
     }
 
     if (hack)
         delete focusEvent;
 
     return hack;
 }
 
 void SearchBar::showEvent(QShowEvent *e)
 {
     QWidget::showEvent(e);
     m_searchEdit->selectAll();
 }
 
 bool SearchBar::focusedChild()
 {
     QList<QWidget *> l = findChildren<QWidget *>();
 
     for (int i=0; i < l.size(); i++)
         if (l.at(i)->hasFocus())
             return true;
     return false;
 }
 
 void SearchBar::hideEvent(QHideEvent* e)
 {
     m_timer->stop();
     QWidget::hideEvent(e);
 
     if (focusedChild())
         emit hidden();
 }
 
 void SearchBar::slotTextChanged()
 {
     m_timer->start(50);
 }
 
 void SearchBar::slotFind()
 {
     if (m_searchEdit->text().isEmpty())
     {
         m_searchEdit->setPalette(QPalette());
         m_findNextButton->setEnabled(false);
         m_findPreviousButton->setEnabled(false);
         return;
     }
 
     emit signalSearchChanged(m_searchEdit->text());
 }
 
 void SearchBar::slotFindNext()
 {
     if (m_searchEdit->text().isEmpty())
     {
         m_searchEdit->setPalette(QPalette());
         m_findNextButton->setEnabled(false);
         m_findPreviousButton->setEnabled(false);
         return;
     }
 
     emit signalSearchNext();
 }
 
 void SearchBar::slotFindPrevious()
 {
     if (m_searchEdit->text().isEmpty())
     {
         m_searchEdit->setPalette(QPalette());
         m_findNextButton->setEnabled(false);
         m_findPreviousButton->setEnabled(false);
         return;
     }
 
     emit signalSearchPrevious();
 }
 
 void SearchBar::setHasMatch(bool value)
 {
     QPalette pal = m_searchEdit->palette();
     KColorScheme::adjustBackground(pal, value ? KColorScheme::PositiveBackground : KColorScheme::NegativeBackground);
     m_searchEdit->setPalette(pal);
 
     m_findNextButton->setEnabled(value);
     m_findPreviousButton->setEnabled(value);
 }
 
 QString SearchBar::pattern() const
 {
     return m_searchEdit->text();
 }
 
 bool SearchBar::searchForward() const
 {
     return m_searchFoward;
 }
 
 bool SearchBar::caseSensitive() const
 {
     return m_matchCase;
 }
 
 bool SearchBar::wholeWords() const
 {
     return m_wholeWords;
 }
 
 bool SearchBar::fromCursor() const
 {
     return m_fromCursor;
 }
 
 void SearchBar::toggleSearchFoward(bool value)
 {
     Application* konvApp = Application::instance();
     if (value) {
       m_findNextButton->setIcon(m_goDownSearch);
       m_findPreviousButton->setIcon(m_goUpSearch);
       konvApp->getMainWindow()->actionCollection()->action(KStandardAction::name(KStandardAction::FindNext))->setIcon(m_goDownSearch);
       konvApp->getMainWindow()->actionCollection()->action(KStandardAction::name(KStandardAction::FindPrev))->setIcon(m_goUpSearch);
     }
     else
     {
       m_findNextButton->setIcon(m_goUpSearch);
       m_findPreviousButton->setIcon(m_goDownSearch);
       konvApp->getMainWindow()->actionCollection()->action(KStandardAction::name(KStandardAction::FindNext))->setIcon(m_goUpSearch);
       konvApp->getMainWindow()->actionCollection()->action(KStandardAction::name(KStandardAction::FindPrev))->setIcon(m_goDownSearch);
     }
     m_searchFoward = value;
     slotTextChanged();
 }
 
 void SearchBar::toggleMatchCase(bool value)
 {
     m_matchCase = value;
     slotTextChanged();
 }
 
 void SearchBar::toggleWholeWords(bool value)
 {
     m_wholeWords = value;
     slotTextChanged();
 }
 
 void SearchBar::toggleFromCursor(bool value)
 {
     m_fromCursor = value;
     slotTextChanged();
 }
 
 void SearchBar::showOptionsMenu()
 {
   m_optionsButton->showMenu();
 }