diff --git a/kstars/ekos/align/align.cpp b/kstars/ekos/align/align.cpp
index 4e5391b798b8a106ee8fa7e72bdf81b00bc5ef8f..9a65ad3b224cc7aebfbd38d71c9d0bc4c0783c74 100644
--- a/kstars/ekos/align/align.cpp
+++ b/kstars/ekos/align/align.cpp
@@ -122,7 +122,9 @@ Align::Align()
     gotoModeButtonGroup->button(currentGotoMode)->setChecked(true);
 
     syncBoxesB->setIcon(QIcon::fromTheme("edit-copy", QIcon(":/icons/breeze/default/edit-copy.svg")));
+    syncBoxesB->setAttribute(Qt::WA_LayoutUsesWidgetRect);
     clearBoxesB->setIcon(QIcon::fromTheme("edit-clear", QIcon(":/icons/breeze/default/edit-clear.svg")));
+    clearBoxesB->setAttribute(Qt::WA_LayoutUsesWidgetRect);
 
     raBox->setDegType(false); //RA box should be HMS-style
 
diff --git a/kstars/ekos/focus/focus.cpp b/kstars/ekos/focus/focus.cpp
index 63d500d9c57ea5b2b5c3ab475298e3f4dfceb069..340ac65a0c44bbce8af9d588cd8faa68a31e35dd 100644
--- a/kstars/ekos/focus/focus.cpp
+++ b/kstars/ekos/focus/focus.cpp
@@ -99,9 +99,11 @@ Focus::Focus()
     frameNum=0;
 
     showFITSViewerB->setIcon(QIcon::fromTheme("kstars_fitsviewer", QIcon(":/icons/breeze/default/kstars_fitsviewer.svg")));
+    showFITSViewerB->setAttribute(Qt::WA_LayoutUsesWidgetRect);
     connect(showFITSViewerB, SIGNAL(clicked()), this, SLOT(showFITSViewer()));
 
     toggleFullScreenB->setIcon(QIcon::fromTheme("view-fullscreen", QIcon(":/icons/breeze/default/view-fullscreen.svg")));
+    toggleFullScreenB->setAttribute(Qt::WA_LayoutUsesWidgetRect);
     connect(toggleFullScreenB, SIGNAL(clicked()), this, SLOT(toggleFocusingWidgetFullScreen()));
 
     connect(startFocusB, SIGNAL(clicked()), this, SLOT(start()));
diff --git a/kstars/kstars.cpp b/kstars/kstars.cpp
index 41dd9934c6230c6dd6fb57f05d5165c7a3d8a9e2..fef97d35f8be6e39f109bbe80d86222e6e5447e9 100644
--- a/kstars/kstars.cpp
+++ b/kstars/kstars.cpp
@@ -80,10 +80,6 @@ KStars::KStars( bool doSplash, bool clockrun, const QString &startdate )
     //Note:  You need to make sure the environment variables for KStars are set correctly to get this running properly.
 #ifdef Q_OS_OSX
     QProcess* klauncher = new QProcess(this);
-   // QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
-   // QString stringPath = QCoreApplication::applicationDirPath();
-   // env.insert("QT_PLUGIN_PATH", stringPath + "/../plugins");
-   // klauncher->setProcessEnvironment(env);
     klauncher->start("kdeinit5");
 #endif
 
diff --git a/kstars/kstarsactions.cpp b/kstars/kstarsactions.cpp
index d5ff99ea54e0f3e9f8f10a9ee28ba14db9cc4f71..1ca9ede6fcd77ffd0fb539e276ec0ef50e6e954c 100644
--- a/kstars/kstarsactions.cpp
+++ b/kstars/kstarsactions.cpp
@@ -1513,6 +1513,8 @@ void KStars::slotAboutToQuit()
     quit->waitForFinished(1000);
     quit->start("killall kioslave");
     quit->waitForFinished(1000);
+    quit->start("killall kio_http_cache_cleaner");
+    quit->waitForFinished(1000);
     delete quit;
 #endif
 
diff --git a/kstars/tools/observinglist.cpp b/kstars/tools/observinglist.cpp
index 3820f8fe4afcda1e8180475cd17303c943c277bc..a0fb15cde196067319484d0832c6c8c28e37a734 100644
--- a/kstars/tools/observinglist.cpp
+++ b/kstars/tools/observinglist.cpp
@@ -218,9 +218,13 @@ ObservingList::ObservingList()
              this, SLOT( slotOALExport() ) );
     //Add icons to Push Buttons
     ui->OpenButton->setIcon( QIcon::fromTheme("document-open", QIcon(":/icons/breeze/default/document-open.svg")) );
+    ui->OpenButton ->setAttribute(Qt::WA_LayoutUsesWidgetRect);
     ui->SaveButton->setIcon( QIcon::fromTheme("document-save", QIcon(":/icons/breeze/default/document-save.svg")) );
+    ui->SaveButton->setAttribute(Qt::WA_LayoutUsesWidgetRect);
     ui->SaveAsButton->setIcon( QIcon::fromTheme("document-save-as", QIcon(":/icons/breeze/default/document-save-as.svg")) );
+    ui->SaveAsButton->setAttribute(Qt::WA_LayoutUsesWidgetRect);
     ui->WizardButton->setIcon( QIcon::fromTheme("tools-wizard", QIcon(":/icons/breeze/default/tools-wizard.svg")) );
+    ui->WizardButton->setAttribute(Qt::WA_LayoutUsesWidgetRect);
     ui->MiniButton->setIcon( QIcon::fromTheme("view-restore", QIcon(":/icons/breeze/default/view-restore.svg")) );
     noSelection = true;
     showScope = false;