diff --git a/src/GoldenCheetah.cpp b/src/GoldenCheetah.cpp
index 4ed1ec296..232ee8c42 100644
--- a/src/GoldenCheetah.cpp
+++ b/src/GoldenCheetah.cpp
@@ -685,7 +685,6 @@ GcChartWindow::GcChartWindow(QWidget *parent) : GcWindow(parent) {
     //
     setContentsMargins(0,0,0,0);
 
-    // Main layout
     _layout = new QStackedLayout();
     setLayout(_layout);
 
@@ -698,6 +697,7 @@ GcChartWindow::GcChartWindow(QWidget *parent) : GcWindow(parent) {
     _layout->addWidget(_mainWidget);
     _layout->setCurrentWidget(_mainWidget);
 
+    // Main layout
     _mainLayout = new QGridLayout();
     _mainLayout->setContentsMargins(2,2,2,2);
 
@@ -728,6 +728,31 @@ GcChartWindow::GcChartWindow(QWidget *parent) : GcWindow(parent) {
 
     _mainLayout->addWidget(_revealControls,0,0, Qt::AlignTop);
     _mainWidget->setLayout(_mainLayout);
+
+    //
+    // Default Blank layout
+    //
+    _defaultBlankLayout = new QVBoxLayout();
+    _defaultBlankLayout->setAlignment(Qt::AlignCenter);
+    _defaultBlankLayout->setContentsMargins(10,10,10,10);
+
+    QToolButton *blankImg = new QToolButton(this);
+    blankImg->setFocusPolicy(Qt::NoFocus);
+    blankImg->setToolButtonStyle(Qt::ToolButtonIconOnly);
+    blankImg->setStyleSheet("QToolButton {text-align: left;color : blue;background: transparent}");
+    blankImg->setSizePolicy(QSizePolicy::MinimumExpanding,QSizePolicy::MinimumExpanding);
+
+    blankImg->setIcon(QPixmap(":/images/gc-blank.png"));
+    blankImg->setIconSize(QSize(300,300)); //512
+
+    QLabel *blankLabel = new QLabel(tr("No data available"));
+    blankLabel->setAlignment(Qt::AlignCenter);
+
+    _defaultBlankLayout->addStretch();
+    _defaultBlankLayout->addWidget(blankImg);
+    _defaultBlankLayout->addWidget(blankLabel);
+    _defaultBlankLayout->addStretch();
+    _blank->setLayout(_defaultBlankLayout);
 }
 
 void
@@ -747,6 +772,7 @@ GcChartWindow:: setRevealLayout(QLayout *layout)
 void
 GcChartWindow:: setBlankLayout(QLayout *layout)
 {
+    _blankLayout = layout;
     _blank->setLayout(layout);
 }
 
diff --git a/src/GoldenCheetah.h b/src/GoldenCheetah.h
index d0f923134..654e57d8f 100644
--- a/src/GoldenCheetah.h
+++ b/src/GoldenCheetah.h
@@ -201,8 +201,12 @@ private:
 
     QStackedLayout *_layout;
     QGridLayout *_mainLayout;
+    QVBoxLayout *_defaultBlankLayout;
+
     QLayout *_chartLayout,
-            *_revealLayout;
+            *_revealLayout,
+            *_blankLayout;
+
     QWidget *_mainWidget;
     QWidget *_blank;
     QWidget *_chart;
diff --git a/src/GoogleMapControl.cpp b/src/GoogleMapControl.cpp
index 397c90e09..3ac0f2f54 100644
--- a/src/GoogleMapControl.cpp
+++ b/src/GoogleMapControl.cpp
@@ -51,26 +51,6 @@ GoogleMapControl::GoogleMapControl(MainWindow *mw) : GcChartWindow(mw), main(mw)
 
     webBridge = new WebBridge(mw, this);
 
-    //
-    // Blank layout (no GPS data)
-    //
-    QVBoxLayout *blanklayout = new QVBoxLayout();
-    blanklayout->setAlignment(Qt::AlignCenter);
-    blanklayout->setContentsMargins(70,70,70,70);
-
-    QToolButton *blankImg = new QToolButton(this);
-    blankImg->setFocusPolicy(Qt::NoFocus);
-    blankImg->setToolButtonStyle(Qt::ToolButtonIconOnly);
-    blankImg->setStyleSheet("QToolButton {text-align: left;color : blue;background: transparent}");
-
-    blankImg->setIcon(QPixmap(":/images/nogps.png"));
-    blankImg->setIconSize(QSize(475,610));
-
-    blanklayout->addStretch();
-    blanklayout->addWidget(blankImg);
-    blanklayout->addStretch();
-    setBlankLayout(blanklayout);
-
     //
     // connects
     //
diff --git a/src/application.qrc b/src/application.qrc
index e3e2c5928..fac8fe5ba 100644
--- a/src/application.qrc
+++ b/src/application.qrc
@@ -124,7 +124,6 @@
         <file>images/mac/scope-inactive.png</file>
         <file>images/mac/hide.png</file>
         <file>images/mac/show.png</file>
-        <file>images/nogps.png</file>
         <file>images/analysis.png</file>
         <file>images/home.png</file>
         <file>images/diary.png</file>
diff --git a/src/images/nogps.png b/src/images/nogps.png
deleted file mode 100644
index 1631a9742..000000000
Binary files a/src/images/nogps.png and /dev/null differ