diff --git a/src/core/mainwindow.cpp b/src/core/mainwindow.cpp
index 2aa81458b..e164f320f 100644
--- a/src/core/mainwindow.cpp
+++ b/src/core/mainwindow.cpp
@@ -857,7 +857,9 @@ void MainWindow::ReloadAllSettings() {
 }
 
 void MainWindow::RefreshStyleSheet() {
-  setStyleSheet(styleSheet());
+  QString contents(styleSheet());
+  setStyleSheet("");
+  setStyleSheet(contents);
 }
 
 void MainWindow::MediaStopped() {
diff --git a/src/core/stylesheetloader.cpp b/src/core/stylesheetloader.cpp
index 931c690a3..30a1078b5 100644
--- a/src/core/stylesheetloader.cpp
+++ b/src/core/stylesheetloader.cpp
@@ -93,6 +93,7 @@ void StyleSheetLoader::UpdateStyleSheet(QWidget *widget) {
   contents.replace("macos", "*");
 #endif
 
+  widget->setStyleSheet("");
   widget->setStyleSheet(contents);
 
 }
diff --git a/src/widgets/fancytabwidget.cpp b/src/widgets/fancytabwidget.cpp
index 2c4aa645b..943d2ba38 100644
--- a/src/widgets/fancytabwidget.cpp
+++ b/src/widgets/fancytabwidget.cpp
@@ -362,12 +362,12 @@ void FancyTabWidget::saveSettings(const char *kSettingsGroup) {
 
 }
 
-void FancyTabWidget::addBottomWidget(QWidget* widget) {
-  bottom_widget_ = widget;
+void FancyTabWidget::addBottomWidget(QWidget* widget_view) {
+  bottom_widget_ = widget_view;
 }
 
-int FancyTabWidget::addTab(QWidget *widget, const QIcon &icon, const QString &label) {
-  return insertTab(count(), widget, icon, label);
+int FancyTabWidget::addTab(QWidget *widget_view, const QIcon &icon, const QString &label) {
+  return insertTab(count(), widget_view, icon, label);
 }
 
 int FancyTabWidget::insertTab(int index, QWidget *widget_view, const QIcon &icon, const QString &label) {
diff --git a/src/widgets/fancytabwidget.h b/src/widgets/fancytabwidget.h
index 1a5c360b0..3c4d8d0dd 100644
--- a/src/widgets/fancytabwidget.h
+++ b/src/widgets/fancytabwidget.h
@@ -42,10 +42,10 @@ class FancyTabWidget : public QTabWidget {
 
   public:
     FancyTabWidget(QWidget* parent = 0);
-    int addTab(QWidget *widget, const QIcon &icon, const QString &label);
+    int addTab(QWidget *widget_view, const QIcon &icon, const QString &label);
     void delTab(const QString &label);
-    int insertTab(int index, QWidget *widget, const QIcon &icon, const QString &label);
-    void addBottomWidget(QWidget* widget);
+    int insertTab(int index, QWidget *widget_view, const QIcon &icon, const QString &label);
+    void addBottomWidget(QWidget* widget_view);
 
     void setBackgroundPixmap(const QPixmap& pixmap);
     void addSpacer();