diff --git a/krusader/Konfigurator/kgadvanced.cpp b/krusader/Konfigurator/kgadvanced.cpp
index 32cc79b5..3e636c38 100644
--- a/krusader/Konfigurator/kgadvanced.cpp
+++ b/krusader/Konfigurator/kgadvanced.cpp
@@ -1,114 +1,115 @@
 /*****************************************************************************
  * Copyright (C) 2004 Csaba Karai <krusader@users.sourceforge.net>           *
  * Copyright (C) 2004-2019 Krusader Krew [https://krusader.org]              *
  *                                                                           *
  * This file is part of Krusader [https://krusader.org].                     *
  *                                                                           *
  * Krusader 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.                                       *
  *                                                                           *
  * Krusader is distributed in the hope that it will be useful,               *
  * but WITHOUT ANY WARRANTY; without even the implied warranty of            *
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the             *
  * GNU General Public License for more details.                              *
  *                                                                           *
  * You should have received a copy of the GNU General Public License         *
  * along with Krusader.  If not, see [http://www.gnu.org/licenses/].         *
  *****************************************************************************/
 
 #include "kgadvanced.h"
 #include "../defaults.h"
 
 // QtWidgets
 #include <QGridLayout>
 #include <QLabel>
 
 #include <KI18n/KLocalizedString>
 #include <KIOCore/KProtocolInfo>
 
 KgAdvanced::KgAdvanced(bool first, QWidget* parent) :
         KonfiguratorPage(first, parent)
 {
     QWidget *innerWidget = new QFrame(this);
     setWidget(innerWidget);
     setWidgetResizable(true);
     auto *kgAdvancedLayout = new QGridLayout(innerWidget);
     kgAdvancedLayout->setSpacing(6);
 
     //  -------------------------- GENERAL GROUPBOX ----------------------------------
 
     QGroupBox *generalGrp = createFrame(i18n("General"), innerWidget);
     QGridLayout *generalGrid = createGridLayout(generalGrp);
 
     KONFIGURATOR_CHECKBOX_PARAM generalSettings[] =
         //   cfg_class  cfg_name             default              text                                                        restart tooltip
     {
         {"Advanced", "AutoMount",          _AutoMount,          i18n("Automount filesystems"),                            false,  i18n("When stepping into a folder which is defined as a mount point in the <b>fstab</b>, try mounting it with the defined parameters.")}
     };
 
     KonfiguratorCheckBoxGroup *generals = createCheckBoxGroup(1, 0, generalSettings, 1, generalGrp);
 
     generalGrid->addWidget(generals, 1, 0);
 
     addLabel(generalGrid, 2, 0, i18n("MountMan will not (un)mount the following mount-points:"),
              generalGrp);
     KonfiguratorEditBox *nonMountPoints = createEditBox("Advanced", "Nonmount Points", _NonMountPoints, generalGrp, false);
     generalGrid->addWidget(nonMountPoints, 2, 1);
 
 
 #ifdef BSD
     generals->find("AutoMount")->setEnabled(false);     /* disable AutoMount on BSD */
 #endif
 
     kgAdvancedLayout->addWidget(generalGrp, 0 , 0);
 
     //  ----------------------- CONFIRMATIONS GROUPBOX -------------------------------
 
     QGroupBox *confirmGrp = createFrame(i18n("Confirmations"), innerWidget);
     QGridLayout *confirmGrid = createGridLayout(confirmGrp);
 
     addLabel(confirmGrid, 0, 0, i18n("\nRequest user confirmation for the following operations:\n"),
              confirmGrp);
 
     KONFIGURATOR_CHECKBOX_PARAM confirmations[] =
         //   cfg_class  cfg_name                default             text                                          restart ToolTip
     {{"Advanced", "Confirm Unempty Dir",   _ConfirmUnemptyDir, i18n("Deleting non-empty folders"),       false,  ""},
         {"Advanced", "Confirm Delete",        _ConfirmDelete,     i18n("Deleting files"),                   false,  ""},
         {"Advanced", "Confirm Copy",          _ConfirmCopy,       i18n("Copying files"),                    false,  ""},
         {"Advanced", "Confirm Move",          _ConfirmMove,       i18n("Moving files"),                     false,  ""},
         {"Advanced", "Confirm Feed to Listbox",  _ConfirmFeedToListbox, i18n("Confirm feed to listbox"), false, i18n("Ask for a result name when feeding items to the listbox. By default the standard value is used.")},
         {"Notification Messages", "Confirm Remove UserAction", true, i18n("Removing Useractions"), false,  ""}
     };
 
     KonfiguratorCheckBoxGroup *confWnd = createCheckBoxGroup(2, 0, confirmations, 6, confirmGrp);
 
     confirmGrid->addWidget(confWnd, 1, 0);
 
     kgAdvancedLayout->addWidget(confirmGrp, 1 , 0);
 
 
     //  ------------------------ FINE-TUNING GROUPBOX --------------------------------
 
     QGroupBox *fineTuneGrp = createFrame(i18n("Fine-Tuning"), innerWidget);
     QGridLayout *fineTuneGrid = createGridLayout(fineTuneGrp);
     fineTuneGrid->setAlignment(Qt::AlignLeft | Qt::AlignTop);
 
     QLabel *label = new QLabel(i18n("Icon cache size (KB):"), fineTuneGrp);
     label->setWhatsThis(i18n("The icon cache size influences how fast the contents of a panel can be displayed. However, too large a cache might consume your memory."));
     fineTuneGrid->addWidget(label, 0, 0);
     KonfiguratorSpinBox *spinBox = createSpinBox("Advanced", "Icon Cache Size", _IconCacheSize,
                                    1, 8192, fineTuneGrp, false);
     spinBox->setWhatsThis(i18n("The icon cache size influences how fast the contents of a panel can be displayed. However, too large a cache might consume your memory."));
+    spinBox->setToolTip(i18n("The icon cache size influences how fast the contents of a panel can be displayed. However, too large a cache might consume your memory."));
     spinBox->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
     fineTuneGrid->addWidget(spinBox, 0, 1);
 
     addLabel(fineTuneGrid, 1, 0, i18n("Arguments of updatedb:"),
              fineTuneGrp);
     KonfiguratorEditBox *updatedbArgs = createEditBox("Locate", "UpdateDB Arguments", "", fineTuneGrp, false);
     fineTuneGrid->addWidget(updatedbArgs, 1, 1);
 
     kgAdvancedLayout->addWidget(fineTuneGrp, 2 , 0);
 }
 
diff --git a/krusader/Konfigurator/konfiguratorpage.cpp b/krusader/Konfigurator/konfiguratorpage.cpp
index a41c2063..d6c737ba 100644
--- a/krusader/Konfigurator/konfiguratorpage.cpp
+++ b/krusader/Konfigurator/konfiguratorpage.cpp
@@ -1,285 +1,289 @@
 /*****************************************************************************
  * Copyright (C) 2003 Csaba Karai <krusader@users.sourceforge.net>           *
  * Copyright (C) 2004-2019 Krusader Krew [https://krusader.org]              *
  *                                                                           *
  * This file is part of Krusader [https://krusader.org].                     *
  *                                                                           *
  * Krusader 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.                                       *
  *                                                                           *
  * Krusader is distributed in the hope that it will be useful,               *
  * but WITHOUT ANY WARRANTY; without even the implied warranty of            *
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the             *
  * GNU General Public License for more details.                              *
  *                                                                           *
  * You should have received a copy of the GNU General Public License         *
  * along with Krusader.  If not, see [http://www.gnu.org/licenses/].         *
  *****************************************************************************/
 
 #include "konfiguratorpage.h"
 
 // QtWidgets
 #include <QLayout>
 #include <QHBoxLayout>
 #include <QGridLayout>
 #include <QScrollArea>
 #include <QLabel>
 
 #include <KConfigCore/KConfig>
 #include <utility>
 
 #include "../krglobal.h"
 
 KonfiguratorPage::KonfiguratorPage(bool firstTime, QWidget* parent) :
         QScrollArea(parent), firstCall(firstTime)
 {
     setFrameStyle(QFrame::NoFrame);
 }
 
 bool KonfiguratorPage::apply()
 {
     bool restartNeeded = false;
 
     for (auto & item : itemList)
         restartNeeded = item->apply() || restartNeeded;
 
     krConfig->sync();
     return restartNeeded;
 }
 
 void KonfiguratorPage::setDefaults()
 {
     int activePage = activeSubPage();
 
     for (auto & item : itemList) {
         if (item->subPage() == activePage)
             item->setDefaults();
     }
 }
 
 void KonfiguratorPage::loadInitialValues()
 {
     for (auto & item : itemList)
         item->loadInitialValue();
 }
 
 bool KonfiguratorPage::isChanged()
 {
     bool isChanged = false;
 
     for (auto & item : itemList)
         isChanged = isChanged || item->isChanged();
 
     return isChanged;
 }
 
 KonfiguratorCheckBox* KonfiguratorPage::createCheckBox(QString configGroup, QString name,
         bool defaultValue, QString text, QWidget *parent, bool restart, const QString& toolTip, int page)
 {
     KonfiguratorCheckBox *checkBox = new KonfiguratorCheckBox(std::move(configGroup), std::move(name), defaultValue, std::move(text),
             parent, restart, page);
-    if (!toolTip.isEmpty())
+    if (!toolTip.isEmpty()) {
         checkBox->setWhatsThis(toolTip);
+        checkBox->setToolTip(toolTip);
+    }
 
     registerObject(checkBox->extension());
     return checkBox;
 }
 
 KonfiguratorSpinBox* KonfiguratorPage::createSpinBox(QString configGroup, QString configName,
         int defaultValue, int min, int max, QWidget *parent, bool restart, int page)
 {
     KonfiguratorSpinBox *spinBox = new KonfiguratorSpinBox(std::move(configGroup), std::move(configName), defaultValue,
                                                            min, max, parent, restart, page);
 
     registerObject(spinBox->extension());
     return spinBox;
 }
 
 KonfiguratorEditBox* KonfiguratorPage::createEditBox(QString configGroup, QString name,
         QString defaultValue, QWidget *parent, bool restart, int page)
 {
     KonfiguratorEditBox *editBox = new KonfiguratorEditBox(std::move(configGroup), std::move(name), std::move(defaultValue), parent,
             restart, page);
 
     registerObject(editBox->extension());
     return editBox;
 }
 
 KonfiguratorListBox* KonfiguratorPage::createListBox(QString configGroup, QString name,
         QStringList defaultValue, QWidget *parent, bool restart, int page)
 {
     KonfiguratorListBox *listBox = new KonfiguratorListBox(std::move(configGroup), std::move(name), std::move(defaultValue), parent,
             restart, page);
 
     registerObject(listBox->extension());
     return listBox;
 }
 
 KonfiguratorURLRequester* KonfiguratorPage::createURLRequester(QString configGroup, QString name,
         QString defaultValue, QWidget *parent, bool restart, int page, bool expansion)
 {
     KonfiguratorURLRequester *urlRequester = new KonfiguratorURLRequester(std::move(configGroup), std::move(name), std::move(defaultValue),
             parent, restart, page, expansion);
 
     registerObject(urlRequester->extension());
     return urlRequester;
 }
 
 QGroupBox* KonfiguratorPage::createFrame(const QString& text, QWidget *parent)
 {
     auto *groupBox = new QGroupBox(parent);
     if (!text.isNull())
         groupBox->setTitle(text);
     return groupBox;
 }
 
 QGridLayout* KonfiguratorPage::createGridLayout(QWidget *parent)
 {
     auto *gridLayout = new QGridLayout(parent);
     gridLayout->setAlignment(Qt::AlignTop);
     gridLayout->setSpacing(6);
     gridLayout->setContentsMargins(11, 11, 11, 11);
     return gridLayout;
 }
 
 QLabel* KonfiguratorPage::addLabel(QGridLayout *layout, int x, int y, const QString& label,
                                    QWidget *parent)
 {
     QLabel *lbl = new QLabel(label, parent);
     layout->addWidget(lbl, x, y);
     return lbl;
 }
 
 QWidget* KonfiguratorPage::createSpacer(QWidget *parent)
 {
     QWidget *widget = new QWidget(parent);
     auto *hboxlayout = new QHBoxLayout(widget);
     auto* spacer = new QSpacerItem(40, 20, QSizePolicy::Expanding, QSizePolicy::Minimum);
     hboxlayout->addItem(spacer);
     return widget;
 }
 
 KonfiguratorCheckBoxGroup* KonfiguratorPage::createCheckBoxGroup(int sizex, int sizey,
         KONFIGURATOR_CHECKBOX_PARAM *params, int paramNum, QWidget *parent,
         int page)
 {
     auto *groupWidget = new KonfiguratorCheckBoxGroup(parent);
     auto *layout = new QGridLayout(groupWidget);
     layout->setSpacing(6);
     layout->setContentsMargins(0, 0, 0, 0);
 
     int x = 0, y = 0;
 
     for (int i = 0; i != paramNum; i++) {
         KonfiguratorCheckBox *checkBox = createCheckBox(params[i].configClass,
                                          params[i].configName, params[i].defaultValue, params[i].text, groupWidget,
                                          params[i].restart, params[i].toolTip, page);
 
         groupWidget->add(checkBox);
         layout->addWidget(checkBox, y, x);
 
         if (sizex) {
             if (++x == sizex)
                 x = 0, y++;
         } else {
             if (++y == sizey)
                 y = 0, x++;
         }
     }
 
     return groupWidget;
 }
 
 KonfiguratorRadioButtons* KonfiguratorPage::createRadioButtonGroup(QString configGroup,
         QString name, QString defaultValue, int sizex, int sizey, KONFIGURATOR_NAME_VALUE_TIP *params,
         int paramNum, QWidget *parent, bool restart, int page)
 {
     KonfiguratorRadioButtons *radioWidget = new KonfiguratorRadioButtons(std::move(configGroup), std::move(name), std::move(defaultValue), parent, restart, page);
 
     auto *layout = new QGridLayout(radioWidget);
     layout->setAlignment(Qt::AlignTop);
     layout->setSpacing(6);
     layout->setContentsMargins(0, 0, 0, 0);
 
     int x = 0, y = 0;
 
     for (int i = 0; i != paramNum; i++) {
         auto *radBtn = new QRadioButton(params[i].text, radioWidget);
 
-        if (!params[i].tooltip.isEmpty())
+        if (!params[i].tooltip.isEmpty()) {
             radBtn->setWhatsThis(params[i].tooltip);
+            radBtn->setToolTip(params[i].tooltip);
+        }
 
         layout->addWidget(radBtn, y, x);
 
         radioWidget->addRadioButton(radBtn, params[i].text, params[i].value);
 
         if (sizex) {
             if (++x == sizex)
                 x = 0, y++;
         } else {
             if (++y == sizey)
                 y = 0, x++;
         }
     }
 
     radioWidget->loadInitialValue();
     registerObject(radioWidget->extension());
     return radioWidget;
 }
 
 KonfiguratorFontChooser *KonfiguratorPage::createFontChooser(QString configGroup, QString name,
         const QFont& defaultValue, QWidget *parent, bool restart, int page)
 {
     KonfiguratorFontChooser *fontChooser = new KonfiguratorFontChooser(std::move(configGroup), std::move(name), defaultValue, parent,
             restart, page);
 
     registerObject(fontChooser->extension());
     return fontChooser;
 }
 
 KonfiguratorComboBox *KonfiguratorPage::createComboBox(QString configGroup, QString name, QString defaultValue,
         KONFIGURATOR_NAME_VALUE_PAIR *params, int paramNum, QWidget *parent, bool restart, bool editable, int page)
 {
     KonfiguratorComboBox *comboBox = new KonfiguratorComboBox(std::move(configGroup), std::move(name), std::move(defaultValue), params,
             paramNum, parent, restart, editable, page);
 
     registerObject(comboBox->extension());
     return comboBox;
 }
 
 QFrame* KonfiguratorPage::createLine(QWidget *parent, bool vertical)
 {
     QFrame *line = new QFrame(parent);
     line->setFrameStyle((vertical ? QFrame::VLine : QFrame::HLine) | QFrame::Sunken);
     return line;
 }
 
 void KonfiguratorPage::registerObject(KonfiguratorExtension *item)
 {
     itemList.push_back(item);
     connect(item, SIGNAL(sigChanged(bool)), this, SIGNAL(sigChanged()));
 }
 
 void KonfiguratorPage::removeObject(KonfiguratorExtension *item)
 {
     int ndx = itemList.indexOf(item);
     if (ndx != -1) {
         QList<KonfiguratorExtension *>::iterator it = itemList.begin() + ndx;
         delete *it;
         itemList.erase(it);
     }
 }
 
 KonfiguratorColorChooser *KonfiguratorPage::createColorChooser(QString configGroup, QString name, QColor defaultValue,
         QWidget *parent, bool restart,
         ADDITIONAL_COLOR *addColPtr, int addColNum, int page)
 {
     KonfiguratorColorChooser *colorChooser = new KonfiguratorColorChooser(std::move(configGroup), std::move(name), std::move(defaultValue),  parent,
             restart, addColPtr, addColNum, page);
 
     registerObject(colorChooser->extension());
     return colorChooser;
 }