diff --git a/Clover/app/src/main/java/org/floens/chan/chan/ChanUrls.java b/Clover/app/src/main/java/org/floens/chan/chan/ChanUrls.java
index 56262fa3..eb12fb7f 100644
--- a/Clover/app/src/main/java/org/floens/chan/chan/ChanUrls.java
+++ b/Clover/app/src/main/java/org/floens/chan/chan/ChanUrls.java
@@ -58,6 +58,10 @@ public class ChanUrls {
         return scheme() + "://s.4cdn.org/image/country/" + countryCode.toLowerCase(Locale.ENGLISH) + ".gif";
     }
 
+    public static String getCountryTrollFlagUrl(String trollCode) {
+        return scheme() + "://s.4cdn.org/image/country/troll/" + trollCode.toLowerCase(Locale.ENGLISH) + ".gif";
+    }
+
     public static String getBoardsUrl() {
         return scheme() + "://a.4cdn.org/boards.json";
     }
diff --git a/Clover/app/src/main/java/org/floens/chan/core/model/Post.java b/Clover/app/src/main/java/org/floens/chan/core/model/Post.java
index f3fb1f5c..2f237453 100644
--- a/Clover/app/src/main/java/org/floens/chan/core/model/Post.java
+++ b/Clover/app/src/main/java/org/floens/chan/core/model/Post.java
@@ -87,6 +87,8 @@ public class Post {
 
     public String countryName = "";
 
+    public String trollCountry = "";
+
     public long time = -1;
 
     public long fileSize;
@@ -180,8 +182,12 @@ public class Post {
             image = new PostImage(String.valueOf(tim), thumbnailUrl, imageUrl, filename, ext, imageWidth, imageHeight, spoilerImage, fileSize);
         }
 
-        if (!TextUtils.isEmpty(country)) {
-            countryUrl = ChanUrls.getCountryFlagUrl(country);
+        if (!TextUtils.isEmpty(countryName)) {
+            if (!TextUtils.isEmpty(trollCountry)) {
+                countryUrl = ChanUrls.getCountryTrollFlagUrl(trollCountry);
+            } else {
+                countryUrl = ChanUrls.getCountryFlagUrl(country);
+            }
         }
 
         ChanParser.getInstance().parse(this);
diff --git a/Clover/app/src/main/java/org/floens/chan/core/net/ChanReaderRequest.java b/Clover/app/src/main/java/org/floens/chan/core/net/ChanReaderRequest.java
index 860ceab1..58995375 100644
--- a/Clover/app/src/main/java/org/floens/chan/core/net/ChanReaderRequest.java
+++ b/Clover/app/src/main/java/org/floens/chan/core/net/ChanReaderRequest.java
@@ -400,6 +400,9 @@ public class ChanReaderRequest extends JsonReaderRequest<ChanReaderRequest.ChanR
                 case "country_name":
                     post.countryName = reader.nextString();
                     break;
+                case "troll_country":
+                    post.trollCountry = reader.nextString();
+                    break;
                 case "id":
                     post.id = reader.nextString();
                     break;
diff --git a/Clover/app/src/main/java/org/floens/chan/ui/cell/PostCell.java b/Clover/app/src/main/java/org/floens/chan/ui/cell/PostCell.java
index d194f592..3bef5d9f 100644
--- a/Clover/app/src/main/java/org/floens/chan/ui/cell/PostCell.java
+++ b/Clover/app/src/main/java/org/floens/chan/ui/cell/PostCell.java
@@ -399,7 +399,7 @@ public class PostCell extends LinearLayout implements PostCellInterface {
         icons.set(PostIcons.DELETED, post.deleted.get());
         icons.set(PostIcons.ARCHIVED, post.archived);
 
-        if (!isEmpty(post.country)) {
+        if (!isEmpty(post.countryUrl)) {
             icons.set(PostIcons.COUNTRY, true);
             icons.showCountry(post, theme, countrySizePx);
         } else {