diff --git a/libs/widgets/KoToolBoxButton_p.h b/libs/widgets/KoToolBoxButton_p.h
index 6685e9cb97..bac811f051 100644
--- a/libs/widgets/KoToolBoxButton_p.h
+++ b/libs/widgets/KoToolBoxButton_p.h
@@ -1,40 +1,40 @@
 /*
  * Copyright (c) 2015 Friedrich W. H. Kossebau <kossebau@kde.org>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library 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
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public License
  * along with this library; see the file COPYING.LIB.  If not, write to
  * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
  */
 
 #ifndef _KO_TOOLBOXBUTTON_H_
 #define _KO_TOOLBOXBUTTON_H_
 
 #include <QToolButton>
 
 class KoToolAction;
 
 class KoToolBoxButton : public QToolButton
 {
     Q_OBJECT
 public:
     explicit KoToolBoxButton(KoToolAction *toolAction, QWidget * parent);
     void setHighlightColor();
 
 private Q_SLOTS:
-    void setDataFromToolAction();
+    void setDataFromToolAction(); // Generates tooltips.
 private:
     KoToolAction *m_toolAction;
 };
 
 #endif // _KO_TOOLBOXBUTTON_H_
diff --git a/plugins/tools/basictools/kis_tool_fill.h b/plugins/tools/basictools/kis_tool_fill.h
index 4c8b699d48..393a70ae11 100644
--- a/plugins/tools/basictools/kis_tool_fill.h
+++ b/plugins/tools/basictools/kis_tool_fill.h
@@ -1,118 +1,118 @@
 /*
  *  kis_tool_fill.h - part of Krayon^Krita
  *
  *  Copyright (c) 2004 Bart Coppens <kde@bartcoppens.be>
  *
  *  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.
  *
  *  This program 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 this program; if not, write to the Free Software
  *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
 #ifndef KIS_TOOL_FILL_H_
 #define KIS_TOOL_FILL_H_
 
 #include "kis_tool_paint.h"
 #include <flake/kis_node_shape.h>
 #include <KoIcon.h>
 #include <kis_icon.h>
 #include <QPoint>
 #include <kconfig.h>
 #include <kconfiggroup.h>
 
 
 
 class QWidget;
 class QCheckBox;
 class KisSliderSpinBox;
 class KoCanvasBase;
 
 class KisToolFill : public KisToolPaint
 {
 
     Q_OBJECT
 
 public:
 
     KisToolFill(KoCanvasBase * canvas);
     ~KisToolFill() override;
 
     void beginPrimaryAction(KoPointerEvent *event) override;
     void endPrimaryAction(KoPointerEvent *event) override;
 
     QWidget * createOptionWidget() override;
 
 public Q_SLOTS:
     void activate(ToolActivation toolActivation, const QSet<KoShape*> &shapes) override;
     void slotSetUseFastMode(bool);
     void slotSetThreshold(int);
     void slotSetUsePattern(bool);
     void slotSetSampleMerged(bool);
     void slotSetFillSelection(bool);
     void slotSetSizemod(int);
     void slotSetFeather(int);
 
 protected Q_SLOTS:
     void resetCursorStyle() override;
 protected:
     bool wantsAutoScroll() const override { return false; }
 private:
     void updateGUI();
 
 private:
     int m_feather;
     int m_sizemod;
     QPoint m_startPos;
     int m_threshold;
     bool m_unmerged;
     bool m_usePattern;
     bool m_fillOnlySelection;
 
     QCheckBox *m_useFastMode;
     KisSliderSpinBox *m_slThreshold;
     KisSliderSpinBox *m_sizemodWidget;
     KisSliderSpinBox *m_featherWidget;
     QCheckBox *m_checkUsePattern;
     QCheckBox *m_checkSampleMerged;
     QCheckBox *m_checkFillSelection;
 
     KConfigGroup m_configGroup;
 };
 
 
 #include "KoToolFactoryBase.h"
 
 class KisToolFillFactory : public KoToolFactoryBase
 {
 
 public:
     KisToolFillFactory()
             : KoToolFactoryBase("KritaFill/KisToolFill") {
         setToolTip(i18n("Fill Tool"));
         setSection(TOOL_TYPE_FILL);
         setPriority(0);
         setActivationShapeId(KRITA_TOOL_ACTIVATION_ID);
         setIconName(koIconNameCStr("krita_tool_color_fill"));
-        //setShortcut( QKeySequence( Qt::Key_F ) );
+        setShortcut( QKeySequence( Qt::Key_F ) );
         setPriority(14);
     }
 
     ~KisToolFillFactory() override {}
 
     KoToolBase * createTool(KoCanvasBase *canvas) override {
         return new KisToolFill(canvas);
     }
 
 };
 
 #endif //__filltool_h__