diff --git a/src/blackgui/components/marginsinput.cpp b/src/blackgui/components/marginsinput.cpp
index d7ca8f9c4..09334a489 100644
--- a/src/blackgui/components/marginsinput.cpp
+++ b/src/blackgui/components/marginsinput.cpp
@@ -66,13 +66,6 @@ namespace BlackGui
             return m;
         }
 
-        void CMarginsInput::paintEvent(QPaintEvent *event)
-        {
-            bool s = CStyleSheetUtility::useStyleSheetInDerivedWidget(this, QStyle::PE_Widget);
-            if (s) { return; }
-            QFrame::paintEvent(event);
-        }
-
         void CMarginsInput::ps_Confirmed()
         {
             const QMargins m(this->getMargins());
diff --git a/src/blackgui/components/marginsinput.h b/src/blackgui/components/marginsinput.h
index 2dcf7970b..0ebee5069 100644
--- a/src/blackgui/components/marginsinput.h
+++ b/src/blackgui/components/marginsinput.h
@@ -42,10 +42,6 @@ namespace BlackGui
             //! Current values of margins
             QMargins getMargins() const;
 
-        protected:
-            //! \copydoc QFrame::paintEvent
-            virtual void paintEvent(QPaintEvent *event) override;
-
         signals:
             //! Margins changed
             void changedMargins(const QMargins &margins);
diff --git a/src/blackgui/components/navigatordialog.cpp b/src/blackgui/components/navigatordialog.cpp
index 6a7ad0b06..2e229d43b 100644
--- a/src/blackgui/components/navigatordialog.cpp
+++ b/src/blackgui/components/navigatordialog.cpp
@@ -152,6 +152,13 @@ namespace BlackGui
             this->buildNavigator(this->m_currentColumns);
         }
 
+        void CNavigatorDialog::paintEvent(QPaintEvent *event)
+        {
+            bool s = CStyleSheetUtility::useStyleSheetInDerivedWidget(this, QStyle::PE_Widget);
+            if (s) { return; }
+            QDialog::paintEvent(event);
+        }
+
         void CNavigatorDialog::ps_showContextMenu(const QPoint &pos)
         {
             QPoint globalPos = this->mapToGlobal(pos);
diff --git a/src/blackgui/components/navigatordialog.h b/src/blackgui/components/navigatordialog.h
index e2d9cdc94..6209f5cfb 100644
--- a/src/blackgui/components/navigatordialog.h
+++ b/src/blackgui/components/navigatordialog.h
@@ -61,17 +61,14 @@ namespace BlackGui
             //! Style sheet has changed
             void ps_onStyleSheetsChanged();
 
-            //! \copydoc QMainWindow::mouseMoveEvent
+            //! \name Base class events
+            //! @{
             virtual void mouseMoveEvent(QMouseEvent *event) override;
-
-            //! \copydoc QMainWindow::mousePressEvent
             virtual void mousePressEvent(QMouseEvent *event) override;
-
-            //! \copydoc QMainWindow::mousePressEvent
             virtual void changeEvent(QEvent *evt) override;
-
-            //! \copydoc CEnableForFramelessWindow::windowFlagsChanged
             virtual void windowFlagsChanged() override;
+            virtual void paintEvent(QPaintEvent *event) override;
+            //! @}
 
         private slots:
             //! Context menu
diff --git a/src/blackgui/dropsite.cpp b/src/blackgui/dropsite.cpp
index f44c320c2..fa79857fd 100644
--- a/src/blackgui/dropsite.cpp
+++ b/src/blackgui/dropsite.cpp
@@ -89,11 +89,4 @@ namespace BlackGui
     {
         // style sheet changes go here
     }
-
-    void CDropSite::paintEvent(QPaintEvent *event)
-    {
-        Q_UNUSED(event);
-        CStyleSheetUtility::useStyleSheetInDerivedWidget(this, QStyle::PE_Widget);
-    }
-
 } // ns
diff --git a/src/blackgui/dropsite.h b/src/blackgui/dropsite.h
index 5512f943f..58c045078 100644
--- a/src/blackgui/dropsite.h
+++ b/src/blackgui/dropsite.h
@@ -65,9 +65,6 @@ namespace BlackGui
         //! \copydoc QWidget::dropEvent
         virtual void dropEvent(QDropEvent *event) override;
 
-        //! \copydoc QWidget::paintEvent
-        virtual void paintEvent(QPaintEvent *event) override;
-
     private slots:
         //! Style has been changed
         void ps_onStyleSheetsChanged();
diff --git a/src/blackgui/overlaymessages.cpp b/src/blackgui/overlaymessages.cpp
index 8c3964114..7ae2e6cf8 100644
--- a/src/blackgui/overlaymessages.cpp
+++ b/src/blackgui/overlaymessages.cpp
@@ -318,12 +318,4 @@ namespace BlackGui
             m_autoCloseTimer.stop();
         }
     }
-
-    void BlackGui::COverlayMessages::paintEvent(QPaintEvent *event)
-    {
-        bool s = CStyleSheetUtility::useStyleSheetInDerivedWidget(this, QStyle::PE_Widget);
-        if (s) { return; }
-        QFrame::paintEvent(event);
-    }
-
 } // ns
diff --git a/src/blackgui/overlaymessages.h b/src/blackgui/overlaymessages.h
index f70e52110..16d15ef0c 100644
--- a/src/blackgui/overlaymessages.h
+++ b/src/blackgui/overlaymessages.h
@@ -113,9 +113,6 @@ namespace BlackGui
         //! \copydoc QFrame::keyPressEvent
         virtual void keyPressEvent(QKeyEvent *event) override;
 
-        //! \copydoc QFrame::paintEvent
-        virtual void paintEvent(QPaintEvent *event) override;
-
     private slots:
         //! Stylesheet changed
         void ps_onStyleSheetsChanged();
diff --git a/src/blackgui/overlaymessagesframe.cpp b/src/blackgui/overlaymessagesframe.cpp
index 474871e82..508eeb8d3 100644
--- a/src/blackgui/overlaymessagesframe.cpp
+++ b/src/blackgui/overlaymessagesframe.cpp
@@ -83,13 +83,6 @@ namespace BlackGui
         this->repaint();
     }
 
-    void COverlayMessagesFrame::paintEvent(QPaintEvent *event)
-    {
-        bool s = CStyleSheetUtility::useStyleSheetInDerivedWidget(this, QStyle::PE_Widget);
-        if (s) { return; }
-        QFrame::paintEvent(event);
-    }
-
     void COverlayMessagesFrame::keyPressEvent(QKeyEvent *event)
     {
         if (m_overlayMessages && event->key() == Qt::Key_Escape)
diff --git a/src/blackgui/overlaymessagesframe.h b/src/blackgui/overlaymessagesframe.h
index 2a178acfa..7956ecdfd 100644
--- a/src/blackgui/overlaymessagesframe.h
+++ b/src/blackgui/overlaymessagesframe.h
@@ -81,9 +81,6 @@ namespace BlackGui
         void showOverlayImage(const BlackMisc::CPixmap &pixmap, int timeOutMs = -1);
 
     protected:
-        //! \copydoc QFrame::paintEvent
-        virtual void paintEvent(QPaintEvent *event) override;
-
         //! \copydoc QFrame::keyPressEvent
         virtual void keyPressEvent(QKeyEvent *event) override;
 
diff --git a/src/blackgui/stylesheetutility.cpp b/src/blackgui/stylesheetutility.cpp
index 5129aa6ef..ba6ac6a9c 100644
--- a/src/blackgui/stylesheetutility.cpp
+++ b/src/blackgui/stylesheetutility.cpp
@@ -361,6 +361,7 @@ namespace BlackGui
         // 1) QStylePainter: modern version of
         //    usedWidget->style()->drawPrimitive(element, &opt, &p, usedWidget);
         // 2) With viewport based widgets viewport has to be used
+        // see http://stackoverflow.com/questions/37952348/enable-own-widget-for-stylesheet
         QAbstractScrollArea *sa = qobject_cast<QAbstractScrollArea *>(usedWidget);
         QStylePainter p(
             sa ? sa->viewport() :
diff --git a/src/blackgui/views/viewbase.cpp b/src/blackgui/views/viewbase.cpp
index 70c7354e3..86c885b9d 100644
--- a/src/blackgui/views/viewbase.cpp
+++ b/src/blackgui/views/viewbase.cpp
@@ -359,12 +359,6 @@ namespace BlackGui
             connect(actionInteractiveResize, &QAction::toggled, this, &CViewBaseNonTemplate::ps_toggleResizeMode);
         }
 
-        void CViewBaseNonTemplate::paintEvent(QPaintEvent *event)
-        {
-            QTableView::paintEvent(event);
-            // CStyleSheetUtility::useStyleSheetInDerivedWidget(this, QStyle::PE_Widget);
-        }
-
         void CViewBaseNonTemplate::showEvent(QShowEvent *event)
         {
             if (this->isShowingLoadIndicator())
diff --git a/src/blackgui/views/viewbase.h b/src/blackgui/views/viewbase.h
index 238398e1a..b3cb54c97 100644
--- a/src/blackgui/views/viewbase.h
+++ b/src/blackgui/views/viewbase.h
@@ -321,7 +321,6 @@ namespace BlackGui
 
             //! \name Functions from QTableView
             //! @{
-            virtual void paintEvent(QPaintEvent *event) override;
             virtual void showEvent(QShowEvent *event) override;
             virtual void dragEnterEvent(QDragEnterEvent *event) override;
             virtual void dragMoveEvent(QDragMoveEvent *event) override;