diff --git a/resources/graphics/icons/mini-kfaenza/cs_CZ.png b/resources/graphics/icons/mini-kfaenza/cs_CZ.png
deleted file mode 100644
index b50e69ec0..000000000
Binary files a/resources/graphics/icons/mini-kfaenza/cs_CZ.png and /dev/null differ
diff --git a/resources/graphics/icons/mini-kfaenza/de_DE.png b/resources/graphics/icons/mini-kfaenza/de_DE.png
deleted file mode 100644
index 463f855d7..000000000
Binary files a/resources/graphics/icons/mini-kfaenza/de_DE.png and /dev/null differ
diff --git a/resources/graphics/icons/mini-kfaenza/en_GB.png b/resources/graphics/icons/mini-kfaenza/en_GB.png
deleted file mode 100644
index bfe631c02..000000000
Binary files a/resources/graphics/icons/mini-kfaenza/en_GB.png and /dev/null differ
diff --git a/resources/graphics/icons/mini-kfaenza/fr_FR.png b/resources/graphics/icons/mini-kfaenza/fr_FR.png
deleted file mode 100644
index 33156c6a6..000000000
Binary files a/resources/graphics/icons/mini-kfaenza/fr_FR.png and /dev/null differ
diff --git a/resources/graphics/icons/mini-kfaenza/it_IT.png b/resources/graphics/icons/mini-kfaenza/it_IT.png
deleted file mode 100644
index ea0b791b5..000000000
Binary files a/resources/graphics/icons/mini-kfaenza/it_IT.png and /dev/null differ
diff --git a/resources/graphics/icons/mini-kfaenza/nl_NL.png b/resources/graphics/icons/mini-kfaenza/nl_NL.png
deleted file mode 100644
index 2e7ac6191..000000000
Binary files a/resources/graphics/icons/mini-kfaenza/nl_NL.png and /dev/null differ
diff --git a/src/definitions/definitions.h.in b/src/definitions/definitions.h.in
index e0a1103f5..39019f522 100755
--- a/src/definitions/definitions.h.in
+++ b/src/definitions/definitions.h.in
@@ -61,6 +61,7 @@
 #define STARTUP_UPDATE_DELAY            1500
 #define TIMEZONE_OFFSET_LIMIT           6
 #define CHANGE_EVENT_DELAY              250
+#define FLAG_ICON_SUBFOLDER             "flags"
 #define SEACRH_MESSAGES_ACTION_NAME     "search"
 #define HIGHLIGHTER_ACTION_NAME         "highlighter"
 #define SPACER_ACTION_NAME              "spacer"
diff --git a/src/gui/formsettings.cpp b/src/gui/formsettings.cpp
index e731e4754..d1349a1a0 100755
--- a/src/gui/formsettings.cpp
+++ b/src/gui/formsettings.cpp
@@ -442,7 +442,8 @@ void FormSettings::loadLanguage() {
     item->setText(2, language.m_version);
     item->setText(3, language.m_author);
     item->setText(4, language.m_email);
-    item->setIcon(0, IconFactory::instance()->fromTheme(language.m_code));
+    item->setIcon(0, IconFactory::instance()->fromTheme("flags" + QDir::separator() +
+                                                        language.m_code));
   }
 
   QList<QTreeWidgetItem*> matching_items = m_ui->m_treeLanguages->findItems(Localization::instance()->loadedLanguage(),