diff --git a/launcher/ui/themes/IconTheme.cpp b/launcher/ui/themes/IconTheme.cpp
index cd1dfbaf5..4bd889854 100644
--- a/launcher/ui/themes/IconTheme.cpp
+++ b/launcher/ui/themes/IconTheme.cpp
@@ -25,7 +25,7 @@ IconTheme::IconTheme(const QString& id, const QString& path) : m_id(id), m_path(
 
 bool IconTheme::load()
 {
-    QString path = m_path + "/index.theme";
+    const QString path = m_path + "/index.theme";
 
     if (!QFile::exists(path))
         return false;
@@ -50,4 +50,4 @@ QString IconTheme::path()
 QString IconTheme::name()
 {
     return m_name;
-}
\ No newline at end of file
+}
diff --git a/launcher/ui/themes/IconTheme.h b/launcher/ui/themes/IconTheme.h
index 458ea12c1..4e466c6ae 100644
--- a/launcher/ui/themes/IconTheme.h
+++ b/launcher/ui/themes/IconTheme.h
@@ -34,4 +34,4 @@ class IconTheme {
     QString m_id;
     QString m_path;
     QString m_name;
-};
\ No newline at end of file
+};
diff --git a/launcher/ui/themes/ThemeManager.cpp b/launcher/ui/themes/ThemeManager.cpp
index 32585618f..c929549e3 100644
--- a/launcher/ui/themes/ThemeManager.cpp
+++ b/launcher/ui/themes/ThemeManager.cpp
@@ -72,17 +72,12 @@ void ThemeManager::initializeIcons()
 {
     // TODO: icon themes and instance icons do not mesh well together. Rearrange and fix discrepancies!
     // set icon theme search path!
-
-    if (!m_iconThemeFolder.mkpath("."))
-        themeWarningLog() << "Couldn't create icon theme folder";
-    themeDebugLog() << "Icon Theme Folder Path: " << m_iconThemeFolder.absolutePath();
+    themeDebugLog() << "<> Initializing Icon Themes";
 
     auto searchPaths = QIcon::themeSearchPaths();
     searchPaths.append(m_iconThemeFolder.path());
     QIcon::setThemeSearchPaths(searchPaths);
 
-    themeDebugLog() << "<> Initializing Icon Themes";
-
     for (const QString& id : builtinIcons) {
         IconTheme theme(id, QString(":/icons/%1").arg(id));
         if (!theme.load()) {
@@ -94,6 +89,10 @@ void ThemeManager::initializeIcons()
         themeDebugLog() << "Loaded Built-In Icon Theme" << id;
     }
 
+    if (!m_iconThemeFolder.mkpath("."))
+        themeWarningLog() << "Couldn't create icon theme folder";
+    themeDebugLog() << "Icon Theme Folder Path: " << m_iconThemeFolder.absolutePath();
+
     QDirIterator directoryIterator(m_iconThemeFolder.path(), QDir::Dirs | QDir::NoDotAndDotDot);
     while (directoryIterator.hasNext()) {
         QDir dir(directoryIterator.next());
diff --git a/launcher/ui/widgets/ThemeCustomizationWidget.ui b/launcher/ui/widgets/ThemeCustomizationWidget.ui
index 700c530c7..266b1dd62 100644
--- a/launcher/ui/widgets/ThemeCustomizationWidget.ui
+++ b/launcher/ui/widgets/ThemeCustomizationWidget.ui
@@ -167,12 +167,6 @@
    </item>
   </layout>
  </widget>
- <tabstops>
-  <tabstop>iconsComboBox</tabstop>
-  <tabstop>widgetStyleComboBox</tabstop>
-  <tabstop>backgroundCatComboBox</tabstop>
-  <tabstop>catInfoLabel</tabstop>
- </tabstops>
  <resources/>
  <connections/>
 </ui>