diff --git a/i2p2www/pages/downloads/select.html b/i2p2www/pages/downloads/select.html
index 3eaf46a911d75cb94b8b7b19959f997cc2acf2e1..2745a2b211b0861bf239a787decedebe9f35f138 100644
--- a/i2p2www/pages/downloads/select.html
+++ b/i2p2www/pages/downloads/select.html
@@ -9,7 +9,7 @@
   <ul>
     <li><a href="{{ url_for('downloads_redirect', protocol=protocol.name, file=file) }}">Any mirror</a></li>
     {% for mirror in protocol.mirrors -%}
-    <li><img src="{{ url_for('static', filename='images/'+mirror.country+'.png') }}" />&nbsp;{% if mirror.org_url %}<a href="{{ mirror.org_url }}">{% endif %}{{ mirror.org }}{% if mirror.org_url %}</a>{% endif %} <a href="{{ url_for('downloads_redirect', protocol=protocol.name, file=file, mirror=loop.index-1) }}">[Download]</a></li>
+    <li><img src="{{ url_for('static', filename='images/flags/'+mirror.country+'.png') }}" />&nbsp;{% if mirror.org_url %}<a href="{{ mirror.org_url }}">{% endif %}{{ mirror.org }}{% if mirror.org_url %}</a>{% endif %} <a href="{{ url_for('downloads_redirect', protocol=protocol.name, file=file, mirror=loop.index-1) }}">[Download]</a></li>
     {%- endfor %}
   </ul>
 </div>
diff --git a/i2p2www/pages/global/lang.html b/i2p2www/pages/global/lang.html
index 1a930207181a5b91e80cb788c6608671b108e802..8e3d657218c2f398f67bbafc0112d6d10805348f 100644
--- a/i2p2www/pages/global/lang.html
+++ b/i2p2www/pages/global/lang.html
@@ -1,14 +1,14 @@
 <ul class="languages">
-  <li><a href="{{ change_lang('en') }}"><img src="{{ url_for('static', filename='images/us.png') }}" alt="English" /></a></li>
-  <li><a href="{{ change_lang('es') }}"><img src="{{ url_for('static', filename='images/es.png') }}" alt="Castellano" /></a></li>
-  <li><a href="{{ change_lang('zh') }}"><img src="{{ url_for('static', filename='images/zh.png') }}" alt="Chinese" /></a></li>
-  <li><a href="{{ change_lang('de') }}"><img src="{{ url_for('static', filename='images/de.png') }}" alt="Deutsch" /></a></li>
-  <li><a href="{{ change_lang('fr') }}"><img src="{{ url_for('static', filename='images/fr.png') }}" alt="Français" /></a></li>
-  <li><a href="{{ change_lang('it') }}"><img src="{{ url_for('static', filename='images/it.png') }}" alt="Italiano" /></a></li>
-  <li><a href="{{ change_lang('nl') }}"><img src="{{ url_for('static', filename='images/nl.png') }}" alt="Nederlands" /></a></li>
-  <li><a href="{{ change_lang('ru') }}"><img src="{{ url_for('static', filename='images/ru.png') }}" alt="Russian" /></a></li>
-  <li><a href="{{ change_lang('sv') }}"><img src="{{ url_for('static', filename='images/sv.png') }}" alt="Svenska" /></a></li>
-  <li><a href="{{ change_lang('cs') }}"><img src="{{ url_for('static', filename='images/cs.png') }}" alt="Czech" /></a></li>
-  <li><a href="{{ change_lang('ar') }}"><img src="{{ url_for('static', filename='images/ar.png') }}" alt="Arabic" /></a></li>
-  <li><a href="{{ change_lang('el') }}"><img src="{{ url_for('static', filename='images/el.png') }}" alt="Greek" /></a></li>
+  <li><a href="{{ change_lang('en') }}"><img src="{{ url_for('static', filename='images/flags/us.png') }}" alt="English" /></a></li>
+  <li><a href="{{ change_lang('es') }}"><img src="{{ url_for('static', filename='images/flags/es.png') }}" alt="Castellano" /></a></li>
+  <li><a href="{{ change_lang('zh') }}"><img src="{{ url_for('static', filename='images/flags/zh.png') }}" alt="Chinese" /></a></li>
+  <li><a href="{{ change_lang('de') }}"><img src="{{ url_for('static', filename='images/flags/de.png') }}" alt="Deutsch" /></a></li>
+  <li><a href="{{ change_lang('fr') }}"><img src="{{ url_for('static', filename='images/flags/fr.png') }}" alt="Français" /></a></li>
+  <li><a href="{{ change_lang('it') }}"><img src="{{ url_for('static', filename='images/flags/it.png') }}" alt="Italiano" /></a></li>
+  <li><a href="{{ change_lang('nl') }}"><img src="{{ url_for('static', filename='images/flags/nl.png') }}" alt="Nederlands" /></a></li>
+  <li><a href="{{ change_lang('ru') }}"><img src="{{ url_for('static', filename='images/flags/ru.png') }}" alt="Russian" /></a></li>
+  <li><a href="{{ change_lang('sv') }}"><img src="{{ url_for('static', filename='images/flags/sv.png') }}" alt="Svenska" /></a></li>
+  <li><a href="{{ change_lang('cs') }}"><img src="{{ url_for('static', filename='images/flags/cs.png') }}" alt="Czech" /></a></li>
+  <li><a href="{{ change_lang('ar') }}"><img src="{{ url_for('static', filename='images/flags/ar.png') }}" alt="Arabic" /></a></li>
+  <li><a href="{{ change_lang('el') }}"><img src="{{ url_for('static', filename='images/flags/el.png') }}" alt="Greek" /></a></li>
 </ul>
diff --git a/i2p2www/static/images/cz.png b/i2p2www/static/images/cz.png
deleted file mode 100644
index c8403dd21fd15f46d501a766a7a97733462f3b22..0000000000000000000000000000000000000000
Binary files a/i2p2www/static/images/cz.png and /dev/null differ
diff --git a/i2p2www/static/images/ar.png b/i2p2www/static/images/flags/ar.png
similarity index 100%
rename from i2p2www/static/images/ar.png
rename to i2p2www/static/images/flags/ar.png
diff --git a/i2p2www/static/images/cs.png b/i2p2www/static/images/flags/cs.png
similarity index 100%
rename from i2p2www/static/images/cs.png
rename to i2p2www/static/images/flags/cs.png
diff --git a/i2p2www/static/images/de.png b/i2p2www/static/images/flags/de.png
similarity index 100%
rename from i2p2www/static/images/de.png
rename to i2p2www/static/images/flags/de.png
diff --git a/i2p2www/static/images/el.png b/i2p2www/static/images/flags/el.png
similarity index 100%
rename from i2p2www/static/images/el.png
rename to i2p2www/static/images/flags/el.png
diff --git a/i2p2www/static/images/es.png b/i2p2www/static/images/flags/es.png
similarity index 100%
rename from i2p2www/static/images/es.png
rename to i2p2www/static/images/flags/es.png
diff --git a/i2p2www/static/images/eu.png b/i2p2www/static/images/flags/eu.png
similarity index 100%
rename from i2p2www/static/images/eu.png
rename to i2p2www/static/images/flags/eu.png
diff --git a/i2p2www/static/images/fr.png b/i2p2www/static/images/flags/fr.png
similarity index 100%
rename from i2p2www/static/images/fr.png
rename to i2p2www/static/images/flags/fr.png
diff --git a/i2p2www/static/images/it.png b/i2p2www/static/images/flags/it.png
similarity index 100%
rename from i2p2www/static/images/it.png
rename to i2p2www/static/images/flags/it.png
diff --git a/i2p2www/static/images/lu.png b/i2p2www/static/images/flags/lu.png
similarity index 100%
rename from i2p2www/static/images/lu.png
rename to i2p2www/static/images/flags/lu.png
diff --git a/i2p2www/static/images/nl.png b/i2p2www/static/images/flags/nl.png
similarity index 100%
rename from i2p2www/static/images/nl.png
rename to i2p2www/static/images/flags/nl.png
diff --git a/i2p2www/static/images/ru.png b/i2p2www/static/images/flags/ru.png
similarity index 100%
rename from i2p2www/static/images/ru.png
rename to i2p2www/static/images/flags/ru.png
diff --git a/i2p2www/static/images/sv.png b/i2p2www/static/images/flags/sv.png
similarity index 100%
rename from i2p2www/static/images/sv.png
rename to i2p2www/static/images/flags/sv.png
diff --git a/i2p2www/static/images/us.png b/i2p2www/static/images/flags/us.png
similarity index 100%
rename from i2p2www/static/images/us.png
rename to i2p2www/static/images/flags/us.png
diff --git a/i2p2www/static/images/zh.png b/i2p2www/static/images/flags/zh.png
similarity index 100%
rename from i2p2www/static/images/zh.png
rename to i2p2www/static/images/flags/zh.png
diff --git a/i2p2www/static/images/lang_ar.png b/i2p2www/static/images/lang_ar.png
deleted file mode 100644
index f9dee35851c8c76ae16b6cc53fe27aa1ead25f3d..0000000000000000000000000000000000000000
Binary files a/i2p2www/static/images/lang_ar.png and /dev/null differ