diff --git a/android/.gitignore b/android/.gitignore
index 57dd3b34ae..690715a1be 100644
--- a/android/.gitignore
+++ b/android/.gitignore
@@ -36,6 +36,3 @@ res/drawable-mdpi/uk_england.png
 res/drawable-mdpi/uk_northern_ireland.png
 res/drawable-mdpi/uk_scotland.png
 res/drawable-mdpi/uk_wales.png
-
-assets
-Yopme/assets
diff --git a/android/assets/categories.txt b/android/assets/categories.txt
new file mode 120000
index 0000000000..8038010aa8
--- /dev/null
+++ b/android/assets/categories.txt
@@ -0,0 +1 @@
+../../data/categories.txt
\ No newline at end of file
diff --git a/android/assets/classificator.txt b/android/assets/classificator.txt
new file mode 120000
index 0000000000..db372b15cb
--- /dev/null
+++ b/android/assets/classificator.txt
@@ -0,0 +1 @@
+../../data/classificator.txt
\ No newline at end of file
diff --git a/android/assets/copyright.html b/android/assets/copyright.html
new file mode 120000
index 0000000000..c17fba3e25
--- /dev/null
+++ b/android/assets/copyright.html
@@ -0,0 +1 @@
+../../data/copyright.html
\ No newline at end of file
diff --git a/android/assets/countries.txt b/android/assets/countries.txt
new file mode 120000
index 0000000000..89e7165e30
--- /dev/null
+++ b/android/assets/countries.txt
@@ -0,0 +1 @@
+../../data/countries.txt
\ No newline at end of file
diff --git a/android/assets/drules_proto.bin b/android/assets/drules_proto.bin
new file mode 120000
index 0000000000..0f04287cae
--- /dev/null
+++ b/android/assets/drules_proto.bin
@@ -0,0 +1 @@
+../../data/drules_proto.bin
\ No newline at end of file
diff --git a/android/assets/external_resources.txt b/android/assets/external_resources.txt
new file mode 120000
index 0000000000..767cf5f94e
--- /dev/null
+++ b/android/assets/external_resources.txt
@@ -0,0 +1 @@
+../../data/external_resources.txt
\ No newline at end of file
diff --git a/android/assets/faq.html b/android/assets/faq.html
new file mode 120000
index 0000000000..50811ba5b7
--- /dev/null
+++ b/android/assets/faq.html
@@ -0,0 +1 @@
+../../data/faq.html
\ No newline at end of file
diff --git a/android/assets/fonts_blacklist.txt b/android/assets/fonts_blacklist.txt
new file mode 120000
index 0000000000..5803bdabdc
--- /dev/null
+++ b/android/assets/fonts_blacklist.txt
@@ -0,0 +1 @@
+../../data/fonts_blacklist.txt
\ No newline at end of file
diff --git a/android/assets/fonts_whitelist.txt b/android/assets/fonts_whitelist.txt
new file mode 120000
index 0000000000..a33524b69d
--- /dev/null
+++ b/android/assets/fonts_whitelist.txt
@@ -0,0 +1 @@
+../../data/fonts_whitelist.txt
\ No newline at end of file
diff --git a/android/assets/languages.txt b/android/assets/languages.txt
new file mode 120000
index 0000000000..27e6a591ca
--- /dev/null
+++ b/android/assets/languages.txt
@@ -0,0 +1 @@
+../../data/languages.txt
\ No newline at end of file
diff --git a/android/assets/packed_polygons.bin b/android/assets/packed_polygons.bin
new file mode 120000
index 0000000000..668660390b
--- /dev/null
+++ b/android/assets/packed_polygons.bin
@@ -0,0 +1 @@
+../../data/packed_polygons.bin
\ No newline at end of file
diff --git a/android/assets/resources-hdpi b/android/assets/resources-hdpi
new file mode 120000
index 0000000000..86e4f7e291
--- /dev/null
+++ b/android/assets/resources-hdpi
@@ -0,0 +1 @@
+../../data/resources-hdpi
\ No newline at end of file
diff --git a/android/assets/resources-ldpi b/android/assets/resources-ldpi
new file mode 120000
index 0000000000..06f167188a
--- /dev/null
+++ b/android/assets/resources-ldpi
@@ -0,0 +1 @@
+../../data/resources-ldpi
\ No newline at end of file
diff --git a/android/assets/resources-mdpi b/android/assets/resources-mdpi
new file mode 120000
index 0000000000..7074d82529
--- /dev/null
+++ b/android/assets/resources-mdpi
@@ -0,0 +1 @@
+../../data/resources-mdpi
\ No newline at end of file
diff --git a/android/assets/resources-xhdpi b/android/assets/resources-xhdpi
new file mode 120000
index 0000000000..13f9a291ff
--- /dev/null
+++ b/android/assets/resources-xhdpi
@@ -0,0 +1 @@
+../../data/resources-xhdpi
\ No newline at end of file
diff --git a/android/assets/resources-xxhdpi b/android/assets/resources-xxhdpi
new file mode 120000
index 0000000000..0367e3b8aa
--- /dev/null
+++ b/android/assets/resources-xxhdpi
@@ -0,0 +1 @@
+../../data/resources-xxhdpi
\ No newline at end of file
diff --git a/android/assets/types.txt b/android/assets/types.txt
new file mode 120000
index 0000000000..17099212ba
--- /dev/null
+++ b/android/assets/types.txt
@@ -0,0 +1 @@
+../../data/types.txt
\ No newline at end of file
diff --git a/android/assets/unicode_blocks.txt b/android/assets/unicode_blocks.txt
new file mode 120000
index 0000000000..49dff2d773
--- /dev/null
+++ b/android/assets/unicode_blocks.txt
@@ -0,0 +1 @@
+../../data/unicode_blocks.txt
\ No newline at end of file
diff --git a/tools/android/update_assets.sh b/tools/android/update_assets.sh
index 6436bc8151..4faf087177 100755
--- a/tools/android/update_assets.sh
+++ b/tools/android/update_assets.sh
@@ -1,2 +1,2 @@
-./update_assets_for_version.sh ../../android/assets
+./update_assets_for_version.sh ../../data ../../android/assets
 ./add_assets_mwm-ttf.sh ../../android/flavors/mwm-ttf-assets
diff --git a/tools/android/update_assets_for_version.sh b/tools/android/update_assets_for_version.sh
index 6820994b95..44cda0818f 100755
--- a/tools/android/update_assets_for_version.sh
+++ b/tools/android/update_assets_for_version.sh
@@ -1,12 +1,12 @@
 #!/bin/bash
-set -x -u
+set -e -x -u
 
-SRC=../../data
-DST=$1
+SRC=$1
+DST=$2
 
 # Remove old links
-rm -rf $DST
-mkdir $DST
+rm -rf $DST || true
+mkdir $DST || true
 
 files=(copyright.html faq.html resources-ldpi resources-mdpi resources-hdpi resources-xhdpi resources-xxhdpi categories.txt classificator.txt
        types.txt fonts_blacklist.txt fonts_whitelist.txt languages.txt unicode_blocks.txt \