From 8e6bc06164e58d57988994133ebe2900f6a7a974 Mon Sep 17 00:00:00 2001
From: Andrew Shkrob <andrew.shkrob.social@yandex.by>
Date: Wed, 8 May 2024 20:37:27 +0200
Subject: [PATCH] [data] Refactor resources folder

Signed-off-by: Andrew Shkrob <andrew.shkrob.social@yandex.by>
---
 .gitignore                                    |   2 +-
 .../app/src/main/assets/resources-6plus_clear |   1 -
 .../app/src/main/assets/resources-6plus_dark  |   1 -
 android/app/src/main/assets/resources-default |   1 -
 .../app/src/main/assets/resources-hdpi_clear  |   1 -
 .../app/src/main/assets/resources-hdpi_dark   |   1 -
 .../app/src/main/assets/resources-mdpi_clear  |   1 -
 .../app/src/main/assets/resources-mdpi_dark   |   1 -
 .../app/src/main/assets/resources-xhdpi_clear |   1 -
 .../app/src/main/assets/resources-xhdpi_dark  |   1 -
 .../src/main/assets/resources-xxhdpi_clear    |   1 -
 .../app/src/main/assets/resources-xxhdpi_dark |   1 -
 .../src/main/assets/resources-xxxhdpi_clear   |   1 -
 .../src/main/assets/resources-xxxhdpi_dark    |   1 -
 android/app/src/main/assets/symbols           |   1 +
 data/resources-6plus_dark/area-hatching.png   | Bin 17758 -> 0 bytes
 data/resources-6plus_dark/traffic-arrow.png   | Bin 15056 -> 0 bytes
 data/resources-hdpi_clear/area-hatching.png   | Bin 17758 -> 0 bytes
 data/resources-hdpi_clear/traffic-arrow.png   | Bin 15042 -> 0 bytes
 data/resources-hdpi_dark/area-hatching.png    | Bin 17758 -> 0 bytes
 data/resources-hdpi_dark/traffic-arrow.png    | Bin 15042 -> 0 bytes
 data/resources-mdpi_clear/area-hatching.png   | Bin 17758 -> 0 bytes
 data/resources-mdpi_clear/traffic-arrow.png   | Bin 14744 -> 0 bytes
 data/resources-mdpi_dark/area-hatching.png    | Bin 17758 -> 0 bytes
 data/resources-mdpi_dark/traffic-arrow.png    | Bin 14744 -> 0 bytes
 data/resources-xhdpi_clear/area-hatching.png  | Bin 17758 -> 0 bytes
 data/resources-xhdpi_clear/traffic-arrow.png  | Bin 15056 -> 0 bytes
 data/resources-xhdpi_dark/area-hatching.png   | Bin 17758 -> 0 bytes
 data/resources-xhdpi_dark/traffic-arrow.png   | Bin 15056 -> 0 bytes
 data/resources-xxhdpi_clear/area-hatching.png | Bin 17758 -> 0 bytes
 data/resources-xxhdpi_clear/traffic-arrow.png | Bin 15928 -> 0 bytes
 data/resources-xxhdpi_dark/area-hatching.png  | Bin 17758 -> 0 bytes
 data/resources-xxhdpi_dark/traffic-arrow.png  | Bin 15928 -> 0 bytes
 .../resources-xxxhdpi_clear/area-hatching.png | Bin 17758 -> 0 bytes
 .../resources-xxxhdpi_clear/traffic-arrow.png | Bin 15928 -> 0 bytes
 data/resources-xxxhdpi_dark/area-hatching.png | Bin 17758 -> 0 bytes
 data/resources-xxxhdpi_dark/traffic-arrow.png | Bin 15928 -> 0 bytes
 data/{resources-svg => symbols-svg}/README.md |   0
 .../ic_facebook_white.svg                     |   0
 .../ic_follow.svg                             |   0
 .../ic_instagram_white.svg                    |   0
 .../ic_layer_contours.svg                     |   0
 .../ic_layer_outdoor_lake.svg                 |   0
 .../ic_layer_outdoor_river.svg                |   0
 .../ic_layer_outdoor_river_r2.svg             |   0
 .../ic_layer_subway.svg                       |   0
 .../ic_level_white.svg                        |   0
 .../ic_line_white.svg                         |   0
 .../ic_twitter_white.svg                      |   0
 .../ic_vk_white.svg                           |   0
 .../ic_wikimedia_commons_white.svg            |   0
 .../ios_ic_category_secondhand_dark.svg       |   0
 .../ios_ic_category_secondhand_light.svg      |   0
 .../6plus/clear}/symbols.png                  | Bin
 .../6plus/clear}/symbols.sdf                  |   0
 .../6plus/dark}/symbols.png                   | Bin
 .../6plus/dark}/symbols.sdf                   |   0
 .../default}/area-hatching.png                | Bin
 .../default}/arrow.obj                        |   0
 .../default}/arrow_shadow.obj                 |   0
 .../default}/default.ui                       |   0
 .../default}/smaa-area.png                    | Bin
 .../default}/smaa-search.png                  | Bin
 .../default}/traffic-arrow.png                | Bin
 .../hdpi/clear}/symbols.png                   | Bin
 .../hdpi/clear}/symbols.sdf                   |   0
 .../hdpi/dark}/symbols.png                    | Bin
 .../hdpi/dark}/symbols.sdf                    |   0
 .../mdpi/clear}/symbols.png                   | Bin
 .../mdpi/clear}/symbols.sdf                   |   0
 .../mdpi/dark}/symbols.png                    | Bin
 .../mdpi/dark}/symbols.sdf                    |   0
 .../xhdpi/clear}/symbols.png                  | Bin
 .../xhdpi/clear}/symbols.sdf                  |   0
 .../xhdpi/dark}/symbols.png                   | Bin
 .../xhdpi/dark}/symbols.sdf                   |   0
 .../xxhdpi/clear}/symbols.png                 | Bin
 .../xxhdpi/clear}/symbols.sdf                 |   0
 .../xxhdpi/dark}/symbols.png                  | Bin
 .../xxhdpi/dark}/symbols.sdf                  |   0
 .../xxxhdpi/clear}/symbols.png                | Bin
 .../xxxhdpi/clear}/symbols.sdf                |   0
 .../xxxhdpi/dark}/symbols.png                 | Bin
 .../xxxhdpi/dark}/symbols.sdf                 |   0
 docs/STRUCTURE.md                             |   7 ++-
 drape/drape_tests/static_texture_tests.cpp    |  30 ++--------
 drape/texture_manager.cpp                     |   4 +-
 drape_frontend/gui/skin.cpp                   |   4 +-
 indexer/map_style_reader.cpp                  |  31 +++++-----
 iphone/Maps/Maps.xcodeproj/project.pbxproj    |  56 ++----------------
 platform/platform_tests/apk_test.cpp          |  12 ++--
 platform/platform_tests/platform_test.cpp     |   2 +-
 qt/CMakeLists.txt                             |  32 ++++------
 qt/build_style/build_skins.cpp                |   6 +-
 tools/unix/generate_symbols.sh                |  48 ++++++---------
 95 files changed, 78 insertions(+), 170 deletions(-)
 delete mode 120000 android/app/src/main/assets/resources-6plus_clear
 delete mode 120000 android/app/src/main/assets/resources-6plus_dark
 delete mode 120000 android/app/src/main/assets/resources-default
 delete mode 120000 android/app/src/main/assets/resources-hdpi_clear
 delete mode 120000 android/app/src/main/assets/resources-hdpi_dark
 delete mode 120000 android/app/src/main/assets/resources-mdpi_clear
 delete mode 120000 android/app/src/main/assets/resources-mdpi_dark
 delete mode 120000 android/app/src/main/assets/resources-xhdpi_clear
 delete mode 120000 android/app/src/main/assets/resources-xhdpi_dark
 delete mode 120000 android/app/src/main/assets/resources-xxhdpi_clear
 delete mode 120000 android/app/src/main/assets/resources-xxhdpi_dark
 delete mode 120000 android/app/src/main/assets/resources-xxxhdpi_clear
 delete mode 120000 android/app/src/main/assets/resources-xxxhdpi_dark
 create mode 120000 android/app/src/main/assets/symbols
 delete mode 100644 data/resources-6plus_dark/area-hatching.png
 delete mode 100644 data/resources-6plus_dark/traffic-arrow.png
 delete mode 100644 data/resources-hdpi_clear/area-hatching.png
 delete mode 100644 data/resources-hdpi_clear/traffic-arrow.png
 delete mode 100644 data/resources-hdpi_dark/area-hatching.png
 delete mode 100644 data/resources-hdpi_dark/traffic-arrow.png
 delete mode 100644 data/resources-mdpi_clear/area-hatching.png
 delete mode 100644 data/resources-mdpi_clear/traffic-arrow.png
 delete mode 100644 data/resources-mdpi_dark/area-hatching.png
 delete mode 100644 data/resources-mdpi_dark/traffic-arrow.png
 delete mode 100644 data/resources-xhdpi_clear/area-hatching.png
 delete mode 100644 data/resources-xhdpi_clear/traffic-arrow.png
 delete mode 100644 data/resources-xhdpi_dark/area-hatching.png
 delete mode 100644 data/resources-xhdpi_dark/traffic-arrow.png
 delete mode 100644 data/resources-xxhdpi_clear/area-hatching.png
 delete mode 100644 data/resources-xxhdpi_clear/traffic-arrow.png
 delete mode 100644 data/resources-xxhdpi_dark/area-hatching.png
 delete mode 100644 data/resources-xxhdpi_dark/traffic-arrow.png
 delete mode 100644 data/resources-xxxhdpi_clear/area-hatching.png
 delete mode 100644 data/resources-xxxhdpi_clear/traffic-arrow.png
 delete mode 100644 data/resources-xxxhdpi_dark/area-hatching.png
 delete mode 100644 data/resources-xxxhdpi_dark/traffic-arrow.png
 rename data/{resources-svg => symbols-svg}/README.md (100%)
 rename data/{resources-svg => symbols-svg}/ic_facebook_white.svg (100%)
 rename data/{resources-svg => symbols-svg}/ic_follow.svg (100%)
 rename data/{resources-svg => symbols-svg}/ic_instagram_white.svg (100%)
 rename data/{resources-svg => symbols-svg}/ic_layer_contours.svg (100%)
 rename data/{resources-svg => symbols-svg}/ic_layer_outdoor_lake.svg (100%)
 rename data/{resources-svg => symbols-svg}/ic_layer_outdoor_river.svg (100%)
 rename data/{resources-svg => symbols-svg}/ic_layer_outdoor_river_r2.svg (100%)
 rename data/{resources-svg => symbols-svg}/ic_layer_subway.svg (100%)
 rename data/{resources-svg => symbols-svg}/ic_level_white.svg (100%)
 rename data/{resources-svg => symbols-svg}/ic_line_white.svg (100%)
 rename data/{resources-svg => symbols-svg}/ic_twitter_white.svg (100%)
 rename data/{resources-svg => symbols-svg}/ic_vk_white.svg (100%)
 rename data/{resources-svg => symbols-svg}/ic_wikimedia_commons_white.svg (100%)
 rename data/{resources-svg => symbols-svg}/ios_ic_category_secondhand_dark.svg (100%)
 rename data/{resources-svg => symbols-svg}/ios_ic_category_secondhand_light.svg (100%)
 rename data/{resources-6plus_clear => symbols/6plus/clear}/symbols.png (100%)
 rename data/{resources-6plus_clear => symbols/6plus/clear}/symbols.sdf (100%)
 rename data/{resources-6plus_dark => symbols/6plus/dark}/symbols.png (100%)
 rename data/{resources-6plus_dark => symbols/6plus/dark}/symbols.sdf (100%)
 rename data/{resources-6plus_clear => symbols/default}/area-hatching.png (100%)
 rename data/{resources-default => symbols/default}/arrow.obj (100%)
 rename data/{resources-default => symbols/default}/arrow_shadow.obj (100%)
 rename data/{resources-default => symbols/default}/default.ui (100%)
 rename data/{resources-default => symbols/default}/smaa-area.png (100%)
 rename data/{resources-default => symbols/default}/smaa-search.png (100%)
 rename data/{resources-6plus_clear => symbols/default}/traffic-arrow.png (100%)
 rename data/{resources-hdpi_clear => symbols/hdpi/clear}/symbols.png (100%)
 rename data/{resources-hdpi_clear => symbols/hdpi/clear}/symbols.sdf (100%)
 rename data/{resources-hdpi_dark => symbols/hdpi/dark}/symbols.png (100%)
 rename data/{resources-hdpi_dark => symbols/hdpi/dark}/symbols.sdf (100%)
 rename data/{resources-mdpi_clear => symbols/mdpi/clear}/symbols.png (100%)
 rename data/{resources-mdpi_clear => symbols/mdpi/clear}/symbols.sdf (100%)
 rename data/{resources-mdpi_dark => symbols/mdpi/dark}/symbols.png (100%)
 rename data/{resources-mdpi_dark => symbols/mdpi/dark}/symbols.sdf (100%)
 rename data/{resources-xhdpi_clear => symbols/xhdpi/clear}/symbols.png (100%)
 rename data/{resources-xhdpi_clear => symbols/xhdpi/clear}/symbols.sdf (100%)
 rename data/{resources-xhdpi_dark => symbols/xhdpi/dark}/symbols.png (100%)
 rename data/{resources-xhdpi_dark => symbols/xhdpi/dark}/symbols.sdf (100%)
 rename data/{resources-xxhdpi_clear => symbols/xxhdpi/clear}/symbols.png (100%)
 rename data/{resources-xxhdpi_clear => symbols/xxhdpi/clear}/symbols.sdf (100%)
 rename data/{resources-xxhdpi_dark => symbols/xxhdpi/dark}/symbols.png (100%)
 rename data/{resources-xxhdpi_dark => symbols/xxhdpi/dark}/symbols.sdf (100%)
 rename data/{resources-xxxhdpi_clear => symbols/xxxhdpi/clear}/symbols.png (100%)
 rename data/{resources-xxxhdpi_clear => symbols/xxxhdpi/clear}/symbols.sdf (100%)
 rename data/{resources-xxxhdpi_dark => symbols/xxxhdpi/dark}/symbols.png (100%)
 rename data/{resources-xxxhdpi_dark => symbols/xxxhdpi/dark}/symbols.sdf (100%)

diff --git a/.gitignore b/.gitignore
index d41c34931490b..8978c066597ef 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,7 +15,7 @@ stxxl.log
 screenlog.0
 
 data/styles/*/*/out/*
-data/resources-*_design/*
+data/symbols/*/design/*
 data/drules_proto_design.bin
 data/colors_design.txt
 data/patterns_design.txt
diff --git a/android/app/src/main/assets/resources-6plus_clear b/android/app/src/main/assets/resources-6plus_clear
deleted file mode 120000
index 4c5920391add6..0000000000000
--- a/android/app/src/main/assets/resources-6plus_clear
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../data/resources-6plus_clear
\ No newline at end of file
diff --git a/android/app/src/main/assets/resources-6plus_dark b/android/app/src/main/assets/resources-6plus_dark
deleted file mode 120000
index 543501d63abb9..0000000000000
--- a/android/app/src/main/assets/resources-6plus_dark
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../data/resources-6plus_dark
\ No newline at end of file
diff --git a/android/app/src/main/assets/resources-default b/android/app/src/main/assets/resources-default
deleted file mode 120000
index 9a8aaa1811988..0000000000000
--- a/android/app/src/main/assets/resources-default
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../data/resources-default
\ No newline at end of file
diff --git a/android/app/src/main/assets/resources-hdpi_clear b/android/app/src/main/assets/resources-hdpi_clear
deleted file mode 120000
index c0a4872dea0ed..0000000000000
--- a/android/app/src/main/assets/resources-hdpi_clear
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../data/resources-hdpi_clear
\ No newline at end of file
diff --git a/android/app/src/main/assets/resources-hdpi_dark b/android/app/src/main/assets/resources-hdpi_dark
deleted file mode 120000
index 21d8f368d4739..0000000000000
--- a/android/app/src/main/assets/resources-hdpi_dark
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../data/resources-hdpi_dark
\ No newline at end of file
diff --git a/android/app/src/main/assets/resources-mdpi_clear b/android/app/src/main/assets/resources-mdpi_clear
deleted file mode 120000
index ab1d86f371108..0000000000000
--- a/android/app/src/main/assets/resources-mdpi_clear
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../data/resources-mdpi_clear
\ No newline at end of file
diff --git a/android/app/src/main/assets/resources-mdpi_dark b/android/app/src/main/assets/resources-mdpi_dark
deleted file mode 120000
index f59648be5bcaf..0000000000000
--- a/android/app/src/main/assets/resources-mdpi_dark
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../data/resources-mdpi_dark
\ No newline at end of file
diff --git a/android/app/src/main/assets/resources-xhdpi_clear b/android/app/src/main/assets/resources-xhdpi_clear
deleted file mode 120000
index 0c91aeb5bc5d5..0000000000000
--- a/android/app/src/main/assets/resources-xhdpi_clear
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../data/resources-xhdpi_clear
\ No newline at end of file
diff --git a/android/app/src/main/assets/resources-xhdpi_dark b/android/app/src/main/assets/resources-xhdpi_dark
deleted file mode 120000
index 127d046ad6302..0000000000000
--- a/android/app/src/main/assets/resources-xhdpi_dark
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../data/resources-xhdpi_dark
\ No newline at end of file
diff --git a/android/app/src/main/assets/resources-xxhdpi_clear b/android/app/src/main/assets/resources-xxhdpi_clear
deleted file mode 120000
index 777210e74c14b..0000000000000
--- a/android/app/src/main/assets/resources-xxhdpi_clear
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../data/resources-xxhdpi_clear
\ No newline at end of file
diff --git a/android/app/src/main/assets/resources-xxhdpi_dark b/android/app/src/main/assets/resources-xxhdpi_dark
deleted file mode 120000
index d9877f68f1b79..0000000000000
--- a/android/app/src/main/assets/resources-xxhdpi_dark
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../data/resources-xxhdpi_dark
\ No newline at end of file
diff --git a/android/app/src/main/assets/resources-xxxhdpi_clear b/android/app/src/main/assets/resources-xxxhdpi_clear
deleted file mode 120000
index 7363df305e443..0000000000000
--- a/android/app/src/main/assets/resources-xxxhdpi_clear
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../data/resources-xxxhdpi_clear
\ No newline at end of file
diff --git a/android/app/src/main/assets/resources-xxxhdpi_dark b/android/app/src/main/assets/resources-xxxhdpi_dark
deleted file mode 120000
index 072a2b1ec341c..0000000000000
--- a/android/app/src/main/assets/resources-xxxhdpi_dark
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../data/resources-xxxhdpi_dark
\ No newline at end of file
diff --git a/android/app/src/main/assets/symbols b/android/app/src/main/assets/symbols
new file mode 120000
index 0000000000000..60317a425b160
--- /dev/null
+++ b/android/app/src/main/assets/symbols
@@ -0,0 +1 @@
+../../../../../data/symbols
\ No newline at end of file
diff --git a/data/resources-6plus_dark/area-hatching.png b/data/resources-6plus_dark/area-hatching.png
deleted file mode 100644
index 36f7b6f0b1c8ef6d0e3c181db215af70f669caab..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 17758
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

diff --git a/data/resources-6plus_dark/traffic-arrow.png b/data/resources-6plus_dark/traffic-arrow.png
deleted file mode 100644
index 87b2190d58f7f2f563fd4042624cf18e414dc338..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 15056
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
Z1Un+TSDiVZxgFhtww5iSL$~++{=e^be1`x4

diff --git a/data/resources-hdpi_clear/area-hatching.png b/data/resources-hdpi_clear/area-hatching.png
deleted file mode 100644
index 36f7b6f0b1c8ef6d0e3c181db215af70f669caab..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 17758
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

diff --git a/data/resources-hdpi_clear/traffic-arrow.png b/data/resources-hdpi_clear/traffic-arrow.png
deleted file mode 100644
index 5c92a611fb29d318d4c46233d8ad25909711d422..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 15042
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

diff --git a/data/resources-hdpi_dark/area-hatching.png b/data/resources-hdpi_dark/area-hatching.png
deleted file mode 100644
index 36f7b6f0b1c8ef6d0e3c181db215af70f669caab..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 17758
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

diff --git a/data/resources-hdpi_dark/traffic-arrow.png b/data/resources-hdpi_dark/traffic-arrow.png
deleted file mode 100644
index 5c92a611fb29d318d4c46233d8ad25909711d422..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 15042
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

diff --git a/data/resources-mdpi_clear/area-hatching.png b/data/resources-mdpi_clear/area-hatching.png
deleted file mode 100644
index 36f7b6f0b1c8ef6d0e3c181db215af70f669caab..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 17758
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

diff --git a/data/resources-mdpi_clear/traffic-arrow.png b/data/resources-mdpi_clear/traffic-arrow.png
deleted file mode 100644
index ff2157496e38f8a75aec7f19fd3c232d4c8135a0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 14744
zcmeI3Z)_7~9LJxn;BX2dq7ennSt4kly}SO|)=OI)>u^<y%Qkg{7xs4dth=o3op)E-
zEs{)86Mex8Vh9kBC>V*T(U<-SE<q(GY9c{Rh#C{&g-X;HGa?4(bJwo@wd;7m@bYQ4
z_Sfh6et*B`KF^=tn|q;u>w`<%?`%g1Elu_%2FT|W`RA70K;F-KjeE(*jYi)#3!$4<
zIR7o^z`>OWb@{ZRVS6~WMN;&fUsm-I>@VdEqDCmXv1G`~IJUVFoYC?z@9!Uc<mEIq
z=6yVz5>iGF9@F|JO*}Zcbx4^US0bu+W4t|Dl1PFawq>rA%jPYq6!W@yB@#Q$yq9w&
z_IS+O?G)sOQ~g|zZelL%@9-&NFu-+2{9-r~=n8G%0)p7V3n5;N_{5+@{z3v*d3odQ
zB#N5qs5Fq+Tq#Gs#k^y-ZAd&{EEfI6pkFsL#2$(8LVynhd_>{1Ci1pi^5v~H<s@@?
z64+8q&9F5+&pCPJ5xro?yk4hJ^;Nm9oKY>5w<_!iMZP2(yyzGBW+qjsdW?dZb%&-Z
zJkH`A&f6C8iA{aRm~QLVn7%;CYWISL$(*E8)!I$Ro69vVZP~p$2!aaIrcP^U!od6h
zw)BFj;NBhNQr0xPdRrT<O-@}Vr)R;j<C3<3&FLxI+@(;Sp(wdlsmH{!t(!x-o{g7R
zS^peDuBXRYRbhXayDudxTHYahf0S>u)#kjG5hr9D$BDbsCx|{#7!o_AupkAy)(b&N
z5I~Z$vLQ!GSGCcJW;sMDB*Gj(*_eauAyu~JtI7hkAdjj@qq>=s?YNecGnhB>nJ8at
z1j_2ll6v&4Zjxc)creO0YX&ZNwMogmWy^U5Clhhf;MX)&>cmPY98pGnqM|6iP)P0a
zb%_ztC&-bJjt)WS3<&`jVk!mg^HL{trQqzCN^12QQv>_F)Q^}NIql>u&^V*N))Gz9
z%q!KWS!9h)fVE3juzQ{j;wS4{=Q^^QdoCHWX<=vA#k_Odu6mGF&nd^_?p{e&oD(gs
zIGX~iQNFIVHms_%V$=Tb1eWsy`@%JfV>o}M4OLF%suoUS>7#a0HgR``tck1L@8!((
z*2WT1-uV^CYW0&*ZmplAxm7!VPNUA@CXw|(#wNS-AV&FlZMDi}{jf8y*@CO@3<%`K
zi_Uw+3cDMv+pcVd-Hq0o^U=I!$H`uF2injKT+RtxJ{kte%>s^hgu}sbly7Wqbo6T_
zoE=VRWDi@;$`k`#6;oqRQ|GptGf2khR&$M@qhc)275H6ur?T8i?i$Dq3tzossh{QQ
zZn(}t?TW5*VwjE<fi$Qw!$m~|1q>IYL5&$MDk3OgxF8K`%y3Z=K>@=BX;5Q^i;4&e
z7%oVI8Z%r}L{PwRK^oMU;i4jf0)`9HpvDXr6%iCLT#yDeX1J(`pn&0mG^jDdMMVS!
z3>Tz9jTtT~A}C<EAPs8Fa8VIK0mB7pP-BLRiU<lAE=YqKGh9?eP{43O8q}EKq9TF<
zh6~c5#tat~5fm_7kOnnoxTuJrfZ>8Ps4>GuMFa&57o<Ur87?X!C}6lC4QkAAQ4v7_
z!v$$j<16B7uRQ~Z^W?$5B6-5^<AdAxlcxhYrEegG&?I@XaB3Gqf6tQ7pAjku2>p^q
zNZN<c?fRZ4KG{sP=aY%<q0-q4`^9A^g_}LcPi#2++Yg7u!BZ=rTlMbVLYun#))lvW
z@$AvIne(5md%$^eu?4lFMQ90Hj%K<~pI0Vlx1av%;y<tdwK4kB;zfVF^4jv%m-%~8
zlHYl1@1~2H*(1SEJwLV#x4enAq_?kFd1Tk_C7aK!9ejB;daCtU=$qqb4m_55zU`QL
z;f*tw9zLY4edqM|Cmwq1j=~-fT0eDL`tugy>G7|V%cfsi*EY3kar#BxcjUdDeDLn+
z8PCa)FQu74uJx{B=G)63TKqXQ-JV|j-9Ascb^Oo3A<y)`2gw!A&U#Sq(f3jC(yPCc
PuPE8OHSzYQ^fUhf-vk4H

diff --git a/data/resources-mdpi_dark/area-hatching.png b/data/resources-mdpi_dark/area-hatching.png
deleted file mode 100644
index 36f7b6f0b1c8ef6d0e3c181db215af70f669caab..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 17758
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

diff --git a/data/resources-mdpi_dark/traffic-arrow.png b/data/resources-mdpi_dark/traffic-arrow.png
deleted file mode 100644
index ff2157496e38f8a75aec7f19fd3c232d4c8135a0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 14744
zcmeI3Z)_7~9LJxn;BX2dq7ennSt4kly}SO|)=OI)>u^<y%Qkg{7xs4dth=o3op)E-
zEs{)86Mex8Vh9kBC>V*T(U<-SE<q(GY9c{Rh#C{&g-X;HGa?4(bJwo@wd;7m@bYQ4
z_Sfh6et*B`KF^=tn|q;u>w`<%?`%g1Elu_%2FT|W`RA70K;F-KjeE(*jYi)#3!$4<
zIR7o^z`>OWb@{ZRVS6~WMN;&fUsm-I>@VdEqDCmXv1G`~IJUVFoYC?z@9!Uc<mEIq
z=6yVz5>iGF9@F|JO*}Zcbx4^US0bu+W4t|Dl1PFawq>rA%jPYq6!W@yB@#Q$yq9w&
z_IS+O?G)sOQ~g|zZelL%@9-&NFu-+2{9-r~=n8G%0)p7V3n5;N_{5+@{z3v*d3odQ
zB#N5qs5Fq+Tq#Gs#k^y-ZAd&{EEfI6pkFsL#2$(8LVynhd_>{1Ci1pi^5v~H<s@@?
z64+8q&9F5+&pCPJ5xro?yk4hJ^;Nm9oKY>5w<_!iMZP2(yyzGBW+qjsdW?dZb%&-Z
zJkH`A&f6C8iA{aRm~QLVn7%;CYWISL$(*E8)!I$Ro69vVZP~p$2!aaIrcP^U!od6h
zw)BFj;NBhNQr0xPdRrT<O-@}Vr)R;j<C3<3&FLxI+@(;Sp(wdlsmH{!t(!x-o{g7R
zS^peDuBXRYRbhXayDudxTHYahf0S>u)#kjG5hr9D$BDbsCx|{#7!o_AupkAy)(b&N
z5I~Z$vLQ!GSGCcJW;sMDB*Gj(*_eauAyu~JtI7hkAdjj@qq>=s?YNecGnhB>nJ8at
z1j_2ll6v&4Zjxc)creO0YX&ZNwMogmWy^U5Clhhf;MX)&>cmPY98pGnqM|6iP)P0a
zb%_ztC&-bJjt)WS3<&`jVk!mg^HL{trQqzCN^12QQv>_F)Q^}NIql>u&^V*N))Gz9
z%q!KWS!9h)fVE3juzQ{j;wS4{=Q^^QdoCHWX<=vA#k_Odu6mGF&nd^_?p{e&oD(gs
zIGX~iQNFIVHms_%V$=Tb1eWsy`@%JfV>o}M4OLF%suoUS>7#a0HgR``tck1L@8!((
z*2WT1-uV^CYW0&*ZmplAxm7!VPNUA@CXw|(#wNS-AV&FlZMDi}{jf8y*@CO@3<%`K
zi_Uw+3cDMv+pcVd-Hq0o^U=I!$H`uF2injKT+RtxJ{kte%>s^hgu}sbly7Wqbo6T_
zoE=VRWDi@;$`k`#6;oqRQ|GptGf2khR&$M@qhc)275H6ur?T8i?i$Dq3tzossh{QQ
zZn(}t?TW5*VwjE<fi$Qw!$m~|1q>IYL5&$MDk3OgxF8K`%y3Z=K>@=BX;5Q^i;4&e
z7%oVI8Z%r}L{PwRK^oMU;i4jf0)`9HpvDXr6%iCLT#yDeX1J(`pn&0mG^jDdMMVS!
z3>Tz9jTtT~A}C<EAPs8Fa8VIK0mB7pP-BLRiU<lAE=YqKGh9?eP{43O8q}EKq9TF<
zh6~c5#tat~5fm_7kOnnoxTuJrfZ>8Ps4>GuMFa&57o<Ur87?X!C}6lC4QkAAQ4v7_
z!v$$j<16B7uRQ~Z^W?$5B6-5^<AdAxlcxhYrEegG&?I@XaB3Gqf6tQ7pAjku2>p^q
zNZN<c?fRZ4KG{sP=aY%<q0-q4`^9A^g_}LcPi#2++Yg7u!BZ=rTlMbVLYun#))lvW
z@$AvIne(5md%$^eu?4lFMQ90Hj%K<~pI0Vlx1av%;y<tdwK4kB;zfVF^4jv%m-%~8
zlHYl1@1~2H*(1SEJwLV#x4enAq_?kFd1Tk_C7aK!9ejB;daCtU=$qqb4m_55zU`QL
z;f*tw9zLY4edqM|Cmwq1j=~-fT0eDL`tugy>G7|V%cfsi*EY3kar#BxcjUdDeDLn+
z8PCa)FQu74uJx{B=G)63TKqXQ-JV|j-9Ascb^Oo3A<y)`2gw!A&U#Sq(f3jC(yPCc
PuPE8OHSzYQ^fUhf-vk4H

diff --git a/data/resources-xhdpi_clear/area-hatching.png b/data/resources-xhdpi_clear/area-hatching.png
deleted file mode 100644
index 36f7b6f0b1c8ef6d0e3c181db215af70f669caab..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 17758
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

diff --git a/data/resources-xhdpi_clear/traffic-arrow.png b/data/resources-xhdpi_clear/traffic-arrow.png
deleted file mode 100644
index 87b2190d58f7f2f563fd4042624cf18e414dc338..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 15056
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
Z1Un+TSDiVZxgFhtww5iSL$~++{=e^be1`x4

diff --git a/data/resources-xhdpi_dark/area-hatching.png b/data/resources-xhdpi_dark/area-hatching.png
deleted file mode 100644
index 36f7b6f0b1c8ef6d0e3c181db215af70f669caab..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 17758
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

diff --git a/data/resources-xhdpi_dark/traffic-arrow.png b/data/resources-xhdpi_dark/traffic-arrow.png
deleted file mode 100644
index 87b2190d58f7f2f563fd4042624cf18e414dc338..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 15056
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
Z1Un+TSDiVZxgFhtww5iSL$~++{=e^be1`x4

diff --git a/data/resources-xxhdpi_clear/area-hatching.png b/data/resources-xxhdpi_clear/area-hatching.png
deleted file mode 100644
index 36f7b6f0b1c8ef6d0e3c181db215af70f669caab..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 17758
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

diff --git a/data/resources-xxhdpi_clear/traffic-arrow.png b/data/resources-xxhdpi_clear/traffic-arrow.png
deleted file mode 100644
index e72c93d9a7fb0f35414f91ba0005bef57d977955..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 15928
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
Y*7=KTle4cbhyQ}Cg^SZadR4LE|IEz-$^ZZW

diff --git a/data/resources-xxhdpi_dark/area-hatching.png b/data/resources-xxhdpi_dark/area-hatching.png
deleted file mode 100644
index 36f7b6f0b1c8ef6d0e3c181db215af70f669caab..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 17758
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

diff --git a/data/resources-xxhdpi_dark/traffic-arrow.png b/data/resources-xxhdpi_dark/traffic-arrow.png
deleted file mode 100644
index e72c93d9a7fb0f35414f91ba0005bef57d977955..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 15928
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
Y*7=KTle4cbhyQ}Cg^SZadR4LE|IEz-$^ZZW

diff --git a/data/resources-xxxhdpi_clear/area-hatching.png b/data/resources-xxxhdpi_clear/area-hatching.png
deleted file mode 100644
index 36f7b6f0b1c8ef6d0e3c181db215af70f669caab..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 17758
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

diff --git a/data/resources-xxxhdpi_clear/traffic-arrow.png b/data/resources-xxxhdpi_clear/traffic-arrow.png
deleted file mode 100644
index e72c93d9a7fb0f35414f91ba0005bef57d977955..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 15928
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
Y*7=KTle4cbhyQ}Cg^SZadR4LE|IEz-$^ZZW

diff --git a/data/resources-xxxhdpi_dark/area-hatching.png b/data/resources-xxxhdpi_dark/area-hatching.png
deleted file mode 100644
index 36f7b6f0b1c8ef6d0e3c181db215af70f669caab..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 17758
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

diff --git a/data/resources-xxxhdpi_dark/traffic-arrow.png b/data/resources-xxxhdpi_dark/traffic-arrow.png
deleted file mode 100644
index e72c93d9a7fb0f35414f91ba0005bef57d977955..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 15928
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
Y*7=KTle4cbhyQ}Cg^SZadR4LE|IEz-$^ZZW

diff --git a/data/resources-svg/README.md b/data/symbols-svg/README.md
similarity index 100%
rename from data/resources-svg/README.md
rename to data/symbols-svg/README.md
diff --git a/data/resources-svg/ic_facebook_white.svg b/data/symbols-svg/ic_facebook_white.svg
similarity index 100%
rename from data/resources-svg/ic_facebook_white.svg
rename to data/symbols-svg/ic_facebook_white.svg
diff --git a/data/resources-svg/ic_follow.svg b/data/symbols-svg/ic_follow.svg
similarity index 100%
rename from data/resources-svg/ic_follow.svg
rename to data/symbols-svg/ic_follow.svg
diff --git a/data/resources-svg/ic_instagram_white.svg b/data/symbols-svg/ic_instagram_white.svg
similarity index 100%
rename from data/resources-svg/ic_instagram_white.svg
rename to data/symbols-svg/ic_instagram_white.svg
diff --git a/data/resources-svg/ic_layer_contours.svg b/data/symbols-svg/ic_layer_contours.svg
similarity index 100%
rename from data/resources-svg/ic_layer_contours.svg
rename to data/symbols-svg/ic_layer_contours.svg
diff --git a/data/resources-svg/ic_layer_outdoor_lake.svg b/data/symbols-svg/ic_layer_outdoor_lake.svg
similarity index 100%
rename from data/resources-svg/ic_layer_outdoor_lake.svg
rename to data/symbols-svg/ic_layer_outdoor_lake.svg
diff --git a/data/resources-svg/ic_layer_outdoor_river.svg b/data/symbols-svg/ic_layer_outdoor_river.svg
similarity index 100%
rename from data/resources-svg/ic_layer_outdoor_river.svg
rename to data/symbols-svg/ic_layer_outdoor_river.svg
diff --git a/data/resources-svg/ic_layer_outdoor_river_r2.svg b/data/symbols-svg/ic_layer_outdoor_river_r2.svg
similarity index 100%
rename from data/resources-svg/ic_layer_outdoor_river_r2.svg
rename to data/symbols-svg/ic_layer_outdoor_river_r2.svg
diff --git a/data/resources-svg/ic_layer_subway.svg b/data/symbols-svg/ic_layer_subway.svg
similarity index 100%
rename from data/resources-svg/ic_layer_subway.svg
rename to data/symbols-svg/ic_layer_subway.svg
diff --git a/data/resources-svg/ic_level_white.svg b/data/symbols-svg/ic_level_white.svg
similarity index 100%
rename from data/resources-svg/ic_level_white.svg
rename to data/symbols-svg/ic_level_white.svg
diff --git a/data/resources-svg/ic_line_white.svg b/data/symbols-svg/ic_line_white.svg
similarity index 100%
rename from data/resources-svg/ic_line_white.svg
rename to data/symbols-svg/ic_line_white.svg
diff --git a/data/resources-svg/ic_twitter_white.svg b/data/symbols-svg/ic_twitter_white.svg
similarity index 100%
rename from data/resources-svg/ic_twitter_white.svg
rename to data/symbols-svg/ic_twitter_white.svg
diff --git a/data/resources-svg/ic_vk_white.svg b/data/symbols-svg/ic_vk_white.svg
similarity index 100%
rename from data/resources-svg/ic_vk_white.svg
rename to data/symbols-svg/ic_vk_white.svg
diff --git a/data/resources-svg/ic_wikimedia_commons_white.svg b/data/symbols-svg/ic_wikimedia_commons_white.svg
similarity index 100%
rename from data/resources-svg/ic_wikimedia_commons_white.svg
rename to data/symbols-svg/ic_wikimedia_commons_white.svg
diff --git a/data/resources-svg/ios_ic_category_secondhand_dark.svg b/data/symbols-svg/ios_ic_category_secondhand_dark.svg
similarity index 100%
rename from data/resources-svg/ios_ic_category_secondhand_dark.svg
rename to data/symbols-svg/ios_ic_category_secondhand_dark.svg
diff --git a/data/resources-svg/ios_ic_category_secondhand_light.svg b/data/symbols-svg/ios_ic_category_secondhand_light.svg
similarity index 100%
rename from data/resources-svg/ios_ic_category_secondhand_light.svg
rename to data/symbols-svg/ios_ic_category_secondhand_light.svg
diff --git a/data/resources-6plus_clear/symbols.png b/data/symbols/6plus/clear/symbols.png
similarity index 100%
rename from data/resources-6plus_clear/symbols.png
rename to data/symbols/6plus/clear/symbols.png
diff --git a/data/resources-6plus_clear/symbols.sdf b/data/symbols/6plus/clear/symbols.sdf
similarity index 100%
rename from data/resources-6plus_clear/symbols.sdf
rename to data/symbols/6plus/clear/symbols.sdf
diff --git a/data/resources-6plus_dark/symbols.png b/data/symbols/6plus/dark/symbols.png
similarity index 100%
rename from data/resources-6plus_dark/symbols.png
rename to data/symbols/6plus/dark/symbols.png
diff --git a/data/resources-6plus_dark/symbols.sdf b/data/symbols/6plus/dark/symbols.sdf
similarity index 100%
rename from data/resources-6plus_dark/symbols.sdf
rename to data/symbols/6plus/dark/symbols.sdf
diff --git a/data/resources-6plus_clear/area-hatching.png b/data/symbols/default/area-hatching.png
similarity index 100%
rename from data/resources-6plus_clear/area-hatching.png
rename to data/symbols/default/area-hatching.png
diff --git a/data/resources-default/arrow.obj b/data/symbols/default/arrow.obj
similarity index 100%
rename from data/resources-default/arrow.obj
rename to data/symbols/default/arrow.obj
diff --git a/data/resources-default/arrow_shadow.obj b/data/symbols/default/arrow_shadow.obj
similarity index 100%
rename from data/resources-default/arrow_shadow.obj
rename to data/symbols/default/arrow_shadow.obj
diff --git a/data/resources-default/default.ui b/data/symbols/default/default.ui
similarity index 100%
rename from data/resources-default/default.ui
rename to data/symbols/default/default.ui
diff --git a/data/resources-default/smaa-area.png b/data/symbols/default/smaa-area.png
similarity index 100%
rename from data/resources-default/smaa-area.png
rename to data/symbols/default/smaa-area.png
diff --git a/data/resources-default/smaa-search.png b/data/symbols/default/smaa-search.png
similarity index 100%
rename from data/resources-default/smaa-search.png
rename to data/symbols/default/smaa-search.png
diff --git a/data/resources-6plus_clear/traffic-arrow.png b/data/symbols/default/traffic-arrow.png
similarity index 100%
rename from data/resources-6plus_clear/traffic-arrow.png
rename to data/symbols/default/traffic-arrow.png
diff --git a/data/resources-hdpi_clear/symbols.png b/data/symbols/hdpi/clear/symbols.png
similarity index 100%
rename from data/resources-hdpi_clear/symbols.png
rename to data/symbols/hdpi/clear/symbols.png
diff --git a/data/resources-hdpi_clear/symbols.sdf b/data/symbols/hdpi/clear/symbols.sdf
similarity index 100%
rename from data/resources-hdpi_clear/symbols.sdf
rename to data/symbols/hdpi/clear/symbols.sdf
diff --git a/data/resources-hdpi_dark/symbols.png b/data/symbols/hdpi/dark/symbols.png
similarity index 100%
rename from data/resources-hdpi_dark/symbols.png
rename to data/symbols/hdpi/dark/symbols.png
diff --git a/data/resources-hdpi_dark/symbols.sdf b/data/symbols/hdpi/dark/symbols.sdf
similarity index 100%
rename from data/resources-hdpi_dark/symbols.sdf
rename to data/symbols/hdpi/dark/symbols.sdf
diff --git a/data/resources-mdpi_clear/symbols.png b/data/symbols/mdpi/clear/symbols.png
similarity index 100%
rename from data/resources-mdpi_clear/symbols.png
rename to data/symbols/mdpi/clear/symbols.png
diff --git a/data/resources-mdpi_clear/symbols.sdf b/data/symbols/mdpi/clear/symbols.sdf
similarity index 100%
rename from data/resources-mdpi_clear/symbols.sdf
rename to data/symbols/mdpi/clear/symbols.sdf
diff --git a/data/resources-mdpi_dark/symbols.png b/data/symbols/mdpi/dark/symbols.png
similarity index 100%
rename from data/resources-mdpi_dark/symbols.png
rename to data/symbols/mdpi/dark/symbols.png
diff --git a/data/resources-mdpi_dark/symbols.sdf b/data/symbols/mdpi/dark/symbols.sdf
similarity index 100%
rename from data/resources-mdpi_dark/symbols.sdf
rename to data/symbols/mdpi/dark/symbols.sdf
diff --git a/data/resources-xhdpi_clear/symbols.png b/data/symbols/xhdpi/clear/symbols.png
similarity index 100%
rename from data/resources-xhdpi_clear/symbols.png
rename to data/symbols/xhdpi/clear/symbols.png
diff --git a/data/resources-xhdpi_clear/symbols.sdf b/data/symbols/xhdpi/clear/symbols.sdf
similarity index 100%
rename from data/resources-xhdpi_clear/symbols.sdf
rename to data/symbols/xhdpi/clear/symbols.sdf
diff --git a/data/resources-xhdpi_dark/symbols.png b/data/symbols/xhdpi/dark/symbols.png
similarity index 100%
rename from data/resources-xhdpi_dark/symbols.png
rename to data/symbols/xhdpi/dark/symbols.png
diff --git a/data/resources-xhdpi_dark/symbols.sdf b/data/symbols/xhdpi/dark/symbols.sdf
similarity index 100%
rename from data/resources-xhdpi_dark/symbols.sdf
rename to data/symbols/xhdpi/dark/symbols.sdf
diff --git a/data/resources-xxhdpi_clear/symbols.png b/data/symbols/xxhdpi/clear/symbols.png
similarity index 100%
rename from data/resources-xxhdpi_clear/symbols.png
rename to data/symbols/xxhdpi/clear/symbols.png
diff --git a/data/resources-xxhdpi_clear/symbols.sdf b/data/symbols/xxhdpi/clear/symbols.sdf
similarity index 100%
rename from data/resources-xxhdpi_clear/symbols.sdf
rename to data/symbols/xxhdpi/clear/symbols.sdf
diff --git a/data/resources-xxhdpi_dark/symbols.png b/data/symbols/xxhdpi/dark/symbols.png
similarity index 100%
rename from data/resources-xxhdpi_dark/symbols.png
rename to data/symbols/xxhdpi/dark/symbols.png
diff --git a/data/resources-xxhdpi_dark/symbols.sdf b/data/symbols/xxhdpi/dark/symbols.sdf
similarity index 100%
rename from data/resources-xxhdpi_dark/symbols.sdf
rename to data/symbols/xxhdpi/dark/symbols.sdf
diff --git a/data/resources-xxxhdpi_clear/symbols.png b/data/symbols/xxxhdpi/clear/symbols.png
similarity index 100%
rename from data/resources-xxxhdpi_clear/symbols.png
rename to data/symbols/xxxhdpi/clear/symbols.png
diff --git a/data/resources-xxxhdpi_clear/symbols.sdf b/data/symbols/xxxhdpi/clear/symbols.sdf
similarity index 100%
rename from data/resources-xxxhdpi_clear/symbols.sdf
rename to data/symbols/xxxhdpi/clear/symbols.sdf
diff --git a/data/resources-xxxhdpi_dark/symbols.png b/data/symbols/xxxhdpi/dark/symbols.png
similarity index 100%
rename from data/resources-xxxhdpi_dark/symbols.png
rename to data/symbols/xxxhdpi/dark/symbols.png
diff --git a/data/resources-xxxhdpi_dark/symbols.sdf b/data/symbols/xxxhdpi/dark/symbols.sdf
similarity index 100%
rename from data/resources-xxxhdpi_dark/symbols.sdf
rename to data/symbols/xxxhdpi/dark/symbols.sdf
diff --git a/docs/STRUCTURE.md b/docs/STRUCTURE.md
index 64be9a6dbfd7a..312f83429d0f1 100644
--- a/docs/STRUCTURE.md
+++ b/docs/STRUCTURE.md
@@ -44,13 +44,14 @@ Automatically generated:
 
 ### Styles and icons
 
-- `resources-default/` -
-- `resources-svg/` - social networks icons
+- `symbols/` - symbols for different screen DPIs
+- `symbols/default/` - default resources used on all sceen DPIs
+- `symbols-svg/` - social networks icons
 - `search-icons/svg/` - source SVG files for search categories icons
 - `styles/` - map [style files](STYLES.md#files)
 
 Automatically [generated](STYLES.md#technical-details):
-- `resources-*/` - icons skin files in various resolutions for `dark` and `clear` (light) themes.
+- `symbols/` - icons skin files in various resolutions for `dark` and `clear` (light) themes.
 - `drules_proto*` - binary drawing rules files.
 - `colors.txt`,`patterns.txt`,`visibility.txt`
 
diff --git a/drape/drape_tests/static_texture_tests.cpp b/drape/drape_tests/static_texture_tests.cpp
index 0366a0cb1b55b..7357efb803d07 100644
--- a/drape/drape_tests/static_texture_tests.cpp
+++ b/drape/drape_tests/static_texture_tests.cpp
@@ -1,34 +1,16 @@
 #include "testing/testing.hpp"
 
-#include "indexer/map_style.hpp"
-#include "indexer/map_style_reader.hpp"
-
 #include "drape/drape_tests/testing_graphics_context.hpp"
 #include "drape/static_texture.hpp"
 
-#include <string>
-#include <vector>
-
 UNIT_TEST(CheckTrafficArrowTextures)
 {
-  static std::vector<std::string> skinPaths = {"6plus", "mdpi", "hdpi", "xhdpi", "xxhdpi", "xxxhdpi"};
-  static std::vector<MapStyle> styles = {MapStyle::MapStyleClear, MapStyle::MapStyleDark,
-                                         MapStyle::MapStyleVehicleClear,
-                                         MapStyle::MapStyleVehicleDark};
-
   TestingGraphicsContext context;
-  for (auto const & style : styles)
-  {
-    GetStyleReader().SetCurrentStyle(style);
-    for (size_t i = 0; i < skinPaths.size(); ++i)
-    {
-      dp::StaticTexture texture(make_ref(&context), "traffic-arrow", skinPaths[i],
-                                dp::TextureFormat::RGBA8, nullptr);
-      TEST(texture.IsLoadingCorrect(), ());
+  dp::StaticTexture texture(make_ref(&context), "traffic-arrow", dp::StaticTexture::kDefaultResource,
+                            dp::TextureFormat::RGBA8, nullptr);
+  TEST(texture.IsLoadingCorrect(), ());
 
-      dp::StaticTexture texture2(make_ref(&context), "area-hatching", skinPaths[i],
-                                 dp::TextureFormat::RGBA8, nullptr);
-      TEST(texture2.IsLoadingCorrect(), ());
-    }
-  }
+  dp::StaticTexture texture2(make_ref(&context), "area-hatching", dp::StaticTexture::kDefaultResource,
+                             dp::TextureFormat::RGBA8, nullptr);
+  TEST(texture2.IsLoadingCorrect(), ());
 }
diff --git a/drape/texture_manager.cpp b/drape/texture_manager.cpp
index 7c9a3d8ced089..329b01e29d4fd 100644
--- a/drape/texture_manager.cpp
+++ b/drape/texture_manager.cpp
@@ -399,10 +399,10 @@ void TextureManager::Init(ref_ptr<dp::GraphicsContext> context, Params const & p
 
   // Initialize static textures.
   m_trafficArrowTexture =
-      make_unique_dp<StaticTexture>(context, "traffic-arrow.png", m_resPostfix,
+      make_unique_dp<StaticTexture>(context, "traffic-arrow.png", StaticTexture::kDefaultResource,
                                     dp::TextureFormat::RGBA8, make_ref(m_textureAllocator));
   m_hatchingTexture =
-      make_unique_dp<StaticTexture>(context, "area-hatching.png", m_resPostfix,
+      make_unique_dp<StaticTexture>(context, "area-hatching.png", StaticTexture::kDefaultResource,
                                     dp::TextureFormat::RGBA8, make_ref(m_textureAllocator));
   m_arrowTexture =
       CreateArrowTexture(context, make_ref(m_textureAllocator), params.m_arrowTexturePath,
diff --git a/drape_frontend/gui/skin.cpp b/drape_frontend/gui/skin.cpp
index 623087b735310..c0f3f230faef8 100644
--- a/drape_frontend/gui/skin.cpp
+++ b/drape_frontend/gui/skin.cpp
@@ -288,7 +288,7 @@ ReaderPtr<Reader> ResolveGuiSkinFile(std::string const & deviceType)
   std::unique_ptr<Reader> reader;
   try
   {
-    reader = pl.GetReader("resources-default/" + deviceType + ".ui");
+    reader = pl.GetReader("symbols/default/" + deviceType + ".ui");
   }
   catch(FileAbsentException & e)
   {
@@ -299,7 +299,7 @@ ReaderPtr<Reader> ResolveGuiSkinFile(std::string const & deviceType)
   {
     try
     {
-      reader = pl.GetReader("resources-default/default.ui");
+      reader = pl.GetReader("symbols/default/default.ui");
     }
     catch(FileAbsentException & e)
     {
diff --git a/indexer/map_style_reader.cpp b/indexer/map_style_reader.cpp
index 8c79211e6ebe3..cc50ba4d99c56 100644
--- a/indexer/map_style_reader.cpp
+++ b/indexer/map_style_reader.cpp
@@ -7,17 +7,17 @@
 
 namespace
 {
-std::string const kSuffixDark = "_dark";
-std::string const kSuffixClear = "_clear";
-std::string const kSuffixVehicleDark = "_vehicle_dark";
-std::string const kSuffixVehicleClear = "_vehicle_clear";
-std::string const kSuffixOutdoorsClear = "_outdoors_clear";
-std::string const kSuffixOutdoorsDark = "_outdoors_dark";
+std::string const kSuffixDark = "dark";
+std::string const kSuffixClear = "clear";
+std::string const kSuffixVehicleDark = "vehicle_dark";
+std::string const kSuffixVehicleClear = "vehicle_clear";
+std::string const kSuffixOutdoorsClear = "outdoors_clear";
+std::string const kSuffixOutdoorsDark = "outdoors_dark";
 
 std::string const kStylesOverrideDir = "styles";
 
 #ifdef BUILD_DESIGNER
-std::string const kSuffixDesignTool = "_design";
+std::string const kSuffixDesignTool = "design";
 #endif // BUILD_DESIGNER
 
 std::string GetStyleRulesSuffix(MapStyle mapStyle)
@@ -40,7 +40,7 @@ std::string GetStyleRulesSuffix(MapStyle mapStyle)
   case MapStyleOutdoorsDark:
     return kSuffixOutdoorsDark;
   case MapStyleMerged:
-    return std::string();
+    return "";
 
   case MapStyleCount:
     break;
@@ -68,7 +68,7 @@ std::string GetStyleResourcesSuffix(MapStyle mapStyle)
   case MapStyleOutdoorsClear:
     return kSuffixClear;
   case MapStyleMerged:
-    return std::string();
+    return "";
 
   case MapStyleCount:
     break;
@@ -101,8 +101,11 @@ bool StyleReader::IsCarNavigationStyle() const
 
 ReaderPtr<Reader> StyleReader::GetDrawingRulesReader() const
 {
-  std::string rulesFile =
-      std::string("drules_proto") + GetStyleRulesSuffix(GetCurrentStyle()) + ".bin";
+  std::string rulesFile;
+  if (const std::string & stylesPrefix = GetStyleRulesSuffix(GetCurrentStyle()); stylesPrefix.empty())
+    rulesFile = "drules_proto.bin";
+  else
+    rulesFile = std::string("drules_proto_") + stylesPrefix + ".bin";
 
   auto overriddenRulesFile =
       base::JoinPath(GetPlatform().WritableDir(), kStylesOverrideDir, rulesFile);
@@ -120,9 +123,7 @@ ReaderPtr<Reader> StyleReader::GetDrawingRulesReader() const
 ReaderPtr<Reader> StyleReader::GetResourceReader(std::string const & file,
                                                  std::string_view density) const
 {
-  std::string const resourceDir =
-      std::string("resources-").append(density) + GetStyleResourcesSuffix(GetCurrentStyle());
-  std::string resFile = base::JoinPath(resourceDir, file);
+  std::string resFile = base::JoinPath("symbols", std::string{density}, GetStyleResourcesSuffix(GetCurrentStyle()), file);
 
   auto overriddenResFile = base::JoinPath(GetPlatform().WritableDir(), kStylesOverrideDir, resFile);
   if (GetPlatform().IsFileExistsByFullPath(overriddenResFile))
@@ -138,7 +139,7 @@ ReaderPtr<Reader> StyleReader::GetResourceReader(std::string const & file,
 
 ReaderPtr<Reader> StyleReader::GetDefaultResourceReader(std::string const & file) const
 {
-  return GetPlatform().GetReader(base::JoinPath("resources-default", file));
+  return GetPlatform().GetReader(base::JoinPath("symbols/default", file));
 }
 
 StyleReader & GetStyleReader()
diff --git a/iphone/Maps/Maps.xcodeproj/project.pbxproj b/iphone/Maps/Maps.xcodeproj/project.pbxproj
index 9caf76600b55e..6bac570db169c 100644
--- a/iphone/Maps/Maps.xcodeproj/project.pbxproj
+++ b/iphone/Maps/Maps.xcodeproj/project.pbxproj
@@ -7,6 +7,7 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		16876BAC2BEBF13600915C23 /* symbols in Resources */ = {isa = PBXBuildFile; fileRef = 16876BAB2BEBF13600915C23 /* symbols */; };
 		1DFA2F6A20D3B57400FB2C66 /* UIColor+PartnerColor.m in Sources */ = {isa = PBXBuildFile; fileRef = 1DFA2F6920D3B57400FB2C66 /* UIColor+PartnerColor.m */; };
 		3304306D21D4EAFB00317CA3 /* SearchCategoryCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3304306C21D4EAFB00317CA3 /* SearchCategoryCell.swift */; };
 		33046832219C57180041F3A8 /* CategorySettingsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33046831219C57180041F3A8 /* CategorySettingsViewController.swift */; };
@@ -186,8 +187,6 @@
 		44360A112A7D35440016F412 /* TransportRuler.xib in Resources */ = {isa = PBXBuildFile; fileRef = 44360A102A7D35440016F412 /* TransportRuler.xib */; };
 		447DB4BC2BA78282000DF4C2 /* MWMOsmReauthAlert.mm in Sources */ = {isa = PBXBuildFile; fileRef = 447DB4BB2BA78282000DF4C2 /* MWMOsmReauthAlert.mm */; };
 		447DB4C42BA78665000DF4C2 /* MWMOsmReauthAlert.xib in Resources */ = {isa = PBXBuildFile; fileRef = 447DB4C12BA78665000DF4C2 /* MWMOsmReauthAlert.xib */; };
-		4501B1942077C35A001B9173 /* resources-xxxhdpi_clear in Resources */ = {isa = PBXBuildFile; fileRef = 4501B1922077C35A001B9173 /* resources-xxxhdpi_clear */; };
-		4501B1952077C35A001B9173 /* resources-xxxhdpi_dark in Resources */ = {isa = PBXBuildFile; fileRef = 4501B1932077C35A001B9173 /* resources-xxxhdpi_dark */; };
 		4554B6EC1E55F0EF0084017F /* drules_proto_vehicle_clear.bin in Resources */ = {isa = PBXBuildFile; fileRef = 4554B6E81E55F02B0084017F /* drules_proto_vehicle_clear.bin */; };
 		4554B6EE1E55F0F30084017F /* drules_proto_vehicle_dark.bin in Resources */ = {isa = PBXBuildFile; fileRef = 4554B6E91E55F02B0084017F /* drules_proto_vehicle_dark.bin */; };
 		462452E92BD052C0004C85E1 /* MWMEditorSegmentedTableViewCell.mm in Sources */ = {isa = PBXBuildFile; fileRef = 462452E72BD052C0004C85E1 /* MWMEditorSegmentedTableViewCell.mm */; };
@@ -263,17 +262,14 @@
 		6741A9421BF340DE002C974C /* sound-strings in Resources */ = {isa = PBXBuildFile; fileRef = 5605022E1B6211E100169CAD /* sound-strings */; };
 		6741A9451BF340DE002C974C /* classificator.txt in Resources */ = {isa = PBXBuildFile; fileRef = EE026F0511D6AC0D00645242 /* classificator.txt */; };
 		6741A9491BF340DE002C974C /* countries.txt in Resources */ = {isa = PBXBuildFile; fileRef = FA46DA2B12D4166E00968C36 /* countries.txt */; };
-		6741A94A1BF340DE002C974C /* resources-6plus_clear in Resources */ = {isa = PBXBuildFile; fileRef = 4A23D1571B8B4DD700D4EB6F /* resources-6plus_clear */; };
 		6741A94B1BF340DE002C974C /* unicode_blocks.txt in Resources */ = {isa = PBXBuildFile; fileRef = EE583CBA12F773F00042CBE3 /* unicode_blocks.txt */; };
 		6741A94C1BF340DE002C974C /* fonts_blacklist.txt in Resources */ = {isa = PBXBuildFile; fileRef = EEFE7C1212F8C9E1006AF8C3 /* fonts_blacklist.txt */; };
-		6741A94D1BF340DE002C974C /* resources-xxhdpi_clear in Resources */ = {isa = PBXBuildFile; fileRef = 4A23D15A1B8B4DD700D4EB6F /* resources-xxhdpi_clear */; };
 		6741A94F1BF340DE002C974C /* MWMDefaultAlert.xib in Resources */ = {isa = PBXBuildFile; fileRef = F64F198C1AB81A00006EAF7E /* MWMDefaultAlert.xib */; };
 		6741A9501BF340DE002C974C /* fonts_whitelist.txt in Resources */ = {isa = PBXBuildFile; fileRef = EEFE7C1312F8C9E1006AF8C3 /* fonts_whitelist.txt */; };
 		6741A9511BF340DE002C974C /* MWMDownloaderDialogHeader.xib in Resources */ = {isa = PBXBuildFile; fileRef = F64F4B701B4A41D40081A24A /* MWMDownloaderDialogHeader.xib */; };
 		6741A9521BF340DE002C974C /* World.mwm in Resources */ = {isa = PBXBuildFile; fileRef = FAFF42291347F101009BBB14 /* World.mwm */; };
 		6741A9531BF340DE002C974C /* 01_dejavusans.ttf in Resources */ = {isa = PBXBuildFile; fileRef = EEA615E5134C4968003A9827 /* 01_dejavusans.ttf */; };
 		6741A9541BF340DE002C974C /* 02_droidsans-fallback.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 9DF04B231B71010E00DACAF1 /* 02_droidsans-fallback.ttf */; };
-		6741A9551BF340DE002C974C /* resources-xxhdpi_dark in Resources */ = {isa = PBXBuildFile; fileRef = 4A7D89C41B2EBF3B00AC843E /* resources-xxhdpi_dark */; };
 		6741A9571BF340DE002C974C /* 03_jomolhari-id-a3d.ttf in Resources */ = {isa = PBXBuildFile; fileRef = EEA615E7134C4968003A9827 /* 03_jomolhari-id-a3d.ttf */; };
 		6741A9581BF340DE002C974C /* 04_padauk.ttf in Resources */ = {isa = PBXBuildFile; fileRef = EEA615E8134C4968003A9827 /* 04_padauk.ttf */; };
 		6741A9591BF340DE002C974C /* 05_khmeros.ttf in Resources */ = {isa = PBXBuildFile; fileRef = EEA615E9134C4968003A9827 /* 05_khmeros.ttf */; };
@@ -281,22 +277,17 @@
 		6741A95C1BF340DE002C974C /* categories.txt in Resources */ = {isa = PBXBuildFile; fileRef = FAAFD696139D9BE2000AE70C /* categories.txt */; };
 		6741A95D1BF340DE002C974C /* types.txt in Resources */ = {isa = PBXBuildFile; fileRef = FA64D9A813F975AD00350ECF /* types.txt */; };
 		6741A9601BF340DE002C974C /* MWMRoutingDisclaimerAlert.xib in Resources */ = {isa = PBXBuildFile; fileRef = F63774E61B59375E00BCF54D /* MWMRoutingDisclaimerAlert.xib */; };
-		6741A9611BF340DE002C974C /* resources-xhdpi_dark in Resources */ = {isa = PBXBuildFile; fileRef = 4A7D89C31B2EBF3B00AC843E /* resources-xhdpi_dark */; };
 		6741A9681BF340DE002C974C /* faq.html in Resources */ = {isa = PBXBuildFile; fileRef = 978D4A30199A11E600D72CA7 /* faq.html */; };
 		6741A96C1BF340DE002C974C /* MWMDownloadTransitMapAlert.xib in Resources */ = {isa = PBXBuildFile; fileRef = F64F19981AB81A00006EAF7E /* MWMDownloadTransitMapAlert.xib */; };
 		6741A96D1BF340DE002C974C /* MWMLocationAlert.xib in Resources */ = {isa = PBXBuildFile; fileRef = F6BBF2C71B4FFB8C000CF8E2 /* MWMLocationAlert.xib */; };
 		6741A9711BF340DE002C974C /* copyright.html in Resources */ = {isa = PBXBuildFile; fileRef = 97A5967E19B9CD47007A963F /* copyright.html */; };
-		6741A9741BF340DE002C974C /* resources-6plus_dark in Resources */ = {isa = PBXBuildFile; fileRef = 4A7D89C11B2EBF3B00AC843E /* resources-6plus_dark */; };
 		6741A9751BF340DE002C974C /* WorldCoasts.mwm in Resources */ = {isa = PBXBuildFile; fileRef = FA459EB314327AF700B5BB3C /* WorldCoasts.mwm */; };
 		6741A9761BF340DE002C974C /* packed_polygons.bin in Resources */ = {isa = PBXBuildFile; fileRef = FA85F632145DDDC20090E1A0 /* packed_polygons.bin */; };
 		6741A97D1BF340DE002C974C /* synonyms.txt in Resources */ = {isa = PBXBuildFile; fileRef = FAAEA7D0161BD26600CCD661 /* synonyms.txt */; };
 		6741A97E1BF340DE002C974C /* drules_proto_dark.bin in Resources */ = {isa = PBXBuildFile; fileRef = 4A00DBDE1AB704C400113624 /* drules_proto_dark.bin */; };
-		6741A97F1BF340DE002C974C /* resources-mdpi_clear in Resources */ = {isa = PBXBuildFile; fileRef = 4A23D1581B8B4DD700D4EB6F /* resources-mdpi_clear */; };
 		6741A9871BF340DE002C974C /* drules_proto_clear.bin in Resources */ = {isa = PBXBuildFile; fileRef = 4A23D1561B8B4DD700D4EB6F /* drules_proto_clear.bin */; };
 		6741A98B1BF340DE002C974C /* MWMCircularProgress.xib in Resources */ = {isa = PBXBuildFile; fileRef = 349A35771B53D4C9009677EE /* MWMCircularProgress.xib */; };
-		6741A9901BF340DE002C974C /* resources-mdpi_dark in Resources */ = {isa = PBXBuildFile; fileRef = 4A7D89C21B2EBF3B00AC843E /* resources-mdpi_dark */; };
 		6741A9951BF340DE002C974C /* MWMDownloaderDialogCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = F64F4B6E1B46A5380081A24A /* MWMDownloaderDialogCell.xib */; };
-		6741A9981BF340DE002C974C /* resources-xhdpi_clear in Resources */ = {isa = PBXBuildFile; fileRef = 4A23D1591B8B4DD700D4EB6F /* resources-xhdpi_clear */; };
 		6741A9991BF340DE002C974C /* MWMAlertViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = F64F19831AB81A00006EAF7E /* MWMAlertViewController.xib */; };
 		6741A99F1BF340DE002C974C /* 07_roboto_medium.ttf in Resources */ = {isa = PBXBuildFile; fileRef = FAF30A94173AB23900818BF6 /* 07_roboto_medium.ttf */; };
 		6741A9A31BF340DE002C974C /* main.mm in Sources */ = {isa = PBXBuildFile; fileRef = 29B97316FDCFA39411CA2CEA /* main.mm */; };
@@ -321,7 +312,6 @@
 		674A7E301C0DB10B003D48E1 /* MWMMapWidgets.mm in Sources */ = {isa = PBXBuildFile; fileRef = 34FE4C441BCC013500066718 /* MWMMapWidgets.mm */; };
 		676507601C10559800830BB3 /* patterns.txt in Resources */ = {isa = PBXBuildFile; fileRef = 451950391B7A3E070085DA05 /* patterns.txt */; };
 		676507611C10559B00830BB3 /* colors.txt in Resources */ = {isa = PBXBuildFile; fileRef = 452FCA3A1B6A3DF7007019AB /* colors.txt */; };
-		677A2DE21C0DD50900635A00 /* resources-default in Resources */ = {isa = PBXBuildFile; fileRef = A367C93A1B17334800E2B6E7 /* resources-default */; };
 		6B15907226623AE500944BBA /* 00_NotoSansThai-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 6B15907026623AE500944BBA /* 00_NotoSansThai-Regular.ttf */; };
 		6B679E89266BFD0A0074AE2A /* 00_NotoNaskhArabic-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 6B679E88266BFD090074AE2A /* 00_NotoNaskhArabic-Regular.ttf */; };
 		6B9978361C89A316003B8AA0 /* editor.config in Resources */ = {isa = PBXBuildFile; fileRef = 6B9978341C89A316003B8AA0 /* editor.config */; };
@@ -483,8 +473,6 @@
 		EDFDFB4C2B722C9C0013A44C /* InfoTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = EDFDFB4B2B722C9C0013A44C /* InfoTableViewCell.swift */; };
 		EDFDFB522B726F1A0013A44C /* ButtonsStackView.swift in Sources */ = {isa = PBXBuildFile; fileRef = EDFDFB512B726F1A0013A44C /* ButtonsStackView.swift */; };
 		EDFDFB612B74E2500013A44C /* DonationView.swift in Sources */ = {isa = PBXBuildFile; fileRef = EDFDFB602B74E2500013A44C /* DonationView.swift */; };
-		F607C1881C032A8800B53A87 /* resources-hdpi_clear in Resources */ = {isa = PBXBuildFile; fileRef = F607C1831C032A8800B53A87 /* resources-hdpi_clear */; };
-		F607C18A1C032A8800B53A87 /* resources-hdpi_dark in Resources */ = {isa = PBXBuildFile; fileRef = F607C1841C032A8800B53A87 /* resources-hdpi_dark */; };
 		F623DA6C1C9C2731006A3436 /* opening_hours_how_to_edit.html in Resources */ = {isa = PBXBuildFile; fileRef = F623DA6A1C9C2731006A3436 /* opening_hours_how_to_edit.html */; };
 		F623DA6F1C9C2E62006A3436 /* MWMAddPlaceNavigationBar.xib in Resources */ = {isa = PBXBuildFile; fileRef = F653CE171C71F62400A453F1 /* MWMAddPlaceNavigationBar.xib */; };
 		F62607FD207B790300176C5A /* SpinnerAlert.swift in Sources */ = {isa = PBXBuildFile; fileRef = F62607FC207B790300176C5A /* SpinnerAlert.swift */; };
@@ -710,6 +698,7 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
+		16876BAB2BEBF13600915C23 /* symbols */ = {isa = PBXFileReference; lastKnownFileType = folder; name = symbols; path = ../../data/symbols; sourceTree = "<group>"; };
 		1D3623240D0F684500981E51 /* MapsAppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MapsAppDelegate.h; sourceTree = "<group>"; };
 		1D3623250D0F684500981E51 /* MapsAppDelegate.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; lineEnding = 0; path = MapsAppDelegate.mm; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
 		1DFA2F6820D3B52F00FB2C66 /* UIColor+PartnerColor.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "UIColor+PartnerColor.h"; sourceTree = "<group>"; };
@@ -1059,8 +1048,6 @@
 		447DB4BA2BA78282000DF4C2 /* MWMOsmReauthAlert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MWMOsmReauthAlert.h; path = Classes/CustomAlert/MWMOsmReauthAlert.h; sourceTree = SOURCE_ROOT; };
 		447DB4BB2BA78282000DF4C2 /* MWMOsmReauthAlert.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = MWMOsmReauthAlert.mm; path = Classes/CustomAlert/MWMOsmReauthAlert.mm; sourceTree = SOURCE_ROOT; };
 		447DB4C12BA78665000DF4C2 /* MWMOsmReauthAlert.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = MWMOsmReauthAlert.xib; path = Classes/CustomAlert/MWMOsmReauthAlert.xib; sourceTree = SOURCE_ROOT; };
-		4501B1922077C35A001B9173 /* resources-xxxhdpi_clear */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "resources-xxxhdpi_clear"; path = "../../data/resources-xxxhdpi_clear"; sourceTree = "<group>"; };
-		4501B1932077C35A001B9173 /* resources-xxxhdpi_dark */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "resources-xxxhdpi_dark"; path = "../../data/resources-xxxhdpi_dark"; sourceTree = "<group>"; };
 		451950391B7A3E070085DA05 /* patterns.txt */ = {isa = PBXFileReference; lastKnownFileType = text; name = patterns.txt; path = ../../data/patterns.txt; sourceTree = "<group>"; };
 		452FCA3A1B6A3DF7007019AB /* colors.txt */ = {isa = PBXFileReference; lastKnownFileType = text; name = colors.txt; path = ../../data/colors.txt; sourceTree = "<group>"; };
 		4554B6E81E55F02B0084017F /* drules_proto_vehicle_clear.bin */ = {isa = PBXFileReference; lastKnownFileType = archive.macbinary; name = drules_proto_vehicle_clear.bin; path = ../../data/drules_proto_vehicle_clear.bin; sourceTree = "<group>"; };
@@ -1154,15 +1141,7 @@
 		47F86D0020C93D8D00FEE291 /* TabViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TabViewController.swift; sourceTree = "<group>"; };
 		4A00DBDE1AB704C400113624 /* drules_proto_dark.bin */ = {isa = PBXFileReference; lastKnownFileType = archive.macbinary; name = drules_proto_dark.bin; path = ../../data/drules_proto_dark.bin; sourceTree = "<group>"; };
 		4A23D1561B8B4DD700D4EB6F /* drules_proto_clear.bin */ = {isa = PBXFileReference; lastKnownFileType = archive.macbinary; name = drules_proto_clear.bin; path = ../../data/drules_proto_clear.bin; sourceTree = "<group>"; };
-		4A23D1571B8B4DD700D4EB6F /* resources-6plus_clear */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "resources-6plus_clear"; path = "../../data/resources-6plus_clear"; sourceTree = "<group>"; };
-		4A23D1581B8B4DD700D4EB6F /* resources-mdpi_clear */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "resources-mdpi_clear"; path = "../../data/resources-mdpi_clear"; sourceTree = "<group>"; };
-		4A23D1591B8B4DD700D4EB6F /* resources-xhdpi_clear */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "resources-xhdpi_clear"; path = "../../data/resources-xhdpi_clear"; sourceTree = "<group>"; };
-		4A23D15A1B8B4DD700D4EB6F /* resources-xxhdpi_clear */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "resources-xxhdpi_clear"; path = "../../data/resources-xxhdpi_clear"; sourceTree = "<group>"; };
 		4A300ED31C6DCFD400140018 /* countries-strings */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "countries-strings"; path = "../../data/countries-strings"; sourceTree = "<group>"; };
-		4A7D89C11B2EBF3B00AC843E /* resources-6plus_dark */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "resources-6plus_dark"; path = "../../data/resources-6plus_dark"; sourceTree = "<group>"; };
-		4A7D89C21B2EBF3B00AC843E /* resources-mdpi_dark */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "resources-mdpi_dark"; path = "../../data/resources-mdpi_dark"; sourceTree = "<group>"; };
-		4A7D89C31B2EBF3B00AC843E /* resources-xhdpi_dark */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "resources-xhdpi_dark"; path = "../../data/resources-xhdpi_dark"; sourceTree = "<group>"; };
-		4A7D89C41B2EBF3B00AC843E /* resources-xxhdpi_dark */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "resources-xxhdpi_dark"; path = "../../data/resources-xxhdpi_dark"; sourceTree = "<group>"; };
 		5605022E1B6211E100169CAD /* sound-strings */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "sound-strings"; path = "../../data/sound-strings"; sourceTree = "<group>"; };
 		6741AA5D1BF340DE002C974C /* Organic Maps (Debug).app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Organic Maps (Debug).app"; sourceTree = BUILT_PRODUCTS_DIR; };
 		6B15907026623AE500944BBA /* 00_NotoSansThai-Regular.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "00_NotoSansThai-Regular.ttf"; path = "../../data/00_NotoSansThai-Regular.ttf"; sourceTree = "<group>"; };
@@ -1286,7 +1265,6 @@
 		99F9A0E42462CA0E00AE21E0 /* DownloadAllView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DownloadAllView.swift; sourceTree = "<group>"; };
 		99F9A0E62462CA1700AE21E0 /* DownloadAllView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = DownloadAllView.xib; sourceTree = "<group>"; };
 		9DF04B231B71010E00DACAF1 /* 02_droidsans-fallback.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "02_droidsans-fallback.ttf"; path = "../../data/02_droidsans-fallback.ttf"; sourceTree = "<group>"; };
-		A367C93A1B17334800E2B6E7 /* resources-default */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "resources-default"; path = "../../data/resources-default"; sourceTree = "<group>"; };
 		A630D1E9207CA95900976DEA /* ar */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = ar; path = ar.lproj/Localizable.stringsdict; sourceTree = "<group>"; };
 		A630D1EB207CA96700976DEA /* cs */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = cs; path = cs.lproj/Localizable.stringsdict; sourceTree = "<group>"; };
 		A630D1EC207CA96D00976DEA /* da */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = da; path = da.lproj/Localizable.stringsdict; sourceTree = "<group>"; };
@@ -1384,8 +1362,6 @@
 		EED10A4411F78D120095FAD4 /* MapViewController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; lineEnding = 0; path = MapViewController.mm; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objcpp; };
 		EEFE7C1212F8C9E1006AF8C3 /* fonts_blacklist.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = fonts_blacklist.txt; path = ../../data/fonts_blacklist.txt; sourceTree = "<group>"; };
 		EEFE7C1312F8C9E1006AF8C3 /* fonts_whitelist.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = fonts_whitelist.txt; path = ../../data/fonts_whitelist.txt; sourceTree = "<group>"; };
-		F607C1831C032A8800B53A87 /* resources-hdpi_clear */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "resources-hdpi_clear"; path = "../../data/resources-hdpi_clear"; sourceTree = "<group>"; };
-		F607C1841C032A8800B53A87 /* resources-hdpi_dark */ = {isa = PBXFileReference; lastKnownFileType = folder; name = "resources-hdpi_dark"; path = "../../data/resources-hdpi_dark"; sourceTree = "<group>"; };
 		F607C18C1C047FDC00B53A87 /* MWMSegue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MWMSegue.h; sourceTree = "<group>"; };
 		F607C18D1C047FDC00B53A87 /* MWMSegue.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MWMSegue.m; sourceTree = "<group>"; };
 		F623DA6A1C9C2731006A3436 /* opening_hours_how_to_edit.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; name = opening_hours_how_to_edit.html; path = ../../data/opening_hours_how_to_edit.html; sourceTree = "<group>"; };
@@ -3611,6 +3587,7 @@
 		FA065FC61286143F00FEA989 /* External Resources */ = {
 			isa = PBXGroup;
 			children = (
+				16876BAB2BEBF13600915C23 /* symbols */,
 				6B679E88266BFD090074AE2A /* 00_NotoNaskhArabic-Regular.ttf */,
 				6B15907026623AE500944BBA /* 00_NotoSansThai-Regular.ttf */,
 				FA45118E2A5EC15100CD8F64 /* 00_NotoSerifDevanagari-Regular.ttf */,
@@ -3644,19 +3621,6 @@
 				F623DA6A1C9C2731006A3436 /* opening_hours_how_to_edit.html */,
 				FA85F632145DDDC20090E1A0 /* packed_polygons.bin */,
 				451950391B7A3E070085DA05 /* patterns.txt */,
-				4A23D1571B8B4DD700D4EB6F /* resources-6plus_clear */,
-				4A7D89C11B2EBF3B00AC843E /* resources-6plus_dark */,
-				A367C93A1B17334800E2B6E7 /* resources-default */,
-				F607C1831C032A8800B53A87 /* resources-hdpi_clear */,
-				F607C1841C032A8800B53A87 /* resources-hdpi_dark */,
-				4A23D1581B8B4DD700D4EB6F /* resources-mdpi_clear */,
-				4A7D89C21B2EBF3B00AC843E /* resources-mdpi_dark */,
-				4A23D1591B8B4DD700D4EB6F /* resources-xhdpi_clear */,
-				4A7D89C31B2EBF3B00AC843E /* resources-xhdpi_dark */,
-				4A23D15A1B8B4DD700D4EB6F /* resources-xxhdpi_clear */,
-				4A7D89C41B2EBF3B00AC843E /* resources-xxhdpi_dark */,
-				4501B1922077C35A001B9173 /* resources-xxxhdpi_clear */,
-				4501B1932077C35A001B9173 /* resources-xxxhdpi_dark */,
 				FAAEA7D0161BD26600CCD661 /* synonyms.txt */,
 				BB25B1A51FB32767007276FA /* transit_colors.txt */,
 				FA64D9A813F975AD00350ECF /* types.txt */,
@@ -3886,6 +3850,7 @@
 				6741A97E1BF340DE002C974C /* drules_proto_dark.bin in Resources */,
 				6B9978361C89A316003B8AA0 /* editor.config in Resources */,
 				6741A9681BF340DE002C974C /* faq.html in Resources */,
+				16876BAC2BEBF13600915C23 /* symbols in Resources */,
 				6B679E89266BFD0A0074AE2A /* 00_NotoNaskhArabic-Regular.ttf in Resources */,
 				6741A94C1BF340DE002C974C /* fonts_blacklist.txt in Resources */,
 				6741A9501BF340DE002C974C /* fonts_whitelist.txt in Resources */,
@@ -3899,7 +3864,6 @@
 				993DF0CA23F6BD0600AC231A /* ElevationDetailsViewController.xib in Resources */,
 				F623DA6F1C9C2E62006A3436 /* MWMAddPlaceNavigationBar.xib in Resources */,
 				6741A9991BF340DE002C974C /* MWMAlertViewController.xib in Resources */,
-				4501B1942077C35A001B9173 /* resources-xxxhdpi_clear in Resources */,
 				3467CEB7202C6FA900D3C670 /* BMCNotificationsCell.xib in Resources */,
 				4761BE2B252D3DB900EE2DE4 /* SubgroupCell.xib in Resources */,
 				99F9A0E72462CA1700AE21E0 /* DownloadAllView.xib in Resources */,
@@ -3978,7 +3942,6 @@
 				F6E2FF421E097BA00083EBEC /* MWMSearchTableViewController.xib in Resources */,
 				34AB66681FC5AA330078E451 /* TransportTransitPedestrian.xib in Resources */,
 				F6E2FEEE1E097BA00083EBEC /* MWMSearchView.xib in Resources */,
-				4501B1952077C35A001B9173 /* resources-xxxhdpi_dark in Resources */,
 				F6D67CDE2062BBA60032FD38 /* MWMBCCreateCategoryAlert.xib in Resources */,
 				3490D2E31CE9DD2500D0B838 /* MWMSideButtonsView.xib in Resources */,
 				F6E2FE2E1E097BA00083EBEC /* MWMStreetEditorEditTableViewCell.xib in Resources */,
@@ -3988,20 +3951,9 @@
 				6741A9761BF340DE002C974C /* packed_polygons.bin in Resources */,
 				676507601C10559800830BB3 /* patterns.txt in Resources */,
 				6B15907226623AE500944BBA /* 00_NotoSansThai-Regular.ttf in Resources */,
-				6741A94A1BF340DE002C974C /* resources-6plus_clear in Resources */,
 				9989273D2449E60200260CE2 /* BottomMenuViewController.xib in Resources */,
-				6741A9741BF340DE002C974C /* resources-6plus_dark in Resources */,
-				677A2DE21C0DD50900635A00 /* resources-default in Resources */,
-				F607C1881C032A8800B53A87 /* resources-hdpi_clear in Resources */,
-				F607C18A1C032A8800B53A87 /* resources-hdpi_dark in Resources */,
 				FA637ED229A500BE00D8921A /* drules_proto_outdoors_clear.bin in Resources */,
-				6741A97F1BF340DE002C974C /* resources-mdpi_clear in Resources */,
-				6741A9901BF340DE002C974C /* resources-mdpi_dark in Resources */,
-				6741A9981BF340DE002C974C /* resources-xhdpi_clear in Resources */,
-				6741A9611BF340DE002C974C /* resources-xhdpi_dark in Resources */,
-				6741A94D1BF340DE002C974C /* resources-xxhdpi_clear in Resources */,
 				3404F49E2028A2430090E401 /* BMCActionsCell.xib in Resources */,
-				6741A9551BF340DE002C974C /* resources-xxhdpi_dark in Resources */,
 				340E1EF51E2F614400CE49BF /* SearchFilters.storyboard in Resources */,
 				340E1EF81E2F614400CE49BF /* Settings.storyboard in Resources */,
 				44360A112A7D35440016F412 /* TransportRuler.xib in Resources */,
diff --git a/platform/platform_tests/apk_test.cpp b/platform/platform_tests/apk_test.cpp
index 9194950311ad5..7f365d365cb59 100644
--- a/platform/platform_tests/apk_test.cpp
+++ b/platform/platform_tests/apk_test.cpp
@@ -21,12 +21,12 @@ using std::string, std::vector;
 
 char const * arrFiles[] = {
   "copyright.html",
-  "resources-mdpi_clear/symbols.sdf",
-  "resources-mdpi_clear/symbols.png",
-  "resources-hdpi_clear/symbols.sdf",
-  "resources-hdpi_clear/symbols.png",
-  "resources-xhdpi_clear/symbols.sdf",
-  "resources-xhdpi_clear/symbols.png",
+  "symbols/mdpi/clear/symbols.sdf",
+  "symbols/mdpi/clear/symbols.png",
+  "symbols/hdpi/clear/symbols.sdf",
+  "symbols/hdpi/clear/symbols.png",
+  "symbols/xhdpi/clear/symbols.sdf",
+  "symbols/xhdpi/clear/symbols.png",
   "categories.txt",
   "categories_cuisines.txt",
   "classificator.txt",
diff --git a/platform/platform_tests/platform_test.cpp b/platform/platform_tests/platform_test.cpp
index a94fa019ca02b..bdeb44db674da 100644
--- a/platform/platform_tests/platform_test.cpp
+++ b/platform/platform_tests/platform_test.cpp
@@ -68,7 +68,7 @@ UNIT_TEST(GetReader)
 {
   char const * NON_EXISTING_FILE = "mgbwuerhsnmbui45efhdbn34.tmp";
   char const * arr[] = {
-    "resources-mdpi_clear/symbols.sdf",
+    "symbols/mdpi/clear/symbols.sdf",
     "classificator.txt",
     "minsk-pass.mwm"
   };
diff --git a/qt/CMakeLists.txt b/qt/CMakeLists.txt
index 0801dfdde641f..ba55f6f166908 100644
--- a/qt/CMakeLists.txt
+++ b/qt/CMakeLists.txt
@@ -107,13 +107,7 @@ endfunction()
 
 copy_resources(
   countries-strings
-  resources-default
-  resources-mdpi_clear
-  resources-hdpi_clear
-  resources-xhdpi_clear
-  resources-xxhdpi_clear
-  resources-xxxhdpi_clear
-  resources-6plus_clear
+  symbols
   welcome.html
 
   categories.txt
@@ -190,12 +184,12 @@ endif()
 
 if (BUILD_DESIGNER)
   execute_process(
-    COMMAND cp -rf ${OMIM_ROOT}/data/resources-mdpi_clear/ ${OMIM_ROOT}/data/resources-mdpi_design/
-    COMMAND cp -rf ${OMIM_ROOT}/data/resources-hdpi_clear/ ${OMIM_ROOT}/data/resources-hdpi_design/
-    COMMAND cp -rf ${OMIM_ROOT}/data/resources-xhdpi_clear/ ${OMIM_ROOT}/data/resources-xhdpi_design/
-    COMMAND cp -rf ${OMIM_ROOT}/data/resources-xxhdpi_clear/ ${OMIM_ROOT}/data/resources-xxhdpi_design/
-    COMMAND cp -rf ${OMIM_ROOT}/data/resources-6plus_clear/ ${OMIM_ROOT}/data/resources-6plus_design/
-    COMMAND cp -rf ${OMIM_ROOT}/data/resources-xxxhdpi_clear/ ${OMIM_ROOT}/data/resources-xxxhdpi_design/
+    COMMAND cp -rf ${OMIM_ROOT}/data/symbols/mdpi/clear/ ${OMIM_ROOT}/data/symbols/mdpi/design/
+    COMMAND cp -rf ${OMIM_ROOT}/data/symbols/hdpi/clear/ ${OMIM_ROOT}/data/symbols/hdpi/design/
+    COMMAND cp -rf ${OMIM_ROOT}/data/symbols/xhdpi/clear/ ${OMIM_ROOT}/data/symbols/xhdpi/design/
+    COMMAND cp -rf ${OMIM_ROOT}/data/symbols/xxhdpi/clear/ ${OMIM_ROOT}/data/symbols/xxhdpi/design/
+    COMMAND cp -rf ${OMIM_ROOT}/data/symbols/6plus/clear/ ${OMIM_ROOT}/data/symbols/6plus/design/
+    COMMAND cp -rf ${OMIM_ROOT}/data/symbols/xxxhdpi/clear/ ${OMIM_ROOT}/data/symbols/xxxhdpi/design/
     COMMAND cp -f ${OMIM_ROOT}/data/drules_proto_clear.bin ${OMIM_ROOT}/data/drules_proto_design.bin
     COMMAND cp -f ${OMIM_ROOT}/data/colors.txt ${OMIM_ROOT}/data/colors_design.txt
     COMMAND cp -f ${OMIM_ROOT}/data/patterns.txt ${OMIM_ROOT}/data/patterns_design.txt
@@ -207,12 +201,12 @@ if (BUILD_DESIGNER)
     mapcss-dynamic.txt
     mapcss-mapping.csv
     patterns_design.txt
-    resources-mdpi_design
-    resources-hdpi_design
-    resources-xhdpi_design
-    resources-xxhdpi_design
-    resources-xxxhdpi_design
-    resources-6plus_design
+    symbols/mdpi/design
+    symbols/hdpi/design
+    symbols/xhdpi/design
+    symbols/xxhdpi/design
+    symbols/xxxhdpi/design
+    symbols/6plus/design
   )
 
   execute_process(
diff --git a/qt/build_style/build_skins.cpp b/qt/build_style/build_skins.cpp
index 83d382309d505..8e25b698f7c4f 100644
--- a/qt/build_style/build_skins.cpp
+++ b/qt/build_style/build_skins.cpp
@@ -177,7 +177,7 @@ void BuildSkins(QString const & styleDir, QString const & outputDir)
   for (SkinType s : g_skinTypes)
   {
     QString const suffix = SkinSuffix(s);
-    QString const outputSkinDir = JoinPathQt({outputDir, "resources-" + suffix + "_design"});
+    QString const outputSkinDir = JoinPathQt({outputDir, "symbols", suffix, "design"});
     int const size = resolution2size.at(suffix.toStdString()); // SkinSize(s);
     bool const colorCorrection = SkinCoorrectColor(s);
 
@@ -192,8 +192,8 @@ void ApplySkins(QString const & outputDir)
   for (SkinType s : g_skinTypes)
   {
     QString const suffix = SkinSuffix(s);
-    QString const outputSkinDir = JoinPathQt({outputDir, "resources-" + suffix + "_design"});
-    QString const resourceSkinDir = JoinPathQt({resourceDir, "resources-" + suffix + "_design"});
+    QString const outputSkinDir = JoinPathQt({outputDir, "symbols", suffix, "design"});
+    QString const resourceSkinDir = JoinPathQt({resourceDir, "symbols", suffix, "design"});
 
     if (!QFileInfo::exists(resourceSkinDir) && !QDir().mkdir(resourceSkinDir))
       throw std::runtime_error("Cannot create resource skin directory: " + resourceSkinDir.toStdString());
diff --git a/tools/unix/generate_symbols.sh b/tools/unix/generate_symbols.sh
index aca799e944095..5b4dc395555f9 100755
--- a/tools/unix/generate_symbols.sh
+++ b/tools/unix/generate_symbols.sh
@@ -64,44 +64,34 @@ function BuildSkin() {
   ln -s "$STYLE_PATH/$resourceName$symbolsSuffix" "$PNG_PATH"
   # Run skin generator
   "$SKIN_GENERATOR" --symbolWidth $symbolSize --symbolHeight $symbolSize --symbolsDir "$STYLE_PATH/$symbolsFolder" \
-      --skinName "$DATA_PATH/resources-$resourceName$suffix/basic" --skinSuffix="$symbolsSuffix"
+      --skinName "$DATA_PATH/symbols/$resourceName/$suffix/basic" --skinSuffix="$symbolsSuffix"
   # Reset environment
   rm -r "$PNG_PATH" || true
 }
 
-# Cleanup
-cleanup=(resources-{{6plus,mdpi,hdpi,xhdpi,xxhdpi,xxxhdpi}{_dark,_clear}})
-for item in ${cleanup[*]}
-do
-  rm -rf "$DATA_PATH/$item" || true
-  mkdir "$DATA_PATH/$item"
-done
+symbols_name=({6plus,mdpi,hdpi,xhdpi,xxhdpi,xxxhdpi})
 
 # Build styles
 
-BuildSkin clear  night mdpi    18 _dark symbols
-BuildSkin clear  night hdpi    27 _dark symbols
-BuildSkin clear  night xhdpi   36 _dark symbols
-BuildSkin clear  night xxhdpi  54 _dark symbols
-BuildSkin clear  night 6plus   54 _dark symbols
-BuildSkin clear  night xxxhdpi 64 _dark symbols
-
-BuildSkin clear  clear mdpi    18 _clear symbols
-BuildSkin clear  clear hdpi    27 _clear symbols
-BuildSkin clear  clear xhdpi   36 _clear symbols
-BuildSkin clear  clear xxhdpi  54 _clear symbols
-BuildSkin clear  clear 6plus   54 _clear symbols
-BuildSkin clear  clear xxxhdpi 64 _clear symbols
-
-rm -rf "$OMIM_PATH"/data/resources-{*}
+BuildSkin clear  night mdpi    18 dark symbols
+BuildSkin clear  night hdpi    27 dark symbols
+BuildSkin clear  night xhdpi   36 dark symbols
+BuildSkin clear  night xxhdpi  54 dark symbols
+BuildSkin clear  night 6plus   54 dark symbols
+BuildSkin clear  night xxxhdpi 64 dark symbols
 
-rm -rf "$OMIM_PATH"/data/resources-*_design
+BuildSkin clear  clear mdpi    18 clear symbols
+BuildSkin clear  clear hdpi    27 clear symbols
+BuildSkin clear  clear xhdpi   36 clear symbols
+BuildSkin clear  clear xxhdpi  54 clear symbols
+BuildSkin clear  clear 6plus   54 clear symbols
+BuildSkin clear  clear xxxhdpi 64 clear symbols
 
-for i in mdpi hdpi xhdpi xxhdpi xxxhdpi 6plus; do
-  optipng -zc9 -zm8 -zs0 -f0 "$OMIM_PATH"/data/resources-${i}_clear/symbols.png
-  optipng -zc9 -zm8 -zs0 -f0 "$OMIM_PATH"/data/resources-${i}_dark/symbols.png
+for i in ${symbols_name[*]}; do
+  optipng -zc9 -zm8 -zs0 -f0 "$DATA_PATH"/symbols/"${i}"/clear/symbols.png
+  optipng -zc9 -zm8 -zs0 -f0 "$DATA_PATH"/symbols/"${i}"/dark/symbols.png
 done
 
-for i in mdpi hdpi xhdpi xxhdpi xxxhdpi 6plus; do
-  cp -r "$OMIM_PATH"/data/resources-${i}_clear/ "$OMIM_PATH"/data/resources-${i}_design/
+for i in ${symbols_name[*]}; do
+  cp -r "$DATA_PATH"/symbols/"${i}"/clear/ "$DATA_PATH"/symbols/"${i}"/design/
 done