diff --git a/src/core/iconloader.cpp b/src/core/iconloader.cpp
index 04f5f3d92..1e81c803e 100644
--- a/src/core/iconloader.cpp
+++ b/src/core/iconloader.cpp
@@ -37,10 +37,12 @@ bool IconLoader::custom_icons_ = false;
 
 void IconLoader::Init() {
 
-  QSettings s;
-  s.beginGroup(AppearanceSettingsPage::kSettingsGroup);
-  system_icons_ = s.value("system_icons", false).toBool();
-  s.endGroup();
+  // TODO: Fix use system icons option properly.
+
+  //QSettings s;
+  //s.beginGroup(AppearanceSettingsPage::kSettingsGroup);
+  //system_icons_ = s.value("system_icons", false).toBool();
+  //s.endGroup();
 
   QDir dir;
   if (dir.exists(QStandardPaths::writableLocation(QStandardPaths::AppLocalDataLocation) + "/icons")) {
diff --git a/src/settings/appearancesettingspage.cpp b/src/settings/appearancesettingspage.cpp
index 524e693be..b8f5a1913 100644
--- a/src/settings/appearancesettingspage.cpp
+++ b/src/settings/appearancesettingspage.cpp
@@ -110,6 +110,8 @@ AppearanceSettingsPage::AppearanceSettingsPage(SettingsDialog *dialog)
   connect(ui_->select_tabbar_color, SIGNAL(pressed()), SLOT(TabBarSelectBGColor()));
   connect(ui_->tabbar_system_color, SIGNAL(toggled(bool)), SLOT(TabBarSystemColor(bool)));
 
+  ui_->checkbox_system_icons->hide();
+
   Load();
 
 }