diff --git a/memopol/tests/response_fixtures/GroupListTest.test_country/content b/memopol/tests/response_fixtures/GroupListTest.test_country/content
index 9a313cfca437644e5175c02d495f2c94afc9c1ee..46407dc23a2afa4b90a925840bd6c9e70a7caa0d 100644
--- a/memopol/tests/response_fixtures/GroupListTest.test_country/content
+++ b/memopol/tests/response_fixtures/GroupListTest.test_country/content
@@ -190,8 +190,7 @@
           <td>
             <a href='/legislature/representative/country/European%20Parliament/Austria/'>
               
-                Austria
-
+                <span class="flag-icon flag-icon-at"></span> Austria
               
             </a>
           </td>
@@ -209,8 +208,7 @@
           <td>
             <a href='/legislature/representative/country/European%20Parliament/Belgium/'>
               
-                Belgium
-
+                <span class="flag-icon flag-icon-be"></span> Belgium
               
             </a>
           </td>
@@ -228,8 +226,7 @@
           <td>
             <a href='/legislature/representative/country/European%20Parliament/Bulgaria/'>
               
-                Bulgaria
-
+                <span class="flag-icon flag-icon-bg"></span> Bulgaria
               
             </a>
           </td>
@@ -247,8 +244,7 @@
           <td>
             <a href='/legislature/representative/country/European%20Parliament/Cyprus/'>
               
-                Cyprus
-
+                <span class="flag-icon flag-icon-cy"></span> Cyprus
               
             </a>
           </td>
@@ -266,8 +262,7 @@
           <td>
             <a href='/legislature/representative/country/European%20Parliament/Czech%20Republic/'>
               
-                Czech Republic
-
+                <span class="flag-icon flag-icon-cz"></span> Czech Republic
               
             </a>
           </td>
@@ -285,8 +280,7 @@
           <td>
             <a href='/legislature/representative/country/European%20Parliament/Denmark/'>
               
-                Denmark
-
+                <span class="flag-icon flag-icon-dk"></span> Denmark
               
             </a>
           </td>
@@ -304,8 +298,7 @@
           <td>
             <a href='/legislature/representative/country/European%20Parliament/Estonia/'>
               
-                Estonia
-
+                <span class="flag-icon flag-icon-ee"></span> Estonia
               
             </a>
           </td>
@@ -323,8 +316,7 @@
           <td>
             <a href='/legislature/representative/country/European%20Parliament/Finland/'>
               
-                Finland
-
+                <span class="flag-icon flag-icon-fi"></span> Finland
               
             </a>
           </td>
@@ -342,8 +334,7 @@
           <td>
             <a href='/legislature/representative/country/European%20Parliament/France/'>
               
-                France
-
+                <span class="flag-icon flag-icon-fr"></span> France
               
             </a>
           </td>
@@ -361,8 +352,7 @@
           <td>
             <a href='/legislature/representative/country/European%20Parliament/Germany/'>
               
-                Germany
-
+                <span class="flag-icon flag-icon-de"></span> Germany
               
             </a>
           </td>
@@ -380,8 +370,7 @@
           <td>
             <a href='/legislature/representative/country/European%20Parliament/Greece/'>
               
-                Greece
-
+                <span class="flag-icon flag-icon-gr"></span> Greece
               
             </a>
           </td>
@@ -399,8 +388,7 @@
           <td>
             <a href='/legislature/representative/country/European%20Parliament/Hungary/'>
               
-                Hungary
-
+                <span class="flag-icon flag-icon-hu"></span> Hungary
               
             </a>
           </td>
diff --git a/templates/representatives/_representative_block.haml b/templates/representatives/_representative_block.haml
index a49830ebe55ee01b9202e7210abb3a48094561c0..87cc39be8fe2db939910703185c431998e3b612e 100644
--- a/templates/representatives/_representative_block.haml
+++ b/templates/representatives/_representative_block.haml
@@ -1,5 +1,4 @@
 - load memopol_tags
-- load representatives_tags
 - load representatives_recommendations_tags
 - load humanize
 
diff --git a/templates/representatives/group_list.haml b/templates/representatives/group_list.haml
index d2201929059b3c142d53761eceb19b4386116547..26ca8927946fa6871ca9113c2a7ff279486111cc 100644
--- a/templates/representatives/group_list.haml
+++ b/templates/representatives/group_list.haml
@@ -1,7 +1,6 @@
 - extends 'base.html'
 
 - load memopol_tags
-- load representatives_tags
 
 - block content
 
@@ -25,6 +24,8 @@
             %a{'href': "{% group_url group %}"}=
               - if group.kind == 'chamber'
                 = group|chamber_icon
+              - elif group.kind == 'country'
+                = group|country_flag
               - elif group.kind == 'group'
                 = group|group_long_icon
               - else
diff --git a/templates/representatives/representative_detail.haml b/templates/representatives/representative_detail.haml
index d2818765bc82021a7a624903089f6ed6dd23e4ee..57a2241b7b400c9b24019f54d23f1bfc5f16355b 100644
--- a/templates/representatives/representative_detail.haml
+++ b/templates/representatives/representative_detail.haml
@@ -2,8 +2,6 @@
 
 - load humanize
 - load memopol_tags
-- load representatives_tags
-- load representatives_votes_tags
 - load representatives_recommendations_tags
 
 - block head
diff --git a/templates/representatives/representative_grid.haml b/templates/representatives/representative_grid.haml
index 2680906b810330d0c07264a6e08175d93b7b2eae..0812dcbdb769fae1807923ff9d259da0a092b3e2 100644
--- a/templates/representatives/representative_grid.haml
+++ b/templates/representatives/representative_grid.haml
@@ -1,7 +1,6 @@
 - extends 'representatives/representative_list.html'
 
 - load memopol_tags
-- load representatives_tags
 - load representatives_recommendations_tags
 
 - block list
diff --git a/templates/representatives/representative_list.haml b/templates/representatives/representative_list.haml
index 4badc2c22d560aaddf54d34dc98dae48cf2d9abe..9f75d0e5f91ac9fee8431ab7ee154eb87e5001c5 100644
--- a/templates/representatives/representative_list.haml
+++ b/templates/representatives/representative_list.haml
@@ -2,7 +2,6 @@
 
 - load i18n
 - load memopol_tags
-- load representatives_tags
 - load representatives_recommendations_tags
 
 - block content
diff --git a/templates/representatives_votes/dossier_detail.haml b/templates/representatives_votes/dossier_detail.haml
index 2734ac692666ddc4bcd7162eacd8603856fcfa34..6c04315710f5abef18c46988bd19ad22d183fe69 100644
--- a/templates/representatives_votes/dossier_detail.haml
+++ b/templates/representatives_votes/dossier_detail.haml
@@ -1,7 +1,7 @@
 - extends "base.html"
 
 - load i18n
-- load representatives_votes_tags
+- load memopol_tags
 
 - block content