diff --git a/src/Icons/flags/belgium.png b/src/Icons/flags/belgium.png
new file mode 100644
index 000000000..980d634b7
Binary files /dev/null and b/src/Icons/flags/belgium.png differ
diff --git a/src/Icons/flags/bosnia.png b/src/Icons/flags/bosnia.png
new file mode 100644
index 000000000..da493ac44
Binary files /dev/null and b/src/Icons/flags/bosnia.png differ
diff --git a/src/Icons/flags/georgia.png b/src/Icons/flags/georgia.png
new file mode 100644
index 000000000..5d646b548
Binary files /dev/null and b/src/Icons/flags/georgia.png differ
diff --git a/src/Icons/flags/indonesia.png b/src/Icons/flags/indonesia.png
index 31f12c658..4baaf3c94 100644
Binary files a/src/Icons/flags/indonesia.png and b/src/Icons/flags/indonesia.png differ
diff --git a/src/Icons/flags/luxembourg.png b/src/Icons/flags/luxembourg.png
new file mode 100644
index 000000000..70f03280a
Binary files /dev/null and b/src/Icons/flags/luxembourg.png differ
diff --git a/src/Icons/flags/suisse.png b/src/Icons/flags/suisse.png
new file mode 100644
index 000000000..72741bdf0
Binary files /dev/null and b/src/Icons/flags/suisse.png differ
diff --git a/src/bittorrent.h b/src/bittorrent.h
index c6f0628e2..4c7a2a178 100644
--- a/src/bittorrent.h
+++ b/src/bittorrent.h
@@ -58,11 +58,9 @@ public:
 
   //TrackerInfos() {}
   TrackerInfos(const TrackerInfos &b) {
-    qDebug("TrackerInfos copy contructor called");
     name_or_url = b.name_or_url;
     Q_ASSERT(!name_or_url.isEmpty());
     last_message = b.last_message;
-    qDebug("Copied message: %s", last_message.toLocal8Bit().data());
     num_peers = b.num_peers;
   }
   TrackerInfos(QString name_or_url): name_or_url(name_or_url), last_message(""), num_peers(0) {
diff --git a/src/geoip.h b/src/geoip.h
index 34d5fe943..4a22b9823 100644
--- a/src/geoip.h
+++ b/src/geoip.h
@@ -127,12 +127,15 @@ public:
       if(iso[1] == 'R') return QIcon(":/Icons/flags/brazil.png");
       if(iso[1] == 'G') return QIcon(":/Icons/flags/bulgaria.png");
       if(iso[1] == 'Y') return QIcon(":/Icons/flags/belarus.png");
+      if(iso[1] == 'E') return QIcon(":/Icons/flags/belgium.png");
+      if(iso[1] == 'A') return QIcon(":/Icons/flags/bosnia.png");
       break;
     case 'C':
       if(iso[1] == 'A') return QIcon(":/Icons/flags/canada.png");
       if(iso[1] == 'Z') return QIcon(":/Icons/flags/czech.png");
       if(iso[1] == 'N') return QIcon(":/Icons/flags/china.png");
       if(iso[1] == 'R') return QIcon(":/Icons/flags/costa_rica.png");
+      if(iso[1] == 'H') return QIcon(":/Icons/flags/suisse.png");
       break;
     case 'D':
       if(iso[1] == 'E') return QIcon(":/Icons/flags/germany.png");
@@ -150,6 +153,7 @@ public:
     case 'G':
       if(iso[1] == 'B') return QIcon(":/Icons/flags/united_kingdom.png");
       if(iso[1] == 'R') return QIcon(":/Icons/flags/greece.png");
+      if(iso[1] == 'E') return QIcon(":/Icons/flags/georgia.png");
       break;
     case 'H':
       if(iso[1] == 'U') return QIcon(":/Icons/flags/hungary.png");
@@ -170,6 +174,9 @@ public:
     case 'K':
       if(iso[1] == 'R') return QIcon(":/Icons/flags/south_korea.png");
       break;
+    case 'L':
+      if(iso[1] == 'U') return QIcon(":/Icons/flags/luxembourg.png");
+      break;
     case 'M':
       if(iso[1] == 'Y') return QIcon(":/Icons/flags/malaysia.png");
       if(iso[1] == 'X') return QIcon(":/Icons/flags/mexico.png");
diff --git a/src/icons.qrc b/src/icons.qrc
index d554cb511..475cef60e 100644
--- a/src/icons.qrc
+++ b/src/icons.qrc
@@ -44,6 +44,7 @@
   <file>Icons/flags/serbia.png</file>
   <file>Icons/flags/iceland.png</file>
   <file>Icons/flags/china.png</file>
+  <file>Icons/flags/luxembourg.png</file>
   <file>Icons/flags/newzealand.png</file>
   <file>Icons/flags/austria.png</file>
   <file>Icons/flags/indonesia.png</file>
@@ -55,15 +56,18 @@
   <file>Icons/flags/netherlands.png</file>
   <file>Icons/flags/south_africa.png</file>
   <file>Icons/flags/belarus.png</file>
+  <file>Icons/flags/georgia.png</file>
   <file>Icons/flags/taiwan.png</file>
   <file>Icons/flags/sweden.png</file>
   <file>Icons/flags/spain_catalunya.png</file>
   <file>Icons/flags/ireland.png</file>
   <file>Icons/flags/singapore.png</file>
   <file>Icons/flags/israel.png</file>
+  <file>Icons/flags/belgium.png</file>
   <file>Icons/flags/usa.png</file>
   <file>Icons/flags/costa_rica.png</file>
   <file>Icons/flags/romania.png</file>
+  <file>Icons/flags/suisse.png</file>
   <file>Icons/flags/croatia.png</file>
   <file>Icons/flags/mexico.png</file>
   <file>Icons/flags/denmark.png</file>
@@ -91,6 +95,7 @@
   <file>Icons/flags/egypt.png</file>
   <file>Icons/flags/italy.png</file>
   <file>Icons/flags/south_korea.png</file>
+  <file>Icons/flags/bosnia.png</file>
   <file>Icons/flags/japan.png</file>
   <file>Icons/flags/malaysia.png</file>
   <file>Icons/flags/philippines.png</file>