diff --git a/Source/Core/DolphinQt2/Config/SettingsWindow.cpp b/Source/Core/DolphinQt2/Config/SettingsWindow.cpp
index 96b583d028..63d29e4255 100644
--- a/Source/Core/DolphinQt2/Config/SettingsWindow.cpp
+++ b/Source/Core/DolphinQt2/Config/SettingsWindow.cpp
@@ -68,8 +68,9 @@ void SettingsWindow::MakeUnfinishedWarning()
 
 void SettingsWindow::AddCategoryToList(const QString& title, const QString& icon)
 {
+  QString dir = Settings().GetThemeDir();
   QListWidgetItem* button = new QListWidgetItem();
-  button->setIcon(QIcon(icon));
+  button->setIcon(QIcon(dir.append(icon)));
   button->setText(title);
   button->setTextAlignment(Qt::AlignVCenter);
   button->setSizeHint(QSize(28, 28));
@@ -79,17 +80,14 @@ void SettingsWindow::AddCategoryToList(const QString& title, const QString& icon
 
 void SettingsWindow::MakeCategoryList()
 {
-  QString dir = Settings().GetThemeDir();
-
   m_categories = new QListWidget;
   m_categories->setMaximumWidth(175);
   m_categories->setIconSize(QSize(32, 32));
   m_categories->setMovement(QListView::Static);
   m_categories->setSpacing(0);
 
-  AddCategoryToList(tr("General"), dir.append(QStringLiteral("config.png")));
-  AddCategoryToList(tr("Interface"), dir.append(QStringLiteral("config.png")));
-
+  AddCategoryToList(tr("General"), QStringLiteral("config.png"));
+  AddCategoryToList(tr("Interface"), QStringLiteral("browse.png"));
   connect(m_categories, &QListWidget::currentItemChanged, this, &SettingsWindow::changePage);
 }
 
diff --git a/Source/Core/DolphinQt2/DolphinQt2.vcxproj.filters b/Source/Core/DolphinQt2/DolphinQt2.vcxproj.filters
index e2b922515b..2b4fd61650 100644
--- a/Source/Core/DolphinQt2/DolphinQt2.vcxproj.filters
+++ b/Source/Core/DolphinQt2/DolphinQt2.vcxproj.filters
@@ -95,12 +95,18 @@
       <Filter>Settings</Filter>
     </ClCompile>
     <ClCompile Include="$(QtMocOutPrefix)GeneralPane.cpp">
-    <ClCompile Include="Settings/InterfacePane.cpp">
-      <Filter>Settings</Filter>
+      <Filter>Generated Files</Filter>
     </ClCompile>
     <ClCompile Include="$(QtMocOutPrefix)InterfacePane.cpp">
       <Filter>Generated Files</Filter>
     </ClCompile>
+    <ClCompile Include="Config\ControllersWindow.cpp" />
+    <ClCompile Include="$(QtMocOutPrefix)ControllersWindow.cpp">
+      <Filter>Generated Files</Filter>
+    </ClCompile>
+    <ClCompile Include="Settings\InterfacePane.cpp">
+      <Filter>Settings</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <QtMoc Include="MainWindow.h" />
@@ -134,10 +140,13 @@
     <QtMoc Include="Config\FilesystemWidget.h" />
     <QtMoc Include="Config\InfoWidget.h" />
     <QtMoc Include="InDevelopmentWarning.h" />
-    <QtMoc Include="Settings\GeneralPane.h">
+    <QtMoc Include="Config\ControllersWindow.h" />
     <QtMoc Include="Settings\InterfacePane.h">
       <Filter>Settings</Filter>
     </QtMoc>
+    <QtMoc Include="Settings\GeneralPane.h">
+      <Filter>Settings</Filter>
+    </QtMoc>
   </ItemGroup>
   <ItemGroup>
     <QtUi Include="*.ui" />
@@ -165,4 +174,4 @@
   <ItemGroup>
     <ClInclude Include="Resources.h" />
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file