Reorganizing the images folders for every plugins

499 files changed, 285 insertions, 285 deletions

diff --git a/core/DataTable.php b/core/DataTable.php
index b5e2064980..3b5947bfd1 100644
--- a/core/DataTable.php
+++ b/core/DataTable.php
@@ -40,7 +40,7 @@ require_once PIWIK_INCLUDE_PATH . '/core/Common.php';
  *                        'visitors' => 155,
  *                        'pages' => 214,
  *                        'bounce_rate' => 67)
- * - metadata = array('logo' => '/img/browsers/FF.png')
+ * - metadata = array('logo' => '/plugins/UserSettings/images/browsers/FF.gif')
  * - no sub DataTable
  *
  * A more complex example would be a DataTable_Row that is associated to a sub DataTable.
@@ -50,7 +50,7 @@ require_once PIWIK_INCLUDE_PATH . '/core/Common.php';
  *                        'visits' => 1550,
  *                        'visits_length' => 514214,
  *                        'returning_visits' => 77)
- * - metadata = array(    'logo' => '/img/search/google.png',
+ * - metadata = array(    'logo' => '/plugins/Referers/images/searchEngines/google.com.png',
  *                        'url' => 'http://google.com')
  * - DataTable = DataTable containing several DataTable_Row containing the keywords information for this search engine
  *            Example of one DataTable_Row
diff --git a/plugins/API/API.php b/plugins/API/API.php
index 1d8b92dbd6..810a01a8c2 100644
--- a/plugins/API/API.php
+++ b/plugins/API/API.php
@@ -485,7 +485,7 @@ class Piwik_API_API
      */
     public function getSVGLogoUrl($pathOnly = false)
     {
-        $logo = 'plugins/Zeitgeist/theme/images/logo.svg';
+        $logo = 'plugins/Zeitgeist/images/logo.svg';
         if (Piwik_Config::getInstance()->branding['use_custom_logo'] == 1
             && file_exists(Piwik_Common::getPathToPiwikRoot() . '/themes/logo.svg')
         ) {
diff --git a/plugins/Annotations/templates/annotation.twig b/plugins/Annotations/templates/annotation.twig
index e3144413af..e3e879c403 100755
--- a/plugins/Annotations/templates/annotation.twig
+++ b/plugins/Annotations/templates/annotation.twig
@@ -3,9 +3,9 @@
         <div class="annotation-star{% if annotation.canEditOrDelete %} annotation-star-changeable{% endif %}" data-starred="{{ annotation.starred }}"
             {% if annotation.canEditOrDelete %}title="{{ 'Annotations_ClickToStarOrUnstar'|translate }}"{% endif %}>
             {% if annotation.starred %}
-                <img src="plugins/Zeitgeist/theme/images/star.png"/>
+                <img src="plugins/Zeitgeist/images/star.png"/>
             {% else %}
-                <img src="plugins/Zeitgeist/theme/images/star_empty.png"/>
+                <img src="plugins/Zeitgeist/images/star_empty.png"/>
             {% endif %}
         </div>
         <div class="annotation-period {% if annotation.canEditOrDelete %}annotation-enter-edit-mode{% endif %}">({{ annotation.date }})</div>
diff --git a/plugins/Annotations/templates/annotationManager.twig b/plugins/Annotations/templates/annotationManager.twig
index 6d79f1ac08..8cd93e2b10 100755
--- a/plugins/Annotations/templates/annotationManager.twig
+++ b/plugins/Annotations/templates/annotationManager.twig
@@ -12,7 +12,7 @@
     <div class="annotation-list">
         {% include "@Annotations/annotations.twig" %}
 
-        <span class="loadingPiwik" style="display:none"><img src="plugins/Zeitgeist/theme/images/loading-blue.gif"/>{{ 'General_Loading_js'|translate }}</span>
+        <span class="loadingPiwik" style="display:none"><img src="plugins/Zeitgeist/images/loading-blue.gif"/>{{ 'General_Loading_js'|translate }}</span>
 
     </div>
 
diff --git a/plugins/Annotations/templates/evolutionAnnotations.twig b/plugins/Annotations/templates/evolutionAnnotations.twig
index b860d348d8..f2475c2416 100755
--- a/plugins/Annotations/templates/evolutionAnnotations.twig
+++ b/plugins/Annotations/templates/evolutionAnnotations.twig
@@ -6,7 +6,7 @@
               {% if counts.count == 0 %}title="{{ 'Annotations_AddAnnotationsFor_js'|translate(date) }}"
               {% elseif counts.count == 1 %}title="{{ 'Annotations_AnnotationOnDate'|translate(date,counts.note) }}{{ 'Annotations_ClickToEditOrAdd'|translate }}"
               {% else %}}title="{{ 'Annotations_ViewAndAddAnnotations_js'|translate(date) }}"{% endif %}>
-		<img src="plugins/Zeitgeist/theme/images/{% if counts.starred > 0 %}yellow_marker.png{% else %}grey_marker.png{% endif %}" width="16" height="16"/>
+		<img src="plugins/Zeitgeist/images/{% if counts.starred > 0 %}yellow_marker.png{% else %}grey_marker.png{% endif %}" width="16" height="16"/>
 	</span>
     {% endfor %}
 </div>
diff --git a/plugins/CoreAdminHome/templates/generalSettings.twig b/plugins/CoreAdminHome/templates/generalSettings.twig
index bd82f8687d..430dc195c9 100644
--- a/plugins/CoreAdminHome/templates/generalSettings.twig
+++ b/plugins/CoreAdminHome/templates/generalSettings.twig
@@ -164,7 +164,7 @@
         {% if isValidHost is defined and invalidHostMessage is defined and not isValidHost %}
             <div class="ajaxSuccess">
                 <a style="float:right" href="http://piwik.org/faq/troubleshooting/#faq_171" target="_blank">
-                    <img src="plugins/Zeitgeist/theme/images/help_grey.png"/>
+                    <img src="plugins/Zeitgeist/images/help_grey.png"/>
                 </a>
                 <strong>{{ 'General_Warning'|translate }}:&nbsp;</strong>{{ invalidHostMessage }}
             </div>
diff --git a/plugins/CoreHome/templates/images/bg_header.jpg b/plugins/CoreHome/images/bg_header.jpg
index 1733b0e355..1733b0e355 100644
--- a/plugins/CoreHome/templates/images/bg_header.jpg
+++ b/plugins/CoreHome/images/bg_header.jpg
diff --git a/plugins/CoreHome/templates/images/bullet1.gif b/plugins/CoreHome/images/bullet1.gif
index f2707da68c..f2707da68c 100644
--- a/plugins/CoreHome/templates/images/bullet1.gif
+++ b/plugins/CoreHome/images/bullet1.gif
diff --git a/plugins/CoreHome/templates/images/bullet2.gif b/plugins/CoreHome/images/bullet2.gif
index 26e1b6af33..26e1b6af33 100644
--- a/plugins/CoreHome/templates/images/bullet2.gif
+++ b/plugins/CoreHome/images/bullet2.gif
diff --git a/plugins/CoreHome/templates/images/more.png b/plugins/CoreHome/images/more.png
index cba03a05f5..cba03a05f5 100644
--- a/plugins/CoreHome/templates/images/more.png
+++ b/plugins/CoreHome/images/more.png
diff --git a/plugins/CoreHome/templates/images/more_date.gif b/plugins/CoreHome/images/more_date.gif
index 87da6b4963..87da6b4963 100644
--- a/plugins/CoreHome/templates/images/more_date.gif
+++ b/plugins/CoreHome/images/more_date.gif
diff --git a/plugins/CoreHome/templates/images/more_period.gif b/plugins/CoreHome/images/more_period.gif
index b0c9787851..b0c9787851 100644
--- a/plugins/CoreHome/templates/images/more_period.gif
+++ b/plugins/CoreHome/images/more_period.gif
diff --git a/plugins/CoreHome/templates/images/promo_splash.png b/plugins/CoreHome/images/promo_splash.png
index 9a78f8e283..9a78f8e283 100755
--- a/plugins/CoreHome/templates/images/promo_splash.png
+++ b/plugins/CoreHome/images/promo_splash.png
diff --git a/plugins/CoreHome/templates/images/reset_search.png b/plugins/CoreHome/images/reset_search.png
index cb1d9e80a2..cb1d9e80a2 100644
--- a/plugins/CoreHome/templates/images/reset_search.png
+++ b/plugins/CoreHome/images/reset_search.png
diff --git a/plugins/CoreHome/templates/images/search.png b/plugins/CoreHome/images/search.png
index 6d1f037c69..6d1f037c69 100644
--- a/plugins/CoreHome/templates/images/search.png
+++ b/plugins/CoreHome/images/search.png
diff --git a/plugins/CoreHome/templates/datatable.css b/plugins/CoreHome/templates/datatable.css
index daddbc86b0..9527054647 100644
--- a/plugins/CoreHome/templates/datatable.css
+++ b/plugins/CoreHome/templates/datatable.css
@@ -152,11 +152,11 @@ table.dataTable td.columnodd {
 }
 
 table.dataTable td.labeleven {
-    background: #F9FAFA url(images/bullet2.gif) no-repeat;
+    background: #F9FAFA url(../images/bullet2.gif) no-repeat;
 }
 
 table.dataTable td.labelodd {
-    background: #fff url(images/bullet1.gif) no-repeat;
+    background: #fff url(../images/bullet1.gif) no-repeat;
 }
 
 .dataTable tr.highlight td {
diff --git a/plugins/CoreHome/templates/datatable.js b/plugins/CoreHome/templates/datatable.js
index 49725bead6..219fc7e3a8 100644
--- a/plugins/CoreHome/templates/datatable.js
+++ b/plugins/CoreHome/templates/datatable.js
@@ -432,7 +432,7 @@ dataTable.prototype =
                 if (currentPattern) {
                     var target = this;
                     var clearImg = $('<span style="position: relative;">\
-							<img src="plugins/CoreHome/templates/images/reset_search.png" style="position: absolute; top: 4px; left: -15px; cursor: pointer; display: inline;" title="Clear" />\
+							<img src="plugins/CoreHome/images/reset_search.png" style="position: absolute; top: 4px; left: -15px; cursor: pointer; display: inline;" title="Clear" />\
 							</span>')
                         .click(function () {
                             $('#keyword', target).val('');
diff --git a/plugins/CoreHome/templates/datatable_cell.twig b/plugins/CoreHome/templates/datatable_cell.twig
index 7ec96403c0..dab9a6401d 100644
--- a/plugins/CoreHome/templates/datatable_cell.twig
+++ b/plugins/CoreHome/templates/datatable_cell.twig
@@ -3,7 +3,7 @@
 {% if not row.idsubdatatable and column=='label' and row.metadata.url is not empty %}
     <a target="_blank" href='{% if row.metadata.url|slice(0,4) not in ['http','ftp:'] %}http://{% endif %}{{ row.metadata.url }}'>
     {% if row.metadata.logo is empty %}
-        <img class="link" width="10" height="9" src="plugins/Zeitgeist/theme/images/link.gif"/>
+        <img class="link" width="10" height="9" src="plugins/Zeitgeist/images/link.gif"/>
     {% endif %}
 {% endif %}
 {% if column=='label' %}
diff --git a/plugins/CoreHome/templates/datatable_footer.twig b/plugins/CoreHome/templates/datatable_footer.twig
index 7d6f0c0fe7..bf4e932068 100644
--- a/plugins/CoreHome/templates/datatable_footer.twig
+++ b/plugins/CoreHome/templates/datatable_footer.twig
@@ -20,38 +20,38 @@
     </span>
     {% endif %}
 
-    <span class="loadingPiwik" style='display:none'><img src="plugins/Zeitgeist/theme/images/loading-blue.gif"/> {{ 'General_LoadingData'|translate }}</span>
+    <span class="loadingPiwik" style='display:none'><img src="plugins/Zeitgeist/images/loading-blue.gif"/> {{ 'General_LoadingData'|translate }}</span>
     {% if properties.show_footer_icons %}
         <div class="dataTableFooterIcons">
             <div class="dataTableFooterWrap" var="{{ javascriptVariablesToSet.viewDataTable }}">
                 {% if not properties.hide_all_views_icons %}
-                    <img src="plugins/Zeitgeist/theme/images/data_table_footer_active_item.png" class="dataTableFooterActiveItem"/>
+                    <img src="plugins/Zeitgeist/images/data_table_footer_active_item.png" class="dataTableFooterActiveItem"/>
                 {% endif %}
                 <div class="tableIconsGroup">
             	<span class="tableAllColumnsSwitch">
                     {% if properties.show_table %}
                         <a class="tableIcon" format="table" var="table">
-                            <img title="{{ 'General_DisplaySimpleTable'|translate }}" src="plugins/Zeitgeist/theme/images/table.png"/>
+                            <img title="{{ 'General_DisplaySimpleTable'|translate }}" src="plugins/Zeitgeist/images/table.png"/>
                         </a>
                     {% endif %}
                     {% if properties.show_table_all_columns %}
                         <a class="tableIcon" format="tableAllColumns" var="tableAllColumns">
-                            <img title="{{ 'General_DisplayTableWithMoreMetrics'|translate }}" src="plugins/Zeitgeist/theme/images/table_more.png"/>
+                            <img title="{{ 'General_DisplayTableWithMoreMetrics'|translate }}" src="plugins/Zeitgeist/images/table_more.png"/>
                         </a>
                     {% endif %}
                     {% if properties.show_goals %}
                         <a class="tableIcon" format="tableGoals" var="tableGoals">
                             <img title="{{ 'General_DisplayTableWithGoalMetrics'|translate }}"
-                                 src="plugins/Zeitgeist/theme/images/{% if javascriptVariablesToSet.idGoal is defined and javascriptVariablesToSet.idGoal=='ecommerceOrder' %}ecommerceOrder.gif{% else %}goal.png{% endif %}"/>
+                                 src="plugins/Zeitgeist/images/{% if javascriptVariablesToSet.idGoal is defined and javascriptVariablesToSet.idGoal=='ecommerceOrder' %}ecommerceOrder.gif{% else %}goal.png{% endif %}"/>
                         </a>
                     {% endif %}
                     {% if properties.show_ecommerce %}
                         <a class="tableIcon" format="ecommerceOrder" var="ecommerceOrder">
-                            <img title="{{ 'General_EcommerceOrders'|translate }}" src="plugins/Zeitgeist/theme/images/ecommerceOrder.gif" />
+                            <img title="{{ 'General_EcommerceOrders'|translate }}" src="plugins/Zeitgeist/images/ecommerceOrder.gif" />
                             <span>{{ 'General_EcommerceOrders'|translate }}</span>
                         </a>
                         <a class="tableIcon" format="ecommerceAbandonedCart" var="ecommerceAbandonedCart">
-                            <img title="{{ 'General_AbandonedCarts'|translate }}" src="plugins/Zeitgeist/theme/images/ecommerceAbandonedCart.gif" />
+                            <img title="{{ 'General_AbandonedCarts'|translate }}" src="plugins/Zeitgeist/images/ecommerceAbandonedCart.gif" />
                             <span>{{ 'General_AbandonedCarts'|translate }}</span>
                         </a>
                     {% endif %}
@@ -62,17 +62,17 @@
             	    <span class="tableGraphViews tableGraphCollapsed">
                     {% if properties.show_bar_chart %}
                         <a class="tableIcon" format="graphVerticalBar" var="graphVerticalBar">
-                            <img width="16" height="16" src="plugins/Zeitgeist/theme/images/chart_bar.png" title="{{ 'General_VBarGraph'|translate }}"/>
+                            <img width="16" height="16" src="plugins/Zeitgeist/images/chart_bar.png" title="{{ 'General_VBarGraph'|translate }}"/>
                         </a>
                     {% endif %}
                     {% if properties.show_pie_chart %}
                         <a class="tableIcon" format="graphPie" var="graphPie">
-                            <img width="16" height="16" src="plugins/Zeitgeist/theme/images/chart_pie.png" title="{{ 'General_Piechart'|translate }}"/>
+                            <img width="16" height="16" src="plugins/Zeitgeist/images/chart_pie.png" title="{{ 'General_Piechart'|translate }}"/>
                         </a>
                     {% endif %}
                     {% if properties.show_tag_cloud %}
                         <a class="tableIcon" format="cloud" var="cloud">
-                            <img width="16" height="16" src="plugins/Zeitgeist/theme/images/tagcloud.png" title="{{ 'General_TagCloud'|translate }}"/>
+                            <img width="16" height="16" src="plugins/Zeitgeist/images/tagcloud.png" title="{{ 'General_TagCloud'|translate }}"/>
                         </a>
                     {% endif %}
 				    </span>
@@ -81,7 +81,7 @@
                 <div class="tableIconsGroup">
             	    <span class="tableGraphViews">
                         <a class="tableIcon" format="graphEvolution" var="graphEvolution">
-                            <img width="16" height="16" src="plugins/Zeitgeist/theme/images/chart_bar.png" title="{{ 'General_VBarGraph'|translate }}"/>
+                            <img width="16" height="16" src="plugins/Zeitgeist/images/chart_bar.png" title="{{ 'General_VBarGraph'|translate }}"/>
                         </a>
                     </span>
                 </div>
@@ -89,7 +89,7 @@
                 <div class="tableIconsGroup">
                     <span class="exportToFormatIcons">
                         <a class="tableIcon" var="export">
-                            <img width="16" height="16" src="plugins/Zeitgeist/theme/images/export.png" title="{{ 'General_ExportThisReport'|translate }}"/>
+                            <img width="16" height="16" src="plugins/Zeitgeist/images/export.png" title="{{ 'General_ExportThisReport'|translate }}"/>
                         </a>
                     </span>
 				    <span class="exportToFormatItems" style="display:none">
@@ -102,14 +102,14 @@
                     {% if properties.show_export_as_rss_feed %}
                         |
                         <a target="_blank" methodToCall="{{ properties.apiMethodToRequestDataTable }}" format="RSS" filter_limit="{{ properties.exportLimit }}" date="last10">
-                            <img border="0" src="plugins/Zeitgeist/theme/images/feed.png"/>
+                            <img border="0" src="plugins/Zeitgeist/images/feed.png"/>
                         </a>
                     {% endif %}
 				    </span>
                     {% if properties.show_export_as_image_icon %}
                         <span id="dataTableFooterExportAsImageIcon">
                             <a class="tableIcon" href="#" onclick="$(this).closest('.dataTable').find('div.jqplot-target').trigger('piwikExportAsImage'); return false;">
-                                <img title="{{ 'General_ExportAsImage_js'|translate }}" src="plugins/Zeitgeist/theme/images/image.png"/>
+                                <img title="{{ 'General_ExportAsImage_js'|translate }}" src="plugins/Zeitgeist/images/image.png"/>
                             </a>
                         </span>
                     {% endif %}
@@ -139,7 +139,7 @@
             {% if not properties.hide_annotations_view %}
                 <div class="annotationView" title="{{ 'Annotations_IconDesc_js'|translate }}">
                     <a class="tableIcon">
-                        <img width="16" height="16" src="plugins/Zeitgeist/theme/images/grey_marker.png"/>
+                        <img width="16" height="16" src="plugins/Zeitgeist/images/grey_marker.png"/>
                     </a>
                     <span>{{ 'Annotations_Annotations'|translate }}</span>
                 </div>
@@ -170,6 +170,6 @@
 
 </div>
 
-<span class="loadingPiwikBelow" style='display:none'><img src="plugins/Zeitgeist/theme/images/loading-blue.gif"/> {{ 'General_LoadingData'|translate }}</span>
+<span class="loadingPiwikBelow" style='display:none'><img src="plugins/Zeitgeist/images/loading-blue.gif"/> {{ 'General_LoadingData'|translate }}</span>
 
 <div class="dataTableSpacer"></div>
diff --git a/plugins/CoreHome/templates/donate.js b/plugins/CoreHome/templates/donate.js
index a73f12a7c3..bd540109da 100755
--- a/plugins/CoreHome/templates/donate.js
+++ b/plugins/CoreHome/templates/donate.js
@@ -27,7 +27,7 @@
             $('.slider-donate-amount', slider).text('$' + donateAmounts[pos] + '/' + _pk_translate('General_YearShort_js'));
 
             // set the right smiley face
-            $('.slider-smiley-face').attr('src', 'plugins/Zeitgeist/theme/images/smileyprog_' + pos + '.png');
+            $('.slider-smiley-face').attr('src', 'plugins/Zeitgeist/images/smileyprog_' + pos + '.png');
 
             // set the hidden option input for paypal
             var option = Math.max(1, pos);
diff --git a/plugins/CoreHome/templates/donate.twig b/plugins/CoreHome/templates/donate.twig
index 6e51a0ea1b..c33dfffe9e 100755
--- a/plugins/CoreHome/templates/donate.twig
+++ b/plugins/CoreHome/templates/donate.twig
@@ -26,14 +26,14 @@
             <div style="display:inline-block">
                 <div class="slider-donate-amount">$30/{{ 'General_YearShort_js'|translate }}</div>
 
-                <img class="slider-smiley-face" width="40" height="40" src="plugins/Zeitgeist/theme/images/smileyprog_1.png"/>
+                <img class="slider-smiley-face" width="40" height="40" src="plugins/Zeitgeist/images/smileyprog_1.png"/>
             </div>
 
             <input type="hidden" name="os0" value="Option 1"/>
         </div>
 
         <div class="donate-submit">
-            <input type="image" src="plugins/Zeitgeist/theme/images/paypal_subscribe.gif" border="0" name="submit"
+            <input type="image" src="plugins/Zeitgeist/images/paypal_subscribe.gif" border="0" name="submit"
                 title="{{ 'CoreHome_SubscribeAndBecomePiwikSupporter'|translate }}"/>
 			<a class="donate-spacer">{{ 'CoreHome_MakeOneTimeDonation'|translate }}</a>
             <a href="https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=RPL23NJURMTFA&bb2_screener_=1357583494+83.233.186.82"
@@ -41,11 +41,11 @@
         </div>
 
         <!-- to cache images -->
-        <img style="display:none" src="plugins/Zeitgeist/theme/images/smileyprog_0.png"/>
-        <img style="display:none" src="plugins/Zeitgeist/theme/images/smileyprog_1.png"/>
-        <img style="display:none" src="plugins/Zeitgeist/theme/images/smileyprog_2.png"/>
-        <img style="display:none" src="plugins/Zeitgeist/theme/images/smileyprog_3.png"/>
-        <img style="display:none" src="plugins/Zeitgeist/theme/images/smileyprog_4.png"/>
+        <img style="display:none" src="plugins/Zeitgeist/images/smileyprog_0.png"/>
+        <img style="display:none" src="plugins/Zeitgeist/images/smileyprog_1.png"/>
+        <img style="display:none" src="plugins/Zeitgeist/images/smileyprog_2.png"/>
+        <img style="display:none" src="plugins/Zeitgeist/images/smileyprog_3.png"/>
+        <img style="display:none" src="plugins/Zeitgeist/images/smileyprog_4.png"/>
     </form>
     {% if footerMessage is defined %}
         <div class="form-description">
diff --git a/plugins/CoreHome/templates/header_message.twig b/plugins/CoreHome/templates/header_message.twig
index 15411c683d..c929db3c03 100644
--- a/plugins/CoreHome/templates/header_message.twig
+++ b/plugins/CoreHome/templates/header_message.twig
@@ -32,8 +32,8 @@
         {% if hasSomeAdminAccess %}
             <br/>
             <div id="updateCheckLinkContainer">
-                <span class='loadingPiwik' style="display:none"><img src='plugins/Zeitgeist/theme/images/loading-blue.gif'/></span>
-                <img src="plugins/Zeitgeist/theme/images/reload.png"/>
+                <span class='loadingPiwik' style="display:none"><img src='plugins/Zeitgeist/images/loading-blue.gif'/></span>
+                <img src="plugins/Zeitgeist/images/reload.png"/>
                 <a href="#" id="checkForUpdates"><em>{{ 'CoreHome_CheckForUpdates'|translate }}</em></a>
             </div>
         {% endif %}
diff --git a/plugins/CoreHome/templates/images/favicon.ico b/plugins/CoreHome/templates/images/favicon.ico
deleted file mode 100644
index ebb2412eab..0000000000
--- a/plugins/CoreHome/templates/images/favicon.ico
+++ /dev/null
diff --git a/plugins/CoreHome/templates/promo_video.twig b/plugins/CoreHome/templates/promo_video.twig
index fde6d99c75..0ae0c23ed3 100755
--- a/plugins/CoreHome/templates/promo_video.twig
+++ b/plugins/CoreHome/templates/promo_video.twig
@@ -14,7 +14,7 @@
 </script>
 <style type="text/css">
     #piwik-promo-thumbnail {
-        background: #fff url(plugins/CoreHome/templates/images/promo_splash.png) no-repeat 0 0;
+        background: #fff url(plugins/CoreHome/images/promo_splash.png) no-repeat 0 0;
         background-position: center;
         width: 321px;
         margin: 0 auto 0 auto;
@@ -96,7 +96,7 @@
 <div id="piwik-promo">
     <div id="piwik-promo-video">
         <div id="piwik-promo-thumbnail">
-            <img src="plugins/Zeitgeist/theme/images/video_play.png"/>
+            <img src="plugins/Zeitgeist/images/video_play.png"/>
         </div>
 
         <div id="piwik-promo-embed" style="display:none">
diff --git a/plugins/CoreHome/templates/reports_by_dimension.twig b/plugins/CoreHome/templates/reports_by_dimension.twig
index e2bdfc380c..de23fe1053 100644
--- a/plugins/CoreHome/templates/reports_by_dimension.twig
+++ b/plugins/CoreHome/templates/reports_by_dimension.twig
@@ -18,7 +18,7 @@
 
     <div style="float:left;">
         <div class="loadingPiwik" style="display:none">
-            <img src="plugins/Zeitgeist/theme/images/loading-blue.gif" alt=""/>{{ 'General_LoadingData'|translate }}
+            <img src="plugins/Zeitgeist/images/loading-blue.gif" alt=""/>{{ 'General_LoadingData'|translate }}
         </div>
 
         <div class="dimensionReport">{{ firstReport|raw }}</div>
diff --git a/plugins/CoreHome/templates/sites_selection.twig b/plugins/CoreHome/templates/sites_selection.twig
index cd13310bbc..d7c904a6c6 100644
--- a/plugins/CoreHome/templates/sites_selection.twig
+++ b/plugins/CoreHome/templates/sites_selection.twig
@@ -53,7 +53,7 @@
                 <input type="hidden" class="max_sitename_width" value="130"/>
                 <input type="submit" value="Search" class="but"/>
                 <img title="Clear" class="reset" style="position: relative; top: 4px; left: -44px; cursor: pointer; display: none;"
-                     src="plugins/CoreHome/templates/images/reset_search.png"/>
+                     src="plugins/CoreHome/images/reset_search.png"/>
             </div>
         </div>
     </div>
diff --git a/plugins/CoreHome/templates/warning_invalid_host.twig b/plugins/CoreHome/templates/warning_invalid_host.twig
index 1076e7eed0..58ec1b397f 100644
--- a/plugins/CoreHome/templates/warning_invalid_host.twig
+++ b/plugins/CoreHome/templates/warning_invalid_host.twig
@@ -1,7 +1,7 @@
 {# untrusted host warning #}
 {% if (isValidHost and invalidHostMessage and isValidHost == false) %}
     <div class="ajaxSuccess" style='clear:both;width:800px'>
-        <a style="float:right" href="http://piwik.org/faq/troubleshooting/#faq_171" target="_blank"><img src="plugins/Zeitgeist/theme/images/help_grey.png"/></a>
+        <a style="float:right" href="http://piwik.org/faq/troubleshooting/#faq_171" target="_blank"><img src="plugins/Zeitgeist/images/help_grey.png"/></a>
         <strong>{{ 'General_Warning'|translate }}:&nbsp;</strong>{{ invalidHostMessage }}
     </div>
 {% endif %}
diff --git a/plugins/CoreUpdater/templates/layout.twig b/plugins/CoreUpdater/templates/layout.twig
index 7b2ed32425..500a813e8f 100644
--- a/plugins/CoreUpdater/templates/layout.twig
+++ b/plugins/CoreUpdater/templates/layout.twig
@@ -4,7 +4,7 @@
 <head>
     <title>Piwik &rsaquo; {{ 'CoreUpdater_UpdateTitle'|translate }}</title>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-    <link rel="shortcut icon" href="plugins/CoreHome/templates/images/favicon.ico"/>
+    <link rel="shortcut icon" href="plugins/CoreHome/images/favicon.ico"/>
 
     <link rel="stylesheet" type="text/css" href="plugins/Zeitgeist/theme/simple_structure.css"/>
     <link rel="stylesheet" type="text/css" href="libs/jquery/themes/base/jquery-ui.css"/>
@@ -39,7 +39,7 @@
 <body id="simple">
 <div id="contentsimple">
     <div id="title">
-        <img title='Piwik' alt="Piwik" src='plugins/Zeitgeist/theme/images/logo-header.png' style='margin-left:10px'/>
+        <img title='Piwik' alt="Piwik" src='plugins/Zeitgeist/images/logo-header.png' style='margin-left:10px'/>
         <span id="subh1"> # {{ 'General_OpenSourceWebAnalytics'|translate }}</span>
     </div>
     {% block content %}
diff --git a/plugins/CoreUpdater/templates/update_database_done.twig b/plugins/CoreUpdater/templates/update_database_done.twig
index 2c59a0463d..99ae48b124 100644
--- a/plugins/CoreUpdater/templates/update_database_done.twig
+++ b/plugins/CoreUpdater/templates/update_database_done.twig
@@ -8,7 +8,7 @@
     <br/>
     <br/>
     <div class="error">
-        <img src="plugins/Zeitgeist/theme/images/error_medium.png"/> {{ 'CoreUpdater_CriticalErrorDuringTheUpgradeProcess'|translate }}
+        <img src="plugins/Zeitgeist/images/error_medium.png"/> {{ 'CoreUpdater_CriticalErrorDuringTheUpgradeProcess'|translate }}
         {% for message in errorMessages %}
             <pre>{{ message }}</pre>
             <br/>
@@ -32,7 +32,7 @@
 {% else %}
     {% if warningMessages|length > 0 %}
         <div class="warning">
-            <p><img src="plugins/Zeitgeist/theme/images/warning_medium.png"/> {{ 'CoreUpdater_WarningMessages'|translate }}</p>
+            <p><img src="plugins/Zeitgeist/images/warning_medium.png"/> {{ 'CoreUpdater_WarningMessages'|translate }}</p>
             {% for message in warningMessages %}
                 <pre>{{ message }}</pre>
                 <br/>
@@ -42,7 +42,7 @@
 
     {% if errorMessages|length > 0 %}
         <div class="warning">
-            <p><img src="plugins/Zeitgeist/theme/images/error_medium.png"/> {{ 'CoreUpdater_ErrorDuringPluginsUpdates'|translate }}</p>
+            <p><img src="plugins/Zeitgeist/images/error_medium.png"/> {{ 'CoreUpdater_ErrorDuringPluginsUpdates'|translate }}</p>
             {% for message in errorMessages %}
                 <pre>{{ message }}</pre>
                 <br/>
@@ -51,7 +51,7 @@
             {% if deactivatedPlugins is defined and deactivatedPlugins|length > 0 %}
                 {% set listOfDeactivatedPlugins=deactivatedPlugins|join(', ') %}
                 <p style="color:red">
-                    <img src="plugins/Zeitgeist/theme/images/error_medium.png"/>
+                    <img src="plugins/Zeitgeist/images/error_medium.png"/>
                     {{ 'CoreUpdater_WeAutomaticallyDeactivatedTheFollowingPlugins'|translate(listOfDeactivatedPlugins) }}
                 </p>
             {% endif %}
diff --git a/plugins/CoreUpdater/templates/update_one_click_results.twig b/plugins/CoreUpdater/templates/update_one_click_results.twig
index 5f453088b8..3795153608 100644
--- a/plugins/CoreUpdater/templates/update_one_click_results.twig
+++ b/plugins/CoreUpdater/templates/update_one_click_results.twig
@@ -9,11 +9,11 @@
 {% if coreError %}
     <br/>
     <br/>
-    <div class="error"><img src="plugins/Zeitgeist/theme/images/error_medium.png"/> {{ coreError }}</div>
+    <div class="error"><img src="plugins/Zeitgeist/images/error_medium.png"/> {{ coreError }}</div>
     <br/>
     <br/>
     <div class="warning">
-        <img src="plugins/Zeitgeist/theme/images/warning_medium.png"/>
+        <img src="plugins/Zeitgeist/images/warning_medium.png"/>
         {{ 'CoreUpdater_UpdateHasBeenCancelledExplanation'|translate("<br /><br />","<a target='_blank' href='?module=Proxy&action=redirect&url=http://piwik.org/docs/update/'>","</a>")|raw }}
     </div>
     <br/>
diff --git a/plugins/CoreUpdater/templates/update_welcome.twig b/plugins/CoreUpdater/templates/update_welcome.twig
index 2fa16ab950..b527778939 100644
--- a/plugins/CoreUpdater/templates/update_welcome.twig
+++ b/plugins/CoreUpdater/templates/update_welcome.twig
@@ -10,7 +10,7 @@
     <br/>
     <br/>
     <div class="error">
-        <img src="plugins/Zeitgeist/theme/images/error_medium.png"/> {{ 'CoreUpdater_CriticalErrorDuringTheUpgradeProcess'|translate }}
+        <img src="plugins/Zeitgeist/images/error_medium.png"/> {{ 'CoreUpdater_CriticalErrorDuringTheUpgradeProcess'|translate }}
         {% for message in errorMessages %}
             <pre>{{ message|raw }}</pre>
         {% endfor %}
diff --git a/plugins/DBStats/templates/index.twig b/plugins/DBStats/templates/index.twig
index 6be6661795..b28e241764 100755
--- a/plugins/DBStats/templates/index.twig
+++ b/plugins/DBStats/templates/index.twig
@@ -84,7 +84,7 @@
             <h2>{{ 'General_Reports'|translate }}</h2>
 
             <div class="ajaxLoad" action="getIndividualReportsSummary">
-                <span class="loadingPiwik"><img src="plugins/Zeitgeist/theme/images/loading-blue.gif"/>{{ 'General_LoadingData'|translate }}</span>
+                <span class="loadingPiwik"><img src="plugins/Zeitgeist/images/loading-blue.gif"/>{{ 'General_LoadingData'|translate }}</span>
             </div>
         </td>
     </tr>
@@ -103,7 +103,7 @@
             <h2>{{ 'General_Metrics'|translate }}</h2>
 
             <div class="ajaxLoad" action="getIndividualMetricsSummary">
-                <span class="loadingPiwik"><img src="plugins/Zeitgeist/theme/images/loading-blue.gif"/>{{ 'General_LoadingData'|translate }}</span>
+                <span class="loadingPiwik"><img src="plugins/Zeitgeist/images/loading-blue.gif"/>{{ 'General_LoadingData'|translate }}</span>
             </div>
         </td>
     </tr>
diff --git a/plugins/Dashboard/javascripts/widgetMenu.js b/plugins/Dashboard/javascripts/widgetMenu.js
index 7bad272695..3be0597947 100644
--- a/plugins/Dashboard/javascripts/widgetMenu.js
+++ b/plugins/Dashboard/javascripts/widgetMenu.js
@@ -130,16 +130,16 @@ widgetsHelper.getEmptyWidgetHtml = function (uniqueId, widgetName) {
     return '<div id="' + uniqueId + '" class="widget">' +
         '<div class="widgetTop">' +
         '<div class="button" id="close">' +
-        '<img src="plugins/Zeitgeist/theme/images/close.png" title="' + _pk_translate('Dashboard_Close_js') + '" />' +
+        '<img src="plugins/Zeitgeist/images/close.png" title="' + _pk_translate('Dashboard_Close_js') + '" />' +
         '</div>' +
         '<div class="button" id="maximise">' +
-        '<img src="plugins/Zeitgeist/theme/images/maximise.png" title="' + _pk_translate('Dashboard_Maximise_js') + '" />' +
+        '<img src="plugins/Zeitgeist/images/maximise.png" title="' + _pk_translate('Dashboard_Maximise_js') + '" />' +
         '</div>' +
         '<div class="button" id="minimise">' +
-        '<img src="plugins/Zeitgeist/theme/images/minimise.png" title="' + _pk_translate('Dashboard_Minimise_js') + '" />' +
+        '<img src="plugins/Zeitgeist/images/minimise.png" title="' + _pk_translate('Dashboard_Minimise_js') + '" />' +
         '</div>' +
         '<div class="button" id="refresh">' +
-        '<img src="plugins/Zeitgeist/theme/images/refresh.png" title="' + _pk_translate('Dashboard_Refresh_js') + '" />' +
+        '<img src="plugins/Zeitgeist/images/refresh.png" title="' + _pk_translate('Dashboard_Refresh_js') + '" />' +
         '</div>' +
         '<div class="widgetName">' + widgetName + '</div>' +
         '</div>' +
diff --git a/plugins/Goals/templates/list_goal_edit.twig b/plugins/Goals/templates/list_goal_edit.twig
index 0149cd8a02..af4057483f 100644
--- a/plugins/Goals/templates/list_goal_edit.twig
+++ b/plugins/Goals/templates/list_goal_edit.twig
@@ -23,13 +23,13 @@
                 <td>{% if goal.revenue==0 %}-{% else %}{{ goal.revenue|money(idSite) }}{% endif %}</td>
                 <td>
                     <a href='#' name="linkEditGoal" id="{{ goal.idgoal }}" class="link_but">
-                        <img src='plugins/Zeitgeist/theme/images/ico_edit.png' border="0"/>
+                        <img src='plugins/Zeitgeist/images/ico_edit.png' border="0"/>
                         {{ 'General_Edit'|translate }}
                     </a>
                 </td>
                 <td>
                     <a href='#' name="linkDeleteGoal" id="{{ goal.idgoal }}" class="link_but">
-                        <img src='plugins/Zeitgeist/theme/images/ico_delete.png' border="0"/>
+                        <img src='plugins/Zeitgeist/images/ico_delete.png' border="0"/>
                         {{ 'General_Delete'|translate }}
                     </a>
                 </td>
diff --git a/plugins/Goals/templates/title_and_evolution_graph.twig b/plugins/Goals/templates/title_and_evolution_graph.twig
index cec3977955..5141cd73e0 100644
--- a/plugins/Goals/templates/title_and_evolution_graph.twig
+++ b/plugins/Goals/templates/title_and_evolution_graph.twig
@@ -54,7 +54,7 @@
 {% if ecommerce is defined %}
     <div id='rightcolumn' {% if not isWidget %}style='width:30%'{% endif %}>
         <div>
-            <img src='plugins/Zeitgeist/theme/images/ecommerceAbandonedCart.gif'> <i>{{ 'General_AbandonedCarts'|translate }}</i>
+            <img src='plugins/Zeitgeist/images/ecommerceAbandonedCart.gif'> <i>{{ 'General_AbandonedCarts'|translate }}</i>
         </div>
 
         <div class="sparkline">
diff --git a/plugins/Installation/templates/databaseSetup.twig b/plugins/Installation/templates/databaseSetup.twig
index 846825dabc..8afdbb707a 100644
--- a/plugins/Installation/templates/databaseSetup.twig
+++ b/plugins/Installation/templates/databaseSetup.twig
@@ -5,7 +5,7 @@
 
 {% if errorMessage is defined %}
     <div class="error">
-        <img src="plugins/Zeitgeist/theme/images/error_medium.png"/>
+        <img src="plugins/Zeitgeist/images/error_medium.png"/>
         {{ 'Installation_DatabaseErrorConnect'|translate }}:
         <br/>{{ errorMessage }}
 
diff --git a/plugins/Installation/templates/displayJavascriptCode.twig b/plugins/Installation/templates/displayJavascriptCode.twig
index 1c8679da84..64fa19be1e 100644
--- a/plugins/Installation/templates/displayJavascriptCode.twig
+++ b/plugins/Installation/templates/displayJavascriptCode.twig
@@ -4,7 +4,7 @@
 {% if displayfirstWebsiteSetupSuccess is defined %}
     <span id="toFade" class="success">
 	{{ 'Installation_SetupWebsiteSetupSuccess'|translate(displaySiteName) }}
-        <img src="plugins/Zeitgeist/theme/images/success_medium.png"/>
+        <img src="plugins/Zeitgeist/images/success_medium.png"/>
 </span>
 {% endif %}
 
diff --git a/plugins/Installation/templates/firstWebsiteSetup.twig b/plugins/Installation/templates/firstWebsiteSetup.twig
index 5127483c43..f4a0b1449b 100644
--- a/plugins/Installation/templates/firstWebsiteSetup.twig
+++ b/plugins/Installation/templates/firstWebsiteSetup.twig
@@ -4,7 +4,7 @@
 {% if displayGeneralSetupSuccess is defined %}
     <span id="toFade" class="success">
 	    {{ 'Installation_SuperUserSetupSuccess'|translate }}
-        <img src="plugins/Zeitgeist/theme/images/success_medium.png"/>
+        <img src="plugins/Zeitgeist/images/success_medium.png"/>
     </span>
 {% endif %}
 
@@ -12,7 +12,7 @@
 <p>{{ 'Installation_SiteSetup'|translate }}</p>
 {% if errorMessage is defined %}
     <div class="error">
-        <img src="plugins/Zeitgeist/theme/images/error_medium.png"/>
+        <img src="plugins/Zeitgeist/images/error_medium.png"/>
         {{ 'Installation_SetupWebsiteError'|translate }}:
         <br/>- {{ errorMessage }}
 
diff --git a/plugins/Installation/templates/structure.twig b/plugins/Installation/templates/structure.twig
index fb2767ef33..b523ffd03d 100644
--- a/plugins/Installation/templates/structure.twig
+++ b/plugins/Installation/templates/structure.twig
@@ -8,7 +8,7 @@
     <link rel="stylesheet" type="text/css" href="plugins/Zeitgeist/theme/common.css"/>
     <link rel="stylesheet" type="text/css" href="libs/jquery/themes/base/jquery-ui.css"/>
     <link rel="stylesheet" type="text/css" href="plugins/Zeitgeist/theme/styles.css"/>
-    <link rel="shortcut icon" href="plugins/CoreHome/templates/images/favicon.ico"/>
+    <link rel="shortcut icon" href="plugins/CoreHome/images/favicon.ico"/>
     <script type="text/javascript" src="libs/jquery/jquery.js"></script>
     <script type="text/javascript" src="libs/jquery/jquery-ui.js"></script>
 
@@ -31,7 +31,7 @@
 <div id="main">
     <div id="content">
         <div id="logo">
-            <img id="title" width='160' src="plugins/Zeitgeist/theme/images/logo.png"/> &nbsp;&nbsp;&nbsp;<span
+            <img id="title" width='160' src="plugins/Zeitgeist/images/logo.png"/> &nbsp;&nbsp;&nbsp;<span
                     id="subtitle"># {{ 'General_OpenSourceWebAnalytics'|translate }}</span>
         </div>
         <div style="float:right" id="topRightBar">
diff --git a/plugins/Installation/templates/systemCheck.twig b/plugins/Installation/templates/systemCheck.twig
index 8c9db4babd..fd798a0558 100644
--- a/plugins/Installation/templates/systemCheck.twig
+++ b/plugins/Installation/templates/systemCheck.twig
@@ -13,7 +13,7 @@
 {% if not showNextStep %}
     <br/>
     <p>
-        <img src='plugins/Zeitgeist/theme/images/link.gif'/> &nbsp;
+        <img src='plugins/Zeitgeist/images/link.gif'/> &nbsp;
         <a href="?module=Proxy&action=redirect&url=http://piwik.org/docs/requirements/" target="_blank">{{ 'Installation_Requirements'|translate }}</a>
     </p>
     {% include "@Installation/systemCheck_legend.twig" %}
diff --git a/plugins/Installation/templates/systemCheckPage.twig b/plugins/Installation/templates/systemCheckPage.twig
index 59a112c115..219e120394 100755
--- a/plugins/Installation/templates/systemCheckPage.twig
+++ b/plugins/Installation/templates/systemCheckPage.twig
@@ -5,13 +5,13 @@
     <h2>{{ 'Installation_SystemCheck'|translate }}</h2>
     <p style="margin-left:1em">
         {% if infos.has_errors %}
-            <img src='plugins/Zeitgeist/theme/images/error.png'/>
+            <img src='plugins/Zeitgeist/images/error.png'/>
             {{ 'Installation_SystemCheckSummaryThereWereErrors'|translate('<strong>','</strong>','<strong><em>','</em></strong>')|raw }} {{ 'Installation_SeeBelowForMoreInfo'|translate }}
         {% elseif infos.has_warnings %}
-            <img src='plugins/Zeitgeist/theme/images/warning.png'/>
+            <img src='plugins/Zeitgeist/images/warning.png'/>
             {{ 'Installation_SystemCheckSummaryThereWereWarnings'|translate }} {{ 'Installation_SeeBelowForMoreInfo'|translate }}
         {% else %}
-            <img src='plugins/Zeitgeist/theme/images/ok.png'/>
+            <img src='plugins/Zeitgeist/images/ok.png'/>
             {{ 'Installation_SystemCheckSummaryNoProblems'|translate }}
         {% endif %}
     </p>
diff --git a/plugins/Installation/templates/systemCheckSection.twig b/plugins/Installation/templates/systemCheckSection.twig
index bbdde4c9c6..9c0de17d00 100755
--- a/plugins/Installation/templates/systemCheckSection.twig
+++ b/plugins/Installation/templates/systemCheckSection.twig
@@ -1,7 +1,7 @@
-{% set ok %}<img src='plugins/Zeitgeist/theme/images/ok.png' />{% endset %}
-{% set error %}<img src='plugins/Zeitgeist/theme/images/error.png' />{% endset %}
-{% set warning %}<img src='plugins/Zeitgeist/theme/images/warning.png' />{% endset %}
-{% set link %}<img src='plugins/Zeitgeist/theme/images/link.gif' />{% endset %}
+{% set ok %}<img src='plugins/Zeitgeist/images/ok.png' />{% endset %}
+{% set error %}<img src='plugins/Zeitgeist/images/error.png' />{% endset %}
+{% set warning %}<img src='plugins/Zeitgeist/images/warning.png' />{% endset %}
+{% set link %}<img src='plugins/Zeitgeist/images/link.gif' />{% endset %}
 
 <table class="infosServer" id="systemCheckRequired">
     <tr>
diff --git a/plugins/Installation/templates/systemCheck_legend.twig b/plugins/Installation/templates/systemCheck_legend.twig
index ec822a0d41..04e1c20edf 100644
--- a/plugins/Installation/templates/systemCheck_legend.twig
+++ b/plugins/Installation/templates/systemCheck_legend.twig
@@ -2,11 +2,11 @@
     <small>
         <h2>{{ 'Installation_Legend'|translate }}</h2>
         <br/>
-        <img src='plugins/Zeitgeist/theme/images/warning.png'/> <span class="warn">{{ 'General_Warning'|translate }}: {{ 'Installation_SystemCheckWarning'|translate }}</span>
+        <img src='plugins/Zeitgeist/images/warning.png'/> <span class="warn">{{ 'General_Warning'|translate }}: {{ 'Installation_SystemCheckWarning'|translate }}</span>
         <br/>
-        <img src='plugins/Zeitgeist/theme/images/error.png'/> <span style="color:red;font-weight:bold">{{ 'General_Error'|translate }}
+        <img src='plugins/Zeitgeist/images/error.png'/> <span style="color:red;font-weight:bold">{{ 'General_Error'|translate }}
             : {{ 'Installation_SystemCheckError'|translate }} </span><br/>
-        <img src='plugins/Zeitgeist/theme/images/ok.png'/> <span style="color:#26981C;font-weight:bold">{{ 'General_Ok'|translate }}</span><br/>
+        <img src='plugins/Zeitgeist/images/ok.png'/> <span style="color:#26981C;font-weight:bold">{{ 'General_Ok'|translate }}</span><br/>
     </small>
 </div>
 
diff --git a/plugins/Installation/templates/tablesCreation.twig b/plugins/Installation/templates/tablesCreation.twig
index 3163d7a3bb..e5f48fc017 100644
--- a/plugins/Installation/templates/tablesCreation.twig
+++ b/plugins/Installation/templates/tablesCreation.twig
@@ -5,7 +5,7 @@
 
 {% if someTablesInstalled is defined %}
     <div class="warning">{{ 'Installation_TablesWithSameNamesFound'|translate("<span id='linkToggle'>","</span>")|raw }}
-        <img src="plugins/Zeitgeist/theme/images/warning_medium.png"/>
+        <img src="plugins/Zeitgeist/images/warning_medium.png"/>
     </div>
     <div id="toggle" style="display:none;color:#4F2410">
         <small>
@@ -24,12 +24,12 @@
 
 {% if existingTablesDeleted is defined %}
     <div class="success"> {{ 'Installation_TablesDeletedSuccess'|translate }}
-        <img src="plugins/Zeitgeist/theme/images/success_medium.png"/></div>
+        <img src="plugins/Zeitgeist/images/success_medium.png"/></div>
 {% endif %}
 
 {% if tablesCreated is defined %}
     <div class="success"> {{ 'Installation_TablesCreatedSuccess'|translate }}
-        <img src="plugins/Zeitgeist/theme/images/success_medium.png"/></div>
+        <img src="plugins/Zeitgeist/images/success_medium.png"/></div>
 {% endif %}
 
 <script>
diff --git a/plugins/Live/Visitor.php b/plugins/Live/Visitor.php
index 45a3ec7f08..8e53f9f5ee 100644
--- a/plugins/Live/Visitor.php
+++ b/plugins/Live/Visitor.php
@@ -215,7 +215,7 @@ class Piwik_Live_Visitor
         if ($type == 'returning'
             || $type == 'returningCustomer'
         ) {
-            return "plugins/Live/templates/images/returningVisitor.gif";
+            return "plugins/Live/images/returningVisitor.gif";
         }
         return null;
     }
diff --git a/plugins/Live/templates/images/file0.png b/plugins/Live/images/file0.png
index ab6632cbef..ab6632cbef 100644
--- a/plugins/Live/templates/images/file0.png
+++ b/plugins/Live/images/file0.png
diff --git a/plugins/Live/templates/images/file1.png b/plugins/Live/images/file1.png
index db212e575b..db212e575b 100644
--- a/plugins/Live/templates/images/file1.png
+++ b/plugins/Live/images/file1.png
diff --git a/plugins/Live/templates/images/file2.png b/plugins/Live/images/file2.png
index 28a9a30b42..28a9a30b42 100644
--- a/plugins/Live/templates/images/file2.png
+++ b/plugins/Live/images/file2.png
diff --git a/plugins/Live/templates/images/file3.png b/plugins/Live/images/file3.png
index 10b60f9326..10b60f9326 100644
--- a/plugins/Live/templates/images/file3.png
+++ b/plugins/Live/images/file3.png
diff --git a/plugins/Live/templates/images/file4.png b/plugins/Live/images/file4.png
index 67cb7edd0b..67cb7edd0b 100644
--- a/plugins/Live/templates/images/file4.png
+++ b/plugins/Live/images/file4.png
diff --git a/plugins/Live/templates/images/file5.png b/plugins/Live/images/file5.png
index d273922e10..d273922e10 100644
--- a/plugins/Live/templates/images/file5.png
+++ b/plugins/Live/images/file5.png
diff --git a/plugins/Live/templates/images/file6.png b/plugins/Live/images/file6.png
index d1d5da5672..d1d5da5672 100644
--- a/plugins/Live/templates/images/file6.png
+++ b/plugins/Live/images/file6.png
diff --git a/plugins/Live/templates/images/file7.png b/plugins/Live/images/file7.png
index f1aefce06e..f1aefce06e 100644
--- a/plugins/Live/templates/images/file7.png
+++ b/plugins/Live/images/file7.png
diff --git a/plugins/Live/templates/images/file8.png b/plugins/Live/images/file8.png
index a441b8f48d..a441b8f48d 100644
--- a/plugins/Live/templates/images/file8.png
+++ b/plugins/Live/images/file8.png
diff --git a/plugins/Live/templates/images/file9.png b/plugins/Live/images/file9.png
index 6a162c5695..6a162c5695 100644
--- a/plugins/Live/templates/images/file9.png
+++ b/plugins/Live/images/file9.png
diff --git a/plugins/Live/templates/images/pause.gif b/plugins/Live/images/pause.gif
index 5954f9f545..5954f9f545 100644
--- a/plugins/Live/templates/images/pause.gif
+++ b/plugins/Live/images/pause.gif
diff --git a/plugins/Live/templates/images/pause_disabled.gif b/plugins/Live/images/pause_disabled.gif
index 98b79f7402..98b79f7402 100644
--- a/plugins/Live/templates/images/pause_disabled.gif
+++ b/plugins/Live/images/pause_disabled.gif
diff --git a/plugins/Live/templates/images/play.gif b/plugins/Live/images/play.gif
index 87eded433b..87eded433b 100644
--- a/plugins/Live/templates/images/play.gif
+++ b/plugins/Live/images/play.gif
diff --git a/plugins/Live/templates/images/play_disabled.gif b/plugins/Live/images/play_disabled.gif
index ef69513d69..ef69513d69 100644
--- a/plugins/Live/templates/images/play_disabled.gif
+++ b/plugins/Live/images/play_disabled.gif
diff --git a/plugins/Live/templates/images/returningVisitor.gif b/plugins/Live/images/returningVisitor.gif
index bc71867e55..bc71867e55 100644
--- a/plugins/Live/templates/images/returningVisitor.gif
+++ b/plugins/Live/images/returningVisitor.gif
diff --git a/plugins/Live/templates/index.twig b/plugins/Live/templates/index.twig
index 78e35d2fb3..98382fa253 100644
--- a/plugins/Live/templates/index.twig
+++ b/plugins/Live/templates/index.twig
@@ -31,10 +31,10 @@
 
 <div class="visitsLiveFooter">
     <a title="Pause Live!" href="javascript:void(0);" onclick="onClickPause();">
-        <img id="pauseImage" border="0" src="plugins/Live/templates/images/pause_disabled.gif" />
+        <img id="pauseImage" border="0" src="plugins/Live/images/pause_disabled.gif" />
     </a>
     <a title="Start Live!" href="javascript:void(0);" onclick="onClickPlay();">
-        <img id="playImage" border="0" src="plugins/Live/templates/images/play.gif" />
+        <img id="playImage" border="0" src="plugins/Live/images/play.gif" />
     </a>
     {% if not disableLink %}
         &nbsp;
diff --git a/plugins/Live/templates/lastVisits.twig b/plugins/Live/templates/lastVisits.twig
index 0d12a458ee..f8cc9a9703 100644
--- a/plugins/Live/templates/lastVisits.twig
+++ b/plugins/Live/templates/lastVisits.twig
@@ -109,7 +109,7 @@
                                             - {{ 'General_TimeOnPage'|translate }}: {{ action.timeSpentPretty }}
                                         {% endif %}
                                     {% endset %}
-                                    <img src="plugins/Live/templates/images/file{{ col }}.png" title="{{ title }}"/>
+                                    <img src="plugins/Live/images/file{{ col }}.png" title="{{ title }}"/>
                                 {% elseif action.type == 'outlink' or action.type == 'download' %}
                                     <img class='iconPadding' src="{{ action.icon }}"
                                          title="{{ action.url }} - {{ action.serverTimePretty }}"/>
diff --git a/plugins/Live/templates/live.css b/plugins/Live/templates/live.css
index f1794631d7..ce03d2eade 100644
--- a/plugins/Live/templates/live.css
+++ b/plugins/Live/templates/live.css
@@ -18,7 +18,7 @@
 }
 
 #visitsLive .country {
-    background: #FFF url(../../../plugins/CoreHome/templates/images/bullet1.gif) no-repeat scroll 0 0;
+    background: #FFF url(../../CoreHome/images/bullet1.gif) no-repeat scroll 0 0;
 }
 
 #visitsLive .referer {
diff --git a/plugins/Live/templates/scripts/live.js b/plugins/Live/templates/scripts/live.js
index f65f9ac373..f726b10671 100644
--- a/plugins/Live/templates/scripts/live.js
+++ b/plugins/Live/templates/scripts/live.js
@@ -201,10 +201,10 @@
 })(jQuery);
 
 
-var pauseImage = "plugins/Live/templates/images/pause.gif";
-var pauseDisabledImage = "plugins/Live/templates/images/pause_disabled.gif";
-var playImage = "plugins/Live/templates/images/play.gif";
-var playDisabledImage = "plugins/Live/templates/images/play_disabled.gif";
+var pauseImage = "plugins/Live/images/pause.gif";
+var pauseDisabledImage = "plugins/Live/images/pause_disabled.gif";
+var playImage = "plugins/Live/images/play.gif";
+var playDisabledImage = "plugins/Live/images/play_disabled.gif";
 function onClickPause() {
     $('#pauseImage').attr('src', pauseImage);
     $('#playImage').attr('src', playDisabledImage);
diff --git a/plugins/Login/templates/login.twig b/plugins/Login/templates/login.twig
index 801cd2d005..79ce3f050c 100644
--- a/plugins/Login/templates/login.twig
+++ b/plugins/Login/templates/login.twig
@@ -6,7 +6,7 @@
 <head>
     <title>{% if isCustomLogo == false %}Piwik &rsaquo; {% endif %}{{ 'Login_LogIn'|translate }}</title>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-    <link rel="shortcut icon" href="plugins/CoreHome/templates/images/favicon.ico"/>
+    <link rel="shortcut icon" href="plugins/CoreHome/images/favicon.ico"/>
     <link rel="stylesheet" type="text/css" href="plugins/Login/templates/login.css"/>
     <meta name="description" content="{{ 'General_OpenSourceWebAnalytics'|translate }}" />
     <!--[if lt IE 9]>
@@ -69,7 +69,7 @@
 
             <br><br>{{ invalidHostMessageHowToFix }}
             <br/><br/><a style="float:right" href="http://piwik.org/faq/troubleshooting/#faq_171" target="_blank">{{ 'General_Help'|translate }}
-                <img style='vertical-align: bottom' src="plugins/Zeitgeist/theme/images/help_grey.png"/></a><br/>
+                <img style='vertical-align: bottom' src="plugins/Zeitgeist/images/help_grey.png"/></a><br/>
         </div>
     {% else %}
         <div id="message_container">
@@ -120,7 +120,7 @@
             </fieldset>
 
             <fieldset class="actions">
-                <span class="loadingPiwik" style="display:none;"><img alt="Loading" src="plugins/Zeitgeist/theme/images/loading-blue.gif"/></span>
+                <span class="loadingPiwik" style="display:none;"><img alt="Loading" src="plugins/Zeitgeist/images/loading-blue.gif"/></span>
                 <input class="submit" id='reset_form_submit' type="submit" value="{{ 'Login_ChangePassword'|translate }}" tabindex="100"/>
             </fieldset>
 
diff --git a/plugins/Overlay/templates/info.png b/plugins/Overlay/images/info.png
index 12cd1aef90..12cd1aef90 100644
--- a/plugins/Overlay/templates/info.png
+++ b/plugins/Overlay/images/info.png
diff --git a/plugins/Overlay/templates/overlay_icon.png b/plugins/Overlay/images/overlay_icon.png
index a960d1bbc9..a960d1bbc9 100755
--- a/plugins/Overlay/templates/overlay_icon.png
+++ b/plugins/Overlay/images/overlay_icon.png
diff --git a/plugins/Overlay/templates/overlay_icon_hover.png b/plugins/Overlay/images/overlay_icon_hover.png
index 10296ef392..10296ef392 100755
--- a/plugins/Overlay/templates/overlay_icon_hover.png
+++ b/plugins/Overlay/images/overlay_icon_hover.png
diff --git a/plugins/Overlay/templates/error_wrong_domain.twig b/plugins/Overlay/templates/error_wrong_domain.twig
index 555ba53a1d..0a39680a12 100644
--- a/plugins/Overlay/templates/error_wrong_domain.twig
+++ b/plugins/Overlay/templates/error_wrong_domain.twig
@@ -4,7 +4,7 @@
     <title></title>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
     <meta name="generator" content="Piwik - Open Source Web Analytics"/>
-    <link rel="shortcut icon" href="plugins/CoreHome/templates/images/favicon.ico"/>
+    <link rel="shortcut icon" href="plugins/CoreHome/images/favicon.ico"/>
 
     <style type="text/css">
         body {
diff --git a/plugins/Overlay/templates/index.css b/plugins/Overlay/templates/index.css
index 495d669ad4..1d428f834e 100644
--- a/plugins/Overlay/templates/index.css
+++ b/plugins/Overlay/templates/index.css
@@ -87,7 +87,7 @@ a#Overlay_RowEvolution {
 }
 
 a#Overlay_Transitions {
-    background: url(../../Transitions/templates/transitions_icon_hover.png) no-repeat 0 6px;
+    background: url(../../Transitions/images/transitions_icon_hover.png) no-repeat 0 6px;
 }
 
 a#Overlay_FullScreen {
@@ -127,7 +127,7 @@ a#Overlay_Transitions:hover {
 }
 
 h2.Overlay_MainMetrics {
-    background: url(./info.png) 0 1px no-repeat
+    background: url(../images/info.png) 0 1px no-repeat
 }
 
 body .ui-tooltip.Overlay_Tooltip {
diff --git a/plugins/Overlay/templates/index.twig b/plugins/Overlay/templates/index.twig
index 6ec206d908..4b806478cb 100644
--- a/plugins/Overlay/templates/index.twig
+++ b/plugins/Overlay/templates/index.twig
@@ -9,7 +9,7 @@
 {% block content %}
 <a id="Overlay_Title" href="http://piwik.org/docs/page-overlay/" target="_blank">
     {{ 'Overlay_Overlay'|translate }}
-    <img src="plugins/Zeitgeist/theme/images/help.png" alt="Documentation" />
+    <img src="plugins/Zeitgeist/images/help.png" alt="Documentation" />
 </a>
 
 <div id="Overlay_DateRangeSelection">
diff --git a/plugins/Overlay/templates/rowaction.js b/plugins/Overlay/templates/rowaction.js
index a3a48f1d43..caa1f10a8b 100644
--- a/plugins/Overlay/templates/rowaction.js
+++ b/plugins/Overlay/templates/rowaction.js
@@ -35,8 +35,8 @@ DataTable_RowActions_Registry.register({
 
     name: 'Overlay',
 
-    dataTableIcon: 'plugins/Overlay/templates/overlay_icon.png',
-    dataTableIconHover: 'plugins/Overlay/templates/overlay_icon_hover.png',
+    dataTableIcon: 'plugins/Overlay/images/overlay_icon.png',
+    dataTableIconHover: 'plugins/Overlay/images/overlay_icon_hover.png',
 
     order: 30,
 
diff --git a/plugins/PDFReports/templates/list.twig b/plugins/PDFReports/templates/list.twig
index 5db9086d88..96ba0f64d5 100644
--- a/plugins/PDFReports/templates/list.twig
+++ b/plugins/PDFReports/templates/list.twig
@@ -72,14 +72,14 @@
             <td>
                 {# edit link #}
                 <a href='#' name="linkEditReport" id="{{ report.idreport }}" class="link_but">
-                    <img src='plugins/Zeitgeist/theme/images/ico_edit.png' border="0"/>
+                    <img src='plugins/Zeitgeist/images/ico_edit.png' border="0"/>
                     {{ 'General_Edit'|translate }}
                 </a>
             </td>
             <td>
                 {*delete link *}
                 <a href='#' name="linkDeleteReport" id="{{ report.idreport }}" class="link_but">
-                    <img src='plugins/Zeitgeist/theme/images/ico_delete.png' border="0"/>
+                    <img src='plugins/Zeitgeist/images/ico_delete.png' border="0"/>
                     {{ 'General_Delete'|translate }}
                 </a>
             </td>
diff --git a/plugins/SitesManager/templates/index.twig b/plugins/SitesManager/templates/index.twig
index f4809813d0..f633c38625 100644
--- a/plugins/SitesManager/templates/index.twig
+++ b/plugins/SitesManager/templates/index.twig
@@ -239,13 +239,13 @@ $(document).ready(function () {
                 </td>
                 <td>
                     <span id="row{{ site.idsite }}" class='editSite link_but'>
-                        <img src='plugins/Zeitgeist/theme/images/ico_edit.png' title="{{ 'General_Edit'|translate }}" border="0"/>
+                        <img src='plugins/Zeitgeist/images/ico_edit.png' title="{{ 'General_Edit'|translate }}" border="0"/>
                         {{ 'General_Edit'|translate }}
                     </span>
                 </td>
                 <td>
                     <span id="row{{ site.idsite }}" class="deleteSite link_but">
-                        <img src='plugins/Zeitgeist/theme/images/ico_delete.png' title="{{ 'General_Delete'|translate }}" border="0"/>
+                        <img src='plugins/Zeitgeist/images/ico_delete.png' title="{{ 'General_Delete'|translate }}" border="0"/>
                         {{ 'General_Delete'|translate }}
                     </span>
                 </td>
@@ -340,7 +340,7 @@ $(document).ready(function () {
                 {{ 'SitesManager_EnableSiteSpecificUserAgentExclude'|translate }}
             </label>
             <span id='enableSiteUserAgentExclude-loading' class='loadingPiwik' style='display:none'>
-                <img src='plugins/Zeitgeist/theme/images/loading-blue.gif'/>
+                <img src='plugins/Zeitgeist/images/loading-blue.gif'/>
             </span>
         </td>
         <td>
diff --git a/plugins/Transitions/templates/transitions_icon.png b/plugins/Transitions/images/transitions_icon.png
index b7f79961f0..b7f79961f0 100755
--- a/plugins/Transitions/templates/transitions_icon.png
+++ b/plugins/Transitions/images/transitions_icon.png
diff --git a/plugins/Transitions/templates/transitions_icon_hover.png b/plugins/Transitions/images/transitions_icon_hover.png
index 380915b9af..380915b9af 100755
--- a/plugins/Transitions/templates/transitions_icon_hover.png
+++ b/plugins/Transitions/images/transitions_icon_hover.png
diff --git a/plugins/Transitions/templates/transitions.js b/plugins/Transitions/templates/transitions.js
index dec4442413..696bd35fe4 100644
--- a/plugins/Transitions/templates/transitions.js
+++ b/plugins/Transitions/templates/transitions.js
@@ -78,8 +78,8 @@ DataTable_RowActions_Registry.register({
 
     name: 'Transitions',
 
-    dataTableIcon: 'plugins/Transitions/templates/transitions_icon.png',
-    dataTableIconHover: 'plugins/Transitions/templates/transitions_icon_hover.png',
+    dataTableIcon: 'plugins/Transitions/images/transitions_icon.png',
+    dataTableIconHover: 'plugins/Transitions/images/transitions_icon_hover.png',
 
     order: 20,
 
diff --git a/plugins/UserCountry/functions.php b/plugins/UserCountry/functions.php
index ab1ff7e26a..debe9166b2 100644
--- a/plugins/UserCountry/functions.php
+++ b/plugins/UserCountry/functions.php
@@ -17,7 +17,7 @@
  */
 function Piwik_getFlagFromCode($code)
 {
-    $pathInPiwik = 'plugins/UserCountry/flags/%s.png';
+    $pathInPiwik = 'plugins/UserCountry/images/flags/%s.png';
     $pathWithCode = sprintf($pathInPiwik, $code);
     $absolutePath = PIWIK_INCLUDE_PATH . '/' . $pathWithCode;
     if (file_exists($absolutePath)) {
diff --git a/plugins/UserCountry/flags/a1.png b/plugins/UserCountry/images/flags/a1.png
index da6e1bbe89..da6e1bbe89 100644
--- a/plugins/UserCountry/flags/a1.png
+++ b/plugins/UserCountry/images/flags/a1.png
diff --git a/plugins/UserCountry/flags/a2.png b/plugins/UserCountry/images/flags/a2.png
index da6e1bbe89..da6e1bbe89 100644
--- a/plugins/UserCountry/flags/a2.png
+++ b/plugins/UserCountry/images/flags/a2.png
diff --git a/plugins/UserCountry/flags/ac.png b/plugins/UserCountry/images/flags/ac.png
index 405e897c52..405e897c52 100644
--- a/plugins/UserCountry/flags/ac.png
+++ b/plugins/UserCountry/images/flags/ac.png
diff --git a/plugins/UserCountry/flags/ad.png b/plugins/UserCountry/images/flags/ad.png
index 385fa1d7ea..385fa1d7ea 100644
--- a/plugins/UserCountry/flags/ad.png
+++ b/plugins/UserCountry/images/flags/ad.png
diff --git a/plugins/UserCountry/flags/ae.png b/plugins/UserCountry/images/flags/ae.png
index cf10beb4a3..cf10beb4a3 100644
--- a/plugins/UserCountry/flags/ae.png
+++ b/plugins/UserCountry/images/flags/ae.png
diff --git a/plugins/UserCountry/flags/af.png b/plugins/UserCountry/images/flags/af.png
index 1b24b434fa..1b24b434fa 100644
--- a/plugins/UserCountry/flags/af.png
+++ b/plugins/UserCountry/images/flags/af.png
diff --git a/plugins/UserCountry/flags/ag.png b/plugins/UserCountry/images/flags/ag.png
index 3ca9b1763c..3ca9b1763c 100644
--- a/plugins/UserCountry/flags/ag.png
+++ b/plugins/UserCountry/images/flags/ag.png
diff --git a/plugins/UserCountry/flags/ai.png b/plugins/UserCountry/images/flags/ai.png
index 9bde3ce709..9bde3ce709 100644
--- a/plugins/UserCountry/flags/ai.png
+++ b/plugins/UserCountry/images/flags/ai.png
diff --git a/plugins/UserCountry/flags/al.png b/plugins/UserCountry/images/flags/al.png
index e5f7b0647c..e5f7b0647c 100644
--- a/plugins/UserCountry/flags/al.png
+++ b/plugins/UserCountry/images/flags/al.png
diff --git a/plugins/UserCountry/flags/am.png b/plugins/UserCountry/images/flags/am.png
index 6d0a22383b..6d0a22383b 100644
--- a/plugins/UserCountry/flags/am.png
+++ b/plugins/UserCountry/images/flags/am.png
diff --git a/plugins/UserCountry/flags/an.png b/plugins/UserCountry/images/flags/an.png
index c5165608ce..c5165608ce 100644
--- a/plugins/UserCountry/flags/an.png
+++ b/plugins/UserCountry/images/flags/an.png
diff --git a/plugins/UserCountry/flags/ao.png b/plugins/UserCountry/images/flags/ao.png
index c0872c46f8..c0872c46f8 100644
--- a/plugins/UserCountry/flags/ao.png
+++ b/plugins/UserCountry/images/flags/ao.png
diff --git a/plugins/UserCountry/flags/ap.png b/plugins/UserCountry/images/flags/ap.png
index da6e1bbe89..da6e1bbe89 100644
--- a/plugins/UserCountry/flags/ap.png
+++ b/plugins/UserCountry/images/flags/ap.png
diff --git a/plugins/UserCountry/flags/aq.png b/plugins/UserCountry/images/flags/aq.png
index 217eaba391..217eaba391 100644
--- a/plugins/UserCountry/flags/aq.png
+++ b/plugins/UserCountry/images/flags/aq.png
diff --git a/plugins/UserCountry/flags/ar.png b/plugins/UserCountry/images/flags/ar.png
index 0f09ebdd8e..0f09ebdd8e 100644
--- a/plugins/UserCountry/flags/ar.png
+++ b/plugins/UserCountry/images/flags/ar.png
diff --git a/plugins/UserCountry/flags/as.png b/plugins/UserCountry/images/flags/as.png
index 774776150a..774776150a 100644
--- a/plugins/UserCountry/flags/as.png
+++ b/plugins/UserCountry/images/flags/as.png
diff --git a/plugins/UserCountry/flags/at.png b/plugins/UserCountry/images/flags/at.png
index 700a656671..700a656671 100644
--- a/plugins/UserCountry/flags/at.png
+++ b/plugins/UserCountry/images/flags/at.png
diff --git a/plugins/UserCountry/flags/au.png b/plugins/UserCountry/images/flags/au.png
index 709eac00de..709eac00de 100644
--- a/plugins/UserCountry/flags/au.png
+++ b/plugins/UserCountry/images/flags/au.png
diff --git a/plugins/UserCountry/flags/aw.png b/plugins/UserCountry/images/flags/aw.png
index 7b7d01c10f..7b7d01c10f 100644
--- a/plugins/UserCountry/flags/aw.png
+++ b/plugins/UserCountry/images/flags/aw.png
diff --git a/plugins/UserCountry/flags/ax.png b/plugins/UserCountry/images/flags/ax.png
index ff51987a16..ff51987a16 100644
--- a/plugins/UserCountry/flags/ax.png
+++ b/plugins/UserCountry/images/flags/ax.png
diff --git a/plugins/UserCountry/flags/az.png b/plugins/UserCountry/images/flags/az.png
index 2f189667f6..2f189667f6 100644
--- a/plugins/UserCountry/flags/az.png
+++ b/plugins/UserCountry/images/flags/az.png
diff --git a/plugins/UserCountry/flags/ba.png b/plugins/UserCountry/images/flags/ba.png
index c996c301cb..c996c301cb 100644
--- a/plugins/UserCountry/flags/ba.png
+++ b/plugins/UserCountry/images/flags/ba.png
diff --git a/plugins/UserCountry/flags/bb.png b/plugins/UserCountry/images/flags/bb.png
index 50992817cf..50992817cf 100644
--- a/plugins/UserCountry/flags/bb.png
+++ b/plugins/UserCountry/images/flags/bb.png
diff --git a/plugins/UserCountry/flags/bd.png b/plugins/UserCountry/images/flags/bd.png
index 685325475a..685325475a 100644
--- a/plugins/UserCountry/flags/bd.png
+++ b/plugins/UserCountry/images/flags/bd.png
diff --git a/plugins/UserCountry/flags/be.png b/plugins/UserCountry/images/flags/be.png
index 12c10f46e0..12c10f46e0 100644
--- a/plugins/UserCountry/flags/be.png
+++ b/plugins/UserCountry/images/flags/be.png
diff --git a/plugins/UserCountry/flags/bf.png b/plugins/UserCountry/images/flags/bf.png
index 22b42bcc98..22b42bcc98 100644
--- a/plugins/UserCountry/flags/bf.png
+++ b/plugins/UserCountry/images/flags/bf.png
diff --git a/plugins/UserCountry/flags/bg.png b/plugins/UserCountry/images/flags/bg.png
index 41f34d8562..41f34d8562 100644
--- a/plugins/UserCountry/flags/bg.png
+++ b/plugins/UserCountry/images/flags/bg.png
diff --git a/plugins/UserCountry/flags/bh.png b/plugins/UserCountry/images/flags/bh.png
index 32ca603f30..32ca603f30 100644
--- a/plugins/UserCountry/flags/bh.png
+++ b/plugins/UserCountry/images/flags/bh.png
diff --git a/plugins/UserCountry/flags/bi.png b/plugins/UserCountry/images/flags/bi.png
index 1f03e129ad..1f03e129ad 100644
--- a/plugins/UserCountry/flags/bi.png
+++ b/plugins/UserCountry/images/flags/bi.png
diff --git a/plugins/UserCountry/flags/bj.png b/plugins/UserCountry/images/flags/bj.png
index 53d4eb1e99..53d4eb1e99 100644
--- a/plugins/UserCountry/flags/bj.png
+++ b/plugins/UserCountry/images/flags/bj.png
diff --git a/plugins/UserCountry/flags/bl.png b/plugins/UserCountry/images/flags/bl.png
index 744ede391d..744ede391d 100644
--- a/plugins/UserCountry/flags/bl.png
+++ b/plugins/UserCountry/images/flags/bl.png
diff --git a/plugins/UserCountry/flags/bm.png b/plugins/UserCountry/images/flags/bm.png
index 3cb8803156..3cb8803156 100644
--- a/plugins/UserCountry/flags/bm.png
+++ b/plugins/UserCountry/images/flags/bm.png
diff --git a/plugins/UserCountry/flags/bn.png b/plugins/UserCountry/images/flags/bn.png
index 9aafbb389c..9aafbb389c 100644
--- a/plugins/UserCountry/flags/bn.png
+++ b/plugins/UserCountry/images/flags/bn.png
diff --git a/plugins/UserCountry/flags/bo.png b/plugins/UserCountry/images/flags/bo.png
index 46b519eae6..46b519eae6 100644
--- a/plugins/UserCountry/flags/bo.png
+++ b/plugins/UserCountry/images/flags/bo.png
diff --git a/plugins/UserCountry/flags/bq.png b/plugins/UserCountry/images/flags/bq.png
index 77f75f6ffa..77f75f6ffa 100644
--- a/plugins/UserCountry/flags/bq.png
+++ b/plugins/UserCountry/images/flags/bq.png
diff --git a/plugins/UserCountry/flags/br.png b/plugins/UserCountry/images/flags/br.png
index 5cdff06a4a..5cdff06a4a 100644
--- a/plugins/UserCountry/flags/br.png
+++ b/plugins/UserCountry/images/flags/br.png
diff --git a/plugins/UserCountry/flags/bs.png b/plugins/UserCountry/images/flags/bs.png
index bc5333e0b9..bc5333e0b9 100644
--- a/plugins/UserCountry/flags/bs.png
+++ b/plugins/UserCountry/images/flags/bs.png
diff --git a/plugins/UserCountry/flags/bt.png b/plugins/UserCountry/images/flags/bt.png
index 0abb9130c7..0abb9130c7 100644
--- a/plugins/UserCountry/flags/bt.png
+++ b/plugins/UserCountry/images/flags/bt.png
diff --git a/plugins/UserCountry/flags/bu.png b/plugins/UserCountry/images/flags/bu.png
index d931b1dbe4..d931b1dbe4 100644
--- a/plugins/UserCountry/flags/bu.png
+++ b/plugins/UserCountry/images/flags/bu.png
diff --git a/plugins/UserCountry/flags/bv.png b/plugins/UserCountry/images/flags/bv.png
index 74264c5866..74264c5866 100644
--- a/plugins/UserCountry/flags/bv.png
+++ b/plugins/UserCountry/images/flags/bv.png
diff --git a/plugins/UserCountry/flags/bw.png b/plugins/UserCountry/images/flags/bw.png
index 463a97775a..463a97775a 100644
--- a/plugins/UserCountry/flags/bw.png
+++ b/plugins/UserCountry/images/flags/bw.png
diff --git a/plugins/UserCountry/flags/by.png b/plugins/UserCountry/images/flags/by.png
index 81c5086ca6..81c5086ca6 100644
--- a/plugins/UserCountry/flags/by.png
+++ b/plugins/UserCountry/images/flags/by.png
diff --git a/plugins/UserCountry/flags/bz.png b/plugins/UserCountry/images/flags/bz.png
index f653173d4f..f653173d4f 100644
--- a/plugins/UserCountry/flags/bz.png
+++ b/plugins/UserCountry/images/flags/bz.png
diff --git a/plugins/UserCountry/flags/ca.png b/plugins/UserCountry/images/flags/ca.png
index b7c48f6341..b7c48f6341 100644
--- a/plugins/UserCountry/flags/ca.png
+++ b/plugins/UserCountry/images/flags/ca.png
diff --git a/plugins/UserCountry/flags/cat.png b/plugins/UserCountry/images/flags/cat.png
index 58faea35b8..58faea35b8 100644
--- a/plugins/UserCountry/flags/cat.png
+++ b/plugins/UserCountry/images/flags/cat.png
diff --git a/plugins/UserCountry/flags/cc.png b/plugins/UserCountry/images/flags/cc.png
index 0791bad575..0791bad575 100644
--- a/plugins/UserCountry/flags/cc.png
+++ b/plugins/UserCountry/images/flags/cc.png
diff --git a/plugins/UserCountry/flags/cd.png b/plugins/UserCountry/images/flags/cd.png
index 6cdfe5c08b..6cdfe5c08b 100644
--- a/plugins/UserCountry/flags/cd.png
+++ b/plugins/UserCountry/images/flags/cd.png
diff --git a/plugins/UserCountry/flags/cf.png b/plugins/UserCountry/images/flags/cf.png
index d932c21016..d932c21016 100644
--- a/plugins/UserCountry/flags/cf.png
+++ b/plugins/UserCountry/images/flags/cf.png
diff --git a/plugins/UserCountry/flags/cg.png b/plugins/UserCountry/images/flags/cg.png
index 0811ccce06..0811ccce06 100644
--- a/plugins/UserCountry/flags/cg.png
+++ b/plugins/UserCountry/images/flags/cg.png
diff --git a/plugins/UserCountry/flags/ch.png b/plugins/UserCountry/images/flags/ch.png
index ead7c2a0d0..ead7c2a0d0 100644
--- a/plugins/UserCountry/flags/ch.png
+++ b/plugins/UserCountry/images/flags/ch.png
diff --git a/plugins/UserCountry/flags/ci.png b/plugins/UserCountry/images/flags/ci.png
index b0d78c7ec6..b0d78c7ec6 100644
--- a/plugins/UserCountry/flags/ci.png
+++ b/plugins/UserCountry/images/flags/ci.png
diff --git a/plugins/UserCountry/flags/ck.png b/plugins/UserCountry/images/flags/ck.png
index 99efe50044..99efe50044 100644
--- a/plugins/UserCountry/flags/ck.png
+++ b/plugins/UserCountry/images/flags/ck.png
diff --git a/plugins/UserCountry/flags/cl.png b/plugins/UserCountry/images/flags/cl.png
index 74a69dc8e8..74a69dc8e8 100644
--- a/plugins/UserCountry/flags/cl.png
+++ b/plugins/UserCountry/images/flags/cl.png
diff --git a/plugins/UserCountry/flags/cm.png b/plugins/UserCountry/images/flags/cm.png
index 65d3827a46..65d3827a46 100644
--- a/plugins/UserCountry/flags/cm.png
+++ b/plugins/UserCountry/images/flags/cm.png
diff --git a/plugins/UserCountry/flags/cn.png b/plugins/UserCountry/images/flags/cn.png
index 9f1b310908..9f1b310908 100644
--- a/plugins/UserCountry/flags/cn.png
+++ b/plugins/UserCountry/images/flags/cn.png
diff --git a/plugins/UserCountry/flags/co.png b/plugins/UserCountry/images/flags/co.png
index eeb10fd86a..eeb10fd86a 100644
--- a/plugins/UserCountry/flags/co.png
+++ b/plugins/UserCountry/images/flags/co.png
diff --git a/plugins/UserCountry/flags/cp.png b/plugins/UserCountry/images/flags/cp.png
index 744ede391d..744ede391d 100644
--- a/plugins/UserCountry/flags/cp.png
+++ b/plugins/UserCountry/images/flags/cp.png
diff --git a/plugins/UserCountry/flags/cr.png b/plugins/UserCountry/images/flags/cr.png
index 413797bfe2..413797bfe2 100644
--- a/plugins/UserCountry/flags/cr.png
+++ b/plugins/UserCountry/images/flags/cr.png
diff --git a/plugins/UserCountry/flags/cs.png b/plugins/UserCountry/images/flags/cs.png
index 0e0fb6deba..0e0fb6deba 100644
--- a/plugins/UserCountry/flags/cs.png
+++ b/plugins/UserCountry/images/flags/cs.png
diff --git a/plugins/UserCountry/flags/cu.png b/plugins/UserCountry/images/flags/cu.png
index 0303459ddd..0303459ddd 100644
--- a/plugins/UserCountry/flags/cu.png
+++ b/plugins/UserCountry/images/flags/cu.png
diff --git a/plugins/UserCountry/flags/cv.png b/plugins/UserCountry/images/flags/cv.png
index 7a1f79755d..7a1f79755d 100644
--- a/plugins/UserCountry/flags/cv.png
+++ b/plugins/UserCountry/images/flags/cv.png
diff --git a/plugins/UserCountry/flags/cw.png b/plugins/UserCountry/images/flags/cw.png
index a6d5f2834b..a6d5f2834b 100644
--- a/plugins/UserCountry/flags/cw.png
+++ b/plugins/UserCountry/images/flags/cw.png
diff --git a/plugins/UserCountry/flags/cx.png b/plugins/UserCountry/images/flags/cx.png
index 8acecd6ec6..8acecd6ec6 100644
--- a/plugins/UserCountry/flags/cx.png
+++ b/plugins/UserCountry/images/flags/cx.png
diff --git a/plugins/UserCountry/flags/cy.png b/plugins/UserCountry/images/flags/cy.png
index 9c2de21570..9c2de21570 100644
--- a/plugins/UserCountry/flags/cy.png
+++ b/plugins/UserCountry/images/flags/cy.png
diff --git a/plugins/UserCountry/flags/cz.png b/plugins/UserCountry/images/flags/cz.png
index 69ea675978..69ea675978 100644
--- a/plugins/UserCountry/flags/cz.png
+++ b/plugins/UserCountry/images/flags/cz.png
diff --git a/plugins/UserCountry/flags/de.png b/plugins/UserCountry/images/flags/de.png
index 2df162b4af..2df162b4af 100644
--- a/plugins/UserCountry/flags/de.png
+++ b/plugins/UserCountry/images/flags/de.png
diff --git a/plugins/UserCountry/flags/dg.png b/plugins/UserCountry/images/flags/dg.png
index 3e74b6a316..3e74b6a316 100644
--- a/plugins/UserCountry/flags/dg.png
+++ b/plugins/UserCountry/images/flags/dg.png
diff --git a/plugins/UserCountry/flags/dj.png b/plugins/UserCountry/images/flags/dj.png
index 3fe7b82cf6..3fe7b82cf6 100644
--- a/plugins/UserCountry/flags/dj.png
+++ b/plugins/UserCountry/images/flags/dj.png
diff --git a/plugins/UserCountry/flags/dk.png b/plugins/UserCountry/images/flags/dk.png
index 622cebd2ce..622cebd2ce 100644
--- a/plugins/UserCountry/flags/dk.png
+++ b/plugins/UserCountry/images/flags/dk.png
diff --git a/plugins/UserCountry/flags/dm.png b/plugins/UserCountry/images/flags/dm.png
index c49785d5ba..c49785d5ba 100644
--- a/plugins/UserCountry/flags/dm.png
+++ b/plugins/UserCountry/images/flags/dm.png
diff --git a/plugins/UserCountry/flags/do.png b/plugins/UserCountry/images/flags/do.png
index 46230992f8..46230992f8 100644
--- a/plugins/UserCountry/flags/do.png
+++ b/plugins/UserCountry/images/flags/do.png
diff --git a/plugins/UserCountry/flags/dz.png b/plugins/UserCountry/images/flags/dz.png
index 144fe154e2..144fe154e2 100644
--- a/plugins/UserCountry/flags/dz.png
+++ b/plugins/UserCountry/images/flags/dz.png
diff --git a/plugins/UserCountry/flags/ea.png b/plugins/UserCountry/images/flags/ea.png
index cfd22a445c..cfd22a445c 100644
--- a/plugins/UserCountry/flags/ea.png
+++ b/plugins/UserCountry/images/flags/ea.png
diff --git a/plugins/UserCountry/flags/ec.png b/plugins/UserCountry/images/flags/ec.png
index 4ca13865ff..4ca13865ff 100644
--- a/plugins/UserCountry/flags/ec.png
+++ b/plugins/UserCountry/images/flags/ec.png
diff --git a/plugins/UserCountry/flags/ee.png b/plugins/UserCountry/images/flags/ee.png
index 17393b8b00..17393b8b00 100644
--- a/plugins/UserCountry/flags/ee.png
+++ b/plugins/UserCountry/images/flags/ee.png
diff --git a/plugins/UserCountry/flags/eg.png b/plugins/UserCountry/images/flags/eg.png
index a7131a3a78..a7131a3a78 100644
--- a/plugins/UserCountry/flags/eg.png
+++ b/plugins/UserCountry/images/flags/eg.png
diff --git a/plugins/UserCountry/flags/eh.png b/plugins/UserCountry/images/flags/eh.png
index 89fe31a0a9..89fe31a0a9 100644
--- a/plugins/UserCountry/flags/eh.png
+++ b/plugins/UserCountry/images/flags/eh.png
diff --git a/plugins/UserCountry/flags/er.png b/plugins/UserCountry/images/flags/er.png
index 2dfe8106b5..2dfe8106b5 100644
--- a/plugins/UserCountry/flags/er.png
+++ b/plugins/UserCountry/images/flags/er.png
diff --git a/plugins/UserCountry/flags/es.png b/plugins/UserCountry/images/flags/es.png
index cfd22a445c..cfd22a445c 100644
--- a/plugins/UserCountry/flags/es.png
+++ b/plugins/UserCountry/images/flags/es.png
diff --git a/plugins/UserCountry/flags/et.png b/plugins/UserCountry/images/flags/et.png
index 11f79b002a..11f79b002a 100644
--- a/plugins/UserCountry/flags/et.png
+++ b/plugins/UserCountry/images/flags/et.png
diff --git a/plugins/UserCountry/flags/eu.png b/plugins/UserCountry/images/flags/eu.png
index 8f5a3eb31c..8f5a3eb31c 100644
--- a/plugins/UserCountry/flags/eu.png
+++ b/plugins/UserCountry/images/flags/eu.png
diff --git a/plugins/UserCountry/flags/fi.png b/plugins/UserCountry/images/flags/fi.png
index f3b1058cd4..f3b1058cd4 100644
--- a/plugins/UserCountry/flags/fi.png
+++ b/plugins/UserCountry/images/flags/fi.png
diff --git a/plugins/UserCountry/flags/fj.png b/plugins/UserCountry/images/flags/fj.png
index 903f680324..903f680324 100644
--- a/plugins/UserCountry/flags/fj.png
+++ b/plugins/UserCountry/images/flags/fj.png
diff --git a/plugins/UserCountry/flags/fk.png b/plugins/UserCountry/images/flags/fk.png
index 5adec9e3e2..5adec9e3e2 100644
--- a/plugins/UserCountry/flags/fk.png
+++ b/plugins/UserCountry/images/flags/fk.png
diff --git a/plugins/UserCountry/flags/fm.png b/plugins/UserCountry/images/flags/fm.png
index 2e2a7a96f0..2e2a7a96f0 100644
--- a/plugins/UserCountry/flags/fm.png
+++ b/plugins/UserCountry/images/flags/fm.png
diff --git a/plugins/UserCountry/flags/fo.png b/plugins/UserCountry/images/flags/fo.png
index 39d2040bc6..39d2040bc6 100644
--- a/plugins/UserCountry/flags/fo.png
+++ b/plugins/UserCountry/images/flags/fo.png
diff --git a/plugins/UserCountry/flags/fr.png b/plugins/UserCountry/images/flags/fr.png
index 744ede391d..744ede391d 100644
--- a/plugins/UserCountry/flags/fr.png
+++ b/plugins/UserCountry/images/flags/fr.png
diff --git a/plugins/UserCountry/flags/fx.png b/plugins/UserCountry/images/flags/fx.png
index 744ede391d..744ede391d 100644
--- a/plugins/UserCountry/flags/fx.png
+++ b/plugins/UserCountry/images/flags/fx.png
diff --git a/plugins/UserCountry/flags/ga.png b/plugins/UserCountry/images/flags/ga.png
index b6ca79e3bc..b6ca79e3bc 100644
--- a/plugins/UserCountry/flags/ga.png
+++ b/plugins/UserCountry/images/flags/ga.png
diff --git a/plugins/UserCountry/flags/gb.png b/plugins/UserCountry/images/flags/gb.png
index 405e897c52..405e897c52 100644
--- a/plugins/UserCountry/flags/gb.png
+++ b/plugins/UserCountry/images/flags/gb.png
diff --git a/plugins/UserCountry/flags/gd.png b/plugins/UserCountry/images/flags/gd.png
index 9b077bb889..9b077bb889 100644
--- a/plugins/UserCountry/flags/gd.png
+++ b/plugins/UserCountry/images/flags/gd.png
diff --git a/plugins/UserCountry/flags/ge.png b/plugins/UserCountry/images/flags/ge.png
index a700789b0b..a700789b0b 100644
--- a/plugins/UserCountry/flags/ge.png
+++ b/plugins/UserCountry/images/flags/ge.png
diff --git a/plugins/UserCountry/flags/gf.png b/plugins/UserCountry/images/flags/gf.png
index 744ede391d..744ede391d 100644
--- a/plugins/UserCountry/flags/gf.png
+++ b/plugins/UserCountry/images/flags/gf.png
diff --git a/plugins/UserCountry/flags/gg.png b/plugins/UserCountry/images/flags/gg.png
index 479141192e..479141192e 100644
--- a/plugins/UserCountry/flags/gg.png
+++ b/plugins/UserCountry/images/flags/gg.png
diff --git a/plugins/UserCountry/flags/gh.png b/plugins/UserCountry/images/flags/gh.png
index 952b1620aa..952b1620aa 100644
--- a/plugins/UserCountry/flags/gh.png
+++ b/plugins/UserCountry/images/flags/gh.png
diff --git a/plugins/UserCountry/flags/gi.png b/plugins/UserCountry/images/flags/gi.png
index f366599da8..f366599da8 100644
--- a/plugins/UserCountry/flags/gi.png
+++ b/plugins/UserCountry/images/flags/gi.png
diff --git a/plugins/UserCountry/flags/gl.png b/plugins/UserCountry/images/flags/gl.png
index f22289be9d..f22289be9d 100644
--- a/plugins/UserCountry/flags/gl.png
+++ b/plugins/UserCountry/images/flags/gl.png
diff --git a/plugins/UserCountry/flags/gm.png b/plugins/UserCountry/images/flags/gm.png
index feed27f5c5..feed27f5c5 100644
--- a/plugins/UserCountry/flags/gm.png
+++ b/plugins/UserCountry/images/flags/gm.png
diff --git a/plugins/UserCountry/flags/gn.png b/plugins/UserCountry/images/flags/gn.png
index 3efeaa534a..3efeaa534a 100644
--- a/plugins/UserCountry/flags/gn.png
+++ b/plugins/UserCountry/images/flags/gn.png
diff --git a/plugins/UserCountry/flags/gp.png b/plugins/UserCountry/images/flags/gp.png
index 160dae80c0..160dae80c0 100644
--- a/plugins/UserCountry/flags/gp.png
+++ b/plugins/UserCountry/images/flags/gp.png
diff --git a/plugins/UserCountry/flags/gq.png b/plugins/UserCountry/images/flags/gq.png
index cad564ceb4..cad564ceb4 100644
--- a/plugins/UserCountry/flags/gq.png
+++ b/plugins/UserCountry/images/flags/gq.png
diff --git a/plugins/UserCountry/flags/gr.png b/plugins/UserCountry/images/flags/gr.png
index dde5b025b7..dde5b025b7 100644
--- a/plugins/UserCountry/flags/gr.png
+++ b/plugins/UserCountry/images/flags/gr.png
diff --git a/plugins/UserCountry/flags/gs.png b/plugins/UserCountry/images/flags/gs.png
index e37521f63b..e37521f63b 100644
--- a/plugins/UserCountry/flags/gs.png
+++ b/plugins/UserCountry/images/flags/gs.png
diff --git a/plugins/UserCountry/flags/gt.png b/plugins/UserCountry/images/flags/gt.png
index 75e76cddb9..75e76cddb9 100644
--- a/plugins/UserCountry/flags/gt.png
+++ b/plugins/UserCountry/images/flags/gt.png
diff --git a/plugins/UserCountry/flags/gu.png b/plugins/UserCountry/images/flags/gu.png
index 4f034bcb29..4f034bcb29 100644
--- a/plugins/UserCountry/flags/gu.png
+++ b/plugins/UserCountry/images/flags/gu.png
diff --git a/plugins/UserCountry/flags/gw.png b/plugins/UserCountry/images/flags/gw.png
index 2ad970b20b..2ad970b20b 100644
--- a/plugins/UserCountry/flags/gw.png
+++ b/plugins/UserCountry/images/flags/gw.png
diff --git a/plugins/UserCountry/flags/gy.png b/plugins/UserCountry/images/flags/gy.png
index 889b5d786e..889b5d786e 100644
--- a/plugins/UserCountry/flags/gy.png
+++ b/plugins/UserCountry/images/flags/gy.png
diff --git a/plugins/UserCountry/flags/hk.png b/plugins/UserCountry/images/flags/hk.png
index 5a3663a87c..5a3663a87c 100644
--- a/plugins/UserCountry/flags/hk.png
+++ b/plugins/UserCountry/images/flags/hk.png
diff --git a/plugins/UserCountry/flags/hm.png b/plugins/UserCountry/images/flags/hm.png
index 709eac00de..709eac00de 100644
--- a/plugins/UserCountry/flags/hm.png
+++ b/plugins/UserCountry/images/flags/hm.png
diff --git a/plugins/UserCountry/flags/hn.png b/plugins/UserCountry/images/flags/hn.png
index d29296df9c..d29296df9c 100644
--- a/plugins/UserCountry/flags/hn.png
+++ b/plugins/UserCountry/images/flags/hn.png
diff --git a/plugins/UserCountry/flags/hr.png b/plugins/UserCountry/images/flags/hr.png
index 20c66c3a60..20c66c3a60 100644
--- a/plugins/UserCountry/flags/hr.png
+++ b/plugins/UserCountry/images/flags/hr.png
diff --git a/plugins/UserCountry/flags/ht.png b/plugins/UserCountry/images/flags/ht.png
index 7aef235b83..7aef235b83 100644
--- a/plugins/UserCountry/flags/ht.png
+++ b/plugins/UserCountry/images/flags/ht.png
diff --git a/plugins/UserCountry/flags/hu.png b/plugins/UserCountry/images/flags/hu.png
index 2d01818314..2d01818314 100644
--- a/plugins/UserCountry/flags/hu.png
+++ b/plugins/UserCountry/images/flags/hu.png
diff --git a/plugins/UserCountry/flags/ic.png b/plugins/UserCountry/images/flags/ic.png
index 3e48fe66e3..3e48fe66e3 100644
--- a/plugins/UserCountry/flags/ic.png
+++ b/plugins/UserCountry/images/flags/ic.png
diff --git a/plugins/UserCountry/flags/id.png b/plugins/UserCountry/images/flags/id.png
index 2f67d57320..2f67d57320 100644
--- a/plugins/UserCountry/flags/id.png
+++ b/plugins/UserCountry/images/flags/id.png
diff --git a/plugins/UserCountry/flags/ie.png b/plugins/UserCountry/images/flags/ie.png
index 9a799f8640..9a799f8640 100644
--- a/plugins/UserCountry/flags/ie.png
+++ b/plugins/UserCountry/images/flags/ie.png
diff --git a/plugins/UserCountry/flags/il.png b/plugins/UserCountry/images/flags/il.png
index 6512bedf75..6512bedf75 100644
--- a/plugins/UserCountry/flags/il.png
+++ b/plugins/UserCountry/images/flags/il.png
diff --git a/plugins/UserCountry/flags/im.png b/plugins/UserCountry/images/flags/im.png
index 8df02545dc..8df02545dc 100644
--- a/plugins/UserCountry/flags/im.png
+++ b/plugins/UserCountry/images/flags/im.png
diff --git a/plugins/UserCountry/flags/in.png b/plugins/UserCountry/images/flags/in.png
index 351c6a51d9..351c6a51d9 100644
--- a/plugins/UserCountry/flags/in.png
+++ b/plugins/UserCountry/images/flags/in.png
diff --git a/plugins/UserCountry/flags/io.png b/plugins/UserCountry/images/flags/io.png
index d87ed5f932..d87ed5f932 100644
--- a/plugins/UserCountry/flags/io.png
+++ b/plugins/UserCountry/images/flags/io.png
diff --git a/plugins/UserCountry/flags/iq.png b/plugins/UserCountry/images/flags/iq.png
index 4eb6b878bd..4eb6b878bd 100644
--- a/plugins/UserCountry/flags/iq.png
+++ b/plugins/UserCountry/images/flags/iq.png
diff --git a/plugins/UserCountry/flags/ir.png b/plugins/UserCountry/images/flags/ir.png
index f60fb8ac2b..f60fb8ac2b 100644
--- a/plugins/UserCountry/flags/ir.png
+++ b/plugins/UserCountry/images/flags/ir.png
diff --git a/plugins/UserCountry/flags/is.png b/plugins/UserCountry/images/flags/is.png
index a4f546273d..a4f546273d 100644
--- a/plugins/UserCountry/flags/is.png
+++ b/plugins/UserCountry/images/flags/is.png
diff --git a/plugins/UserCountry/flags/it.png b/plugins/UserCountry/images/flags/it.png
index 534fd5e657..534fd5e657 100644
--- a/plugins/UserCountry/flags/it.png
+++ b/plugins/UserCountry/images/flags/it.png
diff --git a/plugins/UserCountry/flags/je.png b/plugins/UserCountry/images/flags/je.png
index 76758f4cd3..76758f4cd3 100644
--- a/plugins/UserCountry/flags/je.png
+++ b/plugins/UserCountry/images/flags/je.png
diff --git a/plugins/UserCountry/flags/jm.png b/plugins/UserCountry/images/flags/jm.png
index f4012fa0dc..f4012fa0dc 100644
--- a/plugins/UserCountry/flags/jm.png
+++ b/plugins/UserCountry/images/flags/jm.png
diff --git a/plugins/UserCountry/flags/jo.png b/plugins/UserCountry/images/flags/jo.png
index f7beba7ead..f7beba7ead 100644
--- a/plugins/UserCountry/flags/jo.png
+++ b/plugins/UserCountry/images/flags/jo.png
diff --git a/plugins/UserCountry/flags/jp.png b/plugins/UserCountry/images/flags/jp.png
index 0dc03c944b..0dc03c944b 100644
--- a/plugins/UserCountry/flags/jp.png
+++ b/plugins/UserCountry/images/flags/jp.png
diff --git a/plugins/UserCountry/flags/ke.png b/plugins/UserCountry/images/flags/ke.png
index 5842ce3c42..5842ce3c42 100644
--- a/plugins/UserCountry/flags/ke.png
+++ b/plugins/UserCountry/images/flags/ke.png
diff --git a/plugins/UserCountry/flags/kg.png b/plugins/UserCountry/images/flags/kg.png
index 766bc89816..766bc89816 100644
--- a/plugins/UserCountry/flags/kg.png
+++ b/plugins/UserCountry/images/flags/kg.png
diff --git a/plugins/UserCountry/flags/kh.png b/plugins/UserCountry/images/flags/kh.png
index c2d9aea1ce..c2d9aea1ce 100644
--- a/plugins/UserCountry/flags/kh.png
+++ b/plugins/UserCountry/images/flags/kh.png
diff --git a/plugins/UserCountry/flags/ki.png b/plugins/UserCountry/images/flags/ki.png
index 89bc45b7bd..89bc45b7bd 100644
--- a/plugins/UserCountry/flags/ki.png
+++ b/plugins/UserCountry/images/flags/ki.png
diff --git a/plugins/UserCountry/flags/km.png b/plugins/UserCountry/images/flags/km.png
index adfe5fb1c3..adfe5fb1c3 100644
--- a/plugins/UserCountry/flags/km.png
+++ b/plugins/UserCountry/images/flags/km.png
diff --git a/plugins/UserCountry/flags/kn.png b/plugins/UserCountry/images/flags/kn.png
index 4460ff6053..4460ff6053 100644
--- a/plugins/UserCountry/flags/kn.png
+++ b/plugins/UserCountry/images/flags/kn.png
diff --git a/plugins/UserCountry/flags/kp.png b/plugins/UserCountry/images/flags/kp.png
index 134a9f1adf..134a9f1adf 100644
--- a/plugins/UserCountry/flags/kp.png
+++ b/plugins/UserCountry/images/flags/kp.png
diff --git a/plugins/UserCountry/flags/kr.png b/plugins/UserCountry/images/flags/kr.png
index 09ad2c39b5..09ad2c39b5 100644
--- a/plugins/UserCountry/flags/kr.png
+++ b/plugins/UserCountry/images/flags/kr.png
diff --git a/plugins/UserCountry/flags/kw.png b/plugins/UserCountry/images/flags/kw.png
index 2742d890f3..2742d890f3 100644
--- a/plugins/UserCountry/flags/kw.png
+++ b/plugins/UserCountry/images/flags/kw.png
diff --git a/plugins/UserCountry/flags/ky.png b/plugins/UserCountry/images/flags/ky.png
index 3f0de844a1..3f0de844a1 100644
--- a/plugins/UserCountry/flags/ky.png
+++ b/plugins/UserCountry/images/flags/ky.png
diff --git a/plugins/UserCountry/flags/kz.png b/plugins/UserCountry/images/flags/kz.png
index 37a7ddf08e..37a7ddf08e 100644
--- a/plugins/UserCountry/flags/kz.png
+++ b/plugins/UserCountry/images/flags/kz.png
diff --git a/plugins/UserCountry/flags/la.png b/plugins/UserCountry/images/flags/la.png
index 7d5b624359..7d5b624359 100644
--- a/plugins/UserCountry/flags/la.png
+++ b/plugins/UserCountry/images/flags/la.png
diff --git a/plugins/UserCountry/flags/lb.png b/plugins/UserCountry/images/flags/lb.png
index 8affe4a819..8affe4a819 100644
--- a/plugins/UserCountry/flags/lb.png
+++ b/plugins/UserCountry/images/flags/lb.png
diff --git a/plugins/UserCountry/flags/lc.png b/plugins/UserCountry/images/flags/lc.png
index 2c9870761b..2c9870761b 100644
--- a/plugins/UserCountry/flags/lc.png
+++ b/plugins/UserCountry/images/flags/lc.png
diff --git a/plugins/UserCountry/flags/li.png b/plugins/UserCountry/images/flags/li.png
index 0d7ad9717c..0d7ad9717c 100644
--- a/plugins/UserCountry/flags/li.png
+++ b/plugins/UserCountry/images/flags/li.png
diff --git a/plugins/UserCountry/flags/lk.png b/plugins/UserCountry/images/flags/lk.png
index 0d14120392..0d14120392 100644
--- a/plugins/UserCountry/flags/lk.png
+++ b/plugins/UserCountry/images/flags/lk.png
diff --git a/plugins/UserCountry/flags/lr.png b/plugins/UserCountry/images/flags/lr.png
index 2376d28817..2376d28817 100644
--- a/plugins/UserCountry/flags/lr.png
+++ b/plugins/UserCountry/images/flags/lr.png
diff --git a/plugins/UserCountry/flags/ls.png b/plugins/UserCountry/images/flags/ls.png
index e4f46519bb..e4f46519bb 100644
--- a/plugins/UserCountry/flags/ls.png
+++ b/plugins/UserCountry/images/flags/ls.png
diff --git a/plugins/UserCountry/flags/lt.png b/plugins/UserCountry/images/flags/lt.png
index ace453f7f2..ace453f7f2 100644
--- a/plugins/UserCountry/flags/lt.png
+++ b/plugins/UserCountry/images/flags/lt.png
diff --git a/plugins/UserCountry/flags/lu.png b/plugins/UserCountry/images/flags/lu.png
index 4a9e3d5d9a..4a9e3d5d9a 100644
--- a/plugins/UserCountry/flags/lu.png
+++ b/plugins/UserCountry/images/flags/lu.png
diff --git a/plugins/UserCountry/flags/lv.png b/plugins/UserCountry/images/flags/lv.png
index d9236f966b..d9236f966b 100644
--- a/plugins/UserCountry/flags/lv.png
+++ b/plugins/UserCountry/images/flags/lv.png
diff --git a/plugins/UserCountry/flags/ly.png b/plugins/UserCountry/images/flags/ly.png
index afaae07d48..afaae07d48 100644
--- a/plugins/UserCountry/flags/ly.png
+++ b/plugins/UserCountry/images/flags/ly.png
diff --git a/plugins/UserCountry/flags/ma.png b/plugins/UserCountry/images/flags/ma.png
index 44f2961c1b..44f2961c1b 100644
--- a/plugins/UserCountry/flags/ma.png
+++ b/plugins/UserCountry/images/flags/ma.png
diff --git a/plugins/UserCountry/flags/mc.png b/plugins/UserCountry/images/flags/mc.png
index ecc5edb750..ecc5edb750 100644
--- a/plugins/UserCountry/flags/mc.png
+++ b/plugins/UserCountry/images/flags/mc.png
diff --git a/plugins/UserCountry/flags/md.png b/plugins/UserCountry/images/flags/md.png
index 80b6bf63af..80b6bf63af 100644
--- a/plugins/UserCountry/flags/md.png
+++ b/plugins/UserCountry/images/flags/md.png
diff --git a/plugins/UserCountry/flags/me.png b/plugins/UserCountry/images/flags/me.png
index 0a3ee99b21..0a3ee99b21 100644
--- a/plugins/UserCountry/flags/me.png
+++ b/plugins/UserCountry/images/flags/me.png
diff --git a/plugins/UserCountry/flags/mf.png b/plugins/UserCountry/images/flags/mf.png
index 744ede391d..744ede391d 100644
--- a/plugins/UserCountry/flags/mf.png
+++ b/plugins/UserCountry/images/flags/mf.png
diff --git a/plugins/UserCountry/flags/mg.png b/plugins/UserCountry/images/flags/mg.png
index b8740f880c..b8740f880c 100644
--- a/plugins/UserCountry/flags/mg.png
+++ b/plugins/UserCountry/images/flags/mg.png
diff --git a/plugins/UserCountry/flags/mh.png b/plugins/UserCountry/images/flags/mh.png
index 9cf98c1546..9cf98c1546 100644
--- a/plugins/UserCountry/flags/mh.png
+++ b/plugins/UserCountry/images/flags/mh.png
diff --git a/plugins/UserCountry/flags/mk.png b/plugins/UserCountry/images/flags/mk.png
index ee987490be..ee987490be 100644
--- a/plugins/UserCountry/flags/mk.png
+++ b/plugins/UserCountry/images/flags/mk.png
diff --git a/plugins/UserCountry/flags/ml.png b/plugins/UserCountry/images/flags/ml.png
index a28459d13f..a28459d13f 100644
--- a/plugins/UserCountry/flags/ml.png
+++ b/plugins/UserCountry/images/flags/ml.png
diff --git a/plugins/UserCountry/flags/mm.png b/plugins/UserCountry/images/flags/mm.png
index d931b1dbe4..d931b1dbe4 100644
--- a/plugins/UserCountry/flags/mm.png
+++ b/plugins/UserCountry/images/flags/mm.png
diff --git a/plugins/UserCountry/flags/mn.png b/plugins/UserCountry/images/flags/mn.png
index cc6c412171..cc6c412171 100644
--- a/plugins/UserCountry/flags/mn.png
+++ b/plugins/UserCountry/images/flags/mn.png
diff --git a/plugins/UserCountry/flags/mo.png b/plugins/UserCountry/images/flags/mo.png
index fc49f581ee..fc49f581ee 100644
--- a/plugins/UserCountry/flags/mo.png
+++ b/plugins/UserCountry/images/flags/mo.png
diff --git a/plugins/UserCountry/flags/mp.png b/plugins/UserCountry/images/flags/mp.png
index df0c4b8c18..df0c4b8c18 100644
--- a/plugins/UserCountry/flags/mp.png
+++ b/plugins/UserCountry/images/flags/mp.png
diff --git a/plugins/UserCountry/flags/mq.png b/plugins/UserCountry/images/flags/mq.png
index 6ebdb3ab6c..6ebdb3ab6c 100644
--- a/plugins/UserCountry/flags/mq.png
+++ b/plugins/UserCountry/images/flags/mq.png
diff --git a/plugins/UserCountry/flags/mr.png b/plugins/UserCountry/images/flags/mr.png
index 6700d1ce92..6700d1ce92 100644
--- a/plugins/UserCountry/flags/mr.png
+++ b/plugins/UserCountry/images/flags/mr.png
diff --git a/plugins/UserCountry/flags/ms.png b/plugins/UserCountry/images/flags/ms.png
index aef23fc512..aef23fc512 100644
--- a/plugins/UserCountry/flags/ms.png
+++ b/plugins/UserCountry/images/flags/ms.png
diff --git a/plugins/UserCountry/flags/mt.png b/plugins/UserCountry/images/flags/mt.png
index 837261ebc2..837261ebc2 100644
--- a/plugins/UserCountry/flags/mt.png
+++ b/plugins/UserCountry/images/flags/mt.png
diff --git a/plugins/UserCountry/flags/mu.png b/plugins/UserCountry/images/flags/mu.png
index c1e8b909d3..c1e8b909d3 100644
--- a/plugins/UserCountry/flags/mu.png
+++ b/plugins/UserCountry/images/flags/mu.png
diff --git a/plugins/UserCountry/flags/mv.png b/plugins/UserCountry/images/flags/mv.png
index f03f90ac65..f03f90ac65 100644
--- a/plugins/UserCountry/flags/mv.png
+++ b/plugins/UserCountry/images/flags/mv.png
diff --git a/plugins/UserCountry/flags/mw.png b/plugins/UserCountry/images/flags/mw.png
index 45ea61d87f..45ea61d87f 100644
--- a/plugins/UserCountry/flags/mw.png
+++ b/plugins/UserCountry/images/flags/mw.png
diff --git a/plugins/UserCountry/flags/mx.png b/plugins/UserCountry/images/flags/mx.png
index c78ac89691..c78ac89691 100644
--- a/plugins/UserCountry/flags/mx.png
+++ b/plugins/UserCountry/images/flags/mx.png
diff --git a/plugins/UserCountry/flags/my.png b/plugins/UserCountry/images/flags/my.png
index d47867be7a..d47867be7a 100644
--- a/plugins/UserCountry/flags/my.png
+++ b/plugins/UserCountry/images/flags/my.png
diff --git a/plugins/UserCountry/flags/mz.png b/plugins/UserCountry/images/flags/mz.png
index 464017e923..464017e923 100644
--- a/plugins/UserCountry/flags/mz.png
+++ b/plugins/UserCountry/images/flags/mz.png
diff --git a/plugins/UserCountry/flags/na.png b/plugins/UserCountry/images/flags/na.png
index d685c4973d..d685c4973d 100644
--- a/plugins/UserCountry/flags/na.png
+++ b/plugins/UserCountry/images/flags/na.png
diff --git a/plugins/UserCountry/flags/nc.png b/plugins/UserCountry/images/flags/nc.png
index 88f4ea8559..88f4ea8559 100644
--- a/plugins/UserCountry/flags/nc.png
+++ b/plugins/UserCountry/images/flags/nc.png
diff --git a/plugins/UserCountry/flags/ne.png b/plugins/UserCountry/images/flags/ne.png
index b5f3b8f06d..b5f3b8f06d 100644
--- a/plugins/UserCountry/flags/ne.png
+++ b/plugins/UserCountry/images/flags/ne.png
diff --git a/plugins/UserCountry/flags/nf.png b/plugins/UserCountry/images/flags/nf.png
index b00b331fe3..b00b331fe3 100644
--- a/plugins/UserCountry/flags/nf.png
+++ b/plugins/UserCountry/images/flags/nf.png
diff --git a/plugins/UserCountry/flags/ng.png b/plugins/UserCountry/images/flags/ng.png
index 6dcc973ed5..6dcc973ed5 100644
--- a/plugins/UserCountry/flags/ng.png
+++ b/plugins/UserCountry/images/flags/ng.png
diff --git a/plugins/UserCountry/flags/ni.png b/plugins/UserCountry/images/flags/ni.png
index 44d8a0d3bd..44d8a0d3bd 100644
--- a/plugins/UserCountry/flags/ni.png
+++ b/plugins/UserCountry/images/flags/ni.png
diff --git a/plugins/UserCountry/flags/nl.png b/plugins/UserCountry/images/flags/nl.png
index 77f75f6ffa..77f75f6ffa 100644
--- a/plugins/UserCountry/flags/nl.png
+++ b/plugins/UserCountry/images/flags/nl.png
diff --git a/plugins/UserCountry/flags/no.png b/plugins/UserCountry/images/flags/no.png
index 74264c5866..74264c5866 100644
--- a/plugins/UserCountry/flags/no.png
+++ b/plugins/UserCountry/images/flags/no.png
diff --git a/plugins/UserCountry/flags/np.png b/plugins/UserCountry/images/flags/np.png
index 5b8e388fda..5b8e388fda 100644
--- a/plugins/UserCountry/flags/np.png
+++ b/plugins/UserCountry/images/flags/np.png
diff --git a/plugins/UserCountry/flags/nr.png b/plugins/UserCountry/images/flags/nr.png
index 211e42bb19..211e42bb19 100644
--- a/plugins/UserCountry/flags/nr.png
+++ b/plugins/UserCountry/images/flags/nr.png
diff --git a/plugins/UserCountry/flags/nt.png b/plugins/UserCountry/images/flags/nt.png
index b253914525..b253914525 100644
--- a/plugins/UserCountry/flags/nt.png
+++ b/plugins/UserCountry/images/flags/nt.png
diff --git a/plugins/UserCountry/flags/nu.png b/plugins/UserCountry/images/flags/nu.png
index b9f7f988f4..b9f7f988f4 100644
--- a/plugins/UserCountry/flags/nu.png
+++ b/plugins/UserCountry/images/flags/nu.png
diff --git a/plugins/UserCountry/flags/nz.png b/plugins/UserCountry/images/flags/nz.png
index be935de872..be935de872 100644
--- a/plugins/UserCountry/flags/nz.png
+++ b/plugins/UserCountry/images/flags/nz.png
diff --git a/plugins/UserCountry/flags/o1.png b/plugins/UserCountry/images/flags/o1.png
index da6e1bbe89..da6e1bbe89 100644
--- a/plugins/UserCountry/flags/o1.png
+++ b/plugins/UserCountry/images/flags/o1.png
diff --git a/plugins/UserCountry/flags/om.png b/plugins/UserCountry/images/flags/om.png
index ec95c5aeb9..ec95c5aeb9 100644
--- a/plugins/UserCountry/flags/om.png
+++ b/plugins/UserCountry/images/flags/om.png
diff --git a/plugins/UserCountry/flags/pa.png b/plugins/UserCountry/images/flags/pa.png
index a8a6ea5083..a8a6ea5083 100644
--- a/plugins/UserCountry/flags/pa.png
+++ b/plugins/UserCountry/images/flags/pa.png
diff --git a/plugins/UserCountry/flags/pe.png b/plugins/UserCountry/images/flags/pe.png
index 1cf08251f1..1cf08251f1 100644
--- a/plugins/UserCountry/flags/pe.png
+++ b/plugins/UserCountry/images/flags/pe.png
diff --git a/plugins/UserCountry/flags/pf.png b/plugins/UserCountry/images/flags/pf.png
index 7e471d6438..7e471d6438 100644
--- a/plugins/UserCountry/flags/pf.png
+++ b/plugins/UserCountry/images/flags/pf.png
diff --git a/plugins/UserCountry/flags/pg.png b/plugins/UserCountry/images/flags/pg.png
index 87160a51ee..87160a51ee 100644
--- a/plugins/UserCountry/flags/pg.png
+++ b/plugins/UserCountry/images/flags/pg.png
diff --git a/plugins/UserCountry/flags/ph.png b/plugins/UserCountry/images/flags/ph.png
index 703dd735a5..703dd735a5 100644
--- a/plugins/UserCountry/flags/ph.png
+++ b/plugins/UserCountry/images/flags/ph.png
diff --git a/plugins/UserCountry/flags/pk.png b/plugins/UserCountry/images/flags/pk.png
index f20f3f6e2e..f20f3f6e2e 100644
--- a/plugins/UserCountry/flags/pk.png
+++ b/plugins/UserCountry/images/flags/pk.png
diff --git a/plugins/UserCountry/flags/pl.png b/plugins/UserCountry/images/flags/pl.png
index f6997a2ca6..f6997a2ca6 100644
--- a/plugins/UserCountry/flags/pl.png
+++ b/plugins/UserCountry/images/flags/pl.png
diff --git a/plugins/UserCountry/flags/pm.png b/plugins/UserCountry/images/flags/pm.png
index 4aa799ba7b..4aa799ba7b 100644
--- a/plugins/UserCountry/flags/pm.png
+++ b/plugins/UserCountry/images/flags/pm.png
diff --git a/plugins/UserCountry/flags/pn.png b/plugins/UserCountry/images/flags/pn.png
index 6f62a64d65..6f62a64d65 100644
--- a/plugins/UserCountry/flags/pn.png
+++ b/plugins/UserCountry/images/flags/pn.png
diff --git a/plugins/UserCountry/flags/pr.png b/plugins/UserCountry/images/flags/pr.png
index 4bf609fec4..4bf609fec4 100644
--- a/plugins/UserCountry/flags/pr.png
+++ b/plugins/UserCountry/images/flags/pr.png
diff --git a/plugins/UserCountry/flags/ps.png b/plugins/UserCountry/images/flags/ps.png
index dd1d7821ec..dd1d7821ec 100644
--- a/plugins/UserCountry/flags/ps.png
+++ b/plugins/UserCountry/images/flags/ps.png
diff --git a/plugins/UserCountry/flags/pt.png b/plugins/UserCountry/images/flags/pt.png
index 67e4878e88..67e4878e88 100644
--- a/plugins/UserCountry/flags/pt.png
+++ b/plugins/UserCountry/images/flags/pt.png
diff --git a/plugins/UserCountry/flags/pw.png b/plugins/UserCountry/images/flags/pw.png
index 71fd0a48ca..71fd0a48ca 100644
--- a/plugins/UserCountry/flags/pw.png
+++ b/plugins/UserCountry/images/flags/pw.png
diff --git a/plugins/UserCountry/flags/py.png b/plugins/UserCountry/images/flags/py.png
index 182d9dc0a9..182d9dc0a9 100644
--- a/plugins/UserCountry/flags/py.png
+++ b/plugins/UserCountry/images/flags/py.png
diff --git a/plugins/UserCountry/flags/qa.png b/plugins/UserCountry/images/flags/qa.png
index 86c39fadaa..86c39fadaa 100644
--- a/plugins/UserCountry/flags/qa.png
+++ b/plugins/UserCountry/images/flags/qa.png
diff --git a/plugins/UserCountry/flags/re.png b/plugins/UserCountry/images/flags/re.png
index 744ede391d..744ede391d 100644
--- a/plugins/UserCountry/flags/re.png
+++ b/plugins/UserCountry/images/flags/re.png
diff --git a/plugins/UserCountry/flags/ro.png b/plugins/UserCountry/images/flags/ro.png
index 2535bc81f2..2535bc81f2 100644
--- a/plugins/UserCountry/flags/ro.png
+++ b/plugins/UserCountry/images/flags/ro.png
diff --git a/plugins/UserCountry/flags/rs.png b/plugins/UserCountry/images/flags/rs.png
index 32f6cb945b..32f6cb945b 100644
--- a/plugins/UserCountry/flags/rs.png
+++ b/plugins/UserCountry/images/flags/rs.png
diff --git a/plugins/UserCountry/flags/ru.png b/plugins/UserCountry/images/flags/ru.png
index 096b9c44e7..096b9c44e7 100644
--- a/plugins/UserCountry/flags/ru.png
+++ b/plugins/UserCountry/images/flags/ru.png
diff --git a/plugins/UserCountry/flags/rw.png b/plugins/UserCountry/images/flags/rw.png
index f4b0136eae..f4b0136eae 100644
--- a/plugins/UserCountry/flags/rw.png
+++ b/plugins/UserCountry/images/flags/rw.png
diff --git a/plugins/UserCountry/flags/sa.png b/plugins/UserCountry/images/flags/sa.png
index 03cecfb8c9..03cecfb8c9 100644
--- a/plugins/UserCountry/flags/sa.png
+++ b/plugins/UserCountry/images/flags/sa.png
diff --git a/plugins/UserCountry/flags/sb.png b/plugins/UserCountry/images/flags/sb.png
index 8af1fb9d2f..8af1fb9d2f 100644
--- a/plugins/UserCountry/flags/sb.png
+++ b/plugins/UserCountry/images/flags/sb.png
diff --git a/plugins/UserCountry/flags/sc.png b/plugins/UserCountry/images/flags/sc.png
index fec2961dbb..fec2961dbb 100644
--- a/plugins/UserCountry/flags/sc.png
+++ b/plugins/UserCountry/images/flags/sc.png
diff --git a/plugins/UserCountry/flags/sd.png b/plugins/UserCountry/images/flags/sd.png
index eba0a2079b..eba0a2079b 100644
--- a/plugins/UserCountry/flags/sd.png
+++ b/plugins/UserCountry/images/flags/sd.png
diff --git a/plugins/UserCountry/flags/se.png b/plugins/UserCountry/images/flags/se.png
index e2b347c78b..e2b347c78b 100644
--- a/plugins/UserCountry/flags/se.png
+++ b/plugins/UserCountry/images/flags/se.png
diff --git a/plugins/UserCountry/flags/sf.png b/plugins/UserCountry/images/flags/sf.png
index f3b1058cd4..f3b1058cd4 100644
--- a/plugins/UserCountry/flags/sf.png
+++ b/plugins/UserCountry/images/flags/sf.png
diff --git a/plugins/UserCountry/flags/sg.png b/plugins/UserCountry/images/flags/sg.png
index 84172cae18..84172cae18 100644
--- a/plugins/UserCountry/flags/sg.png
+++ b/plugins/UserCountry/images/flags/sg.png
diff --git a/plugins/UserCountry/flags/sh.png b/plugins/UserCountry/images/flags/sh.png
index 7e724d4781..7e724d4781 100644
--- a/plugins/UserCountry/flags/sh.png
+++ b/plugins/UserCountry/images/flags/sh.png
diff --git a/plugins/UserCountry/flags/si.png b/plugins/UserCountry/images/flags/si.png
index 266b9df29d..266b9df29d 100644
--- a/plugins/UserCountry/flags/si.png
+++ b/plugins/UserCountry/images/flags/si.png
diff --git a/plugins/UserCountry/flags/sj.png b/plugins/UserCountry/images/flags/sj.png
index 74264c5866..74264c5866 100644
--- a/plugins/UserCountry/flags/sj.png
+++ b/plugins/UserCountry/images/flags/sj.png
diff --git a/plugins/UserCountry/flags/sk.png b/plugins/UserCountry/images/flags/sk.png
index 53d286a6e1..53d286a6e1 100644
--- a/plugins/UserCountry/flags/sk.png
+++ b/plugins/UserCountry/images/flags/sk.png
diff --git a/plugins/UserCountry/flags/sl.png b/plugins/UserCountry/images/flags/sl.png
index c59445bc58..c59445bc58 100644
--- a/plugins/UserCountry/flags/sl.png
+++ b/plugins/UserCountry/images/flags/sl.png
diff --git a/plugins/UserCountry/flags/sm.png b/plugins/UserCountry/images/flags/sm.png
index 65ceb3aa49..65ceb3aa49 100644
--- a/plugins/UserCountry/flags/sm.png
+++ b/plugins/UserCountry/images/flags/sm.png
diff --git a/plugins/UserCountry/flags/sn.png b/plugins/UserCountry/images/flags/sn.png
index 89961cb89b..89961cb89b 100644
--- a/plugins/UserCountry/flags/sn.png
+++ b/plugins/UserCountry/images/flags/sn.png
diff --git a/plugins/UserCountry/flags/so.png b/plugins/UserCountry/images/flags/so.png
index 00750dae44..00750dae44 100644
--- a/plugins/UserCountry/flags/so.png
+++ b/plugins/UserCountry/images/flags/so.png
diff --git a/plugins/UserCountry/flags/sr.png b/plugins/UserCountry/images/flags/sr.png
index 764f544694..764f544694 100644
--- a/plugins/UserCountry/flags/sr.png
+++ b/plugins/UserCountry/images/flags/sr.png
diff --git a/plugins/UserCountry/flags/ss.png b/plugins/UserCountry/images/flags/ss.png
index 84a52ca247..84a52ca247 100644
--- a/plugins/UserCountry/flags/ss.png
+++ b/plugins/UserCountry/images/flags/ss.png
diff --git a/plugins/UserCountry/flags/st.png b/plugins/UserCountry/images/flags/st.png
index dd62dce7ff..dd62dce7ff 100644
--- a/plugins/UserCountry/flags/st.png
+++ b/plugins/UserCountry/images/flags/st.png
diff --git a/plugins/UserCountry/flags/su.png b/plugins/UserCountry/images/flags/su.png
index 3e1d87c962..3e1d87c962 100644
--- a/plugins/UserCountry/flags/su.png
+++ b/plugins/UserCountry/images/flags/su.png
diff --git a/plugins/UserCountry/flags/sv.png b/plugins/UserCountry/images/flags/sv.png
index 03ce5ec83c..03ce5ec83c 100644
--- a/plugins/UserCountry/flags/sv.png
+++ b/plugins/UserCountry/images/flags/sv.png
diff --git a/plugins/UserCountry/flags/sx.png b/plugins/UserCountry/images/flags/sx.png
index 229d4014ba..229d4014ba 100644
--- a/plugins/UserCountry/flags/sx.png
+++ b/plugins/UserCountry/images/flags/sx.png
diff --git a/plugins/UserCountry/flags/sy.png b/plugins/UserCountry/images/flags/sy.png
index 83de9ef018..83de9ef018 100644
--- a/plugins/UserCountry/flags/sy.png
+++ b/plugins/UserCountry/images/flags/sy.png
diff --git a/plugins/UserCountry/flags/sz.png b/plugins/UserCountry/images/flags/sz.png
index 6e40120260..6e40120260 100644
--- a/plugins/UserCountry/flags/sz.png
+++ b/plugins/UserCountry/images/flags/sz.png
diff --git a/plugins/UserCountry/flags/ta.png b/plugins/UserCountry/images/flags/ta.png
index b0eaef6dc5..b0eaef6dc5 100644
--- a/plugins/UserCountry/flags/ta.png
+++ b/plugins/UserCountry/images/flags/ta.png
diff --git a/plugins/UserCountry/flags/tc.png b/plugins/UserCountry/images/flags/tc.png
index 0c96ec08c8..0c96ec08c8 100644
--- a/plugins/UserCountry/flags/tc.png
+++ b/plugins/UserCountry/images/flags/tc.png
diff --git a/plugins/UserCountry/flags/td.png b/plugins/UserCountry/images/flags/td.png
index 6e2da09705..6e2da09705 100644
--- a/plugins/UserCountry/flags/td.png
+++ b/plugins/UserCountry/images/flags/td.png
diff --git a/plugins/UserCountry/flags/tf.png b/plugins/UserCountry/images/flags/tf.png
index 3ed6bc60ad..3ed6bc60ad 100644
--- a/plugins/UserCountry/flags/tf.png
+++ b/plugins/UserCountry/images/flags/tf.png
diff --git a/plugins/UserCountry/flags/tg.png b/plugins/UserCountry/images/flags/tg.png
index 2ab18d070a..2ab18d070a 100644
--- a/plugins/UserCountry/flags/tg.png
+++ b/plugins/UserCountry/images/flags/tg.png
diff --git a/plugins/UserCountry/flags/th.png b/plugins/UserCountry/images/flags/th.png
index c1817ebc94..c1817ebc94 100644
--- a/plugins/UserCountry/flags/th.png
+++ b/plugins/UserCountry/images/flags/th.png
diff --git a/plugins/UserCountry/flags/ti.png b/plugins/UserCountry/images/flags/ti.png
index 0253120670..0253120670 100644
--- a/plugins/UserCountry/flags/ti.png
+++ b/plugins/UserCountry/images/flags/ti.png
diff --git a/plugins/UserCountry/flags/tj.png b/plugins/UserCountry/images/flags/tj.png
index e1ddbb0889..e1ddbb0889 100644
--- a/plugins/UserCountry/flags/tj.png
+++ b/plugins/UserCountry/images/flags/tj.png
diff --git a/plugins/UserCountry/flags/tk.png b/plugins/UserCountry/images/flags/tk.png
index 0440c43b42..0440c43b42 100644
--- a/plugins/UserCountry/flags/tk.png
+++ b/plugins/UserCountry/images/flags/tk.png
diff --git a/plugins/UserCountry/flags/tl.png b/plugins/UserCountry/images/flags/tl.png
index 0fa1b59794..0fa1b59794 100644
--- a/plugins/UserCountry/flags/tl.png
+++ b/plugins/UserCountry/images/flags/tl.png
diff --git a/plugins/UserCountry/flags/tm.png b/plugins/UserCountry/images/flags/tm.png
index cb1b24dd1e..cb1b24dd1e 100644
--- a/plugins/UserCountry/flags/tm.png
+++ b/plugins/UserCountry/images/flags/tm.png
diff --git a/plugins/UserCountry/flags/tn.png b/plugins/UserCountry/images/flags/tn.png
index 33d830d502..33d830d502 100644
--- a/plugins/UserCountry/flags/tn.png
+++ b/plugins/UserCountry/images/flags/tn.png
diff --git a/plugins/UserCountry/flags/to.png b/plugins/UserCountry/images/flags/to.png
index 8b0aa02145..8b0aa02145 100644
--- a/plugins/UserCountry/flags/to.png
+++ b/plugins/UserCountry/images/flags/to.png
diff --git a/plugins/UserCountry/flags/tp.png b/plugins/UserCountry/images/flags/tp.png
index 0fa1b59794..0fa1b59794 100644
--- a/plugins/UserCountry/flags/tp.png
+++ b/plugins/UserCountry/images/flags/tp.png
diff --git a/plugins/UserCountry/flags/tr.png b/plugins/UserCountry/images/flags/tr.png
index 3698f405fa..3698f405fa 100644
--- a/plugins/UserCountry/flags/tr.png
+++ b/plugins/UserCountry/images/flags/tr.png
diff --git a/plugins/UserCountry/flags/tt.png b/plugins/UserCountry/images/flags/tt.png
index 4f36edb09f..4f36edb09f 100644
--- a/plugins/UserCountry/flags/tt.png
+++ b/plugins/UserCountry/images/flags/tt.png
diff --git a/plugins/UserCountry/flags/tv.png b/plugins/UserCountry/images/flags/tv.png
index e1fcffcade..e1fcffcade 100644
--- a/plugins/UserCountry/flags/tv.png
+++ b/plugins/UserCountry/images/flags/tv.png
diff --git a/plugins/UserCountry/flags/tw.png b/plugins/UserCountry/images/flags/tw.png
index 39ac6e00cd..39ac6e00cd 100644
--- a/plugins/UserCountry/flags/tw.png
+++ b/plugins/UserCountry/images/flags/tw.png
diff --git a/plugins/UserCountry/flags/tz.png b/plugins/UserCountry/images/flags/tz.png
index e31644b158..e31644b158 100644
--- a/plugins/UserCountry/flags/tz.png
+++ b/plugins/UserCountry/images/flags/tz.png
diff --git a/plugins/UserCountry/flags/ua.png b/plugins/UserCountry/images/flags/ua.png
index ddda0b21ab..ddda0b21ab 100644
--- a/plugins/UserCountry/flags/ua.png
+++ b/plugins/UserCountry/images/flags/ua.png
diff --git a/plugins/UserCountry/flags/ug.png b/plugins/UserCountry/images/flags/ug.png
index 7a77615592..7a77615592 100644
--- a/plugins/UserCountry/flags/ug.png
+++ b/plugins/UserCountry/images/flags/ug.png
diff --git a/plugins/UserCountry/flags/uk.png b/plugins/UserCountry/images/flags/uk.png
index 405e897c52..405e897c52 100644
--- a/plugins/UserCountry/flags/uk.png
+++ b/plugins/UserCountry/images/flags/uk.png
diff --git a/plugins/UserCountry/flags/um.png b/plugins/UserCountry/images/flags/um.png
index 9ff9ecf851..9ff9ecf851 100644
--- a/plugins/UserCountry/flags/um.png
+++ b/plugins/UserCountry/images/flags/um.png
diff --git a/plugins/UserCountry/flags/us.png b/plugins/UserCountry/images/flags/us.png
index a60ef55968..a60ef55968 100644
--- a/plugins/UserCountry/flags/us.png
+++ b/plugins/UserCountry/images/flags/us.png
diff --git a/plugins/UserCountry/flags/uy.png b/plugins/UserCountry/images/flags/uy.png
index 7aff0bc68f..7aff0bc68f 100644
--- a/plugins/UserCountry/flags/uy.png
+++ b/plugins/UserCountry/images/flags/uy.png
diff --git a/plugins/UserCountry/flags/uz.png b/plugins/UserCountry/images/flags/uz.png
index c3ba2ddcf2..c3ba2ddcf2 100644
--- a/plugins/UserCountry/flags/uz.png
+++ b/plugins/UserCountry/images/flags/uz.png
diff --git a/plugins/UserCountry/flags/va.png b/plugins/UserCountry/images/flags/va.png
index c9be43d266..c9be43d266 100644
--- a/plugins/UserCountry/flags/va.png
+++ b/plugins/UserCountry/images/flags/va.png
diff --git a/plugins/UserCountry/flags/vc.png b/plugins/UserCountry/images/flags/vc.png
index a7935eee68..a7935eee68 100644
--- a/plugins/UserCountry/flags/vc.png
+++ b/plugins/UserCountry/images/flags/vc.png
diff --git a/plugins/UserCountry/flags/ve.png b/plugins/UserCountry/images/flags/ve.png
index 43eb422e11..43eb422e11 100644
--- a/plugins/UserCountry/flags/ve.png
+++ b/plugins/UserCountry/images/flags/ve.png
diff --git a/plugins/UserCountry/flags/vg.png b/plugins/UserCountry/images/flags/vg.png
index 63afb343ca..63afb343ca 100644
--- a/plugins/UserCountry/flags/vg.png
+++ b/plugins/UserCountry/images/flags/vg.png
diff --git a/plugins/UserCountry/flags/vi.png b/plugins/UserCountry/images/flags/vi.png
index dc0d214ae6..dc0d214ae6 100644
--- a/plugins/UserCountry/flags/vi.png
+++ b/plugins/UserCountry/images/flags/vi.png
diff --git a/plugins/UserCountry/flags/vn.png b/plugins/UserCountry/images/flags/vn.png
index a2cd8a151a..a2cd8a151a 100644
--- a/plugins/UserCountry/flags/vn.png
+++ b/plugins/UserCountry/images/flags/vn.png
diff --git a/plugins/UserCountry/flags/vu.png b/plugins/UserCountry/images/flags/vu.png
index e7972bc01d..e7972bc01d 100644
--- a/plugins/UserCountry/flags/vu.png
+++ b/plugins/UserCountry/images/flags/vu.png
diff --git a/plugins/UserCountry/flags/wf.png b/plugins/UserCountry/images/flags/wf.png
index d9d33e18b0..d9d33e18b0 100644
--- a/plugins/UserCountry/flags/wf.png
+++ b/plugins/UserCountry/images/flags/wf.png
diff --git a/plugins/UserCountry/flags/ws.png b/plugins/UserCountry/images/flags/ws.png
index 8b40fdd224..8b40fdd224 100644
--- a/plugins/UserCountry/flags/ws.png
+++ b/plugins/UserCountry/images/flags/ws.png
diff --git a/plugins/UserCountry/flags/xx.png b/plugins/UserCountry/images/flags/xx.png
index da6e1bbe89..da6e1bbe89 100644
--- a/plugins/UserCountry/flags/xx.png
+++ b/plugins/UserCountry/images/flags/xx.png
diff --git a/plugins/UserCountry/flags/ye.png b/plugins/UserCountry/images/flags/ye.png
index 6437e6f918..6437e6f918 100644
--- a/plugins/UserCountry/flags/ye.png
+++ b/plugins/UserCountry/images/flags/ye.png
diff --git a/plugins/UserCountry/flags/yt.png b/plugins/UserCountry/images/flags/yt.png
index ca9bacbbf7..ca9bacbbf7 100644
--- a/plugins/UserCountry/flags/yt.png
+++ b/plugins/UserCountry/images/flags/yt.png
diff --git a/plugins/UserCountry/flags/yu.png b/plugins/UserCountry/images/flags/yu.png
index 0e0fb6deba..0e0fb6deba 100644
--- a/plugins/UserCountry/flags/yu.png
+++ b/plugins/UserCountry/images/flags/yu.png
diff --git a/plugins/UserCountry/flags/za.png b/plugins/UserCountry/images/flags/za.png
index 5200bf9761..5200bf9761 100644
--- a/plugins/UserCountry/flags/za.png
+++ b/plugins/UserCountry/images/flags/za.png
diff --git a/plugins/UserCountry/flags/zm.png b/plugins/UserCountry/images/flags/zm.png
index 5145ab5547..5145ab5547 100644
--- a/plugins/UserCountry/flags/zm.png
+++ b/plugins/UserCountry/images/flags/zm.png
diff --git a/plugins/UserCountry/flags/zr.png b/plugins/UserCountry/images/flags/zr.png
index 0811ccce06..0811ccce06 100644
--- a/plugins/UserCountry/flags/zr.png
+++ b/plugins/UserCountry/images/flags/zr.png
diff --git a/plugins/UserCountry/flags/zw.png b/plugins/UserCountry/images/flags/zw.png
index 3d2d4b6591..3d2d4b6591 100644
--- a/plugins/UserCountry/flags/zw.png
+++ b/plugins/UserCountry/images/flags/zw.png
diff --git a/plugins/UserCountryMap/img/cities.png b/plugins/UserCountryMap/images/cities.png
index 81efe8e9f4..81efe8e9f4 100644
--- a/plugins/UserCountryMap/img/cities.png
+++ b/plugins/UserCountryMap/images/cities.png
diff --git a/plugins/UserCountryMap/img/realtimemap-loading.gif b/plugins/UserCountryMap/images/realtimemap-loading.gif
index 10867afa72..10867afa72 100644
--- a/plugins/UserCountryMap/img/realtimemap-loading.gif
+++ b/plugins/UserCountryMap/images/realtimemap-loading.gif
diff --git a/plugins/UserCountryMap/img/regions.png b/plugins/UserCountryMap/images/regions.png
index 0639a4509e..0639a4509e 100644
--- a/plugins/UserCountryMap/img/regions.png
+++ b/plugins/UserCountryMap/images/regions.png
diff --git a/plugins/UserCountryMap/img/zoom-out-disabled.png b/plugins/UserCountryMap/images/zoom-out-disabled.png
index 2b57757971..2b57757971 100644
--- a/plugins/UserCountryMap/img/zoom-out-disabled.png
+++ b/plugins/UserCountryMap/images/zoom-out-disabled.png
diff --git a/plugins/UserCountryMap/img/zoom-out.png b/plugins/UserCountryMap/images/zoom-out.png
index ec195a571d..ec195a571d 100644
--- a/plugins/UserCountryMap/img/zoom-out.png
+++ b/plugins/UserCountryMap/images/zoom-out.png
diff --git a/plugins/UserCountryMap/img/info.png b/plugins/UserCountryMap/img/info.png
deleted file mode 100644
index 23b8095c7f..0000000000
--- a/plugins/UserCountryMap/img/info.png
+++ /dev/null
diff --git a/plugins/UserCountryMap/img/world.png b/plugins/UserCountryMap/img/world.png
deleted file mode 100644
index 00b7b215fe..0000000000
--- a/plugins/UserCountryMap/img/world.png
+++ /dev/null
diff --git a/plugins/UserCountryMap/templates/realtime-map.twig b/plugins/UserCountryMap/templates/realtime-map.twig
index 3843c9fb90..17933eca58 100644
--- a/plugins/UserCountryMap/templates/realtime-map.twig
+++ b/plugins/UserCountryMap/templates/realtime-map.twig
@@ -8,13 +8,13 @@
             </span>
             <span class="no_data" style="display:none">{{ 'CoreHome_ThereIsNoDataForThisReport'|translate }}</span>
             <span class="loading_data">{{ 'General_LoadingData'|translate }}...</span>
-            <img src="{{ piwikUrl }}plugins/UserCountryMap/img/realtimemap-loading.gif" style="vertical-align:baseline;position:relative;left:-2px;">
+            <img src="{{ piwikUrl }}plugins/UserCountryMap/images/realtimemap-loading.gif" style="vertical-align:baseline;position:relative;left:-2px;">
         </div>
         <div class="realTimeMap_overlay realTimeMap_datetime"></div>
     </div>
     <div id="RealTimeMap_meta">
         <span class="loadingPiwik">
-            <img src="{{ piwikUrl }}plugins/Zeitgeist/theme/images/loading-blue.gif"> {{ 'General_LoadingData'|translate }}...
+            <img src="{{ piwikUrl }}plugins/Zeitgeist/images/loading-blue.gif"> {{ 'General_LoadingData'|translate }}...
         </span>
     </div>
 
diff --git a/plugins/UserCountryMap/templates/visitor-map.twig b/plugins/UserCountryMap/templates/visitor-map.twig
index 08ade75dfb..0a95b574bd 100644
--- a/plugins/UserCountryMap/templates/visitor-map.twig
+++ b/plugins/UserCountryMap/templates/visitor-map.twig
@@ -22,7 +22,7 @@
             <div class="pk-emptyDataTable">{{ 'CoreHome_ThereIsNoDataForThisReport'|translate }}</div>
         {% else %}
             <span class="loadingPiwik">
-                <img src="{{ piwikUrl }}plugins/Zeitgeist/theme/images/loading-blue.gif" />
+                <img src="{{ piwikUrl }}plugins/Zeitgeist/images/loading-blue.gif" />
                 {{ 'General_LoadingData'|translate }}...
             </span>
         {% endif %}
@@ -30,12 +30,12 @@
     <div class="dataTableFeatures" style="padding-top:0px;">
         <div class="dataTableFooterIcons">
             <div class="dataTableFooterWrap" var="graphVerticalBar">
-                <img class="UserCountryMap-activeItem dataTableFooterActiveItem" src="{{ piwikUrl }}plugins/Zeitgeist/theme/images/data_table_footer_active_item.png" style="left: 25px;" />
+                <img class="UserCountryMap-activeItem dataTableFooterActiveItem" src="{{ piwikUrl }}plugins/Zeitgeist/images/data_table_footer_active_item.png" style="left: 25px;" />
 
                 <div class="tableIconsGroup">
                     <span class="tableAllColumnsSwitch">
                         <a class="UserCountryMap-btn-zoom tableIcon" format="table">
-                            <img src="{{ piwikUrl }}plugins/UserCountryMap/img/zoom-out.png" title="Zoom to world" />
+                            <img src="{{ piwikUrl }}plugins/UserCountryMap/images/zoom-out.png" title="Zoom to world" />
                         </a>
                     </span>
                 </div>
@@ -43,11 +43,11 @@
                     <span class="tableAllColumnsSwitch">
                         <a var="tableAllColumns" class="UserCountryMap-btn-region tableIcon activeIcon" format="tableAllColumns"
                            data-region="{{ 'UserCountryMap_Regions'|translate }}" data-country="{{ 'UserCountryMap_Countries'|translate }}">
-                            <img src="{{ piwikUrl }}plugins/UserCountryMap/img/regions.png" title="Show vistors per region/country" />
+                            <img src="{{ piwikUrl }}plugins/UserCountryMap/images/regions.png" title="Show vistors per region/country" />
                             <span style="margin:0">{{ 'UserCountryMap_Countries'|translate }}</span>&nbsp;
                         </a>
                         <a var="tableGoals" class="UserCountryMap-btn-city tableIcon inactiveIco" format="tableGoals">
-                            <img src="{{ piwikUrl }}plugins/UserCountryMap/img/cities.png" title="Show visitors per city" />
+                            <img src="{{ piwikUrl }}plugins/UserCountryMap/images/cities.png" title="Show visitors per city" />
                             <span style="margin:0">{{ 'UserCountryMap_Cities'|translate }}</span>&nbsp;
                         </a>
                     </span>
diff --git a/plugins/Zeitgeist/theme/images/affix-arrow.png b/plugins/Zeitgeist/images/affix-arrow.png
index bc45f553a4..bc45f553a4 100644
--- a/plugins/Zeitgeist/theme/images/affix-arrow.png
+++ b/plugins/Zeitgeist/images/affix-arrow.png
diff --git a/plugins/Zeitgeist/theme/images/arr_r.png b/plugins/Zeitgeist/images/arr_r.png
index 4a244a89e9..4a244a89e9 100644
--- a/plugins/Zeitgeist/theme/images/arr_r.png
+++ b/plugins/Zeitgeist/images/arr_r.png
diff --git a/plugins/Zeitgeist/theme/images/background-submit.png b/plugins/Zeitgeist/images/background-submit.png
index 033a47ad9a..033a47ad9a 100644
--- a/plugins/Zeitgeist/theme/images/background-submit.png
+++ b/plugins/Zeitgeist/images/background-submit.png
diff --git a/plugins/Zeitgeist/theme/images/chart_bar.png b/plugins/Zeitgeist/images/chart_bar.png
index 6c96e7bd57..6c96e7bd57 100644
--- a/plugins/Zeitgeist/theme/images/chart_bar.png
+++ b/plugins/Zeitgeist/images/chart_bar.png
diff --git a/plugins/Zeitgeist/theme/images/chart_line_edit.png b/plugins/Zeitgeist/images/chart_line_edit.png
index e437801b3d..e437801b3d 100755
--- a/plugins/Zeitgeist/theme/images/chart_line_edit.png
+++ b/plugins/Zeitgeist/images/chart_line_edit.png
diff --git a/plugins/Zeitgeist/theme/images/chart_line_edit_bg.png b/plugins/Zeitgeist/images/chart_line_edit_bg.png
index b474a161ad..b474a161ad 100755
--- a/plugins/Zeitgeist/theme/images/chart_line_edit_bg.png
+++ b/plugins/Zeitgeist/images/chart_line_edit_bg.png
diff --git a/plugins/Zeitgeist/theme/images/chart_pie.png b/plugins/Zeitgeist/images/chart_pie.png
index 610f857890..610f857890 100644
--- a/plugins/Zeitgeist/theme/images/chart_pie.png
+++ b/plugins/Zeitgeist/images/chart_pie.png
diff --git a/plugins/Zeitgeist/theme/images/close.png b/plugins/Zeitgeist/images/close.png
index 44b591bd03..44b591bd03 100644
--- a/plugins/Zeitgeist/theme/images/close.png
+++ b/plugins/Zeitgeist/images/close.png
diff --git a/plugins/Zeitgeist/theme/images/collapsed_arrows.gif b/plugins/Zeitgeist/images/collapsed_arrows.gif
index 458728fdec..458728fdec 100644
--- a/plugins/Zeitgeist/theme/images/collapsed_arrows.gif
+++ b/plugins/Zeitgeist/images/collapsed_arrows.gif
diff --git a/plugins/Zeitgeist/theme/images/configure-highlight.png b/plugins/Zeitgeist/images/configure-highlight.png
index dd37fc14de..dd37fc14de 100755
--- a/plugins/Zeitgeist/theme/images/configure-highlight.png
+++ b/plugins/Zeitgeist/images/configure-highlight.png
diff --git a/plugins/Zeitgeist/theme/images/configure.png b/plugins/Zeitgeist/images/configure.png
index 5a0ec4a785..5a0ec4a785 100755
--- a/plugins/Zeitgeist/theme/images/configure.png
+++ b/plugins/Zeitgeist/images/configure.png
diff --git a/plugins/Zeitgeist/theme/images/dashboard_h_bg.png b/plugins/Zeitgeist/images/dashboard_h_bg.png
index 279a94949d..279a94949d 100644
--- a/plugins/Zeitgeist/theme/images/dashboard_h_bg.png
+++ b/plugins/Zeitgeist/images/dashboard_h_bg.png
diff --git a/plugins/Zeitgeist/theme/images/dashboard_h_bg_hover.png b/plugins/Zeitgeist/images/dashboard_h_bg_hover.png
index 37e4bd54e8..37e4bd54e8 100644
--- a/plugins/Zeitgeist/theme/images/dashboard_h_bg_hover.png
+++ b/plugins/Zeitgeist/images/dashboard_h_bg_hover.png
diff --git a/plugins/Zeitgeist/theme/images/data_table_footer_active_item.png b/plugins/Zeitgeist/images/data_table_footer_active_item.png
index 343591f6bf..343591f6bf 100644
--- a/plugins/Zeitgeist/theme/images/data_table_footer_active_item.png
+++ b/plugins/Zeitgeist/images/data_table_footer_active_item.png
diff --git a/plugins/Zeitgeist/theme/images/datepicker_arr_l.png b/plugins/Zeitgeist/images/datepicker_arr_l.png
index aa73d36239..aa73d36239 100644
--- a/plugins/Zeitgeist/theme/images/datepicker_arr_l.png
+++ b/plugins/Zeitgeist/images/datepicker_arr_l.png
diff --git a/plugins/Zeitgeist/theme/images/datepicker_arr_r.png b/plugins/Zeitgeist/images/datepicker_arr_r.png
index 7bd04bc236..7bd04bc236 100644
--- a/plugins/Zeitgeist/theme/images/datepicker_arr_r.png
+++ b/plugins/Zeitgeist/images/datepicker_arr_r.png
diff --git a/plugins/Zeitgeist/theme/images/delete.png b/plugins/Zeitgeist/images/delete.png
index f2a3c2a20d..f2a3c2a20d 100644
--- a/plugins/Zeitgeist/theme/images/delete.png
+++ b/plugins/Zeitgeist/images/delete.png
diff --git a/plugins/Zeitgeist/theme/images/download.png b/plugins/Zeitgeist/images/download.png
index 1920b1bb22..1920b1bb22 100644
--- a/plugins/Zeitgeist/theme/images/download.png
+++ b/plugins/Zeitgeist/images/download.png
diff --git a/plugins/Zeitgeist/theme/images/ecommerceAbandonedCart.gif b/plugins/Zeitgeist/images/ecommerceAbandonedCart.gif
index b4ec1d75f7..b4ec1d75f7 100644
--- a/plugins/Zeitgeist/theme/images/ecommerceAbandonedCart.gif
+++ b/plugins/Zeitgeist/images/ecommerceAbandonedCart.gif
diff --git a/plugins/Zeitgeist/theme/images/ecommerceOrder.gif b/plugins/Zeitgeist/images/ecommerceOrder.gif
index 664e035509..664e035509 100644
--- a/plugins/Zeitgeist/theme/images/ecommerceOrder.gif
+++ b/plugins/Zeitgeist/images/ecommerceOrder.gif
diff --git a/plugins/Zeitgeist/theme/images/email.png b/plugins/Zeitgeist/images/email.png
index 4a6c5d396a..4a6c5d396a 100644
--- a/plugins/Zeitgeist/theme/images/email.png
+++ b/plugins/Zeitgeist/images/email.png
diff --git a/plugins/Zeitgeist/theme/images/error.png b/plugins/Zeitgeist/images/error.png
index 2997461b21..2997461b21 100644
--- a/plugins/Zeitgeist/theme/images/error.png
+++ b/plugins/Zeitgeist/images/error.png
diff --git a/plugins/Zeitgeist/theme/images/error_medium.png b/plugins/Zeitgeist/images/error_medium.png
index 538cb9039f..538cb9039f 100644
--- a/plugins/Zeitgeist/theme/images/error_medium.png
+++ b/plugins/Zeitgeist/images/error_medium.png
diff --git a/plugins/Zeitgeist/theme/images/expanded_arrows.gif b/plugins/Zeitgeist/images/expanded_arrows.gif
index ed33959206..ed33959206 100644
--- a/plugins/Zeitgeist/theme/images/expanded_arrows.gif
+++ b/plugins/Zeitgeist/images/expanded_arrows.gif
diff --git a/plugins/Zeitgeist/theme/images/export.png b/plugins/Zeitgeist/images/export.png
index 110af8c431..110af8c431 100644
--- a/plugins/Zeitgeist/theme/images/export.png
+++ b/plugins/Zeitgeist/images/export.png
diff --git a/plugins/Zeitgeist/theme/images/feed.png b/plugins/Zeitgeist/images/feed.png
index 315c4f4fa6..315c4f4fa6 100644
--- a/plugins/Zeitgeist/theme/images/feed.png
+++ b/plugins/Zeitgeist/images/feed.png
diff --git a/plugins/Zeitgeist/theme/images/fullscreen.png b/plugins/Zeitgeist/images/fullscreen.png
index 3c3273ba9d..3c3273ba9d 100755
--- a/plugins/Zeitgeist/theme/images/fullscreen.png
+++ b/plugins/Zeitgeist/images/fullscreen.png
diff --git a/plugins/Zeitgeist/theme/images/goal.png b/plugins/Zeitgeist/images/goal.png
index 69db019e5e..69db019e5e 100644
--- a/plugins/Zeitgeist/theme/images/goal.png
+++ b/plugins/Zeitgeist/images/goal.png
diff --git a/plugins/Zeitgeist/theme/images/grey_marker.png b/plugins/Zeitgeist/images/grey_marker.png
index b0e3e3e6ae..b0e3e3e6ae 100755
--- a/plugins/Zeitgeist/theme/images/grey_marker.png
+++ b/plugins/Zeitgeist/images/grey_marker.png
diff --git a/plugins/Zeitgeist/theme/images/help.png b/plugins/Zeitgeist/images/help.png
index 5c870176d4..5c870176d4 100644
--- a/plugins/Zeitgeist/theme/images/help.png
+++ b/plugins/Zeitgeist/images/help.png
diff --git a/plugins/Zeitgeist/theme/images/help_grey.png b/plugins/Zeitgeist/images/help_grey.png
index 8f3df97e9c..8f3df97e9c 100644
--- a/plugins/Zeitgeist/theme/images/help_grey.png
+++ b/plugins/Zeitgeist/images/help_grey.png
diff --git a/plugins/Zeitgeist/theme/images/html_icon.png b/plugins/Zeitgeist/images/html_icon.png
index 7b4308d885..7b4308d885 100644
--- a/plugins/Zeitgeist/theme/images/html_icon.png
+++ b/plugins/Zeitgeist/images/html_icon.png
diff --git a/plugins/Zeitgeist/theme/images/ico_alert.png b/plugins/Zeitgeist/images/ico_alert.png
index b8087eba9c..b8087eba9c 100644
--- a/plugins/Zeitgeist/theme/images/ico_alert.png
+++ b/plugins/Zeitgeist/images/ico_alert.png
diff --git a/plugins/Zeitgeist/theme/images/ico_delete.png b/plugins/Zeitgeist/images/ico_delete.png
index eb6cbc030b..eb6cbc030b 100644
--- a/plugins/Zeitgeist/theme/images/ico_delete.png
+++ b/plugins/Zeitgeist/images/ico_delete.png
diff --git a/plugins/Zeitgeist/theme/images/ico_edit.png b/plugins/Zeitgeist/images/ico_edit.png
index 0d1a0fa16f..0d1a0fa16f 100644
--- a/plugins/Zeitgeist/theme/images/ico_edit.png
+++ b/plugins/Zeitgeist/images/ico_edit.png
diff --git a/plugins/Zeitgeist/theme/images/ico_info.png b/plugins/Zeitgeist/images/ico_info.png
index 1278cef852..1278cef852 100644
--- a/plugins/Zeitgeist/theme/images/ico_info.png
+++ b/plugins/Zeitgeist/images/ico_info.png
diff --git a/plugins/Zeitgeist/theme/images/icon-calendar.gif b/plugins/Zeitgeist/images/icon-calendar.gif
index 132350e783..132350e783 100644
--- a/plugins/Zeitgeist/theme/images/icon-calendar.gif
+++ b/plugins/Zeitgeist/images/icon-calendar.gif
diff --git a/plugins/Zeitgeist/theme/images/image.png b/plugins/Zeitgeist/images/image.png
index 546ebcdec7..546ebcdec7 100644
--- a/plugins/Zeitgeist/theme/images/image.png
+++ b/plugins/Zeitgeist/images/image.png
diff --git a/plugins/Zeitgeist/theme/images/inp_bg.png b/plugins/Zeitgeist/images/inp_bg.png
index 6bd9674743..6bd9674743 100644
--- a/plugins/Zeitgeist/theme/images/inp_bg.png
+++ b/plugins/Zeitgeist/images/inp_bg.png
diff --git a/plugins/Zeitgeist/theme/images/li_dbl_gray.gif b/plugins/Zeitgeist/images/li_dbl_gray.gif
index 42fe8b3b89..42fe8b3b89 100644
--- a/plugins/Zeitgeist/theme/images/li_dbl_gray.gif
+++ b/plugins/Zeitgeist/images/li_dbl_gray.gif
diff --git a/plugins/Zeitgeist/theme/images/link.gif b/plugins/Zeitgeist/images/link.gif
index e160f23b63..e160f23b63 100644
--- a/plugins/Zeitgeist/theme/images/link.gif
+++ b/plugins/Zeitgeist/images/link.gif
diff --git a/plugins/Zeitgeist/theme/images/loading-blue.gif b/plugins/Zeitgeist/images/loading-blue.gif
index 4df2f1fde6..4df2f1fde6 100644
--- a/plugins/Zeitgeist/theme/images/loading-blue.gif
+++ b/plugins/Zeitgeist/images/loading-blue.gif
diff --git a/plugins/Zeitgeist/theme/images/login-sprite.png b/plugins/Zeitgeist/images/login-sprite.png
index 1692e4b09b..1692e4b09b 100644
--- a/plugins/Zeitgeist/theme/images/login-sprite.png
+++ b/plugins/Zeitgeist/images/login-sprite.png
diff --git a/plugins/Zeitgeist/theme/images/logo-header.png b/plugins/Zeitgeist/images/logo-header.png
index d10293eaef..d10293eaef 100644
--- a/plugins/Zeitgeist/theme/images/logo-header.png
+++ b/plugins/Zeitgeist/images/logo-header.png
diff --git a/plugins/Zeitgeist/theme/images/logo.png b/plugins/Zeitgeist/images/logo.png
index 00421e4497..00421e4497 100644
--- a/plugins/Zeitgeist/theme/images/logo.png
+++ b/plugins/Zeitgeist/images/logo.png
diff --git a/plugins/Zeitgeist/theme/images/logo.svg b/plugins/Zeitgeist/images/logo.svg
index d83f657687..d83f657687 100644
--- a/plugins/Zeitgeist/theme/images/logo.svg
+++ b/plugins/Zeitgeist/images/logo.svg
diff --git a/plugins/Zeitgeist/theme/images/maximise.png b/plugins/Zeitgeist/images/maximise.png
index 143dfa5c89..143dfa5c89 100644
--- a/plugins/Zeitgeist/theme/images/maximise.png
+++ b/plugins/Zeitgeist/images/maximise.png
diff --git a/plugins/Zeitgeist/theme/images/minimise.png b/plugins/Zeitgeist/images/minimise.png
index 73c82a3cee..73c82a3cee 100644
--- a/plugins/Zeitgeist/theme/images/minimise.png
+++ b/plugins/Zeitgeist/images/minimise.png
diff --git a/plugins/Zeitgeist/theme/images/minus.png b/plugins/Zeitgeist/images/minus.png
index 48a507df9b..48a507df9b 100644
--- a/plugins/Zeitgeist/theme/images/minus.png
+++ b/plugins/Zeitgeist/images/minus.png
diff --git a/plugins/Zeitgeist/theme/images/newtab.png b/plugins/Zeitgeist/images/newtab.png
index 1e50c59200..1e50c59200 100755
--- a/plugins/Zeitgeist/theme/images/newtab.png
+++ b/plugins/Zeitgeist/images/newtab.png
diff --git a/plugins/Zeitgeist/theme/images/ok.png b/plugins/Zeitgeist/images/ok.png
index 148319419d..148319419d 100644
--- a/plugins/Zeitgeist/theme/images/ok.png
+++ b/plugins/Zeitgeist/images/ok.png
diff --git a/plugins/Zeitgeist/theme/images/page_border_grad.png b/plugins/Zeitgeist/images/page_border_grad.png
index 9e7e86903b..9e7e86903b 100644
--- a/plugins/Zeitgeist/theme/images/page_border_grad.png
+++ b/plugins/Zeitgeist/images/page_border_grad.png
diff --git a/plugins/Zeitgeist/theme/images/paypal_subscribe.gif b/plugins/Zeitgeist/images/paypal_subscribe.gif
index 50d8ee52e9..50d8ee52e9 100755
--- a/plugins/Zeitgeist/theme/images/paypal_subscribe.gif
+++ b/plugins/Zeitgeist/images/paypal_subscribe.gif
diff --git a/plugins/Zeitgeist/theme/images/plus.png b/plugins/Zeitgeist/images/plus.png
index 7216c7d7a9..7216c7d7a9 100644
--- a/plugins/Zeitgeist/theme/images/plus.png
+++ b/plugins/Zeitgeist/images/plus.png
diff --git a/plugins/Zeitgeist/theme/images/plus_blue.png b/plugins/Zeitgeist/images/plus_blue.png
index bf16b7512a..bf16b7512a 100755
--- a/plugins/Zeitgeist/theme/images/plus_blue.png
+++ b/plugins/Zeitgeist/images/plus_blue.png
diff --git a/plugins/Zeitgeist/theme/images/refresh.png b/plugins/Zeitgeist/images/refresh.png
index 8e99a5f0ab..8e99a5f0ab 100644
--- a/plugins/Zeitgeist/theme/images/refresh.png
+++ b/plugins/Zeitgeist/images/refresh.png
diff --git a/plugins/Zeitgeist/theme/images/reload.png b/plugins/Zeitgeist/images/reload.png
index a77ffe7c64..a77ffe7c64 100755
--- a/plugins/Zeitgeist/theme/images/reload.png
+++ b/plugins/Zeitgeist/images/reload.png
diff --git a/plugins/Zeitgeist/theme/images/row_evolution.png b/plugins/Zeitgeist/images/row_evolution.png
index 7423c473cc..7423c473cc 100644
--- a/plugins/Zeitgeist/theme/images/row_evolution.png
+++ b/plugins/Zeitgeist/images/row_evolution.png
diff --git a/plugins/Zeitgeist/theme/images/row_evolution_hover.png b/plugins/Zeitgeist/images/row_evolution_hover.png
index 53827ae4df..53827ae4df 100755
--- a/plugins/Zeitgeist/theme/images/row_evolution_hover.png
+++ b/plugins/Zeitgeist/images/row_evolution_hover.png
diff --git a/plugins/Zeitgeist/theme/images/search_bg.png b/plugins/Zeitgeist/images/search_bg.png
index 7688b8080b..7688b8080b 100644
--- a/plugins/Zeitgeist/theme/images/search_bg.png
+++ b/plugins/Zeitgeist/images/search_bg.png
diff --git a/plugins/Zeitgeist/theme/images/search_ico.png b/plugins/Zeitgeist/images/search_ico.png
index dba240f91f..dba240f91f 100644
--- a/plugins/Zeitgeist/theme/images/search_ico.png
+++ b/plugins/Zeitgeist/images/search_ico.png
diff --git a/plugins/Zeitgeist/theme/images/sites_selection.png b/plugins/Zeitgeist/images/sites_selection.png
index 15750a63d8..15750a63d8 100644
--- a/plugins/Zeitgeist/theme/images/sites_selection.png
+++ b/plugins/Zeitgeist/images/sites_selection.png
diff --git a/plugins/Zeitgeist/theme/images/smileyprog_0.png b/plugins/Zeitgeist/images/smileyprog_0.png
index 8a4627eea3..8a4627eea3 100755
--- a/plugins/Zeitgeist/theme/images/smileyprog_0.png
+++ b/plugins/Zeitgeist/images/smileyprog_0.png
diff --git a/plugins/Zeitgeist/theme/images/smileyprog_1.png b/plugins/Zeitgeist/images/smileyprog_1.png
index 5b16b257ae..5b16b257ae 100755
--- a/plugins/Zeitgeist/theme/images/smileyprog_1.png
+++ b/plugins/Zeitgeist/images/smileyprog_1.png
diff --git a/plugins/Zeitgeist/theme/images/smileyprog_2.png b/plugins/Zeitgeist/images/smileyprog_2.png
index 55537fb732..55537fb732 100755
--- a/plugins/Zeitgeist/theme/images/smileyprog_2.png
+++ b/plugins/Zeitgeist/images/smileyprog_2.png
diff --git a/plugins/Zeitgeist/theme/images/smileyprog_3.png b/plugins/Zeitgeist/images/smileyprog_3.png
index 3410a344be..3410a344be 100755
--- a/plugins/Zeitgeist/theme/images/smileyprog_3.png
+++ b/plugins/Zeitgeist/images/smileyprog_3.png
diff --git a/plugins/Zeitgeist/theme/images/smileyprog_4.png b/plugins/Zeitgeist/images/smileyprog_4.png
index 0facd94f85..0facd94f85 100755
--- a/plugins/Zeitgeist/theme/images/smileyprog_4.png
+++ b/plugins/Zeitgeist/images/smileyprog_4.png
diff --git a/plugins/Zeitgeist/theme/images/sort_subtable_asc.png b/plugins/Zeitgeist/images/sort_subtable_asc.png
index e402026efe..e402026efe 100644
--- a/plugins/Zeitgeist/theme/images/sort_subtable_asc.png
+++ b/plugins/Zeitgeist/images/sort_subtable_asc.png
diff --git a/plugins/Zeitgeist/theme/images/sort_subtable_asc_light.png b/plugins/Zeitgeist/images/sort_subtable_asc_light.png
index cad89bd570..cad89bd570 100755
--- a/plugins/Zeitgeist/theme/images/sort_subtable_asc_light.png
+++ b/plugins/Zeitgeist/images/sort_subtable_asc_light.png
diff --git a/plugins/Zeitgeist/theme/images/sort_subtable_desc.png b/plugins/Zeitgeist/images/sort_subtable_desc.png
index a3d7a5dfd4..a3d7a5dfd4 100644
--- a/plugins/Zeitgeist/theme/images/sort_subtable_desc.png
+++ b/plugins/Zeitgeist/images/sort_subtable_desc.png
diff --git a/plugins/Zeitgeist/theme/images/sort_subtable_desc_light.png b/plugins/Zeitgeist/images/sort_subtable_desc_light.png
index 5091fe6841..5091fe6841 100644
--- a/plugins/Zeitgeist/theme/images/sort_subtable_desc_light.png
+++ b/plugins/Zeitgeist/images/sort_subtable_desc_light.png
diff --git a/plugins/Zeitgeist/theme/images/sortasc.png b/plugins/Zeitgeist/images/sortasc.png
index 29a06dad88..29a06dad88 100644
--- a/plugins/Zeitgeist/theme/images/sortasc.png
+++ b/plugins/Zeitgeist/images/sortasc.png
diff --git a/plugins/Zeitgeist/theme/images/sortdesc.png b/plugins/Zeitgeist/images/sortdesc.png
index 91d2618d26..91d2618d26 100644
--- a/plugins/Zeitgeist/theme/images/sortdesc.png
+++ b/plugins/Zeitgeist/images/sortdesc.png
diff --git a/plugins/Zeitgeist/theme/images/star.png b/plugins/Zeitgeist/images/star.png
index 52d161eab4..52d161eab4 100755
--- a/plugins/Zeitgeist/theme/images/star.png
+++ b/plugins/Zeitgeist/images/star.png
diff --git a/plugins/Zeitgeist/theme/images/star_empty.png b/plugins/Zeitgeist/images/star_empty.png
index 965f4bacb8..965f4bacb8 100755
--- a/plugins/Zeitgeist/theme/images/star_empty.png
+++ b/plugins/Zeitgeist/images/star_empty.png
diff --git a/plugins/Zeitgeist/theme/images/success_medium.png b/plugins/Zeitgeist/images/success_medium.png
index 05a3a06be4..05a3a06be4 100644
--- a/plugins/Zeitgeist/theme/images/success_medium.png
+++ b/plugins/Zeitgeist/images/success_medium.png
diff --git a/plugins/Zeitgeist/theme/images/table.png b/plugins/Zeitgeist/images/table.png
index ab0814775d..ab0814775d 100644
--- a/plugins/Zeitgeist/theme/images/table.png
+++ b/plugins/Zeitgeist/images/table.png
diff --git a/plugins/Zeitgeist/theme/images/table_more.png b/plugins/Zeitgeist/images/table_more.png
index d438326d83..d438326d83 100644
--- a/plugins/Zeitgeist/theme/images/table_more.png
+++ b/plugins/Zeitgeist/images/table_more.png
diff --git a/plugins/Zeitgeist/theme/images/tagcloud.png b/plugins/Zeitgeist/images/tagcloud.png
index 47e9d166fc..47e9d166fc 100644
--- a/plugins/Zeitgeist/theme/images/tagcloud.png
+++ b/plugins/Zeitgeist/images/tagcloud.png
diff --git a/plugins/Zeitgeist/theme/images/video_play.png b/plugins/Zeitgeist/images/video_play.png
index 7ca28d991f..7ca28d991f 100755
--- a/plugins/Zeitgeist/theme/images/video_play.png
+++ b/plugins/Zeitgeist/images/video_play.png
diff --git a/plugins/Zeitgeist/theme/images/warning.png b/plugins/Zeitgeist/images/warning.png
index fd49f31f29..fd49f31f29 100644
--- a/plugins/Zeitgeist/theme/images/warning.png
+++ b/plugins/Zeitgeist/images/warning.png
diff --git a/plugins/Zeitgeist/theme/images/warning_medium.png b/plugins/Zeitgeist/images/warning_medium.png
index 62bd22dc5c..62bd22dc5c 100644
--- a/plugins/Zeitgeist/theme/images/warning_medium.png
+++ b/plugins/Zeitgeist/images/warning_medium.png
diff --git a/plugins/Zeitgeist/theme/images/warning_small.png b/plugins/Zeitgeist/images/warning_small.png
index 1242b4f180..1242b4f180 100644
--- a/plugins/Zeitgeist/theme/images/warning_small.png
+++ b/plugins/Zeitgeist/images/warning_small.png
diff --git a/plugins/Zeitgeist/theme/images/yellow_marker.png b/plugins/Zeitgeist/images/yellow_marker.png
index a2506a2a7d..a2506a2a7d 100755
--- a/plugins/Zeitgeist/theme/images/yellow_marker.png
+++ b/plugins/Zeitgeist/images/yellow_marker.png
diff --git a/plugins/Zeitgeist/theme/admin.twig b/plugins/Zeitgeist/theme/admin.twig
index 0466d3a472..003da84420 100644
--- a/plugins/Zeitgeist/theme/admin.twig
+++ b/plugins/Zeitgeist/theme/admin.twig
@@ -8,7 +8,7 @@
             <title>{% if not isCustomLogo %}Piwik &rsaquo; {% endif %}{{ 'CoreAdminHome_Administration'|translate }}</title>
             <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
             <meta name="generator" content="Piwik - Open Source Web Analytics"/>
-            <link rel="shortcut icon" href="plugins/CoreHome/templates/images/favicon.ico"/>
+            <link rel="shortcut icon" href="plugins/CoreHome/images/favicon.ico"/>
 
             {{ loadJavascriptTranslations(['CoreAdminHome','CoreHome'])|raw }}
 
diff --git a/plugins/Zeitgeist/theme/ajaxMacros.twig b/plugins/Zeitgeist/theme/ajaxMacros.twig
index 3c839e56ef..059892706b 100644
--- a/plugins/Zeitgeist/theme/ajaxMacros.twig
+++ b/plugins/Zeitgeist/theme/ajaxMacros.twig
@@ -5,7 +5,7 @@
 {% macro loadingDiv(id='ajaxLoadingDiv') %}
 <div id="{{ id }}" style="display:none">
     <div class="loadingPiwik">
-        <img src="plugins/Zeitgeist/theme/images/loading-blue.gif" alt="{{ 'General_LoadingData'|translate }}" />{{ 'General_LoadingData'|translate }}
+        <img src="plugins/Zeitgeist/images/loading-blue.gif" alt="{{ 'General_LoadingData'|translate }}" />{{ 'General_LoadingData'|translate }}
     </div>
 </div>
 {% endmacro %}
diff --git a/plugins/Zeitgeist/theme/common.css b/plugins/Zeitgeist/theme/common.css
index c32f4d8a56..2d8db49e8b 100644
--- a/plugins/Zeitgeist/theme/common.css
+++ b/plugins/Zeitgeist/theme/common.css
@@ -117,7 +117,7 @@ a {
     margin-right:12px;
     z-index:999;
     position:absolute;
-    background: url("images/icon-calendar.gif") no-repeat scroll right 9px center #F7F7F7;
+    background: url("../images/icon-calendar.gif") no-repeat scroll right 9px center #F7F7F7;
 }
 #periodString:hover {
 	background-color:#f1f0eb;
@@ -205,7 +205,7 @@ a {
 }
 /* Orange alerts box */
 .header_alert {
-	background:#FFFDF7 url(images/ico_alert.png) no-repeat 7px 4px;
+	background:#FFFDF7 url(../images/ico_alert.png) no-repeat 7px 4px;
 	border: 1px solid #FF7F00 ;	
 	font-weight:bold;
 }
@@ -215,7 +215,7 @@ a {
 
 /* Blue info box */
 .header_info {
-	background:#FAFAFA url(images/ico_info.png) no-repeat 7px 4px;
+	background:#FAFAFA url(../images/ico_info.png) no-repeat 7px 4px;
 	border: 1px solid #CBD9EB ;	
 }
 .header_info , .header_info  a { 
@@ -261,7 +261,7 @@ a {
 	position:relative; 
 	z-index:19;
 	padding:6px 6px 5px 6px;
-	background:#fff url(images/sites_selection.png) repeat-x 0 0;
+	background:#fff url(../images/sites_selection.png) repeat-x 0 0;
 	border: 1px solid #d4d4d4;	
 	color:#255792;
 	border-radius:4px;
@@ -274,7 +274,7 @@ a {
 	padding:0 20px 0 4px;
 	display:block; 
 	text-decoration:none; 
-	background: url(images/sort_subtable_desc.png) no-repeat right 0;
+	background: url(../images/sort_subtable_desc.png) no-repeat right 0;
 }
 
 .sites_autocomplete .custom_select_main_link.noselect{
@@ -285,7 +285,7 @@ a {
 }
 
 .sites_autocomplete .custom_select_loading{
-	background: url(images/loading-blue.gif) no-repeat right 3px;
+	background: url(../images/loading-blue.gif) no-repeat right 3px;
 }
 
 .sites_autocomplete .custom_select_ul_list,.sites_autocomplete ul.ui-autocomplete{
@@ -315,7 +315,7 @@ a {
 	height:26px;
 	display: block;
 	white-space: nowrap;
-	background:  url(images/search_bg.png) no-repeat 0 0;
+	background:  url(../images/search_bg.png) no-repeat 0 0;
 }
 
 .sites_autocomplete .custom_select_search .inp {
@@ -486,7 +486,7 @@ div.ui-state-highlight {
 }
 
 .ui-datepicker-header{ 
-	background:#847b6d url(images/dashboard_h_bg_hover.png) repeat-x 0 0!important;
+	background:#847b6d url(../images/dashboard_h_bg_hover.png) repeat-x 0 0!important;
 	color:#fff!important;
 	border-radius:0!important;
 	-moz-border-radius:0!important;
@@ -497,11 +497,11 @@ div.ui-state-highlight {
 }
 
 .ui-datepicker-header .ui-icon-circle-triangle-w{ 
-	background: url(images/datepicker_arr_l.png) no-repeat 5px 4px!important;
+	background: url(../images/datepicker_arr_l.png) no-repeat 5px 4px!important;
 }
 
 .ui-datepicker-header .ui-icon-circle-triangle-e{ 
-	background: url(images/datepicker_arr_r.png) no-repeat 6px 4px!important;
+	background: url(../images/datepicker_arr_r.png) no-repeat 6px 4px!important;
 }
 
 .ui-datepicker .ui-datepicker-next-hover, 
@@ -591,7 +591,7 @@ input, select, textarea {
 	-moz-border-radius:4px;
 	-webkit-border-radius:4px;
 	border:1px solid #d4d4d4;
-	background:#fff url(images/inp_bg.png) repeat-x 0 0;
+	background:#fff url(../images/inp_bg.png) repeat-x 0 0;
 	padding:3px 10px;
 	color:#255792;
 	margin-bottom:3px;
@@ -616,7 +616,7 @@ select {
 	-moz-border-radius:4px;
 	-webkit-border-radius:4px;
 	border:0;
-	background:#847b6d url(images/dashboard_h_bg_hover.png) repeat-x 0 0;
+	background:#847b6d url(../images/dashboard_h_bg_hover.png) repeat-x 0 0;
 	float:right; 
 	margin:12px 0 10px 0;
 	cursor:pointer;
@@ -706,7 +706,7 @@ table.entityTable tr td a {
 	padding:4px 0;
 }
 .entityList ul li{
-	background:#fff url(images/li_dbl_gray.gif) no-repeat 6px 10px;
+	background:#fff url(../images/li_dbl_gray.gif) no-repeat 6px 10px;
 	padding:0 0 0 21px;
 	line-height:22px;
 }
@@ -787,7 +787,7 @@ body .ui-tooltip.small {
 	margin: -8px 0 0 0;
 	padding: 0;
 	height: 16px;
-	background: url(images/help.png);
+	background: url(../images/help.png);
 	overflow: hidden;
 }
 
diff --git a/plugins/Zeitgeist/theme/dashboard.twig b/plugins/Zeitgeist/theme/dashboard.twig
index 63f95d5576..31c8a2703a 100644
--- a/plugins/Zeitgeist/theme/dashboard.twig
+++ b/plugins/Zeitgeist/theme/dashboard.twig
@@ -9,7 +9,7 @@
             <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
             <meta name="generator" content="Piwik - Open Source Web Analytics"/>
             <meta name="description" content="Web Analytics report for '{{ siteName }}' - Piwik"/>
-            <link rel="shortcut icon" href="plugins/CoreHome/templates/images/favicon.ico"/>
+            <link rel="shortcut icon" href="plugins/CoreHome/images/favicon.ico"/>
             {{ loadJavascriptTranslations(['CoreHome','Annotations'])|raw }}
             {% include "@CoreHome/js_global_variables.twig" %}
             <!--[if lt IE 9]>
diff --git a/plugins/Zeitgeist/theme/genericForm.twig b/plugins/Zeitgeist/theme/genericForm.twig
index b47319e475..1c509a9ae5 100644
--- a/plugins/Zeitgeist/theme/genericForm.twig
+++ b/plugins/Zeitgeist/theme/genericForm.twig
@@ -1,6 +1,6 @@
 {% if form_data.errors %}
 	<div class="warning">
-		<img src="plugins/Zeitgeist/theme/images/warning_medium.png">
+		<img src="plugins/Zeitgeist/images/warning_medium.png">
 		<strong>{{ 'Installation_PleaseFixTheFollowingErrors'|translate }}:</strong>
 		<ul>
             {% for data in form_data.errors %}
diff --git a/plugins/Zeitgeist/theme/ieonly.css b/plugins/Zeitgeist/theme/ieonly.css
index 08ad7295ae..125a78b665 100644
--- a/plugins/Zeitgeist/theme/ieonly.css
+++ b/plugins/Zeitgeist/theme/ieonly.css
@@ -32,7 +32,7 @@ input[type=checkbox], input[type=radio] {
 }
 
 .jqplot-seriespicker {
-	background: url(images/chart_line_edit_bg.png) no-repeat center center;
+	background: url(../images/chart_line_edit_bg.png) no-repeat center center;
 }
 
 .jqplock-seriespicker-popover p input {
diff --git a/plugins/Zeitgeist/theme/simple_structure_header.tpl b/plugins/Zeitgeist/theme/simple_structure_header.tpl
index f3a0cbcf9f..4d6252bd26 100644
--- a/plugins/Zeitgeist/theme/simple_structure_header.tpl
+++ b/plugins/Zeitgeist/theme/simple_structure_header.tpl
@@ -4,7 +4,7 @@
 <head>
 	<title>{$HTML_TITLE}</title>
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-	<link rel="shortcut icon" href="plugins/CoreHome/templates/images/favicon.ico" />
+	<link rel="shortcut icon" href="plugins/CoreHome/images/favicon.ico" />
 	<link rel="stylesheet" type="text/css" href="themes/default/simple_structure.css" />
 </head>
 <body id="simple">
diff --git a/plugins/Zeitgeist/theme/styles.css b/plugins/Zeitgeist/theme/styles.css
index f922f1a310..ec12ea6528 100644
--- a/plugins/Zeitgeist/theme/styles.css
+++ b/plugins/Zeitgeist/theme/styles.css
@@ -12,7 +12,7 @@
 }
 
 #languageSelection .ui-autocomplete-input {
-    background:#FFF url(images/sortdesc.png) no-repeat right center!important;
+    background:#FFF url(../images/sortdesc.png) no-repeat right center!important;
     padding: 2px 18px 2px 4px;
     color:#255792!important;
     text-decoration: none;
diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_year.xml b/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_year.xml
index f4fb13bd4d..9c3a7655b0 100644
--- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_year.xml
+++ b/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_year.xml
@@ -56,7 +56,7 @@
 		<continentCode>amn</continentCode>
 		<country>United States</country>
 		<countryCode>us</countryCode>
-		<countryFlag>plugins/UserCountry/flags/us.png</countryFlag>
+		<countryFlag>plugins/UserCountry/images/flags/us.png</countryFlag>
 		<region>California</region>
 		<regionCode>CA</regionCode>
 		<city>not a city</city>
@@ -109,7 +109,7 @@
 		<visitIp>1.2.4.8</visitIp>
 		
 		<visitorType>returningCustomer</visitorType>
-		<visitorTypeIcon>plugins/Live/templates/images/returningVisitor.gif</visitorTypeIcon>
+		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>themes/default/images/goal.png</visitConvertedIcon>
 		<visitEcommerceStatus>none</visitEcommerceStatus>
@@ -194,7 +194,7 @@
 		<continentCode>unk</continentCode>
 		<country>Unknown</country>
 		<countryCode>xx</countryCode>
-		<countryFlag>plugins/UserCountry/flags/xx.png</countryFlag>
+		<countryFlag>plugins/UserCountry/images/flags/xx.png</countryFlag>
 		<region />
 		<regionCode />
 		<city />
@@ -247,7 +247,7 @@
 		<visitIp>1.2.4.8</visitIp>
 		
 		<visitorType>returningCustomer</visitorType>
-		<visitorTypeIcon>plugins/Live/templates/images/returningVisitor.gif</visitorTypeIcon>
+		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>themes/default/images/goal.png</visitConvertedIcon>
 		<visitEcommerceStatus>none</visitEcommerceStatus>
@@ -315,7 +315,7 @@
 		<continentCode>unk</continentCode>
 		<country>Unknown</country>
 		<countryCode>xx</countryCode>
-		<countryFlag>plugins/UserCountry/flags/xx.png</countryFlag>
+		<countryFlag>plugins/UserCountry/images/flags/xx.png</countryFlag>
 		<region />
 		<regionCode />
 		<city />
@@ -368,7 +368,7 @@
 		<visitIp>1.2.4.7</visitIp>
 		
 		<visitorType>returningCustomer</visitorType>
-		<visitorTypeIcon>plugins/Live/templates/images/returningVisitor.gif</visitorTypeIcon>
+		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>themes/default/images/goal.png</visitConvertedIcon>
 		<visitEcommerceStatus>none</visitEcommerceStatus>
@@ -436,7 +436,7 @@
 		<continentCode>eur</continentCode>
 		<country>Macedonia, the Former Yugoslav Republic of</country>
 		<countryCode>mk</countryCode>
-		<countryFlag>plugins/UserCountry/flags/mk.png</countryFlag>
+		<countryFlag>plugins/UserCountry/images/flags/mk.png</countryFlag>
 		<region>Miravci</region>
 		<regionCode>66</regionCode>
 		<city>Stratford-upon-Avon</city>
@@ -489,7 +489,7 @@
 		<visitIp>1.2.4.7</visitIp>
 		
 		<visitorType>returningCustomer</visitorType>
-		<visitorTypeIcon>plugins/Live/templates/images/returningVisitor.gif</visitorTypeIcon>
+		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>themes/default/images/goal.png</visitConvertedIcon>
 		<visitEcommerceStatus>none</visitEcommerceStatus>
@@ -557,7 +557,7 @@
 		<continentCode>eur</continentCode>
 		<country>Macedonia, the Former Yugoslav Republic of</country>
 		<countryCode>mk</countryCode>
-		<countryFlag>plugins/UserCountry/flags/mk.png</countryFlag>
+		<countryFlag>plugins/UserCountry/images/flags/mk.png</countryFlag>
 		<region>Miravci</region>
 		<regionCode>66</regionCode>
 		<city>Stratford-upon-Avon</city>
@@ -610,7 +610,7 @@
 		<visitIp>1.2.4.6</visitIp>
 		
 		<visitorType>returningCustomer</visitorType>
-		<visitorTypeIcon>plugins/Live/templates/images/returningVisitor.gif</visitorTypeIcon>
+		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>themes/default/images/goal.png</visitConvertedIcon>
 		<visitEcommerceStatus>none</visitEcommerceStatus>
@@ -695,7 +695,7 @@
 		<continentCode>eur</continentCode>
 		<country>Russian Federation</country>
 		<countryCode>ru</countryCode>
-		<countryFlag>plugins/UserCountry/flags/ru.png</countryFlag>
+		<countryFlag>plugins/UserCountry/images/flags/ru.png</countryFlag>
 		<region>Saint Petersburg City</region>
 		<regionCode>66</regionCode>
 		<city>Hluboká nad Vltavou</city>
@@ -748,7 +748,7 @@
 		<visitIp>1.2.4.6</visitIp>
 		
 		<visitorType>returningCustomer</visitorType>
-		<visitorTypeIcon>plugins/Live/templates/images/returningVisitor.gif</visitorTypeIcon>
+		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>themes/default/images/goal.png</visitConvertedIcon>
 		<visitEcommerceStatus>none</visitEcommerceStatus>
@@ -816,7 +816,7 @@
 		<continentCode>eur</continentCode>
 		<country>Russian Federation</country>
 		<countryCode>ru</countryCode>
-		<countryFlag>plugins/UserCountry/flags/ru.png</countryFlag>
+		<countryFlag>plugins/UserCountry/images/flags/ru.png</countryFlag>
 		<region>Saint Petersburg City</region>
 		<regionCode>66</regionCode>
 		<city>Hluboká nad Vltavou</city>
@@ -869,7 +869,7 @@
 		<visitIp>1.2.4.5</visitIp>
 		
 		<visitorType>returningCustomer</visitorType>
-		<visitorTypeIcon>plugins/Live/templates/images/returningVisitor.gif</visitorTypeIcon>
+		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>themes/default/images/goal.png</visitConvertedIcon>
 		<visitEcommerceStatus>none</visitEcommerceStatus>
@@ -937,7 +937,7 @@
 		<continentCode>eur</continentCode>
 		<country>Russian Federation</country>
 		<countryCode>ru</countryCode>
-		<countryFlag>plugins/UserCountry/flags/ru.png</countryFlag>
+		<countryFlag>plugins/UserCountry/images/flags/ru.png</countryFlag>
 		<region>Saint Petersburg City</region>
 		<regionCode>66</regionCode>
 		<city>Stratford-upon-Avon</city>
@@ -990,7 +990,7 @@
 		<visitIp>1.2.4.5</visitIp>
 		
 		<visitorType>returningCustomer</visitorType>
-		<visitorTypeIcon>plugins/Live/templates/images/returningVisitor.gif</visitorTypeIcon>
+		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>themes/default/images/goal.png</visitConvertedIcon>
 		<visitEcommerceStatus>none</visitEcommerceStatus>
@@ -1058,7 +1058,7 @@
 		<continentCode>eur</continentCode>
 		<country>Russian Federation</country>
 		<countryCode>ru</countryCode>
-		<countryFlag>plugins/UserCountry/flags/ru.png</countryFlag>
+		<countryFlag>plugins/UserCountry/images/flags/ru.png</countryFlag>
 		<region>Saint Petersburg City</region>
 		<regionCode>66</regionCode>
 		<city>Stratford-upon-Avon</city>
@@ -1111,7 +1111,7 @@
 		<visitIp>1.2.4.4</visitIp>
 		
 		<visitorType>returningCustomer</visitorType>
-		<visitorTypeIcon>plugins/Live/templates/images/returningVisitor.gif</visitorTypeIcon>
+		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>themes/default/images/goal.png</visitConvertedIcon>
 		<visitEcommerceStatus>none</visitEcommerceStatus>
@@ -1196,7 +1196,7 @@
 		<continentCode>eur</continentCode>
 		<country>United Kingdom</country>
 		<countryCode>gb</countryCode>
-		<countryFlag>plugins/UserCountry/flags/gb.png</countryFlag>
+		<countryFlag>plugins/UserCountry/images/flags/gb.png</countryFlag>
 		<region>Kent</region>
 		<regionCode>G5</regionCode>
 		<city>Stratford-upon-Avon</city>
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getCity_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getCity_month.xml
index 5bfd591f8f..1f6e380d6b 100755
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getCity_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getCity_month.xml
@@ -23,7 +23,7 @@
 		<country>xx</country>
 		<country_name>Unknown</country_name>
 		<region_name>Unknown</region_name>
-		<logo>plugins/UserCountry/flags/xx.png</logo>
+		<logo>plugins/UserCountry/images/flags/xx.png</logo>
 	</row>
 	<row>
 		<label>Ashburn, Virginia, United States</label>
@@ -49,6 +49,6 @@
 		<country>us</country>
 		<country_name>United States</country_name>
 		<region_name>Virginia</region_name>
-		<logo>plugins/UserCountry/flags/us.png</logo>
+		<logo>plugins/UserCountry/images/flags/us.png</logo>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getCountry_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getCountry_month.xml
index 14c64c3f03..f0caed4f4a 100755
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getCountry_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getCountry_month.xml
@@ -18,7 +18,7 @@
 		<revenue>50</revenue>
 		<sum_daily_nb_uniq_visitors>11</sum_daily_nb_uniq_visitors>
 		<code>jp</code>
-		<logo>plugins/UserCountry/flags/jp.png</logo>
+		<logo>plugins/UserCountry/images/flags/jp.png</logo>
 		<logoWidth>16</logoWidth>
 		<logoHeight>11</logoHeight>
 	</row>
@@ -40,7 +40,7 @@
 		<revenue>35</revenue>
 		<sum_daily_nb_uniq_visitors>7</sum_daily_nb_uniq_visitors>
 		<code>xx</code>
-		<logo>plugins/UserCountry/flags/xx.png</logo>
+		<logo>plugins/UserCountry/images/flags/xx.png</logo>
 		<logoWidth>16</logoWidth>
 		<logoHeight>11</logoHeight>
 	</row>
@@ -62,7 +62,7 @@
 		<revenue>20</revenue>
 		<sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors>
 		<code>us</code>
-		<logo>plugins/UserCountry/flags/us.png</logo>
+		<logo>plugins/UserCountry/images/flags/us.png</logo>
 		<logoWidth>16</logoWidth>
 		<logoHeight>11</logoHeight>
 	</row>
@@ -84,7 +84,7 @@
 		<revenue>15</revenue>
 		<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 		<code>br</code>
-		<logo>plugins/UserCountry/flags/br.png</logo>
+		<logo>plugins/UserCountry/images/flags/br.png</logo>
 		<logoWidth>16</logoWidth>
 		<logoHeight>11</logoHeight>
 	</row>
@@ -98,7 +98,7 @@
 		<nb_visits_converted>0</nb_visits_converted>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 		<code>au</code>
-		<logo>plugins/UserCountry/flags/au.png</logo>
+		<logo>plugins/UserCountry/images/flags/au.png</logo>
 		<logoWidth>16</logoWidth>
 		<logoHeight>11</logoHeight>
 	</row>
diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getRegion_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getRegion_month.xml
index 345541d0ce..3ff8f54d91 100755
--- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getRegion_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getRegion_month.xml
@@ -21,7 +21,7 @@
 		<country>xx</country>
 		<country_name>Unknown</country_name>
 		<region_name>Unknown</region_name>
-		<logo>plugins/UserCountry/flags/xx.png</logo>
+		<logo>plugins/UserCountry/images/flags/xx.png</logo>
 	</row>
 	<row>
 		<label>Virginia, United States</label>
@@ -44,6 +44,6 @@
 		<country>us</country>
 		<country_name>United States</country_name>
 		<region_name>Virginia</region_name>
-		<logo>plugins/UserCountry/flags/us.png</logo>
+		<logo>plugins/UserCountry/images/flags/us.png</logo>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml
index f4fb13bd4d..9c3a7655b0 100644
--- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml
@@ -56,7 +56,7 @@
 		<continentCode>amn</continentCode>
 		<country>United States</country>
 		<countryCode>us</countryCode>
-		<countryFlag>plugins/UserCountry/flags/us.png</countryFlag>
+		<countryFlag>plugins/UserCountry/images/flags/us.png</countryFlag>
 		<region>California</region>
 		<regionCode>CA</regionCode>
 		<city>not a city</city>
@@ -109,7 +109,7 @@
 		<visitIp>1.2.4.8</visitIp>
 		
 		<visitorType>returningCustomer</visitorType>
-		<visitorTypeIcon>plugins/Live/templates/images/returningVisitor.gif</visitorTypeIcon>
+		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>themes/default/images/goal.png</visitConvertedIcon>
 		<visitEcommerceStatus>none</visitEcommerceStatus>
@@ -194,7 +194,7 @@
 		<continentCode>unk</continentCode>
 		<country>Unknown</country>
 		<countryCode>xx</countryCode>
-		<countryFlag>plugins/UserCountry/flags/xx.png</countryFlag>
+		<countryFlag>plugins/UserCountry/images/flags/xx.png</countryFlag>
 		<region />
 		<regionCode />
 		<city />
@@ -247,7 +247,7 @@
 		<visitIp>1.2.4.8</visitIp>
 		
 		<visitorType>returningCustomer</visitorType>
-		<visitorTypeIcon>plugins/Live/templates/images/returningVisitor.gif</visitorTypeIcon>
+		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>themes/default/images/goal.png</visitConvertedIcon>
 		<visitEcommerceStatus>none</visitEcommerceStatus>
@@ -315,7 +315,7 @@
 		<continentCode>unk</continentCode>
 		<country>Unknown</country>
 		<countryCode>xx</countryCode>
-		<countryFlag>plugins/UserCountry/flags/xx.png</countryFlag>
+		<countryFlag>plugins/UserCountry/images/flags/xx.png</countryFlag>
 		<region />
 		<regionCode />
 		<city />
@@ -368,7 +368,7 @@
 		<visitIp>1.2.4.7</visitIp>
 		
 		<visitorType>returningCustomer</visitorType>
-		<visitorTypeIcon>plugins/Live/templates/images/returningVisitor.gif</visitorTypeIcon>
+		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>themes/default/images/goal.png</visitConvertedIcon>
 		<visitEcommerceStatus>none</visitEcommerceStatus>
@@ -436,7 +436,7 @@
 		<continentCode>eur</continentCode>
 		<country>Macedonia, the Former Yugoslav Republic of</country>
 		<countryCode>mk</countryCode>
-		<countryFlag>plugins/UserCountry/flags/mk.png</countryFlag>
+		<countryFlag>plugins/UserCountry/images/flags/mk.png</countryFlag>
 		<region>Miravci</region>
 		<regionCode>66</regionCode>
 		<city>Stratford-upon-Avon</city>
@@ -489,7 +489,7 @@
 		<visitIp>1.2.4.7</visitIp>
 		
 		<visitorType>returningCustomer</visitorType>
-		<visitorTypeIcon>plugins/Live/templates/images/returningVisitor.gif</visitorTypeIcon>
+		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>themes/default/images/goal.png</visitConvertedIcon>
 		<visitEcommerceStatus>none</visitEcommerceStatus>
@@ -557,7 +557,7 @@
 		<continentCode>eur</continentCode>
 		<country>Macedonia, the Former Yugoslav Republic of</country>
 		<countryCode>mk</countryCode>
-		<countryFlag>plugins/UserCountry/flags/mk.png</countryFlag>
+		<countryFlag>plugins/UserCountry/images/flags/mk.png</countryFlag>
 		<region>Miravci</region>
 		<regionCode>66</regionCode>
 		<city>Stratford-upon-Avon</city>
@@ -610,7 +610,7 @@
 		<visitIp>1.2.4.6</visitIp>
 		
 		<visitorType>returningCustomer</visitorType>
-		<visitorTypeIcon>plugins/Live/templates/images/returningVisitor.gif</visitorTypeIcon>
+		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>themes/default/images/goal.png</visitConvertedIcon>
 		<visitEcommerceStatus>none</visitEcommerceStatus>
@@ -695,7 +695,7 @@
 		<continentCode>eur</continentCode>
 		<country>Russian Federation</country>
 		<countryCode>ru</countryCode>
-		<countryFlag>plugins/UserCountry/flags/ru.png</countryFlag>
+		<countryFlag>plugins/UserCountry/images/flags/ru.png</countryFlag>
 		<region>Saint Petersburg City</region>
 		<regionCode>66</regionCode>
 		<city>Hluboká nad Vltavou</city>
@@ -748,7 +748,7 @@
 		<visitIp>1.2.4.6</visitIp>
 		
 		<visitorType>returningCustomer</visitorType>
-		<visitorTypeIcon>plugins/Live/templates/images/returningVisitor.gif</visitorTypeIcon>
+		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>themes/default/images/goal.png</visitConvertedIcon>
 		<visitEcommerceStatus>none</visitEcommerceStatus>
@@ -816,7 +816,7 @@
 		<continentCode>eur</continentCode>
 		<country>Russian Federation</country>
 		<countryCode>ru</countryCode>
-		<countryFlag>plugins/UserCountry/flags/ru.png</countryFlag>
+		<countryFlag>plugins/UserCountry/images/flags/ru.png</countryFlag>
 		<region>Saint Petersburg City</region>
 		<regionCode>66</regionCode>
 		<city>Hluboká nad Vltavou</city>
@@ -869,7 +869,7 @@
 		<visitIp>1.2.4.5</visitIp>
 		
 		<visitorType>returningCustomer</visitorType>
-		<visitorTypeIcon>plugins/Live/templates/images/returningVisitor.gif</visitorTypeIcon>
+		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>themes/default/images/goal.png</visitConvertedIcon>
 		<visitEcommerceStatus>none</visitEcommerceStatus>
@@ -937,7 +937,7 @@
 		<continentCode>eur</continentCode>
 		<country>Russian Federation</country>
 		<countryCode>ru</countryCode>
-		<countryFlag>plugins/UserCountry/flags/ru.png</countryFlag>
+		<countryFlag>plugins/UserCountry/images/flags/ru.png</countryFlag>
 		<region>Saint Petersburg City</region>
 		<regionCode>66</regionCode>
 		<city>Stratford-upon-Avon</city>
@@ -990,7 +990,7 @@
 		<visitIp>1.2.4.5</visitIp>
 		
 		<visitorType>returningCustomer</visitorType>
-		<visitorTypeIcon>plugins/Live/templates/images/returningVisitor.gif</visitorTypeIcon>
+		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>themes/default/images/goal.png</visitConvertedIcon>
 		<visitEcommerceStatus>none</visitEcommerceStatus>
@@ -1058,7 +1058,7 @@
 		<continentCode>eur</continentCode>
 		<country>Russian Federation</country>
 		<countryCode>ru</countryCode>
-		<countryFlag>plugins/UserCountry/flags/ru.png</countryFlag>
+		<countryFlag>plugins/UserCountry/images/flags/ru.png</countryFlag>
 		<region>Saint Petersburg City</region>
 		<regionCode>66</regionCode>
 		<city>Stratford-upon-Avon</city>
@@ -1111,7 +1111,7 @@
 		<visitIp>1.2.4.4</visitIp>
 		
 		<visitorType>returningCustomer</visitorType>
-		<visitorTypeIcon>plugins/Live/templates/images/returningVisitor.gif</visitorTypeIcon>
+		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>themes/default/images/goal.png</visitConvertedIcon>
 		<visitEcommerceStatus>none</visitEcommerceStatus>
@@ -1196,7 +1196,7 @@
 		<continentCode>eur</continentCode>
 		<country>United Kingdom</country>
 		<countryCode>gb</countryCode>
-		<countryFlag>plugins/UserCountry/flags/gb.png</countryFlag>
+		<countryFlag>plugins/UserCountry/images/flags/gb.png</countryFlag>
 		<region>Kent</region>
 		<regionCode>G5</regionCode>
 		<city>Stratford-upon-Avon</city>
diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCity_month.xml b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCity_month.xml
index 29f5758280..ac96197b86 100755
--- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCity_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCity_month.xml
@@ -28,7 +28,7 @@
 		<country>xx</country>
 		<country_name>Unknown</country_name>
 		<region_name>Unknown</region_name>
-		<logo>plugins/UserCountry/flags/xx.png</logo>
+		<logo>plugins/UserCountry/images/flags/xx.png</logo>
 	</row>
 	<row>
 		<label>Stratford-upon-Avon, Warwickshire, United Kingdom</label>
@@ -59,7 +59,7 @@
 		<country>gb</country>
 		<country_name>United Kingdom</country_name>
 		<region_name>Warwickshire</region_name>
-		<logo>plugins/UserCountry/flags/gb.png</logo>
+		<logo>plugins/UserCountry/images/flags/gb.png</logo>
 	</row>
 	<row>
 		<label>Vancouver, British Columbia, Canada</label>
@@ -90,7 +90,7 @@
 		<country>ca</country>
 		<country_name>Canada</country_name>
 		<region_name>British Columbia</region_name>
-		<logo>plugins/UserCountry/flags/ca.png</logo>
+		<logo>plugins/UserCountry/images/flags/ca.png</logo>
 	</row>
 	<row>
 		<label>Hluboká nad Vltavou, Saint Petersburg City, Russian Federation</label>
@@ -119,7 +119,7 @@
 		<country>ru</country>
 		<country_name>Russian Federation</country_name>
 		<region_name>Saint Petersburg City</region_name>
-		<logo>plugins/UserCountry/flags/ru.png</logo>
+		<logo>plugins/UserCountry/images/flags/ru.png</logo>
 	</row>
 	<row>
 		<label>London, London, City of, United Kingdom</label>
@@ -148,7 +148,7 @@
 		<country>gb</country>
 		<country_name>United Kingdom</country_name>
 		<region_name>London, City of</region_name>
-		<logo>plugins/UserCountry/flags/gb.png</logo>
+		<logo>plugins/UserCountry/images/flags/gb.png</logo>
 	</row>
 	<row>
 		<label>Nuneaton and Bedworth, Warwickshire, United Kingdom</label>
@@ -177,7 +177,7 @@
 		<country>gb</country>
 		<country_name>United Kingdom</country_name>
 		<region_name>Warwickshire</region_name>
-		<logo>plugins/UserCountry/flags/gb.png</logo>
+		<logo>plugins/UserCountry/images/flags/gb.png</logo>
 	</row>
 	<row>
 		<label>Stratford-upon-Avon, Miravci, Macedonia, the Former Yugoslav Republic of</label>
@@ -206,7 +206,7 @@
 		<country>mk</country>
 		<country_name>Macedonia, the Former Yugoslav Republic of</country_name>
 		<region_name>Miravci</region_name>
-		<logo>plugins/UserCountry/flags/mk.png</logo>
+		<logo>plugins/UserCountry/images/flags/mk.png</logo>
 	</row>
 	<row>
 		<label>Stratford-upon-Avon, Saint Petersburg City, Russian Federation</label>
@@ -235,7 +235,7 @@
 		<country>ru</country>
 		<country_name>Russian Federation</country_name>
 		<region_name>Saint Petersburg City</region_name>
-		<logo>plugins/UserCountry/flags/ru.png</logo>
+		<logo>plugins/UserCountry/images/flags/ru.png</logo>
 	</row>
 	<row>
 		<label>Stratford-upon-Avon, Kent, United Kingdom</label>
@@ -264,7 +264,7 @@
 		<country>gb</country>
 		<country_name>United Kingdom</country_name>
 		<region_name>Kent</region_name>
-		<logo>plugins/UserCountry/flags/gb.png</logo>
+		<logo>plugins/UserCountry/images/flags/gb.png</logo>
 	</row>
 	<row>
 		<label>Besançon, Franche-Comte, France</label>
@@ -295,7 +295,7 @@
 		<country>fr</country>
 		<country_name>France</country_name>
 		<region_name>Franche-Comte</region_name>
-		<logo>plugins/UserCountry/flags/fr.png</logo>
+		<logo>plugins/UserCountry/images/flags/fr.png</logo>
 	</row>
 	<row>
 		<label>Lhasa, Unknown, Tibet</label>
@@ -326,7 +326,7 @@
 		<country>ti</country>
 		<country_name>Tibet</country_name>
 		<region_name>Unknown</region_name>
-		<logo>plugins/UserCountry/flags/ti.png</logo>
+		<logo>plugins/UserCountry/images/flags/ti.png</logo>
 	</row>
 	<row>
 		<label>not a city, California, United States</label>
@@ -352,6 +352,6 @@
 		<country>us</country>
 		<country_name>United States</country_name>
 		<region_name>California</region_name>
-		<logo>plugins/UserCountry/flags/us.png</logo>
+		<logo>plugins/UserCountry/images/flags/us.png</logo>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCountry_month.xml b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCountry_month.xml
index 55bc1f2f57..d2c1f86e6a 100755
--- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCountry_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCountry_month.xml
@@ -23,7 +23,7 @@
 		<revenue>75</revenue>
 		<sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
 		<code>gb</code>
-		<logo>plugins/UserCountry/flags/gb.png</logo>
+		<logo>plugins/UserCountry/images/flags/gb.png</logo>
 		<logoWidth>16</logoWidth>
 		<logoHeight>11</logoHeight>
 	</row>
@@ -50,7 +50,7 @@
 		<revenue>30</revenue>
 		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
 		<code>ru</code>
-		<logo>plugins/UserCountry/flags/ru.png</logo>
+		<logo>plugins/UserCountry/images/flags/ru.png</logo>
 		<logoWidth>16</logoWidth>
 		<logoHeight>11</logoHeight>
 	</row>
@@ -77,7 +77,7 @@
 		<revenue>30</revenue>
 		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
 		<code>ca</code>
-		<logo>plugins/UserCountry/flags/ca.png</logo>
+		<logo>plugins/UserCountry/images/flags/ca.png</logo>
 		<logoWidth>16</logoWidth>
 		<logoHeight>11</logoHeight>
 	</row>
@@ -104,7 +104,7 @@
 		<revenue>20</revenue>
 		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
 		<code>fr</code>
-		<logo>plugins/UserCountry/flags/fr.png</logo>
+		<logo>plugins/UserCountry/images/flags/fr.png</logo>
 		<logoWidth>16</logoWidth>
 		<logoHeight>11</logoHeight>
 	</row>
@@ -131,7 +131,7 @@
 		<revenue>15</revenue>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 		<code>mk</code>
-		<logo>plugins/UserCountry/flags/mk.png</logo>
+		<logo>plugins/UserCountry/images/flags/mk.png</logo>
 		<logoWidth>16</logoWidth>
 		<logoHeight>11</logoHeight>
 	</row>
@@ -158,7 +158,7 @@
 		<revenue>15</revenue>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 		<code>xx</code>
-		<logo>plugins/UserCountry/flags/xx.png</logo>
+		<logo>plugins/UserCountry/images/flags/xx.png</logo>
 		<logoWidth>16</logoWidth>
 		<logoHeight>11</logoHeight>
 	</row>
@@ -185,7 +185,7 @@
 		<revenue>10</revenue>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 		<code>id</code>
-		<logo>plugins/UserCountry/flags/id.png</logo>
+		<logo>plugins/UserCountry/images/flags/id.png</logo>
 		<logoWidth>16</logoWidth>
 		<logoHeight>11</logoHeight>
 	</row>
@@ -212,7 +212,7 @@
 		<revenue>10</revenue>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 		<code>it</code>
-		<logo>plugins/UserCountry/flags/it.png</logo>
+		<logo>plugins/UserCountry/images/flags/it.png</logo>
 		<logoWidth>16</logoWidth>
 		<logoHeight>11</logoHeight>
 	</row>
@@ -239,7 +239,7 @@
 		<revenue>10</revenue>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 		<code>ti</code>
-		<logo>plugins/UserCountry/flags/ti.png</logo>
+		<logo>plugins/UserCountry/images/flags/ti.png</logo>
 		<logoWidth>16</logoWidth>
 		<logoHeight>11</logoHeight>
 	</row>
@@ -261,7 +261,7 @@
 		<revenue>5</revenue>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 		<code>us</code>
-		<logo>plugins/UserCountry/flags/us.png</logo>
+		<logo>plugins/UserCountry/images/flags/us.png</logo>
 		<logoWidth>16</logoWidth>
 		<logoHeight>11</logoHeight>
 	</row>
diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getRegion_month.xml b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getRegion_month.xml
index f879c9d3e5..85cd065211 100755
--- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getRegion_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getRegion_month.xml
@@ -26,7 +26,7 @@
 		<country>gb</country>
 		<country_name>United Kingdom</country_name>
 		<region_name>Warwickshire</region_name>
-		<logo>plugins/UserCountry/flags/gb.png</logo>
+		<logo>plugins/UserCountry/images/flags/gb.png</logo>
 	</row>
 	<row>
 		<label>Unknown</label>
@@ -54,7 +54,7 @@
 		<country>xx</country>
 		<country_name>Unknown</country_name>
 		<region_name>Unknown</region_name>
-		<logo>plugins/UserCountry/flags/xx.png</logo>
+		<logo>plugins/UserCountry/images/flags/xx.png</logo>
 	</row>
 	<row>
 		<label>Saint Petersburg City, Russian Federation</label>
@@ -82,7 +82,7 @@
 		<country>ru</country>
 		<country_name>Russian Federation</country_name>
 		<region_name>Saint Petersburg City</region_name>
-		<logo>plugins/UserCountry/flags/ru.png</logo>
+		<logo>plugins/UserCountry/images/flags/ru.png</logo>
 	</row>
 	<row>
 		<label>British Columbia, Canada</label>
@@ -110,7 +110,7 @@
 		<country>ca</country>
 		<country_name>Canada</country_name>
 		<region_name>British Columbia</region_name>
-		<logo>plugins/UserCountry/flags/ca.png</logo>
+		<logo>plugins/UserCountry/images/flags/ca.png</logo>
 	</row>
 	<row>
 		<label>Miravci, Macedonia, the Former Yugoslav Republic of</label>
@@ -138,7 +138,7 @@
 		<country>mk</country>
 		<country_name>Macedonia, the Former Yugoslav Republic of</country_name>
 		<region_name>Miravci</region_name>
-		<logo>plugins/UserCountry/flags/mk.png</logo>
+		<logo>plugins/UserCountry/images/flags/mk.png</logo>
 	</row>
 	<row>
 		<label>Kent, United Kingdom</label>
@@ -166,7 +166,7 @@
 		<country>gb</country>
 		<country_name>United Kingdom</country_name>
 		<region_name>Kent</region_name>
-		<logo>plugins/UserCountry/flags/gb.png</logo>
+		<logo>plugins/UserCountry/images/flags/gb.png</logo>
 	</row>
 	<row>
 		<label>London, City of, United Kingdom</label>
@@ -194,7 +194,7 @@
 		<country>gb</country>
 		<country_name>United Kingdom</country_name>
 		<region_name>London, City of</region_name>
-		<logo>plugins/UserCountry/flags/gb.png</logo>
+		<logo>plugins/UserCountry/images/flags/gb.png</logo>
 	</row>
 	<row>
 		<label>Unknown, Tibet</label>
@@ -222,7 +222,7 @@
 		<country>ti</country>
 		<country_name>Tibet</country_name>
 		<region_name>Unknown</region_name>
-		<logo>plugins/UserCountry/flags/ti.png</logo>
+		<logo>plugins/UserCountry/images/flags/ti.png</logo>
 	</row>
 	<row>
 		<label>Franche-Comte, France</label>
@@ -250,7 +250,7 @@
 		<country>fr</country>
 		<country_name>France</country_name>
 		<region_name>Franche-Comte</region_name>
-		<logo>plugins/UserCountry/flags/fr.png</logo>
+		<logo>plugins/UserCountry/images/flags/fr.png</logo>
 	</row>
 	<row>
 		<label>California, United States</label>
@@ -273,6 +273,6 @@
 		<country>us</country>
 		<country_name>United States</country_name>
 		<region_name>California</region_name>
-		<logo>plugins/UserCountry/flags/us.png</logo>
+		<logo>plugins/UserCountry/images/flags/us.png</logo>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getCity_month.xml b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getCity_month.xml
index f07a79dad9..60dfef99f2 100755
--- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getCity_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getCity_month.xml
@@ -29,6 +29,6 @@
 		<country>gb</country>
 		<country_name>United Kingdom</country_name>
 		<region_name>Warwickshire</region_name>
-		<logo>plugins/UserCountry/flags/gb.png</logo>
+		<logo>plugins/UserCountry/images/flags/gb.png</logo>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getCountry_month.xml b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getCountry_month.xml
index 003f6b0af1..a548f9004f 100755
--- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getCountry_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getCountry_month.xml
@@ -23,7 +23,7 @@
 		<revenue>30</revenue>
 		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
 		<code>gb</code>
-		<logo>plugins/UserCountry/flags/gb.png</logo>
+		<logo>plugins/UserCountry/images/flags/gb.png</logo>
 		<logoWidth>16</logoWidth>
 		<logoHeight>11</logoHeight>
 	</row>
diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getRegion_month.xml b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getRegion_month.xml
index 51f7a0efb4..0a0ca3339d 100755
--- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getRegion_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getRegion_month.xml
@@ -26,6 +26,6 @@
 		<country>gb</country>
 		<country_name>United Kingdom</country_name>
 		<region_name>Warwickshire</region_name>
-		<logo>plugins/UserCountry/flags/gb.png</logo>
+		<logo>plugins/UserCountry/images/flags/gb.png</logo>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_continent__UserCountry.getCountry_month.xml b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_continent__UserCountry.getCountry_month.xml
index edc146a42e..589404867b 100755
--- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_continent__UserCountry.getCountry_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_continent__UserCountry.getCountry_month.xml
@@ -23,7 +23,7 @@
 		<revenue>75</revenue>
 		<sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors>
 		<code>gb</code>
-		<logo>plugins/UserCountry/flags/gb.png</logo>
+		<logo>plugins/UserCountry/images/flags/gb.png</logo>
 		<logoWidth>16</logoWidth>
 		<logoHeight>11</logoHeight>
 	</row>
@@ -50,7 +50,7 @@
 		<revenue>30</revenue>
 		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
 		<code>ru</code>
-		<logo>plugins/UserCountry/flags/ru.png</logo>
+		<logo>plugins/UserCountry/images/flags/ru.png</logo>
 		<logoWidth>16</logoWidth>
 		<logoHeight>11</logoHeight>
 	</row>
@@ -77,7 +77,7 @@
 		<revenue>20</revenue>
 		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
 		<code>fr</code>
-		<logo>plugins/UserCountry/flags/fr.png</logo>
+		<logo>plugins/UserCountry/images/flags/fr.png</logo>
 		<logoWidth>16</logoWidth>
 		<logoHeight>11</logoHeight>
 	</row>
@@ -104,7 +104,7 @@
 		<revenue>15</revenue>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 		<code>mk</code>
-		<logo>plugins/UserCountry/flags/mk.png</logo>
+		<logo>plugins/UserCountry/images/flags/mk.png</logo>
 		<logoWidth>16</logoWidth>
 		<logoHeight>11</logoHeight>
 	</row>
@@ -131,7 +131,7 @@
 		<revenue>10</revenue>
 		<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
 		<code>it</code>
-		<logo>plugins/UserCountry/flags/it.png</logo>
+		<logo>plugins/UserCountry/images/flags/it.png</logo>
 		<logoWidth>16</logoWidth>
 		<logoHeight>11</logoHeight>
 	</row>
diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getCity_month.xml b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getCity_month.xml
index 15277712f8..5f006ed230 100755
--- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getCity_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getCity_month.xml
@@ -29,6 +29,6 @@
 		<country>ca</country>
 		<country_name>Canada</country_name>
 		<region_name>British Columbia</region_name>
-		<logo>plugins/UserCountry/flags/ca.png</logo>
+		<logo>plugins/UserCountry/images/flags/ca.png</logo>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getCountry_month.xml b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getCountry_month.xml
index 33e6aefbdf..b22a9a99af 100755
--- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getCountry_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getCountry_month.xml
@@ -23,7 +23,7 @@
 		<revenue>30</revenue>
 		<sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors>
 		<code>ca</code>
-		<logo>plugins/UserCountry/flags/ca.png</logo>
+		<logo>plugins/UserCountry/images/flags/ca.png</logo>
 		<logoWidth>16</logoWidth>
 		<logoHeight>11</logoHeight>
 	</row>
diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getRegion_month.xml b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getRegion_month.xml
index 6c790beddb..589f609d5e 100755
--- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getRegion_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getRegion_month.xml
@@ -26,6 +26,6 @@
 		<country>ca</country>
 		<country_name>Canada</country_name>
 		<region_name>British Columbia</region_name>
-		<logo>plugins/UserCountry/flags/ca.png</logo>
+		<logo>plugins/UserCountry/images/flags/ca.png</logo>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getCity_month.xml b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getCity_month.xml
index f39b1e6c27..72e6b3fd49 100755
--- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getCity_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getCity_month.xml
@@ -29,7 +29,7 @@
 		<country>gb</country>
 		<country_name>United Kingdom</country_name>
 		<region_name>Warwickshire</region_name>
-		<logo>plugins/UserCountry/flags/gb.png</logo>
+		<logo>plugins/UserCountry/images/flags/gb.png</logo>
 	</row>
 	<row>
 		<label>Nuneaton and Bedworth, Warwickshire, United Kingdom</label>
@@ -58,6 +58,6 @@
 		<country>gb</country>
 		<country_name>United Kingdom</country_name>
 		<region_name>Warwickshire</region_name>
-		<logo>plugins/UserCountry/flags/gb.png</logo>
+		<logo>plugins/UserCountry/images/flags/gb.png</logo>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getCountry_month.xml b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getCountry_month.xml
index 7ea54f11f5..1ff7e1644c 100755
--- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getCountry_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getCountry_month.xml
@@ -23,7 +23,7 @@
 		<revenue>45</revenue>
 		<sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors>
 		<code>gb</code>
-		<logo>plugins/UserCountry/flags/gb.png</logo>
+		<logo>plugins/UserCountry/images/flags/gb.png</logo>
 		<logoWidth>16</logoWidth>
 		<logoHeight>11</logoHeight>
 	</row>
diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getRegion_month.xml b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getRegion_month.xml
index 3f59ad407d..4209f553ae 100755
--- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getRegion_month.xml
+++ b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getRegion_month.xml
@@ -26,6 +26,6 @@
 		<country>gb</country>
 		<country_name>United Kingdom</country_name>
 		<region_name>Warwickshire</region_name>
-		<logo>plugins/UserCountry/flags/gb.png</logo>
+		<logo>plugins/UserCountry/images/flags/gb.png</logo>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__UserCountry.getCity_day.xml b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__UserCountry.getCity_day.xml
index 4592d291b9..e2562def53 100755
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__UserCountry.getCity_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__UserCountry.getCity_day.xml
@@ -28,6 +28,6 @@
 		<country>xx</country>
 		<country_name>Unknown</country_name>
 		<region_name>Unknown</region_name>
-		<logo>plugins/UserCountry/flags/xx.png</logo>
+		<logo>plugins/UserCountry/images/flags/xx.png</logo>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__UserCountry.getCountry_day.xml b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__UserCountry.getCountry_day.xml
index 0ddbedd976..86f61ceeba 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__UserCountry.getCountry_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__UserCountry.getCountry_day.xml
@@ -23,7 +23,7 @@
 		<nb_conversions>2</nb_conversions>
 		<revenue>43</revenue>
 		<code>fr</code>
-		<logo>plugins/UserCountry/flags/fr.png</logo>
+		<logo>plugins/UserCountry/images/flags/fr.png</logo>
 		<logoWidth>16</logoWidth>
 		<logoHeight>11</logoHeight>
 	</row>
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__UserCountry.getRegion_day.xml b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__UserCountry.getRegion_day.xml
index cccafaa0f2..a32f142d6e 100755
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__UserCountry.getRegion_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__UserCountry.getRegion_day.xml
@@ -26,6 +26,6 @@
 		<country>xx</country>
 		<country_name>Unknown</country_name>
 		<region_name>Unknown</region_name>
-		<logo>plugins/UserCountry/flags/xx.png</logo>
+		<logo>plugins/UserCountry/images/flags/xx.png</logo>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml
index b052ae38fa..84165383dd 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml
@@ -6,7 +6,7 @@
 		<visitIp>156.5.3.2</visitIp>
 		
 		<visitorType>returning</visitorType>
-		<visitorTypeIcon>plugins/Live/templates/images/returningVisitor.gif</visitorTypeIcon>
+		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>themes/default/images/goal.png</visitConvertedIcon>
 		<visitEcommerceStatus>none</visitEcommerceStatus>
@@ -57,7 +57,7 @@
 		<continentCode>eur</continentCode>
 		<country>France</country>
 		<countryCode>fr</countryCode>
-		<countryFlag>plugins/UserCountry/flags/fr.png</countryFlag>
+		<countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag>
 		<region />
 		<regionCode />
 		<city />
@@ -241,7 +241,7 @@
 		<continentCode>eur</continentCode>
 		<country>France</country>
 		<countryCode>fr</countryCode>
-		<countryFlag>plugins/UserCountry/flags/fr.png</countryFlag>
+		<countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag>
 		<region />
 		<regionCode />
 		<city />
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getCity_day.xml b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getCity_day.xml
index 4e23dbf45b..4de55a5ecd 100755
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getCity_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getCity_day.xml
@@ -28,6 +28,6 @@
 		<country>xx</country>
 		<country_name>Unknown</country_name>
 		<region_name>Unknown</region_name>
-		<logo>plugins/UserCountry/flags/xx.png</logo>
+		<logo>plugins/UserCountry/images/flags/xx.png</logo>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getCountry_day.xml b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getCountry_day.xml
index bfc75b9891..06f10725ef 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getCountry_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getCountry_day.xml
@@ -23,7 +23,7 @@
 		<nb_conversions>2</nb_conversions>
 		<revenue>43</revenue>
 		<code>fr</code>
-		<logo>plugins/UserCountry/flags/fr.png</logo>
+		<logo>plugins/UserCountry/images/flags/fr.png</logo>
 		<logoWidth>16</logoWidth>
 		<logoHeight>11</logoHeight>
 	</row>
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getRegion_day.xml b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getRegion_day.xml
index 7994ac8c81..8698ce8960 100755
--- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getRegion_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__UserCountry.getRegion_day.xml
@@ -26,6 +26,6 @@
 		<country>xx</country>
 		<country_name>Unknown</country_name>
 		<region_name>Unknown</region_name>
-		<logo>plugins/UserCountry/flags/xx.png</logo>
+		<logo>plugins/UserCountry/images/flags/xx.png</logo>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitor_NoKeywordSpecified__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/Integration/expected/test_OneVisitor_NoKeywordSpecified__Live.getLastVisitsDetails_day.xml
index 0d99dbf939..d7aa0fa4d9 100644
--- a/tests/PHPUnit/Integration/expected/test_OneVisitor_NoKeywordSpecified__Live.getLastVisitsDetails_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_OneVisitor_NoKeywordSpecified__Live.getLastVisitsDetails_day.xml
@@ -46,7 +46,7 @@
 		<continentCode>eur</continentCode>
 		<country>France</country>
 		<countryCode>fr</countryCode>
-		<countryFlag>plugins/UserCountry/flags/fr.png</countryFlag>
+		<countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag>
 		<region />
 		<regionCode />
 		<city />
@@ -149,7 +149,7 @@
 		<continentCode>eur</continentCode>
 		<country>France</country>
 		<countryCode>fr</countryCode>
-		<countryFlag>plugins/UserCountry/flags/fr.png</countryFlag>
+		<countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag>
 		<region />
 		<regionCode />
 		<city />
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__PDFReports.generateReport_month.original.html b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__PDFReports.generateReport_month.original.html
index 58e6f19d5a..0f14630b1b 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__PDFReports.generateReport_month.original.html
+++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__PDFReports.generateReport_month.original.html
@@ -2774,7 +2774,7 @@ width="700"/>
 <tbody>
 <tr style="">
 <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-<img src='plugins/UserCountry/flags/fr.png'>
+<img src='plugins/UserCountry/images/flags/fr.png'>
 &nbsp;
 France
 </td>
@@ -2904,7 +2904,7 @@ width="700"/>
 <tbody>
 <tr style="">
 <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-<img src='plugins/UserCountry/flags/xx.png'>
+<img src='plugins/UserCountry/images/flags/xx.png'>
 &nbsp;
 Unknown
 </td>
@@ -2970,7 +2970,7 @@ width="700"/>
 <tbody>
 <tr style="">
 <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-<img src='plugins/UserCountry/flags/xx.png'>
+<img src='plugins/UserCountry/images/flags/xx.png'>
 &nbsp;
 Unknown
 </td>
diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__PDFReports.generateReport_month.original.html b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__PDFReports.generateReport_month.original.html
index f2b131a8b4..7d014c7303 100644
--- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__PDFReports.generateReport_month.original.html
+++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__PDFReports.generateReport_month.original.html
@@ -2655,7 +2655,7 @@ Country
 <tbody>
 <tr style="">
 <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-<img src='plugins/UserCountry/flags/fr.png'>
+<img src='plugins/UserCountry/images/flags/fr.png'>
 &nbsp;
 France
 </td>
@@ -2771,7 +2771,7 @@ Region
 <tbody>
 <tr style="">
 <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-<img src='plugins/UserCountry/flags/xx.png'>
+<img src='plugins/UserCountry/images/flags/xx.png'>
 &nbsp;
 Unknown
 </td>
@@ -2830,7 +2830,7 @@ City
 <tbody>
 <tr style="">
 <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-<img src='plugins/UserCountry/flags/xx.png'>
+<img src='plugins/UserCountry/images/flags/xx.png'>
 &nbsp;
 Unknown
 </td>
diff --git a/tests/PHPUnit/Integration/expected/test_apiGetReportMetadata__API.getProcessedReport_day.xml b/tests/PHPUnit/Integration/expected/test_apiGetReportMetadata__API.getProcessedReport_day.xml
index 220726e647..0dddbe1d5d 100644
--- a/tests/PHPUnit/Integration/expected/test_apiGetReportMetadata__API.getProcessedReport_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_apiGetReportMetadata__API.getProcessedReport_day.xml
@@ -66,7 +66,7 @@
 	<reportMetadata>
 		<row>
 			<code>fr</code>
-			<logo>plugins/UserCountry/flags/fr.png</logo>
+			<logo>plugins/UserCountry/images/flags/fr.png</logo>
 			<logoWidth>16</logoWidth>
 			<logoHeight>11</logoHeight>
 		</row>
diff --git a/tests/PHPUnit/Integration/expected/test_apiGetReportMetadata_showRawMetrics__API.getProcessedReport_day.xml b/tests/PHPUnit/Integration/expected/test_apiGetReportMetadata_showRawMetrics__API.getProcessedReport_day.xml
index 3d7f33e9df..8912617c44 100644
--- a/tests/PHPUnit/Integration/expected/test_apiGetReportMetadata_showRawMetrics__API.getProcessedReport_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_apiGetReportMetadata_showRawMetrics__API.getProcessedReport_day.xml
@@ -77,7 +77,7 @@
 	<reportMetadata>
 		<row>
 			<code>fr</code>
-			<logo>plugins/UserCountry/flags/fr.png</logo>
+			<logo>plugins/UserCountry/images/flags/fr.png</logo>
 			<logoWidth>16</logoWidth>
 			<logoHeight>11</logoHeight>
 		</row>
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml
index 944ebbc5c0..fae2d87e22 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml
@@ -6,7 +6,7 @@
 		<visitIp>156.5.3.2</visitIp>
 		
 		<visitorType>returningCustomer</visitorType>
-		<visitorTypeIcon>plugins/Live/templates/images/returningVisitor.gif</visitorTypeIcon>
+		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>themes/default/images/goal.png</visitConvertedIcon>
 		<visitEcommerceStatus>ordered</visitEcommerceStatus>
@@ -84,7 +84,7 @@
 		<continentCode>eur</continentCode>
 		<country>France</country>
 		<countryCode>fr</countryCode>
-		<countryFlag>plugins/UserCountry/flags/fr.png</countryFlag>
+		<countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag>
 		<region />
 		<regionCode />
 		<city />
@@ -137,7 +137,7 @@
 		<visitIp>156.5.3.2</visitIp>
 		
 		<visitorType>returningCustomer</visitorType>
-		<visitorTypeIcon>plugins/Live/templates/images/returningVisitor.gif</visitorTypeIcon>
+		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>themes/default/images/goal.png</visitConvertedIcon>
 		<visitEcommerceStatus>orderedThenAbandonedCart</visitEcommerceStatus>
@@ -291,7 +291,7 @@
 		<continentCode>eur</continentCode>
 		<country>France</country>
 		<countryCode>fr</countryCode>
-		<countryFlag>plugins/UserCountry/flags/fr.png</countryFlag>
+		<countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag>
 		<region />
 		<regionCode />
 		<city />
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__API.getProcessedReport_day.xml b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__API.getProcessedReport_day.xml
index 8917a3b21a..df300323a7 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__API.getProcessedReport_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__API.getProcessedReport_day.xml
@@ -66,7 +66,7 @@
 	<reportMetadata>
 		<row>
 			<code>fr</code>
-			<logo>plugins/UserCountry/flags/fr.png</logo>
+			<logo>plugins/UserCountry/images/flags/fr.png</logo>
 			<logoWidth>16</logoWidth>
 			<logoHeight>11</logoHeight>
 		</row>
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml
index debade25ce..2a60c21ab0 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml
@@ -6,7 +6,7 @@
 		<visitIp>156.5.3.2</visitIp>
 		
 		<visitorType>returningCustomer</visitorType>
-		<visitorTypeIcon>plugins/Live/templates/images/returningVisitor.gif</visitorTypeIcon>
+		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
 		<visitConverted>0</visitConverted>
 		<visitConvertedIcon />
 		<visitEcommerceStatus>abandonedCart</visitEcommerceStatus>
@@ -160,7 +160,7 @@
 		<continentCode>eur</continentCode>
 		<country>France</country>
 		<countryCode>fr</countryCode>
-		<countryFlag>plugins/UserCountry/flags/fr.png</countryFlag>
+		<countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag>
 		<region />
 		<regionCode />
 		<city />
@@ -213,7 +213,7 @@
 		<visitIp>156.5.3.2</visitIp>
 		
 		<visitorType>returning</visitorType>
-		<visitorTypeIcon>plugins/Live/templates/images/returningVisitor.gif</visitorTypeIcon>
+		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>themes/default/images/goal.png</visitConvertedIcon>
 		<visitEcommerceStatus>orderedThenAbandonedCart</visitEcommerceStatus>
@@ -486,7 +486,7 @@
 		<continentCode>eur</continentCode>
 		<country>France</country>
 		<countryCode>fr</countryCode>
-		<countryFlag>plugins/UserCountry/flags/fr.png</countryFlag>
+		<countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag>
 		<region />
 		<regionCode />
 		<city />
@@ -694,7 +694,7 @@
 		<continentCode>eur</continentCode>
 		<country>France</country>
 		<countryCode>fr</countryCode>
-		<countryFlag>plugins/UserCountry/flags/fr.png</countryFlag>
+		<countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag>
 		<region />
 		<regionCode />
 		<city />
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__UserCountry.getCity_day.xml b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__UserCountry.getCity_day.xml
index 2fcc10ad53..9d30c24026 100755
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__UserCountry.getCity_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__UserCountry.getCity_day.xml
@@ -39,6 +39,6 @@
 		<country>xx</country>
 		<country_name>Unknown</country_name>
 		<region_name>Unknown</region_name>
-		<logo>plugins/UserCountry/flags/xx.png</logo>
+		<logo>plugins/UserCountry/images/flags/xx.png</logo>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__UserCountry.getCountry_day.xml b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__UserCountry.getCountry_day.xml
index 5dd203bb0a..fdf9642178 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__UserCountry.getCountry_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__UserCountry.getCountry_day.xml
@@ -34,7 +34,7 @@
 		<nb_conversions>3</nb_conversions>
 		<revenue>3121.11</revenue>
 		<code>fr</code>
-		<logo>plugins/UserCountry/flags/fr.png</logo>
+		<logo>plugins/UserCountry/images/flags/fr.png</logo>
 		<logoWidth>16</logoWidth>
 		<logoHeight>11</logoHeight>
 	</row>
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__UserCountry.getRegion_day.xml b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__UserCountry.getRegion_day.xml
index fd669cef97..17d816f7e9 100755
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__UserCountry.getRegion_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__UserCountry.getRegion_day.xml
@@ -37,6 +37,6 @@
 		<country>xx</country>
 		<country_name>Unknown</country_name>
 		<region_name>Unknown</region_name>
-		<logo>plugins/UserCountry/flags/xx.png</logo>
+		<logo>plugins/UserCountry/images/flags/xx.png</logo>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__PDFReports.generateReport_week.original.html b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__PDFReports.generateReport_week.original.html
index efceb0b8a9..f174d5f124 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__PDFReports.generateReport_week.original.html
+++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__PDFReports.generateReport_week.original.html
@@ -4656,7 +4656,7 @@ width="700"/>
 <tbody>
 <tr style="">
 <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-<img src='plugins/UserCountry/flags/fr.png'>
+<img src='plugins/UserCountry/images/flags/fr.png'>
 &nbsp;
 France
 </td>
@@ -4786,7 +4786,7 @@ width="700"/>
 <tbody>
 <tr style="">
 <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-<img src='plugins/UserCountry/flags/xx.png'>
+<img src='plugins/UserCountry/images/flags/xx.png'>
 &nbsp;
 Unknown
 </td>
@@ -4852,7 +4852,7 @@ width="700"/>
 <tbody>
 <tr style="">
 <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-<img src='plugins/UserCountry/flags/xx.png'>
+<img src='plugins/UserCountry/images/flags/xx.png'>
 &nbsp;
 Unknown
 </td>
diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__PDFReports.generateReport_week.original.html b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__PDFReports.generateReport_week.original.html
index 3fd190fc25..e02c135ae8 100644
--- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__PDFReports.generateReport_week.original.html
+++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__PDFReports.generateReport_week.original.html
@@ -4453,7 +4453,7 @@ Country
 <tbody>
 <tr style="">
 <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-<img src='plugins/UserCountry/flags/fr.png'>
+<img src='plugins/UserCountry/images/flags/fr.png'>
 &nbsp;
 France
 </td>
@@ -4569,7 +4569,7 @@ Region
 <tbody>
 <tr style="">
 <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-<img src='plugins/UserCountry/flags/xx.png'>
+<img src='plugins/UserCountry/images/flags/xx.png'>
 &nbsp;
 Unknown
 </td>
@@ -4628,7 +4628,7 @@ City
 <tbody>
 <tr style="">
 <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;">
-<img src='plugins/UserCountry/flags/xx.png'>
+<img src='plugins/UserCountry/images/flags/xx.png'>
 &nbsp;
 Unknown
 </td>
diff --git a/tests/PHPUnit/Integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__API.getProcessedReport_range.xml b/tests/PHPUnit/Integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__API.getProcessedReport_range.xml
index 0e29369c84..12bdc93a73 100644
--- a/tests/PHPUnit/Integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__API.getProcessedReport_range.xml
+++ b/tests/PHPUnit/Integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__API.getProcessedReport_range.xml
@@ -63,7 +63,7 @@
 	<reportMetadata>
 		<row>
 			<code>fr</code>
-			<logo>plugins/UserCountry/flags/fr.png</logo>
+			<logo>plugins/UserCountry/images/flags/fr.png</logo>
 			<logoWidth>16</logoWidth>
 			<logoHeight>11</logoHeight>
 		</row>
diff --git a/tests/PHPUnit/Integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/Integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml
index 901922fe8e..091eb38ae4 100644
--- a/tests/PHPUnit/Integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml
+++ b/tests/PHPUnit/Integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml
@@ -54,7 +54,7 @@
 		<continentCode>eur</continentCode>
 		<country>France</country>
 		<countryCode>fr</countryCode>
-		<countryFlag>plugins/UserCountry/flags/fr.png</countryFlag>
+		<countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag>
 		<region />
 		<regionCode />
 		<city />
@@ -165,7 +165,7 @@
 		<continentCode>eur</continentCode>
 		<country>France</country>
 		<countryCode>fr</countryCode>
-		<countryFlag>plugins/UserCountry/flags/fr.png</countryFlag>
+		<countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag>
 		<region />
 		<regionCode />
 		<city />
@@ -336,7 +336,7 @@
 		<continentCode>eur</continentCode>
 		<country>France</country>
 		<countryCode>fr</countryCode>
-		<countryFlag>plugins/UserCountry/flags/fr.png</countryFlag>
+		<countryFlag>plugins/UserCountry/images/flags/fr.png</countryFlag>
 		<region />
 		<regionCode />
 		<city />
diff --git a/tests/PHPUnit/Integration/expected/test_reportLimiting__UserCountry.getCity_day.xml b/tests/PHPUnit/Integration/expected/test_reportLimiting__UserCountry.getCity_day.xml
index 91995c68b7..3025935cb2 100755
--- a/tests/PHPUnit/Integration/expected/test_reportLimiting__UserCountry.getCity_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_reportLimiting__UserCountry.getCity_day.xml
@@ -14,7 +14,7 @@
 		<country>au</country>
 		<country_name>Australia</country_name>
 		<region_name>Victoria</region_name>
-		<logo>plugins/UserCountry/flags/au.png</logo>
+		<logo>plugins/UserCountry/images/flags/au.png</logo>
 	</row>
 	<row>
 		<label>Nice, Provence-Alpes-Cote d&amp;#039;Azur, France</label>
@@ -30,7 +30,7 @@
 		<country>fr</country>
 		<country_name>France</country_name>
 		<region_name>Provence-Alpes-Cote d'Azur</region_name>
-		<logo>plugins/UserCountry/flags/fr.png</logo>
+		<logo>plugins/UserCountry/images/flags/fr.png</logo>
 	</row>
 	<row>
 		<label>Others</label>
@@ -41,6 +41,6 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>35</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
-		<logo>plugins/UserCountry/flags/xx.png</logo>
+		<logo>plugins/UserCountry/images/flags/xx.png</logo>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_reportLimiting__UserCountry.getRegion_day.xml b/tests/PHPUnit/Integration/expected/test_reportLimiting__UserCountry.getRegion_day.xml
index c570fbd4bc..fe34824621 100755
--- a/tests/PHPUnit/Integration/expected/test_reportLimiting__UserCountry.getRegion_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_reportLimiting__UserCountry.getRegion_day.xml
@@ -13,7 +13,7 @@
 		<country>au</country>
 		<country_name>Australia</country_name>
 		<region_name>Victoria</region_name>
-		<logo>plugins/UserCountry/flags/au.png</logo>
+		<logo>plugins/UserCountry/images/flags/au.png</logo>
 	</row>
 	<row>
 		<label>Provence-Alpes-Cote d&amp;#039;Azur, France</label>
@@ -28,7 +28,7 @@
 		<country>fr</country>
 		<country_name>France</country_name>
 		<region_name>Provence-Alpes-Cote d'Azur</region_name>
-		<logo>plugins/UserCountry/flags/fr.png</logo>
+		<logo>plugins/UserCountry/images/flags/fr.png</logo>
 	</row>
 	<row>
 		<label>Others</label>
@@ -39,6 +39,6 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>35</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
-		<logo>plugins/UserCountry/flags/xx.png</logo>
+		<logo>plugins/UserCountry/images/flags/xx.png</logo>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__UserCountry.getCity_day.xml b/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__UserCountry.getCity_day.xml
index 91995c68b7..3025935cb2 100755
--- a/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__UserCountry.getCity_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__UserCountry.getCity_day.xml
@@ -14,7 +14,7 @@
 		<country>au</country>
 		<country_name>Australia</country_name>
 		<region_name>Victoria</region_name>
-		<logo>plugins/UserCountry/flags/au.png</logo>
+		<logo>plugins/UserCountry/images/flags/au.png</logo>
 	</row>
 	<row>
 		<label>Nice, Provence-Alpes-Cote d&amp;#039;Azur, France</label>
@@ -30,7 +30,7 @@
 		<country>fr</country>
 		<country_name>France</country_name>
 		<region_name>Provence-Alpes-Cote d'Azur</region_name>
-		<logo>plugins/UserCountry/flags/fr.png</logo>
+		<logo>plugins/UserCountry/images/flags/fr.png</logo>
 	</row>
 	<row>
 		<label>Others</label>
@@ -41,6 +41,6 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>35</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
-		<logo>plugins/UserCountry/flags/xx.png</logo>
+		<logo>plugins/UserCountry/images/flags/xx.png</logo>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__UserCountry.getRegion_day.xml b/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__UserCountry.getRegion_day.xml
index c570fbd4bc..fe34824621 100755
--- a/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__UserCountry.getRegion_day.xml
+++ b/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQuery__UserCountry.getRegion_day.xml
@@ -13,7 +13,7 @@
 		<country>au</country>
 		<country_name>Australia</country_name>
 		<region_name>Victoria</region_name>
-		<logo>plugins/UserCountry/flags/au.png</logo>
+		<logo>plugins/UserCountry/images/flags/au.png</logo>
 	</row>
 	<row>
 		<label>Provence-Alpes-Cote d&amp;#039;Azur, France</label>
@@ -28,7 +28,7 @@
 		<country>fr</country>
 		<country_name>France</country_name>
 		<region_name>Provence-Alpes-Cote d'Azur</region_name>
-		<logo>plugins/UserCountry/flags/fr.png</logo>
+		<logo>plugins/UserCountry/images/flags/fr.png</logo>
 	</row>
 	<row>
 		<label>Others</label>
@@ -39,6 +39,6 @@
 		<sum_visit_length>0</sum_visit_length>
 		<bounce_count>35</bounce_count>
 		<nb_visits_converted>0</nb_visits_converted>
-		<logo>plugins/UserCountry/flags/xx.png</logo>
+		<logo>plugins/UserCountry/images/flags/xx.png</logo>
 	</row>
 </result>
\ No newline at end of file
diff --git a/tests/PHPUnit/Plugins/UserCountryTest.php b/tests/PHPUnit/Plugins/UserCountryTest.php
index dbf4168eaa..6206ab5054 100644
--- a/tests/PHPUnit/Plugins/UserCountryTest.php
+++ b/tests/PHPUnit/Plugins/UserCountryTest.php
@@ -46,7 +46,7 @@ class Test_Piwik_UserCountry extends PHPUnit_Framework_Testcase
         $countries = array_merge($GLOBALS['Piwik_CountryList'], $GLOBALS['Piwik_CountryList_Extras']);
 
         // Get list of existing flag icons
-        $flags = scandir(PIWIK_PATH_TEST_TO_ROOT . '/plugins/UserCountry/flags/');
+        $flags = scandir(PIWIK_PATH_TEST_TO_ROOT . '/plugins/UserCountry/images/flags/');
 
         // Get list of countries
         foreach ($countries as $country => $continent) {
diff --git a/tests/PHPUnit/bootstrap.php b/tests/PHPUnit/bootstrap.php
index 0cf18f0826..acdbf24ad5 100644
--- a/tests/PHPUnit/bootstrap.php
+++ b/tests/PHPUnit/bootstrap.php
@@ -71,7 +71,7 @@ Try again.
     } catch (Exception $e) {
         $fetched = "ERROR fetching: " . $e->getMessage();
     }
-    $expectedString = 'plugins/CoreHome/templates/images/favicon.ico';
+    $expectedString = 'plugins/CoreHome/images/favicon.ico';
 
     if (strpos($fetched, $expectedString) === false) {
         echo "\nPiwik should be running at: " . $piwikServerUrl