diff --git a/doc/img/StarTracker_solarsystem.png b/doc/img/StarTracker_solarsystem.png
index b5a99d6e9..93d2ca29f 100644
Binary files a/doc/img/StarTracker_solarsystem.png and b/doc/img/StarTracker_solarsystem.png differ
diff --git a/plugins/feature/startracker/spiceephemerides.cpp b/plugins/feature/startracker/spiceephemerides.cpp
index 82df9e6c3..4b1e6fcec 100644
--- a/plugins/feature/startracker/spiceephemerides.cpp
+++ b/plugins/feature/startracker/spiceephemerides.cpp
@@ -75,6 +75,10 @@ bool SpiceEphemerides::download(const QStringList &emphemerides)
 
 void SpiceEphemerides::downloadComplete(const QString &filename, bool success, const QString &url, const QString &errorMessage)
 {
+    (void) success;
+    (void) url;
+    (void) errorMessage;
+
     m_completedDownloads.append(filename);
     if (m_completedDownloads == m_pendingDownloads)
     {
diff --git a/plugins/feature/startracker/startrackergui.cpp b/plugins/feature/startracker/startrackergui.cpp
index 6339e7361..1e3727f74 100644
--- a/plugins/feature/startracker/startrackergui.cpp
+++ b/plugins/feature/startracker/startrackergui.cpp
@@ -983,6 +983,8 @@ void StarTrackerGUI::updateForTarget()
 
 void StarTrackerGUI::on_target_currentIndexChanged(int index)
 {
+    (void) index;
+
     QString text = ui->target->currentText();
     if (!text.isEmpty())
     {
@@ -1623,26 +1625,13 @@ void StarTrackerGUI::createSolarSystemScene()
     m_solarSystemScene = new QGraphicsScene(ui->image);
     m_solarSystemScene->setBackgroundBrush(QBrush(Qt::black));
 
-    QDateTime dt = m_settings.getDateTime();
-    double t;
-    t = (Astronomy::julianDate(dt) - 2451545.0) / 365250.0;
-
     m_solarSystemLabelFont = m_solarSystemScene->font();
     m_solarSystemLabelFont.setPointSize(6);
     m_solarSystemLabelFontMetrics = QFontMetrics(m_solarSystemLabelFont);
 
-    if (m_settings.m_logScale)
-    {
-        // Pluto is ~56 from Sun on log scale
-        double r = 57;
-        m_solarSystemScene->setSceneRect(-r, -r, r * 2, r * 2);
-    }
-    else
-    {
-        // Mercury is 0.4AU. Neptune is 30 AU
-        double scale = 20;
-        //m_solarSystemScene->setSceneRect(-30 * scale, -30 * scale, 30 * 2 * scale, 30 * 2 * scale);
-    }
+    // Pluto is ~56 from Sun on log scale
+    const double r = 57;
+    m_solarSystemScene->setSceneRect(-r, -r, r * 2, r * 2);
 }
 
 QPixmap *StarTrackerGUI::getPlanetPixmap(const QString& name)
@@ -3298,6 +3287,21 @@ void StarTrackerGUI::on_night_clicked(bool checked)
 void StarTrackerGUI::on_logScale_clicked(bool checked)
 {
     m_settings.m_logScale = checked;
+
+    if (m_settings.m_logScale)
+    {
+        // Pluto is ~56 from Sun on log scale
+        const double r = 57;
+        m_solarSystemScene->setSceneRect(-r, -r, r * 2, r * 2);
+    }
+    else
+    {
+        // Mercury is 0.4AU. Neptune is 30 AU
+        const double max = 32.0;
+        const double pixelScale = 20.0;
+        m_solarSystemScene->setSceneRect(-max * pixelScale, -max * pixelScale, 2.0 * max * pixelScale, 2.0 * max * pixelScale);
+    }
+
     plotChart();
     m_settingsKeys.append("logScale");
     applySettings();