diff --git a/deprecated/OverviewWindow.cpp b/deprecated/OverviewWindow.cpp
index 122135959..4a58cdda4 100644
--- a/deprecated/OverviewWindow.cpp
+++ b/deprecated/OverviewWindow.cpp
@@ -2223,7 +2223,6 @@ OverviewWindow::configChanged(qint32)
     // text edit colors
     QPalette palette;
     palette.setColor(QPalette::Window, GColor(COVERVIEWBACKGROUND));
-    palette.setColor(QPalette::Background, GColor(COVERVIEWBACKGROUND));
 
     // only change base if moved away from white plots
     // which is a Mac thing
diff --git a/deprecated/PerformanceManagerWindow.cpp b/deprecated/PerformanceManagerWindow.cpp
index d2b2bced1..ac74a309f 100644
--- a/deprecated/PerformanceManagerWindow.cpp
+++ b/deprecated/PerformanceManagerWindow.cpp
@@ -152,7 +152,6 @@ void PerformanceManagerWindow::configChanged()
 
     QPalette palette;
     palette.setBrush(QPalette::Window, QBrush(GColor(CPLOTBACKGROUND)));
-    palette.setBrush(QPalette::Background, QBrush(GColor(CPLOTBACKGROUND)));
     palette.setBrush(QPalette::Base, QBrush(GColor(CPLOTBACKGROUND)));
     palette.setColor(QPalette::WindowText, GCColor::invertColor(GColor(CPLOTBACKGROUND)));
     palette.setColor(QPalette::Text, GCColor::invertColor(GColor(CPLOTBACKGROUND)));
diff --git a/deprecated/RaceRider.cpp b/deprecated/RaceRider.cpp
index d6f919845..7a830220a 100644
--- a/deprecated/RaceRider.cpp
+++ b/deprecated/RaceRider.cpp
@@ -24,7 +24,7 @@ RaceRider::RaceRider(QWidget *parent, QColor color, QString name, QString id) :
 {
     QPalette pal = palette();
     //QColor RGB = color.convertTo(QColor::Rgb);
-    pal.setColor(QPalette::Normal, QPalette::Background, color);
+    pal.setColor(QPalette::Normal, QPalette::Window, color);
     pal.setColor(QPalette::Normal, QPalette::Base, color);
     pal.setColor(QPalette::Normal, QPalette::Button, color);
     pal.setColor(QPalette::Normal, QPalette::Text, Qt::black);
diff --git a/src/Charts/AerolabWindow.cpp b/src/Charts/AerolabWindow.cpp
index 2785bbbe2..a010b427b 100644
--- a/src/Charts/AerolabWindow.cpp
+++ b/src/Charts/AerolabWindow.cpp
@@ -324,7 +324,6 @@ AerolabWindow::configChanged(qint32)
   QPalette palette;
 
   palette.setColor(QPalette::Window, GColor(CPLOTBACKGROUND));
-  palette.setColor(QPalette::Background, GColor(CPLOTBACKGROUND));
 
   // only change base if moved away from white plots
   // which is a Mac thing
diff --git a/src/Charts/AllPlot.cpp b/src/Charts/AllPlot.cpp
index d24b2b930..f92ce78f9 100644
--- a/src/Charts/AllPlot.cpp
+++ b/src/Charts/AllPlot.cpp
@@ -997,7 +997,7 @@ AllPlot::AllPlot(QWidget *parent, AllPlotWindow *window, Context *context, RideF
     setAxisScaleDraw(QwtAxisId(QwtAxis::YLeft, 2), sd);
 
     QPalette pal = palette();
-    pal.setBrush(QPalette::Background, QBrush(GColor(CRIDEPLOTBACKGROUND)));
+    pal.setBrush(QPalette::Window, QBrush(GColor(CRIDEPLOTBACKGROUND)));
     pal.setColor(QPalette::WindowText, QColor(Qt::gray));
     pal.setColor(QPalette::Text, QColor(Qt::gray));
     axisWidget(QwtAxisId(QwtAxis::YLeft, 2))->setPalette(pal);
@@ -1471,7 +1471,7 @@ AllPlot::configChanged(qint32 what)
         }
 
         QPalette pal = palette();
-        pal.setBrush(QPalette::Background, QBrush(GColor(CRIDEPLOTBACKGROUND)));
+        pal.setBrush(QPalette::Window, QBrush(GColor(CRIDEPLOTBACKGROUND)));
         setPalette(pal);
 
         // tick draw
@@ -1574,7 +1574,7 @@ AllPlot::setLeftOnePalette()
     setAxisScaleDraw(QwtAxisId(QwtAxis::YLeft, 1), sd);
 
     QPalette pal = palette();
-    pal.setBrush(QPalette::Background, QBrush(GColor(CRIDEPLOTBACKGROUND)));
+    pal.setBrush(QPalette::Window, QBrush(GColor(CRIDEPLOTBACKGROUND)));
     pal.setColor(QPalette::WindowText, single);
     pal.setColor(QPalette::Text, single);
 
@@ -1616,7 +1616,7 @@ AllPlot::setRightPalette()
     setAxisScaleDraw(QwtAxisId(QwtAxis::YRight, 0), sd);
 
     QPalette pal = palette();
-    pal.setBrush(QPalette::Background, QBrush(GColor(CRIDEPLOTBACKGROUND)));
+    pal.setBrush(QPalette::Window, QBrush(GColor(CRIDEPLOTBACKGROUND)));
     pal.setColor(QPalette::WindowText, single);
     pal.setColor(QPalette::Text, single);
 
diff --git a/src/Charts/AllPlotInterval.cpp b/src/Charts/AllPlotInterval.cpp
index 99adc5f81..6c34a3b4c 100644
--- a/src/Charts/AllPlotInterval.cpp
+++ b/src/Charts/AllPlotInterval.cpp
@@ -123,7 +123,7 @@ void
 AllPlotInterval::configChanged(qint32)
 {
     QPalette pal = palette();
-    pal.setBrush(QPalette::Background, QBrush(GColor(CRIDEPLOTBACKGROUND)));
+    pal.setBrush(QPalette::Window, QBrush(GColor(CRIDEPLOTBACKGROUND)));
     setPalette(pal);
     setCanvasBackground(GColor(CRIDEPLOTBACKGROUND));
     static_cast<QwtPlotCanvas*>(canvas())->setFrameStyle(QFrame::NoFrame);
diff --git a/src/Charts/AllPlotWindow.cpp b/src/Charts/AllPlotWindow.cpp
index ec81a4c02..03a519648 100644
--- a/src/Charts/AllPlotWindow.cpp
+++ b/src/Charts/AllPlotWindow.cpp
@@ -459,7 +459,7 @@ AllPlotWindow::AllPlotWindow(Context *context) :
     mainControls->addRow(smoothLabel, smoothLayout);
 
     QPalette palette;
-    palette.setBrush(QPalette::Background, QBrush(GColor(CRIDEPLOTBACKGROUND)));
+    palette.setBrush(QPalette::Window, QBrush(GColor(CRIDEPLOTBACKGROUND)));
 
     allPlot = new AllPlot(this, this, context);
     allPlot->setContentsMargins(0,0,0,0);
@@ -845,7 +845,7 @@ AllPlotWindow::configChanged(qint32 state)
     // 'complicate' or 'make busy' the general
     // look and feel
     QPalette palette;
-    palette.setBrush(QPalette::Background, QBrush(GColor(CRIDEPLOTBACKGROUND)));
+    palette.setBrush(QPalette::Window, QBrush(GColor(CRIDEPLOTBACKGROUND)));
     setPalette(palette); // propagates to children
 
     // set style sheets
@@ -1472,7 +1472,7 @@ AllPlotWindow::compareChanged()
 
         // create blank and add to gui
         QPalette palette;
-        palette.setBrush(QPalette::Background, Qt::NoBrush);
+        palette.setBrush(QPalette::Window, Qt::NoBrush);
 
         foreach(SeriesWanted x, wanted) {
 
@@ -3629,7 +3629,7 @@ AllPlotWindow::setupSeriesStackPlots()
     seriesstackFrame->setUpdatesEnabled(false);
 
     QPalette palette;
-    palette.setBrush(QPalette::Background, Qt::NoBrush);
+    palette.setBrush(QPalette::Window, Qt::NoBrush);
 
     QList<SeriesWanted> serieslist;
     SeriesWanted s;
@@ -3798,7 +3798,7 @@ AllPlotWindow::setupStackPlots()
         nbplot = (int)floor(duration/_stackWidth/60)+1;
 
     QPalette palette;
-    palette.setBrush(QPalette::Background, Qt::NoBrush);
+    palette.setBrush(QPalette::Window, Qt::NoBrush);
 
     for(int i = 0 ; i < nbplot ; i++) {
 
diff --git a/src/Charts/CriticalPowerWindow.cpp b/src/Charts/CriticalPowerWindow.cpp
index 072101e2f..231a3a9f5 100644
--- a/src/Charts/CriticalPowerWindow.cpp
+++ b/src/Charts/CriticalPowerWindow.cpp
@@ -667,13 +667,11 @@ CriticalPowerWindow::configChanged(qint32)
     QPalette whitepalette;
     if (rangemode) {
         whitepalette.setBrush(QPalette::Window, QBrush(GColor(CTRENDPLOTBACKGROUND)));
-        whitepalette.setBrush(QPalette::Background, QBrush(GColor(CTRENDPLOTBACKGROUND)));
         whitepalette.setColor(QPalette::WindowText, GCColor::invertColor(GColor(CTRENDPLOTBACKGROUND)));
         whitepalette.setColor(QPalette::Base, GCColor::alternateColor(GColor(CPLOTBACKGROUND)));
         whitepalette.setColor(QPalette::Text, GCColor::invertColor(GColor(CTRENDPLOTBACKGROUND)));
     } else {
         whitepalette.setBrush(QPalette::Window, QBrush(GColor(CPLOTBACKGROUND)));
-        whitepalette.setBrush(QPalette::Background, QBrush(GColor(CPLOTBACKGROUND)));
         whitepalette.setColor(QPalette::WindowText, GCColor::invertColor(GColor(CPLOTBACKGROUND)));
         whitepalette.setColor(QPalette::Base, GCColor::alternateColor(GColor(CPLOTBACKGROUND)));
         whitepalette.setColor(QPalette::Text, GCColor::invertColor(GColor(CPLOTBACKGROUND)));
diff --git a/src/Charts/DiaryWindow.cpp b/src/Charts/DiaryWindow.cpp
index 50bf9d823..0e7c66809 100644
--- a/src/Charts/DiaryWindow.cpp
+++ b/src/Charts/DiaryWindow.cpp
@@ -111,7 +111,6 @@ DiaryWindow::configChanged(qint32)
 
     QPalette palette;
     palette.setBrush(QPalette::Window, QBrush(GColor(CPLOTBACKGROUND)));
-    palette.setBrush(QPalette::Background, QBrush(GColor(CPLOTBACKGROUND)));
     palette.setBrush(QPalette::Base, QBrush(GColor(CPLOTBACKGROUND)));
     palette.setColor(QPalette::WindowText, GCColor::invertColor(GColor(CPLOTBACKGROUND)));
     palette.setColor(QPalette::Text, GCColor::invertColor(GColor(CPLOTBACKGROUND)));
diff --git a/src/Charts/GenericChart.cpp b/src/Charts/GenericChart.cpp
index 3cddc620c..62b68dde5 100644
--- a/src/Charts/GenericChart.cpp
+++ b/src/Charts/GenericChart.cpp
@@ -46,7 +46,7 @@ GenericChart::GenericChart(QWidget *parent, Context *context) : QWidget(parent),
 {
     // for scrollarea, since we see a little of it.
     QPalette palette;
-    palette.setBrush(QPalette::Background, QBrush(GColor(CRIDEPLOTBACKGROUND)));
+    palette.setBrush(QPalette::Window, QBrush(GColor(CRIDEPLOTBACKGROUND)));
 
     // main layout for widget
     QVBoxLayout *main=new QVBoxLayout(this);
@@ -95,7 +95,7 @@ GenericChart::configChanged(qint32)
 
     setProperty("color", bgcolor);
     QPalette palette;
-    palette.setBrush(QPalette::Background, QBrush(bgcolor));
+    palette.setBrush(QPalette::Window, QBrush(bgcolor));
     setPalette(palette); // propagates to children
 
     // set style sheets
diff --git a/src/Charts/HrPwPlot.cpp b/src/Charts/HrPwPlot.cpp
index cca90c3b7..e0a7f9e1a 100644
--- a/src/Charts/HrPwPlot.cpp
+++ b/src/Charts/HrPwPlot.cpp
@@ -122,7 +122,6 @@ HrPwPlot::configChanged(qint32)
 
     QPalette palette;
     palette.setBrush(QPalette::Window, QBrush(GColor(CPLOTBACKGROUND)));
-    palette.setBrush(QPalette::Background, QBrush(GColor(CPLOTBACKGROUND)));
     palette.setColor(QPalette::WindowText, GColor(CPLOTMARKER));
     palette.setColor(QPalette::Text, GColor(CPLOTMARKER));
     setPalette(palette);
diff --git a/src/Charts/LTMWindow.cpp b/src/Charts/LTMWindow.cpp
index b8c765a49..b96ccff66 100644
--- a/src/Charts/LTMWindow.cpp
+++ b/src/Charts/LTMWindow.cpp
@@ -67,7 +67,7 @@ LTMWindow::LTMWindow(Context *context) :
     QVBoxLayout *mainLayout = new QVBoxLayout;
 
     QPalette palette;
-    palette.setBrush(QPalette::Background, QBrush(GColor(CTRENDPLOTBACKGROUND)));
+    palette.setBrush(QPalette::Window, QBrush(GColor(CTRENDPLOTBACKGROUND)));
 
     // single plot
     plotWidget = new QWidget(this);
@@ -519,7 +519,6 @@ LTMWindow::configChanged(qint32)
     // inverted palette for data etc
     QPalette whitepalette;
     whitepalette.setBrush(QPalette::Window, QBrush(GColor(CTRENDPLOTBACKGROUND)));
-    whitepalette.setBrush(QPalette::Background, QBrush(GColor(CTRENDPLOTBACKGROUND)));
     whitepalette.setColor(QPalette::WindowText, GCColor::invertColor(GColor(CTRENDPLOTBACKGROUND)));
     whitepalette.setColor(QPalette::Base, GCColor::alternateColor(GColor(CPLOTBACKGROUND)));
     whitepalette.setColor(QPalette::Text, GCColor::invertColor(GColor(CTRENDPLOTBACKGROUND)));
diff --git a/src/Charts/RideEditor.cpp b/src/Charts/RideEditor.cpp
index 35d020f78..d8adfdb33 100644
--- a/src/Charts/RideEditor.cpp
+++ b/src/Charts/RideEditor.cpp
@@ -258,7 +258,6 @@ RideEditor::configChanged(qint32)
 
     QPalette palette;
     palette.setBrush(QPalette::Window, QBrush(GColor(CPLOTBACKGROUND)));
-    palette.setBrush(QPalette::Background, QBrush(GColor(CPLOTBACKGROUND)));
     palette.setBrush(QPalette::Base, QBrush(GColor(CPLOTBACKGROUND)));
     palette.setColor(QPalette::WindowText, GCColor::invertColor(GColor(CPLOTBACKGROUND)));
     palette.setColor(QPalette::Text, GCColor::invertColor(GColor(CPLOTBACKGROUND)));
@@ -3049,12 +3048,12 @@ void XDataEditor::configChanged()
 {
 
     QPalette palette;
-    palette.setColor(QPalette::Active, QPalette::Background, GColor(CPLOTBACKGROUND));
+    palette.setColor(QPalette::Active, QPalette::Window, GColor(CPLOTBACKGROUND));
     palette.setColor(QPalette::Active, QPalette::Base, GColor(CPLOTBACKGROUND));
     palette.setColor(QPalette::Active, QPalette::WindowText, GCColor::invertColor(GColor(CPLOTBACKGROUND)));
     palette.setColor(QPalette::Active, QPalette::Text, GCColor::invertColor(GColor(CPLOTBACKGROUND)));
     palette.setColor(QPalette::Active, QPalette::Window, GCColor::invertColor(GColor(CPLOTBACKGROUND)));
-    palette.setColor(QPalette::Inactive, QPalette::Background, GColor(CPLOTBACKGROUND));
+    palette.setColor(QPalette::Inactive, QPalette::Window, GColor(CPLOTBACKGROUND));
     palette.setColor(QPalette::Inactive, QPalette::Base, GColor(CPLOTBACKGROUND));
     palette.setColor(QPalette::Inactive, QPalette::WindowText, GCColor::invertColor(GColor(CPLOTBACKGROUND)));
     palette.setColor(QPalette::Inactive, QPalette::Text, GCColor::invertColor(GColor(CPLOTBACKGROUND)));
diff --git a/src/Gui/ChartSpace.cpp b/src/Gui/ChartSpace.cpp
index 0a64e4bd4..b18439e3d 100644
--- a/src/Gui/ChartSpace.cpp
+++ b/src/Gui/ChartSpace.cpp
@@ -642,7 +642,6 @@ ChartSpace::configChanged(qint32 why)
     // text edit colors
     QPalette palette;
     palette.setColor(QPalette::Window, GColor(COVERVIEWBACKGROUND));
-    palette.setColor(QPalette::Background, GColor(COVERVIEWBACKGROUND));
 
     // only change base if moved away from white plots
     // which is a Mac thing
diff --git a/src/Gui/Colors.cpp b/src/Gui/Colors.cpp
index e9e763339..ed5587ae7 100644
--- a/src/Gui/Colors.cpp
+++ b/src/Gui/Colors.cpp
@@ -578,7 +578,6 @@ GCColor::palette()
     // make it to order, to reflect current config
     QPalette palette;
     palette.setBrush(QPalette::Window, QBrush(GColor(CPLOTBACKGROUND)));
-    palette.setBrush(QPalette::Background, QBrush(GColor(CPLOTBACKGROUND)));
     palette.setBrush(QPalette::Base, QBrush(GColor(CPLOTBACKGROUND)));
     palette.setColor(QPalette::WindowText, GCColor::invertColor(GColor(CPLOTBACKGROUND)));
     palette.setColor(QPalette::Text, GCColor::invertColor(GColor(CPLOTBACKGROUND)));
diff --git a/src/Metrics/RideMetadata.cpp b/src/Metrics/RideMetadata.cpp
index 33a4560db..49218da71 100644
--- a/src/Metrics/RideMetadata.cpp
+++ b/src/Metrics/RideMetadata.cpp
@@ -417,7 +417,6 @@ RideMetadata::configChanged(qint32)
         palette = QPalette();
 
         palette.setColor(QPalette::Window, GColor(CPLOTBACKGROUND));
-        palette.setColor(QPalette::Background, GColor(CPLOTBACKGROUND));
 
         // only change base if moved away from white plots
         // which is a Mac thing
diff --git a/src/Planning/PlanningWindow.cpp b/src/Planning/PlanningWindow.cpp
index a6ce6ce02..65889a4f4 100644
--- a/src/Planning/PlanningWindow.cpp
+++ b/src/Planning/PlanningWindow.cpp
@@ -50,7 +50,6 @@ PlanningWindow::configChanged(qint32)
     // text edit colors
     QPalette palette;
     palette.setColor(QPalette::Window, GColor(CTRAINPLOTBACKGROUND));
-    palette.setColor(QPalette::Background, GColor(CTRAINPLOTBACKGROUND));
 
     // only change base if moved away from white plots
     // which is a Mac thing
diff --git a/src/Train/WorkoutWindow.cpp b/src/Train/WorkoutWindow.cpp
index 55ff83fa1..901dab8ad 100644
--- a/src/Train/WorkoutWindow.cpp
+++ b/src/Train/WorkoutWindow.cpp
@@ -380,7 +380,6 @@ WorkoutWindow::configChanged(qint32)
     // text edit colors
     QPalette palette;
     palette.setColor(QPalette::Window, GColor(CTRAINPLOTBACKGROUND));
-    palette.setColor(QPalette::Background, GColor(CTRAINPLOTBACKGROUND));
 
     // only change base if moved away from white plots
     // which is a Mac thing