diff --git a/.gitignore b/.gitignore
index 662ea3c214..6b54416581 100644
--- a/.gitignore
+++ b/.gitignore
@@ -69,6 +69,21 @@ android/gen
 android/libs
 android/obj
 android/.settings
+android/.classpath
+android/.cproject
+android/.project
+android/assets
+android/local.properties
+android/ant.properties
+# local android scripts, such as debugger helper scrips
+android/local
+# ignore flags symlinks
+android/res/drawable-xhdpi/??.png
+android/res/drawable-xhdpi/do_hack.png
+android/res/drawable-xhdpi/uk_england.png
+android/res/drawable-xhdpi/uk_northern_ireland.png
+android/res/drawable-xhdpi/uk_scotland.png
+android/res/drawable-xhdpi/uk_wales.png
 
 # data
 data/intermediate_data
@@ -91,15 +106,6 @@ data/benchmarks/ipod4/*
 data/benchmarks/ipad/*
 data/benchmarks/mac/*
 
-android/.classpath
-android/.cproject
-android/.project
-android/assets
-android/local.properties
-android/ant.properties
-# local android scripts, such as debugger helper scrips
-android/local
-
 qtc_packaging
 
 syntax: regexp
diff --git a/tools/android/update_assets.sh b/tools/android/update_assets.sh
index 0027a67b94..8d68ff1ae1 100755
--- a/tools/android/update_assets.sh
+++ b/tools/android/update_assets.sh
@@ -20,3 +20,6 @@ done
 
 # Separate case for World and countries list files without search support
 ln -s $SRC/countries.txt.nosearch $DST/countries.txt
+
+# Call flag symlinks generation
+./update_flags.sh
diff --git a/tools/android/update_flags.sh b/tools/android/update_flags.sh
new file mode 100755
index 0000000000..d3253fdc6a
--- /dev/null
+++ b/tools/android/update_flags.sh
@@ -0,0 +1,27 @@
+#!/bin/bash
+set -x -u
+
+SRC=../../data/flags
+DST=../../android/res
+
+# *@2x.png
+sobakaPos=7
+
+for file in $SRC/*.png;
+do
+  filename=$(basename "$file")
+
+  if [[ "$file" == *\@2x.png ]]; then
+    strLen=${#filename}
+    prefixName=${filename:0:`expr $strLen - $sobakaPos`}
+
+    rm "$DST/drawable-xhdpi/${prefixName}.png"
+	ln -s "../$SRC/$filename" "$DST/drawable-xhdpi/${prefixName}.png"
+  #else
+  #  rm "$DST/drawable-mdpi/$filename"
+  #  ln -s "../$SRC/$filename" "$DST/drawable-mdpi/$filename"
+  fi
+done
+
+# rename do.png because of aapt - it doesn't support resource name "do"
+mv "$DST/drawable-xhdpi/do.png" "$DST/drawable-xhdpi/do_hack.png"