diff --git a/.gitignore b/.gitignore
index e10a6187be..ac92631e2c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -105,19 +105,6 @@ android/MapsWithMeLite/local.properties
 android/MapsWithMeLite/ant.properties
 # local android scripts, such as debugger helper scrips
 android/MapsWithMeLite/local
-# ignore flags symlinks
-android/MapsWithMeLite/res/drawable-xhdpi/??.png
-android/MapsWithMeLite/res/drawable-xhdpi/do_hack.png
-android/MapsWithMeLite/res/drawable-xhdpi/uk_england.png
-android/MapsWithMeLite/res/drawable-xhdpi/uk_northern_ireland.png
-android/MapsWithMeLite/res/drawable-xhdpi/uk_scotland.png
-android/MapsWithMeLite/res/drawable-xhdpi/uk_wales.png
-android/MapsWithMeLite/res/drawable-mdpi/??.png
-android/MapsWithMeLite/res/drawable-mdpi/do_hack.png
-android/MapsWithMeLite/res/drawable-mdpi/uk_england.png
-android/MapsWithMeLite/res/drawable-mdpi/uk_northern_ireland.png
-android/MapsWithMeLite/res/drawable-mdpi/uk_scotland.png
-android/MapsWithMeLite/res/drawable-mdpi/uk_wales.png
 
 # android MapsWithMePro
 android/MapsWithMePro/bin
@@ -133,20 +120,6 @@ android/MapsWithMePro/local.properties
 android/MapsWithMePro/ant.properties
 # local android scripts, such as debugger helper scrips
 android/MapsWithMePro/local
-# ignore flags symlinks
-android/MapsWithMePro/res/drawable-xhdpi/??.png
-android/MapsWithMePro/res/drawable-xhdpi/do_hack.png
-android/MapsWithMePro/res/drawable-xhdpi/uk_england.png
-android/MapsWithMePro/res/drawable-xhdpi/uk_northern_ireland.png
-android/MapsWithMePro/res/drawable-xhdpi/uk_scotland.png
-android/MapsWithMePro/res/drawable-xhdpi/uk_wales.png
-android/MapsWithMePro/res/drawable-mdpi/??.png
-android/MapsWithMePro/res/drawable-mdpi/do_hack.png
-android/MapsWithMePro/res/drawable-mdpi/uk_england.png
-android/MapsWithMePro/res/drawable-mdpi/uk_northern_ireland.png
-android/MapsWithMePro/res/drawable-mdpi/uk_scotland.png
-android/MapsWithMeLite/res/drawable-mdpi/uk_wales.png
-
 
 # data
 data/intermediate_data
diff --git a/tools/android/update_assets.sh b/tools/android/update_assets.sh
index 7966a40b24..fdc8a77c1e 100755
--- a/tools/android/update_assets.sh
+++ b/tools/android/update_assets.sh
@@ -1,25 +1,3 @@
-#!/bin/bash
-set -x -u
-
-SRC=../../data
-DST=../../android/assets
-
-# Remove old links
-rm -rf $DST
-mkdir $DST
-
-files=(about.html basic_ldpi.skn basic_mdpi.skn basic_hdpi.skn basic_xhdpi.skn categories.txt classificator.txt 
-       types.txt fonts_blacklist.txt fonts_whitelist.txt languages.txt \
-       symbols_ldpi.png symbols_mdpi.png symbols_hdpi.png symbols_xhdpi.png unicode_blocks.txt \ 
-       visibility.txt drules_proto.txt drules_proto.bin external_resources.txt packed_polygons.bin)
-
-for item in ${files[*]}
-do
-  ln -s $SRC/$item $DST/$item
-done
-
-# Separate case for World and countries list files without search support
-ln -s $SRC/countries.txt $DST/countries.txt
-
-# Call flag symlinks generation
-./update_flags.sh
+./update_assets_for_version.sh ../../android/MapsWithMePro/assets
+./update_assets_for_version.sh ../../android/MapsWithMeLite/assets
+./update_flags.sh
\ No newline at end of file
diff --git a/tools/android/update_assets_for_version.sh b/tools/android/update_assets_for_version.sh
new file mode 100755
index 0000000000..225ededf50
--- /dev/null
+++ b/tools/android/update_assets_for_version.sh
@@ -0,0 +1,22 @@
+#!/bin/bash
+set -x -u
+
+SRC=../../../data
+DST=$1
+
+# Remove old links
+rm -rf $DST
+mkdir $DST
+
+files=(about.html basic_ldpi.skn basic_mdpi.skn basic_hdpi.skn basic_xhdpi.skn categories.txt classificator.txt 
+       types.txt fonts_blacklist.txt fonts_whitelist.txt languages.txt \
+       symbols_ldpi.png symbols_mdpi.png symbols_hdpi.png symbols_xhdpi.png unicode_blocks.txt \ 
+       visibility.txt drules_proto.txt drules_proto.bin external_resources.txt packed_polygons.bin)
+
+for item in ${files[*]}
+do
+  ln -s $SRC/$item $DST/$item
+done
+
+# Separate case for World and countries list files without search support
+ln -s $SRC/countries.txt $DST/countries.txt