diff --git a/lib/Makefile.am b/lib/Makefile.am
index e863f2c0ab..bff08ade78 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -628,9 +628,10 @@ dist_images_DATA1X = \
 	images/layout-toggle_LyX-Code.svgz \
 	images/layout-toggle_Section.svgz \
 	images/lyx.svg \
-	images/lyxfiles-folder.svgz \
 	images/lyxfiles-system.svgz \
+	images/lyxfiles-system-folder.svgz \
 	images/lyxfiles-user.svgz \
+	images/lyxfiles-user-folder.svgz \
 	images/lyx-quit.svgz \
 	images/marginalnote-insert.svgz \
 	images/master-buffer-update.svgz \
diff --git a/lib/images/lyxfiles-folder.svgz b/lib/images/lyxfiles-folder.svgz
deleted file mode 100644
index d3d36458df..0000000000
Binary files a/lib/images/lyxfiles-folder.svgz and /dev/null differ
diff --git a/lib/images/lyxfiles-system-folder.svgz b/lib/images/lyxfiles-system-folder.svgz
new file mode 100644
index 0000000000..c213620445
Binary files /dev/null and b/lib/images/lyxfiles-system-folder.svgz differ
diff --git a/lib/images/lyxfiles-user-folder.svgz b/lib/images/lyxfiles-user-folder.svgz
new file mode 100644
index 0000000000..67e1d7679d
Binary files /dev/null and b/lib/images/lyxfiles-user-folder.svgz differ
diff --git a/lib/images/lyxfiles-user.svgz b/lib/images/lyxfiles-user.svgz
index 6e21ca72bb..7e9b246a85 100644
Binary files a/lib/images/lyxfiles-user.svgz and b/lib/images/lyxfiles-user.svgz differ
diff --git a/src/frontends/qt/GuiLyXFiles.cpp b/src/frontends/qt/GuiLyXFiles.cpp
index c9ab003dad..2c97f2baa2 100644
--- a/src/frontends/qt/GuiLyXFiles.cpp
+++ b/src/frontends/qt/GuiLyXFiles.cpp
@@ -417,7 +417,8 @@ void GuiLyXFiles::updateContents()
 	filesLW->clear();
 	QIcon user_icon(getPixmap("images/", "lyxfiles-user", "svgz,png"));
 	QIcon system_icon(getPixmap("images/", "lyxfiles-system", "svgz,png"));
-	QIcon folder_icon(getPixmap("images/", "lyxfiles-folder", "svgz,png"));
+	QIcon user_folder_icon(getPixmap("images/", "lyxfiles-user-folder", "svgz,png"));
+	QIcon system_folder_icon(getPixmap("images/", "lyxfiles-system-folder", "svgz,png"));
 	QStringList cats;
 	QMap<QString, QString>::const_iterator it = files.constBegin();
 	QFont capfont;
@@ -453,8 +454,8 @@ void GuiLyXFiles::updateContents()
 			guiname = qt_("Default Template");
 		else if (translateName())
 			guiname = toqstr(translateIfPossible(qstring_to_ucs4(guiString(guiname))));
-		QIcon file_icon = (realpath.startsWith(toqstr(package().user_support().absFileName()))) ?
-				user_icon : system_icon;
+		bool const user = realpath.startsWith(toqstr(package().user_support().absFileName()));
+		QIcon file_icon = user ? user_icon : system_icon;
 		item->setIcon(0, file_icon);
 		item->setData(0, Qt::UserRole, it.key());
 		item->setData(0, Qt::DisplayRole, guiname);
@@ -477,7 +478,8 @@ void GuiLyXFiles::updateContents()
 			if (!subcatItem) {
 				subcatItem = new QTreeWidgetItem();
 				subcatItem->setText(0, subcat);
-				subcatItem->setIcon(0, folder_icon);
+				file_icon = user ? user_folder_icon : system_folder_icon;
+				subcatItem->setIcon(0, file_icon);
 				cats << catsave;
 			}
 			subcatItem->addChild(item);