From d478d8f9b12b60d48ef2aec9295782098b4b7820 Mon Sep 17 00:00:00 2001
From: Victor Shcherb <victor.shcherb@gmail.com>
Date: Mon, 30 Mar 2015 01:09:49 +0200
Subject: [PATCH] Update icons

---
 ...on_mode_back.png => ic_action_mode_back.png} | Bin
 ....png => ic_action_reset_to_default_dark.png} | Bin
 OsmAnd/res/drawable-hdpi/ic_plugin_skimaps.png  | Bin 0 -> 1338 bytes
 OsmAnd/res/drawable-hdpi/list_favorite.png      | Bin 3342 -> 0 bytes
 ....png => list_poi_parking_pos_limit_menu.png} | Bin
 ...g => list_poi_parking_pos_no_limit_menu.png} | Bin
 ...ination.png => map_arrow_to_destination.png} | Bin
 ...ycle_bearing.png => map_bicycle_bearing.png} | Bin
 ...le_location.png => map_bicycle_location.png} | Bin
 .../{car_bearing.png => map_car_bearing.png}    | Bin
 .../{car_location.png => map_car_location.png}  | Bin
 ...lt_location.png => map_default_location.png} | Bin
 .../{av_download.png => map_down.png}           | Bin
 ...ate_point.png => map_intermediate_point.png} | Bin
 ...widget_layer_dark.png => map_layer_dark.png} | Bin
 ...n_bearing.png => map_pedestrian_bearing.png} | Bin
 ...location.png => map_pedestrian_location.png} | Bin
 ..._limit.png => map_poi_parking_pos_limit.png} | Bin
 ...mit.png => map_poi_parking_pos_no_limit.png} | Bin
 .../{target_point.png => map_target_point.png}  | Bin
 .../drawable-hdpi/{av_upload.png => map_up.png} | Bin
 OsmAnd/res/drawable-hdpi/widget_monitoring.png  | Bin 4529 -> 0 bytes
 ...widget_layer_dark.png => map_layer_dark.png} | Bin
 ...widget_layer_dark.png => map_layer_dark.png} | Bin
 ...ination.png => map_arrow_to_destination.png} | Bin
 ...ycle_bearing.png => map_bicycle_bearing.png} | Bin
 ...le_location.png => map_bicycle_location.png} | Bin
 .../{car_bearing.png => map_car_bearing.png}    | Bin
 .../{car_location.png => map_car_location.png}  | Bin
 ...lt_location.png => map_default_location.png} | Bin
 ...ate_point.png => map_intermediate_point.png} | Bin
 ...widget_layer_dark.png => map_layer_dark.png} | Bin
 ...n_bearing.png => map_pedestrian_bearing.png} | Bin
 ...location.png => map_pedestrian_location.png} | Bin
 .../{target_point.png => map_target_point.png}  | Bin
 OsmAnd/res/drawable-large/widget_monitoring.png | Bin 4529 -> 0 bytes
 .../widget_reset_to_default_dark.png            | Bin 1736 -> 0 bytes
 .../{av_download.png => map_down.png}           | Bin
 .../drawable-mdpi/{av_upload.png => map_up.png} | Bin
 .../res/drawable-xhdpi/ic_action_label_dark.png | Bin 1439 -> 0 bytes
 ...on_mode_back.png => ic_action_mode_back.png} | Bin
 .../ic_action_reset_to_default_dark.png}        | Bin
 .../{av_download.png => map_down.png}           | Bin
 ...widget_layer_dark.png => map_layer_dark.png} | Bin
 .../{av_upload.png => map_up.png}               | Bin
 .../widget_reset_to_default_dark.png            | Bin 2045 -> 0 bytes
 ...on_mode_back.png => ic_action_mode_back.png} | Bin
 .../ic_action_reset_to_default_dark.png}        | Bin
 .../{av_download.png => map_down.png}           | Bin
 ...widget_layer_dark.png => map_layer_dark.png} | Bin
 .../{av_upload.png => map_up.png}               | Bin
 .../widget_reset_to_default_dark.png            | Bin 2530 -> 0 bytes
 ...on_mode_back.png => ic_action_mode_back.png} | Bin
 OsmAnd/res/layout/change_order_item.xml         |   4 ++--
 OsmAnd/res/layout/dash_error_fragment.xml       |   6 ++++--
 OsmAnd/res/layout/parking_set_type.xml          |   4 ++--
 OsmAnd/res/values/styles.xml                    |   4 ++--
 OsmAnd/src/net/osmand/plus/ApplicationMode.java |  16 ++++++++--------
 .../osmand/plus/activities/HelpActivity.java    |   6 +++---
 .../activities/IntermediatePointsDialog.java    |   6 +++---
 .../plus/dashboard/DashErrorFragment.java       |   3 +++
 .../net/osmand/plus/helpers/WaypointHelper.java |   6 +++---
 OsmAnd/src/net/osmand/plus/osmo/OsMoPlugin.java |   2 +-
 .../plus/parkingpoint/ParkingPositionLayer.java |   4 ++--
 .../plus/skimapsplugin/SkiMapsPlugin.java       |   3 +--
 .../net/osmand/plus/views/MapControlsLayer.java |   2 +-
 .../src/net/osmand/plus/views/MapInfoLayer.java |   6 +++---
 .../osmand/plus/views/PointNavigationLayer.java |   6 +++---
 68 files changed, 41 insertions(+), 37 deletions(-)
 rename OsmAnd/res/drawable-hdpi/{action_mode_back.png => ic_action_mode_back.png} (100%)
 rename OsmAnd/res/drawable-hdpi/{widget_reset_to_default_dark.png => ic_action_reset_to_default_dark.png} (100%)
 create mode 100644 OsmAnd/res/drawable-hdpi/ic_plugin_skimaps.png
 delete mode 100644 OsmAnd/res/drawable-hdpi/list_favorite.png
 rename OsmAnd/res/drawable-hdpi/{poi_parking_pos_limit_menu.png => list_poi_parking_pos_limit_menu.png} (100%)
 rename OsmAnd/res/drawable-hdpi/{poi_parking_pos_no_limit_menu.png => list_poi_parking_pos_no_limit_menu.png} (100%)
 rename OsmAnd/res/drawable-hdpi/{arrow_to_destination.png => map_arrow_to_destination.png} (100%)
 rename OsmAnd/res/drawable-hdpi/{bicycle_bearing.png => map_bicycle_bearing.png} (100%)
 rename OsmAnd/res/drawable-hdpi/{bicycle_location.png => map_bicycle_location.png} (100%)
 rename OsmAnd/res/drawable-hdpi/{car_bearing.png => map_car_bearing.png} (100%)
 rename OsmAnd/res/drawable-hdpi/{car_location.png => map_car_location.png} (100%)
 rename OsmAnd/res/drawable-hdpi/{default_location.png => map_default_location.png} (100%)
 rename OsmAnd/res/drawable-hdpi/{av_download.png => map_down.png} (100%)
 rename OsmAnd/res/drawable-hdpi/{intermediate_point.png => map_intermediate_point.png} (100%)
 rename OsmAnd/res/drawable-hdpi/{widget_layer_dark.png => map_layer_dark.png} (100%)
 rename OsmAnd/res/drawable-hdpi/{pedestrian_bearing.png => map_pedestrian_bearing.png} (100%)
 rename OsmAnd/res/drawable-hdpi/{pedestrian_location.png => map_pedestrian_location.png} (100%)
 rename OsmAnd/res/drawable-hdpi/{poi_parking_pos_limit.png => map_poi_parking_pos_limit.png} (100%)
 rename OsmAnd/res/drawable-hdpi/{poi_parking_pos_no_limit.png => map_poi_parking_pos_no_limit.png} (100%)
 rename OsmAnd/res/drawable-hdpi/{target_point.png => map_target_point.png} (100%)
 rename OsmAnd/res/drawable-hdpi/{av_upload.png => map_up.png} (100%)
 delete mode 100644 OsmAnd/res/drawable-hdpi/widget_monitoring.png
 rename OsmAnd/res/drawable-large-hdpi/{widget_layer_dark.png => map_layer_dark.png} (100%)
 rename OsmAnd/res/drawable-large-xhdpi/{widget_layer_dark.png => map_layer_dark.png} (100%)
 rename OsmAnd/res/drawable-large/{arrow_to_destination.png => map_arrow_to_destination.png} (100%)
 rename OsmAnd/res/drawable-large/{bicycle_bearing.png => map_bicycle_bearing.png} (100%)
 rename OsmAnd/res/drawable-large/{bicycle_location.png => map_bicycle_location.png} (100%)
 rename OsmAnd/res/drawable-large/{car_bearing.png => map_car_bearing.png} (100%)
 rename OsmAnd/res/drawable-large/{car_location.png => map_car_location.png} (100%)
 rename OsmAnd/res/drawable-large/{default_location.png => map_default_location.png} (100%)
 rename OsmAnd/res/drawable-large/{intermediate_point.png => map_intermediate_point.png} (100%)
 rename OsmAnd/res/drawable-large/{widget_layer_dark.png => map_layer_dark.png} (100%)
 rename OsmAnd/res/drawable-large/{pedestrian_bearing.png => map_pedestrian_bearing.png} (100%)
 rename OsmAnd/res/drawable-large/{pedestrian_location.png => map_pedestrian_location.png} (100%)
 rename OsmAnd/res/drawable-large/{target_point.png => map_target_point.png} (100%)
 delete mode 100644 OsmAnd/res/drawable-large/widget_monitoring.png
 delete mode 100644 OsmAnd/res/drawable-large/widget_reset_to_default_dark.png
 rename OsmAnd/res/drawable-mdpi/{av_download.png => map_down.png} (100%)
 rename OsmAnd/res/drawable-mdpi/{av_upload.png => map_up.png} (100%)
 delete mode 100644 OsmAnd/res/drawable-xhdpi/ic_action_label_dark.png
 rename OsmAnd/res/drawable-xhdpi/{action_mode_back.png => ic_action_mode_back.png} (100%)
 rename OsmAnd/res/{drawable-large-xhdpi/widget_reset_to_default_dark.png => drawable-xhdpi/ic_action_reset_to_default_dark.png} (100%)
 rename OsmAnd/res/drawable-xhdpi/{av_download.png => map_down.png} (100%)
 rename OsmAnd/res/drawable-xhdpi/{widget_layer_dark.png => map_layer_dark.png} (100%)
 rename OsmAnd/res/drawable-xhdpi/{av_upload.png => map_up.png} (100%)
 delete mode 100644 OsmAnd/res/drawable-xhdpi/widget_reset_to_default_dark.png
 rename OsmAnd/res/drawable-xxhdpi/{action_mode_back.png => ic_action_mode_back.png} (100%)
 rename OsmAnd/res/{drawable-large-hdpi/widget_reset_to_default_dark.png => drawable-xxhdpi/ic_action_reset_to_default_dark.png} (100%)
 rename OsmAnd/res/drawable-xxhdpi/{av_download.png => map_down.png} (100%)
 rename OsmAnd/res/drawable-xxhdpi/{widget_layer_dark.png => map_layer_dark.png} (100%)
 rename OsmAnd/res/drawable-xxhdpi/{av_upload.png => map_up.png} (100%)
 delete mode 100644 OsmAnd/res/drawable-xxhdpi/widget_reset_to_default_dark.png
 rename OsmAnd/res/drawable-xxxhdpi/{action_mode_back.png => ic_action_mode_back.png} (100%)

diff --git a/OsmAnd/res/drawable-hdpi/action_mode_back.png b/OsmAnd/res/drawable-hdpi/ic_action_mode_back.png
similarity index 100%
rename from OsmAnd/res/drawable-hdpi/action_mode_back.png
rename to OsmAnd/res/drawable-hdpi/ic_action_mode_back.png
diff --git a/OsmAnd/res/drawable-hdpi/widget_reset_to_default_dark.png b/OsmAnd/res/drawable-hdpi/ic_action_reset_to_default_dark.png
similarity index 100%
rename from OsmAnd/res/drawable-hdpi/widget_reset_to_default_dark.png
rename to OsmAnd/res/drawable-hdpi/ic_action_reset_to_default_dark.png
diff --git a/OsmAnd/res/drawable-hdpi/ic_plugin_skimaps.png b/OsmAnd/res/drawable-hdpi/ic_plugin_skimaps.png
new file mode 100644
index 0000000000000000000000000000000000000000..75e7aadb6328de137fb2959be95a35a9896d7509
GIT binary patch
literal 1338
zcmaJ>YfKzf6dnY(LIGo~NMB|;5Cn8~9?Z@%6Sf6*c4f6oaoGqynspv`*>RZ%GlRR}
z4=Jfst1&gCahn(|jYeZ^wQ018{h>u|ghC{y#X?Mt@j<d_)1<bV#-w-`SnLndNoMXn
z_nz;Z@4V)<j`qjON;a1u2vQbm6C!Y}&b{}z;P+P~lYz@7C(!M58gVBjS^#NL3<;ni
zP3!>?ASwfW6QBt}3iqkeZl^oEi<b?}E#`FGY0ZRa1ZmotHbprJ98>~5s_w(Cp8g6$
zRmF#OdBSAa^n--jHfVv)!S<*;n3OpM+qna6O7qZw1{@JhYrVS7r+wIxT^{ap#{`Bh
zsW?d=woIx!+=2QH3!ol1i_0X%pkB^Rc~~#!eH5jkOpuKPP2wcSdm4C>MpqsTdb5-`
z9}$8pzM$m85{_f?1d&Rm+^Gh)Vf7Fc$8iKn6EuxO4cs2k9WjmTc2(Yj0BqS(O-D6!
zG-pwijDE+5L8i+gXl6LPYFM{d5(QI6q(zgU+$5oCxww|JZ6^Z$r?IBC9UU+M5dpT*
zZ^^J8@v1x+=I+jpa*B`*zuQt_QN&)skoz^DJ0Zb`!5g=tDm>#+6iH%PoMu@D=SYUb
zIZmN*7Er(=OALrhO5V;|crWD@f*#W2rx}5w0t^>qS~<2Q5EOz90W#2-$A)y<5p@~l
zeXG#-3YNJemiJpgbPOwM7`^!}=tvljVJ8d|_4}8qj@EXmx?-g4x?Gu-qZWXrz6g|{
zWoYP9o_Tc*4wBLkr>Vv`-pEQ6E_xW41ePIjps;Z-Ab}z)BDR88Zp+_tpTZLuhnc6t
zi?ZwyX<5W2;1zL-0t_zEER9PPP$))`DOnUT0#YP$t#ex|<&R*0=C-SY0fp7k0y>;0
z3l7eK$xRCgQm`u|v_#YMmovWdakBK4XZP_lW$^^@<3lCxGp?!Lt;5H^4ji~RQDmF%
zqk#vizvz4N=85YyTNl2eX74{S%V#6kkG^@gtF{1d={Xpmd}q(xGq=dy6*H~pzH4$~
zZ)CRrb!DWLINDqlyUW!!nEmb3E!k7S*vA)Mor#^^&#&9)eK%S9_<aj5_MfM>y;Tm5
z6ehL|(d41&>BMNorSmCpWPa|;Ll2*_uD$S5MgP4I{#jD*yZOO%-<Va0)=xdr5zVaM
zFj97*rgZ&eSK_D7$~#?Cdrk(AZCh9S^32%q+}P`#3*TQkShTU&_3tC+4xbc8#x8HK
zkDl2(hWLiBX<59dF0%Kzj|yvV{C@a{zoV6(Oc-as-MpAYiO)xF3G~lJqr@MTi#3Z{
zO>9xwzhgsN@ud%|huGofWbx>GLr<YM#(yCvXWQm4o<DXrJXC;Ot$aH>9&gU({$`;-
LyKubq`QiTnNjuT|

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-hdpi/list_favorite.png b/OsmAnd/res/drawable-hdpi/list_favorite.png
deleted file mode 100644
index 890f8f269d6d7e78de1e548897d56b8265e1f383..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3342
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
X5bdy*N^tyZ^@f7Ab;guh`^EkTFc!ye

diff --git a/OsmAnd/res/drawable-hdpi/poi_parking_pos_limit_menu.png b/OsmAnd/res/drawable-hdpi/list_poi_parking_pos_limit_menu.png
similarity index 100%
rename from OsmAnd/res/drawable-hdpi/poi_parking_pos_limit_menu.png
rename to OsmAnd/res/drawable-hdpi/list_poi_parking_pos_limit_menu.png
diff --git a/OsmAnd/res/drawable-hdpi/poi_parking_pos_no_limit_menu.png b/OsmAnd/res/drawable-hdpi/list_poi_parking_pos_no_limit_menu.png
similarity index 100%
rename from OsmAnd/res/drawable-hdpi/poi_parking_pos_no_limit_menu.png
rename to OsmAnd/res/drawable-hdpi/list_poi_parking_pos_no_limit_menu.png
diff --git a/OsmAnd/res/drawable-hdpi/arrow_to_destination.png b/OsmAnd/res/drawable-hdpi/map_arrow_to_destination.png
similarity index 100%
rename from OsmAnd/res/drawable-hdpi/arrow_to_destination.png
rename to OsmAnd/res/drawable-hdpi/map_arrow_to_destination.png
diff --git a/OsmAnd/res/drawable-hdpi/bicycle_bearing.png b/OsmAnd/res/drawable-hdpi/map_bicycle_bearing.png
similarity index 100%
rename from OsmAnd/res/drawable-hdpi/bicycle_bearing.png
rename to OsmAnd/res/drawable-hdpi/map_bicycle_bearing.png
diff --git a/OsmAnd/res/drawable-hdpi/bicycle_location.png b/OsmAnd/res/drawable-hdpi/map_bicycle_location.png
similarity index 100%
rename from OsmAnd/res/drawable-hdpi/bicycle_location.png
rename to OsmAnd/res/drawable-hdpi/map_bicycle_location.png
diff --git a/OsmAnd/res/drawable-hdpi/car_bearing.png b/OsmAnd/res/drawable-hdpi/map_car_bearing.png
similarity index 100%
rename from OsmAnd/res/drawable-hdpi/car_bearing.png
rename to OsmAnd/res/drawable-hdpi/map_car_bearing.png
diff --git a/OsmAnd/res/drawable-hdpi/car_location.png b/OsmAnd/res/drawable-hdpi/map_car_location.png
similarity index 100%
rename from OsmAnd/res/drawable-hdpi/car_location.png
rename to OsmAnd/res/drawable-hdpi/map_car_location.png
diff --git a/OsmAnd/res/drawable-hdpi/default_location.png b/OsmAnd/res/drawable-hdpi/map_default_location.png
similarity index 100%
rename from OsmAnd/res/drawable-hdpi/default_location.png
rename to OsmAnd/res/drawable-hdpi/map_default_location.png
diff --git a/OsmAnd/res/drawable-hdpi/av_download.png b/OsmAnd/res/drawable-hdpi/map_down.png
similarity index 100%
rename from OsmAnd/res/drawable-hdpi/av_download.png
rename to OsmAnd/res/drawable-hdpi/map_down.png
diff --git a/OsmAnd/res/drawable-hdpi/intermediate_point.png b/OsmAnd/res/drawable-hdpi/map_intermediate_point.png
similarity index 100%
rename from OsmAnd/res/drawable-hdpi/intermediate_point.png
rename to OsmAnd/res/drawable-hdpi/map_intermediate_point.png
diff --git a/OsmAnd/res/drawable-hdpi/widget_layer_dark.png b/OsmAnd/res/drawable-hdpi/map_layer_dark.png
similarity index 100%
rename from OsmAnd/res/drawable-hdpi/widget_layer_dark.png
rename to OsmAnd/res/drawable-hdpi/map_layer_dark.png
diff --git a/OsmAnd/res/drawable-hdpi/pedestrian_bearing.png b/OsmAnd/res/drawable-hdpi/map_pedestrian_bearing.png
similarity index 100%
rename from OsmAnd/res/drawable-hdpi/pedestrian_bearing.png
rename to OsmAnd/res/drawable-hdpi/map_pedestrian_bearing.png
diff --git a/OsmAnd/res/drawable-hdpi/pedestrian_location.png b/OsmAnd/res/drawable-hdpi/map_pedestrian_location.png
similarity index 100%
rename from OsmAnd/res/drawable-hdpi/pedestrian_location.png
rename to OsmAnd/res/drawable-hdpi/map_pedestrian_location.png
diff --git a/OsmAnd/res/drawable-hdpi/poi_parking_pos_limit.png b/OsmAnd/res/drawable-hdpi/map_poi_parking_pos_limit.png
similarity index 100%
rename from OsmAnd/res/drawable-hdpi/poi_parking_pos_limit.png
rename to OsmAnd/res/drawable-hdpi/map_poi_parking_pos_limit.png
diff --git a/OsmAnd/res/drawable-hdpi/poi_parking_pos_no_limit.png b/OsmAnd/res/drawable-hdpi/map_poi_parking_pos_no_limit.png
similarity index 100%
rename from OsmAnd/res/drawable-hdpi/poi_parking_pos_no_limit.png
rename to OsmAnd/res/drawable-hdpi/map_poi_parking_pos_no_limit.png
diff --git a/OsmAnd/res/drawable-hdpi/target_point.png b/OsmAnd/res/drawable-hdpi/map_target_point.png
similarity index 100%
rename from OsmAnd/res/drawable-hdpi/target_point.png
rename to OsmAnd/res/drawable-hdpi/map_target_point.png
diff --git a/OsmAnd/res/drawable-hdpi/av_upload.png b/OsmAnd/res/drawable-hdpi/map_up.png
similarity index 100%
rename from OsmAnd/res/drawable-hdpi/av_upload.png
rename to OsmAnd/res/drawable-hdpi/map_up.png
diff --git a/OsmAnd/res/drawable-hdpi/widget_monitoring.png b/OsmAnd/res/drawable-hdpi/widget_monitoring.png
deleted file mode 100644
index 796212a0857127be613ee7ed31743d4387d8d688..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4529
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%0AyYKOKymX%e)lCK)G!T`H!<?N
z(zBRPpPBSFN=iz&sY!k1g3h#>v{L{z{fHG7Njo);d9<Ias~{EbvwTWONJtr0*tF_|
zX7bqtDd?{M?><)9FdiPB7<as+Vr$}e9ig%Q@Yq?BGsFFM8pcMl+%F}|^DP`D+wV$b
zA~W4F8lIk>#`hI}clW%Ahi<}PF!UBSlOR3Ffd*vU-OiX_K(+hs(hPn8{#jI9d;)*=
zkJ*o?pSEMt)+OIAp-V1xqW}T(xBf1qRM8A1K6MZ|?by^TaoJ3G0UK9}MIX$hthl%V
z_UQY-07M=#+y#Gd|MZUd!0YT5iA*ry4ZT3<@bGX)#600H^;d>p=pt13MpNaD<pW%_
zNFIa-))EpD&T6{z^YijfMIOurcbT*8U0lgTzZivQ=nV`YR`1hppt6XgooN{uc7?Q(
z<Ky#;WO&SSh!=7xDQj`6vzUD0fpHLyI6J<j0~NABp9ZCrcL{X>c_ai0HM7LD-fuNc
z+}nC|_hV{ms;StFUhSudLG<#`tHm0^Uo*V!fFQhmflZ{i%AAH63NdyA1bxYVl38}Z
z8|;sE@$fjbQc!qH`T?aF(?GGyMk8hiCw5MY5#-s+fj2x)7^%dvK4|^6r+3CFRB|%V
z-!Fo{6W*WABA(N!YD?_ewY{~oWAZLuFnLpwQ(kA0%zp@NYjCTiL0DKAZB%q(cV?H0
z#R{@pF8xS|k3XQB3unfUd9JfytvaZN*XiXN;MMEd!Vp&;mzJE&tL?sYXJjIrIYiCz
z4hLt^Pbsl*8~J7Qh{knNx{_Z|`t$Cxp@YDdU#9*1DLkOb@4{KJG`+&D6@>cwpf56u
zD>4pT`D3-@Nq1x?LHQ-}uBVe9PxWG@Hd(WRr*eIRlD2COqo*(jPvqB@Y5ZtrO*$Tb
zd}y|g?HwQ}nKqk=MY2Tyz!%`&-C~ZJY^%6~%Oyda3*4$qdwmAmh>n?q)Z9`nBg53V
z9Jm(k?PIanh-p!)7qfS$Va95SO>&t(HMFS5*A4)`7vo&lOQ7>fhNm)qam?1IC(6fD
zwt4<20;KjxrvPupCnP}uXQkx%<Jradlq{fHvyl3X0|RDFNsn?u3xPoS#@?OQ)|P!R
z=WM902$$WLo*JVluQ6v9D*biDobqbzRlwlX8C9r4AW++(QU1?62vbs5ER#12{2wgf
Bcv%1d

diff --git a/OsmAnd/res/drawable-large-hdpi/widget_layer_dark.png b/OsmAnd/res/drawable-large-hdpi/map_layer_dark.png
similarity index 100%
rename from OsmAnd/res/drawable-large-hdpi/widget_layer_dark.png
rename to OsmAnd/res/drawable-large-hdpi/map_layer_dark.png
diff --git a/OsmAnd/res/drawable-large-xhdpi/widget_layer_dark.png b/OsmAnd/res/drawable-large-xhdpi/map_layer_dark.png
similarity index 100%
rename from OsmAnd/res/drawable-large-xhdpi/widget_layer_dark.png
rename to OsmAnd/res/drawable-large-xhdpi/map_layer_dark.png
diff --git a/OsmAnd/res/drawable-large/arrow_to_destination.png b/OsmAnd/res/drawable-large/map_arrow_to_destination.png
similarity index 100%
rename from OsmAnd/res/drawable-large/arrow_to_destination.png
rename to OsmAnd/res/drawable-large/map_arrow_to_destination.png
diff --git a/OsmAnd/res/drawable-large/bicycle_bearing.png b/OsmAnd/res/drawable-large/map_bicycle_bearing.png
similarity index 100%
rename from OsmAnd/res/drawable-large/bicycle_bearing.png
rename to OsmAnd/res/drawable-large/map_bicycle_bearing.png
diff --git a/OsmAnd/res/drawable-large/bicycle_location.png b/OsmAnd/res/drawable-large/map_bicycle_location.png
similarity index 100%
rename from OsmAnd/res/drawable-large/bicycle_location.png
rename to OsmAnd/res/drawable-large/map_bicycle_location.png
diff --git a/OsmAnd/res/drawable-large/car_bearing.png b/OsmAnd/res/drawable-large/map_car_bearing.png
similarity index 100%
rename from OsmAnd/res/drawable-large/car_bearing.png
rename to OsmAnd/res/drawable-large/map_car_bearing.png
diff --git a/OsmAnd/res/drawable-large/car_location.png b/OsmAnd/res/drawable-large/map_car_location.png
similarity index 100%
rename from OsmAnd/res/drawable-large/car_location.png
rename to OsmAnd/res/drawable-large/map_car_location.png
diff --git a/OsmAnd/res/drawable-large/default_location.png b/OsmAnd/res/drawable-large/map_default_location.png
similarity index 100%
rename from OsmAnd/res/drawable-large/default_location.png
rename to OsmAnd/res/drawable-large/map_default_location.png
diff --git a/OsmAnd/res/drawable-large/intermediate_point.png b/OsmAnd/res/drawable-large/map_intermediate_point.png
similarity index 100%
rename from OsmAnd/res/drawable-large/intermediate_point.png
rename to OsmAnd/res/drawable-large/map_intermediate_point.png
diff --git a/OsmAnd/res/drawable-large/widget_layer_dark.png b/OsmAnd/res/drawable-large/map_layer_dark.png
similarity index 100%
rename from OsmAnd/res/drawable-large/widget_layer_dark.png
rename to OsmAnd/res/drawable-large/map_layer_dark.png
diff --git a/OsmAnd/res/drawable-large/pedestrian_bearing.png b/OsmAnd/res/drawable-large/map_pedestrian_bearing.png
similarity index 100%
rename from OsmAnd/res/drawable-large/pedestrian_bearing.png
rename to OsmAnd/res/drawable-large/map_pedestrian_bearing.png
diff --git a/OsmAnd/res/drawable-large/pedestrian_location.png b/OsmAnd/res/drawable-large/map_pedestrian_location.png
similarity index 100%
rename from OsmAnd/res/drawable-large/pedestrian_location.png
rename to OsmAnd/res/drawable-large/map_pedestrian_location.png
diff --git a/OsmAnd/res/drawable-large/target_point.png b/OsmAnd/res/drawable-large/map_target_point.png
similarity index 100%
rename from OsmAnd/res/drawable-large/target_point.png
rename to OsmAnd/res/drawable-large/map_target_point.png
diff --git a/OsmAnd/res/drawable-large/widget_monitoring.png b/OsmAnd/res/drawable-large/widget_monitoring.png
deleted file mode 100644
index 796212a0857127be613ee7ed31743d4387d8d688..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4529
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%0AyYKOKymX%e)lCK)G!T`H!<?N
z(zBRPpPBSFN=iz&sY!k1g3h#>v{L{z{fHG7Njo);d9<Ias~{EbvwTWONJtr0*tF_|
zX7bqtDd?{M?><)9FdiPB7<as+Vr$}e9ig%Q@Yq?BGsFFM8pcMl+%F}|^DP`D+wV$b
zA~W4F8lIk>#`hI}clW%Ahi<}PF!UBSlOR3Ffd*vU-OiX_K(+hs(hPn8{#jI9d;)*=
zkJ*o?pSEMt)+OIAp-V1xqW}T(xBf1qRM8A1K6MZ|?by^TaoJ3G0UK9}MIX$hthl%V
z_UQY-07M=#+y#Gd|MZUd!0YT5iA*ry4ZT3<@bGX)#600H^;d>p=pt13MpNaD<pW%_
zNFIa-))EpD&T6{z^YijfMIOurcbT*8U0lgTzZivQ=nV`YR`1hppt6XgooN{uc7?Q(
z<Ky#;WO&SSh!=7xDQj`6vzUD0fpHLyI6J<j0~NABp9ZCrcL{X>c_ai0HM7LD-fuNc
z+}nC|_hV{ms;StFUhSudLG<#`tHm0^Uo*V!fFQhmflZ{i%AAH63NdyA1bxYVl38}Z
z8|;sE@$fjbQc!qH`T?aF(?GGyMk8hiCw5MY5#-s+fj2x)7^%dvK4|^6r+3CFRB|%V
z-!Fo{6W*WABA(N!YD?_ewY{~oWAZLuFnLpwQ(kA0%zp@NYjCTiL0DKAZB%q(cV?H0
z#R{@pF8xS|k3XQB3unfUd9JfytvaZN*XiXN;MMEd!Vp&;mzJE&tL?sYXJjIrIYiCz
z4hLt^Pbsl*8~J7Qh{knNx{_Z|`t$Cxp@YDdU#9*1DLkOb@4{KJG`+&D6@>cwpf56u
zD>4pT`D3-@Nq1x?LHQ-}uBVe9PxWG@Hd(WRr*eIRlD2COqo*(jPvqB@Y5ZtrO*$Tb
zd}y|g?HwQ}nKqk=MY2Tyz!%`&-C~ZJY^%6~%Oyda3*4$qdwmAmh>n?q)Z9`nBg53V
z9Jm(k?PIanh-p!)7qfS$Va95SO>&t(HMFS5*A4)`7vo&lOQ7>fhNm)qam?1IC(6fD
zwt4<20;KjxrvPupCnP}uXQkx%<Jradlq{fHvyl3X0|RDFNsn?u3xPoS#@?OQ)|P!R
z=WM902$$WLo*JVluQ6v9D*biDobqbzRlwlX8C9r4AW++(QU1?62vbs5ER#12{2wgf
Bcv%1d

diff --git a/OsmAnd/res/drawable-large/widget_reset_to_default_dark.png b/OsmAnd/res/drawable-large/widget_reset_to_default_dark.png
deleted file mode 100644
index 5061627c676c50d4ca25411e9dff219c8abf00b5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1736
zcmbVNc~BE)6wk;ZphOT4U@WsnKrL>vxpyPM#srijT!})VPRX%Agk)o~kN~!0!2{8H
zmNrrk1huU=Hi#fW<q(UCM`%SQSVcUlV~sjBDw?X@AlUxl_(ykU_xs+r@AuyCUAt?O
z6BqdU1pAOkB;VMDqEuoHb=_W`#B-2jG7(D<9-WR$ux#8Q)1f4R5|g7qtXh_XrlK-s
z(XumWB#Go!sFJ4R>EZ;Q0#j3EE*+{-ttHSTQsg|NR;I{9aX^mds5E@aqoZvUK&9kU
z(%521tQDfUs)fZmR8pKMRTSqb5G7?^6cB0T5eC#KE(46}e2t!G<Wq+2@`%0bm_`AH
zRq#AM<t?dnaWWvpbSS{4azF({X8~M<N@sJp2zL&^AY>W@(-;s4Av`vd2Qh$=i$ZwQ
zDYJR0qL>k1gv6)h;<%PaqZteas)0$xbU8FSf*>@AL1QpLLIcznX>gel)aYl7S`eXn
zg-)f#RhR~FS(M4K0-R4Fn7$1`trd&k8P@1W5=EqpW|V1ZbSgwst6gyoYwPh;^j{k9
z)z(Xkv?whV)nf%Z1yPUe8KYn#cOQ1-QY6^$l5{GfD6)JJrYKOO8a!6Srx0(bN|lnw
zWiucIf)P-TqD+v(WidfH!azU-mUHPSm&3|dFh}jY4?mxUz=$x0#YST2bb2&vJ_F{!
zEG~;9;0hqF03OB0YV^2Fqd-S}s|epCSmp<@JfRMi;h0W}Vfmw7kerL*m_8TN0z%<%
z)qz=QDvc5|=x4ji^fqb{s#6uB$`~D{28Q#@Q@w`+1aV=M4x=DP4l_W7l7)aUq{s##
z4uj5Au;~cVT$B;K^8e<KMv$Vpn&m&uGkQdHq-*<b6bRwnFrgY^f^@{F++5pxn?xFO
zFIFUw8vBo#&c{nr0=piie++i}NcU8i_lm>ZH`^O0R*C%<zY%08=I$0ZdF5S7=e+Vr
zX)^y(UfEJn9#>Jb$j6^9nDTARCP#;3nvuHw`a?u--J$<t@Rau9DQDF4<*kpD-FI|Z
z4f6UxxUT>reYs}pA=`noPJ#Hwm6z?Iec$wcg$cS_Is$rHGD??r_(Nkt$~I=LT6x)X
zXX!zfhuU3uqpT_e7)xG}ot%VAItwT0&DQ9iev|d1u|=MS#`RpmPz!s=;+Yuc_t#{H
zyi!~e#Hg?+{Ax=l_wM(+3V-%zqw`61K*E9{e$2oH{X*YgQ<jOvzst;Sjxz7ZA%D9M
zyf`<$Z^9pxliTku*Z_N<Sa*B~0jX_n&UVDCd~9%Yn8((h9A9s<2EIvxEs|S;#;WTp
z!tJ`X5&LiRHuolqcm3S4*nW9t&jx3FW%0cOehnvfM}%FQ9VC4*w0nt0KIh4%!T9^l
zug+Rnnf7PCDGiRN)|5_DR|wB5xbfLk?U`Hkx@}RyJY_;1a82_S`uWnH__L0mu1^2H
z`gqMNU{&YyR&d{>-tc~!#Lp3TI8$93EGn7qAsE+Ws!Vjg%&HXoYzb%%TV*=mWJ>Kh
zmV4v};K$A>5}#sC=9Zlg%(-o5@2ZLR0RI4fy(~>rouoK7ORz4Zgc<1Qn_K1x>d&!U
zxm3PGdWT)>zs9baaJ(VnCh@h~S75ulEqG-Ud3~AhqH<g5uA`2<&l6karCrkLGpPga
z1LKhwx$AcpxffPsBHP9VabqIku0!cI5Afnv^g^iQQ;7}tk950=p7}cP$dWqpqS|>%
z@-)%*c>(>lv^w>klIFun!EyJOy(G)`n(43e@70_ReR{OpVy!m3mS)acy)Uk&&ilG#
zowA*kaLKD1j%qt?F@`N2<Mfl>urb3|KlpC(C#@*?AjdY_VjY??$sBCIy@$NDuI2D=
s8=E<&?&IP1<)@!oSB8*lxz31o(#6UX+6RMKxa;2%8=WXRI6tfOAIa*Zj{pDw

diff --git a/OsmAnd/res/drawable-mdpi/av_download.png b/OsmAnd/res/drawable-mdpi/map_down.png
similarity index 100%
rename from OsmAnd/res/drawable-mdpi/av_download.png
rename to OsmAnd/res/drawable-mdpi/map_down.png
diff --git a/OsmAnd/res/drawable-mdpi/av_upload.png b/OsmAnd/res/drawable-mdpi/map_up.png
similarity index 100%
rename from OsmAnd/res/drawable-mdpi/av_upload.png
rename to OsmAnd/res/drawable-mdpi/map_up.png
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_label_dark.png b/OsmAnd/res/drawable-xhdpi/ic_action_label_dark.png
deleted file mode 100644
index 687e73d67d748f5b72fd9233adbc120b42da1b4e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1439
zcmV;Q1z`G#P)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF000GMNkl<ZcwX(A
zTgX*K7>3=NCZ>>A5d@l`)SX=fLS%#|Fi<d3F$_Vmb847}Jd)>Ai6V&-LU|6YG(<Zf
z6rnd=MMT|19zY_|3q{Ref1h_V>u3L)z4y$lnKl20y$3$l+I!8c^}X-=&6;m!R;gEu
zmr{%4@6{%t9RV%QK)VaHcmT9tf=RkSXJ==hQmJ&W8KbRm0sub{;JdN2*l~!s)=WgC
zAmCj9&oZEIbNm`R3=tQbfrvs0K>fjh{04iZ3ap4YfgOT~3)wa5^Rv{Ml9-|iSPYn{
z4FH`5@IqY&{8$qy^Z4&-DiR7K06@b4@dehu4w&!we>Gt5P<IsP+f3cxIW9;=LXiY)
z2gvhvz@Os(Re-z?_z5Bc>sL|tZ_Zy&K|&z}0P1O@ey#iKCAa}_9n^b{^Q~3jGamln
zWIpx&E3!L8CqOSU9R3u0wua+J0kp~V`H37?)B&G0{fCpeMUqei0WTU=tMMP;kL@Px
z)it(YeI3*-G!mi`po|YdN3o$5z%;Dw1NbhZ{7Xi87x0BgLTmyQ)@!O%-3|D?2E3wU
zBleJk^3_!eiG*kbn3VT0UO#R;zt3?e;6FFuCvjYs6MSKj5R-t}c=?v`RAIjr@FFBj
za@GZc&q#<G2~h|@{YUXmDX%6z9oS~TA2Z;ma8yQU3;T1_QPgN?w3TS1Lo5Qa36G|{
zYXE=JfFH+ktpoVqsPndhMcoD)X=8xvQ6eFj0MvgHXZB;d*GGUqZNR_6@dHdFL!%<)
z7t`*hX*YnQUYbuikPsXRF$hrK9)m3d#E%Aq(p!xNHt=QTGw`OZMv|47>o6G<2|)yy
zlvj%#%K`DT0Wh88`wrl{DPIA8wL{zL;K&^bp#*HelM{d!7`^SKo(ljU<+XNDZ$?>3
zM6O84O#on@;px2r|EmE%gX4S$^?Z~+$o-CBJFp=|yc0qQ7zp?q2E39SO>BBwob*v%
z;6E{QhbK7SgFWUzf>$KuCLnW!NSMj_dk)~eln1yLNXo^`FxPWB-hqH_L$R%X5CJ%*
zBxk7u_*}|YfEU59*}#Y^Y#Zbqa;RIblA8d)&!YW14)+LEUR`Ul10X5C1@K=w)a|O0
zivYmCY?QaPPpSMSU+}pi0Pu5Y_(l^c-)-*UqrNu*fY%cDA_wp(m0yqY$9;ik^=%>C
zbzi{0%8vyO;8XQ^DZdf$U*!ew6#)>SVMsZCqmoK_O`A3A)b3JH@reK%0V$PV7Xy6E
z2v9gq!Kurc9A;inYgX5l;i;}ka$LuG4RxAwe;XuwMdO$e@E7;hzTUqLCPfEpWO%OQ
z{9OZHyGqfD4*{C_*-}xFpf|Fn!<AcIayV3Z?IT77@7o17(?AO!c}j@#|MNhBKa=Od
zwl+Qyke7f^<yRC1K1BrRlNc?Tm5X`dx%PQ2gh=`CZ7PObFFFGBPIwa#*FE3%8dbE$
z_(KRdm$sn<X!@z7q|xH1NKgi;jT23uZAHqj%obQ}l|!$G5TLA2$&vQ&r(v2T)hqfk
zOy3LHij-dhczscpq=XPK14sYNyd=c64K_T$YbmeQ<z(RHYX||8arROL0iSX1vZGUr
zBPBVDxZh6!1m<e$Lx4VI(e`#$l$0nZzm58%IoBGVZBewAlehSDX|}JB3q?R99|At+
zIWJT_>k7ZszeixUU7%WSD#?-Z<xQ2ID4_&|_^iD^DgR5zO+wrD6ai9xVNZh>d8r6c
zt{_v9@*e{Je5iUc+WQbNhzCAg<Dp81Y@fpGdiD))hhCg9oR4u2X98k8tQqgoCZHKr
tN$FEN0#dTwjL&LEKr^b6(x;Y>fCqMHabF@?*Ej$G002ovPDHLkV1hL|lePc=

diff --git a/OsmAnd/res/drawable-xhdpi/action_mode_back.png b/OsmAnd/res/drawable-xhdpi/ic_action_mode_back.png
similarity index 100%
rename from OsmAnd/res/drawable-xhdpi/action_mode_back.png
rename to OsmAnd/res/drawable-xhdpi/ic_action_mode_back.png
diff --git a/OsmAnd/res/drawable-large-xhdpi/widget_reset_to_default_dark.png b/OsmAnd/res/drawable-xhdpi/ic_action_reset_to_default_dark.png
similarity index 100%
rename from OsmAnd/res/drawable-large-xhdpi/widget_reset_to_default_dark.png
rename to OsmAnd/res/drawable-xhdpi/ic_action_reset_to_default_dark.png
diff --git a/OsmAnd/res/drawable-xhdpi/av_download.png b/OsmAnd/res/drawable-xhdpi/map_down.png
similarity index 100%
rename from OsmAnd/res/drawable-xhdpi/av_download.png
rename to OsmAnd/res/drawable-xhdpi/map_down.png
diff --git a/OsmAnd/res/drawable-xhdpi/widget_layer_dark.png b/OsmAnd/res/drawable-xhdpi/map_layer_dark.png
similarity index 100%
rename from OsmAnd/res/drawable-xhdpi/widget_layer_dark.png
rename to OsmAnd/res/drawable-xhdpi/map_layer_dark.png
diff --git a/OsmAnd/res/drawable-xhdpi/av_upload.png b/OsmAnd/res/drawable-xhdpi/map_up.png
similarity index 100%
rename from OsmAnd/res/drawable-xhdpi/av_upload.png
rename to OsmAnd/res/drawable-xhdpi/map_up.png
diff --git a/OsmAnd/res/drawable-xhdpi/widget_reset_to_default_dark.png b/OsmAnd/res/drawable-xhdpi/widget_reset_to_default_dark.png
deleted file mode 100644
index 314632992d8ededc4735fd3f02c869f3ca732fa9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2045
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
Dze*-r

diff --git a/OsmAnd/res/drawable-xxhdpi/action_mode_back.png b/OsmAnd/res/drawable-xxhdpi/ic_action_mode_back.png
similarity index 100%
rename from OsmAnd/res/drawable-xxhdpi/action_mode_back.png
rename to OsmAnd/res/drawable-xxhdpi/ic_action_mode_back.png
diff --git a/OsmAnd/res/drawable-large-hdpi/widget_reset_to_default_dark.png b/OsmAnd/res/drawable-xxhdpi/ic_action_reset_to_default_dark.png
similarity index 100%
rename from OsmAnd/res/drawable-large-hdpi/widget_reset_to_default_dark.png
rename to OsmAnd/res/drawable-xxhdpi/ic_action_reset_to_default_dark.png
diff --git a/OsmAnd/res/drawable-xxhdpi/av_download.png b/OsmAnd/res/drawable-xxhdpi/map_down.png
similarity index 100%
rename from OsmAnd/res/drawable-xxhdpi/av_download.png
rename to OsmAnd/res/drawable-xxhdpi/map_down.png
diff --git a/OsmAnd/res/drawable-xxhdpi/widget_layer_dark.png b/OsmAnd/res/drawable-xxhdpi/map_layer_dark.png
similarity index 100%
rename from OsmAnd/res/drawable-xxhdpi/widget_layer_dark.png
rename to OsmAnd/res/drawable-xxhdpi/map_layer_dark.png
diff --git a/OsmAnd/res/drawable-xxhdpi/av_upload.png b/OsmAnd/res/drawable-xxhdpi/map_up.png
similarity index 100%
rename from OsmAnd/res/drawable-xxhdpi/av_upload.png
rename to OsmAnd/res/drawable-xxhdpi/map_up.png
diff --git a/OsmAnd/res/drawable-xxhdpi/widget_reset_to_default_dark.png b/OsmAnd/res/drawable-xxhdpi/widget_reset_to_default_dark.png
deleted file mode 100644
index 39f1c8ccf230766b584cc839d685c7bc5d4e53d6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2530
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
Qe&Mf+;p#=Nao(N!7wd@|D*ylh

diff --git a/OsmAnd/res/drawable-xxxhdpi/action_mode_back.png b/OsmAnd/res/drawable-xxxhdpi/ic_action_mode_back.png
similarity index 100%
rename from OsmAnd/res/drawable-xxxhdpi/action_mode_back.png
rename to OsmAnd/res/drawable-xxxhdpi/ic_action_mode_back.png
diff --git a/OsmAnd/res/layout/change_order_item.xml b/OsmAnd/res/layout/change_order_item.xml
index 551605f45b..22e0a9e3a5 100644
--- a/OsmAnd/res/layout/change_order_item.xml
+++ b/OsmAnd/res/layout/change_order_item.xml
@@ -11,7 +11,7 @@
     android:background="@color/color_white">
 
     <ImageButton
-        android:src="@drawable/av_download"
+        android:src="@drawable/ic_action_down_dark"
         android:id="@+id/down"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content" />
@@ -28,7 +28,7 @@
         android:layout_weight="1" />
 
     <ImageButton
-        android:src="@drawable/av_upload"
+        android:src="@drawable/ic_action_up_dark"
         android:id="@+id/up"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content" />
diff --git a/OsmAnd/res/layout/dash_error_fragment.xml b/OsmAnd/res/layout/dash_error_fragment.xml
index 7d4b50ee55..d4b30275cc 100644
--- a/OsmAnd/res/layout/dash_error_fragment.xml
+++ b/OsmAnd/res/layout/dash_error_fragment.xml
@@ -17,10 +17,12 @@
 		<ImageView
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-			android:layout_gravity="top"
+			android:layout_gravity="center"
+			android:id="@+id/error_icon"
+			android:scaleType="center"
 			android:layout_marginLeft="@dimen/dashFavIconMargin"
 			android:layout_marginRight="@dimen/dashFavIconMargin"
-			android:src="@drawable/ic_crashlog"/>
+			android:src="@drawable/ic_action_remove_dark"/>
 
 		<TextView
 			android:id="@+id/error_header"
diff --git a/OsmAnd/res/layout/parking_set_type.xml b/OsmAnd/res/layout/parking_set_type.xml
index d648ea6c4f..e587f90140 100644
--- a/OsmAnd/res/layout/parking_set_type.xml
+++ b/OsmAnd/res/layout/parking_set_type.xml
@@ -18,7 +18,7 @@
 					 android:layout_gravity="center_horizontal"
 					 android:id="@+id/parking_no_lim_button"
 					 android:gravity="center_horizontal"
-					 android:background="@drawable/poi_parking_pos_no_limit_menu"
+					 android:background="@drawable/list_poi_parking_pos_no_limit_menu"
 					 android:contentDescription="@string/osmand_parking_time_no_limit"/>
 
 		<TextView android:layout_height="wrap_content"
@@ -40,7 +40,7 @@
 					 android:id="@+id/parking_lim_button"
 					 android:layout_gravity="center_horizontal"
 					 android:gravity="center_horizontal"
-					 android:background="@drawable/poi_parking_pos_limit_menu"
+					 android:background="@drawable/list_poi_parking_pos_limit_menu"
 					 android:contentDescription="@string/osmand_parking_time_limit"/>
 
 		<TextView android:layout_height="wrap_content"
diff --git a/OsmAnd/res/values/styles.xml b/OsmAnd/res/values/styles.xml
index fe8761f2c9..a2c52f46f6 100644
--- a/OsmAnd/res/values/styles.xml
+++ b/OsmAnd/res/values/styles.xml
@@ -141,8 +141,8 @@
 		<item name="dashboard_button">@drawable/dashboard_button_light</item>
 		<item name="dashboardSearchButtonStyle">@style/DashboardSearchButton.Light</item>
         <item name="search_background">@color/search_background_dark</item>
-        <item name="android:actionModeCloseDrawable">@drawable/action_mode_back</item>
-        <item name="actionModeCloseDrawable">@drawable/action_mode_back</item>
+        <item name="android:actionModeCloseDrawable">@drawable/ic_action_mode_back</item>
+        <item name="actionModeCloseDrawable">@drawable/ic_action_mode_back</item>
         <item name="android:actionModeStyle">@style/WhiteActionMode</item>
         <item name="actionModeStyle">@style/WhiteActionMode</item>
         <item name="android:actionMenuTextColor">@color/color_white</item>
diff --git a/OsmAnd/src/net/osmand/plus/ApplicationMode.java b/OsmAnd/src/net/osmand/plus/ApplicationMode.java
index 48c7712349..0a6944a6cb 100644
--- a/OsmAnd/src/net/osmand/plus/ApplicationMode.java
+++ b/OsmAnd/src/net/osmand/plus/ApplicationMode.java
@@ -101,8 +101,8 @@ public class ApplicationMode {
 		}
 		
 		public ApplicationModeBuilder carLocation(){
-			applicationMode.bearingIcon = R.drawable.car_bearing;
-			applicationMode.locationIcon = R.drawable.car_location;
+			applicationMode.bearingIcon = R.drawable.map_car_bearing;
+			applicationMode.locationIcon = R.drawable.map_car_location;
 			return this;
 		}
 		
@@ -112,14 +112,14 @@ public class ApplicationMode {
 		}
 		
 		public ApplicationModeBuilder bicycleLocation(){
-			applicationMode.bearingIcon = R.drawable.bicycle_bearing;
-			applicationMode.locationIcon = R.drawable.bicycle_location;
+			applicationMode.bearingIcon = R.drawable.map_bicycle_bearing;
+			applicationMode.locationIcon = R.drawable.map_bicycle_location;
 			return this;
 		}
 		
 		public ApplicationModeBuilder defLocation(){
-			applicationMode.bearingIcon = R.drawable.pedestrian_bearing;
-			applicationMode.locationIcon = R.drawable.pedestrian_location;
+			applicationMode.bearingIcon = R.drawable.map_pedestrian_bearing;
+			applicationMode.locationIcon = R.drawable.map_pedestrian_location;
 			return this;
 		}
 		
@@ -152,8 +152,8 @@ public class ApplicationMode {
 	private float defaultSpeed = 10f;
 	private int minDistanceForTurn = 50;
 	private int arrivalDistance = 90;
-	private int bearingIcon = R.drawable.pedestrian_bearing;
-	private int locationIcon = R.drawable.pedestrian_location;
+	private int bearingIcon = R.drawable.map_pedestrian_bearing;
+	private int locationIcon = R.drawable.map_pedestrian_location;
 
 	private ApplicationMode(int key, String stringKey) {
 		this.key = key;
diff --git a/OsmAnd/src/net/osmand/plus/activities/HelpActivity.java b/OsmAnd/src/net/osmand/plus/activities/HelpActivity.java
index d21f71c879..7cf580294f 100644
--- a/OsmAnd/src/net/osmand/plus/activities/HelpActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/HelpActivity.java
@@ -4,7 +4,7 @@ import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
-
+import android.annotation.SuppressLint;
 import android.content.pm.ActivityInfo;
 import android.os.Build;
 import android.support.v4.view.MenuItemCompat;
@@ -13,7 +13,6 @@ import android.view.*;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.R;
 import net.osmand.plus.helpers.ScreenOrientationHelper;
-
 import android.os.Bundle;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
@@ -30,6 +29,7 @@ public class HelpActivity extends OsmandActionBarActivity {
 	private static final int CLOSE = 4;
 	private WebView wv;
 	
+	@SuppressLint("NewApi")
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
 		getMyApplication().applyTheme(this);
@@ -120,7 +120,7 @@ public class HelpActivity extends OsmandActionBarActivity {
 				R.drawable.ic_action_redo_dark,
 				MenuItemCompat.SHOW_AS_ACTION_ALWAYS );
 		createMenuItem(menu, CLOSE, R.string.shared_string_close, 
-				R.drawable.ic_action_close_dark,
+				R.drawable.ic_action_remove_dark,
 				MenuItemCompat.SHOW_AS_ACTION_ALWAYS );
 		return super.onCreateOptionsMenu(menu);
 	}
diff --git a/OsmAnd/src/net/osmand/plus/activities/IntermediatePointsDialog.java b/OsmAnd/src/net/osmand/plus/activities/IntermediatePointsDialog.java
index 16e5fb0603..8bb1a8423d 100644
--- a/OsmAnd/src/net/osmand/plus/activities/IntermediatePointsDialog.java
+++ b/OsmAnd/src/net/osmand/plus/activities/IntermediatePointsDialog.java
@@ -251,9 +251,9 @@ public class IntermediatePointsDialog {
 						}
 					});
 				} else {
-					tv.setCompoundDrawablesWithIntrinsicBounds(
-							position == intermediates.size() - 1? R.drawable.list_destination:
-								R.drawable.list_intermediate, 0, 0, 0);
+					int icon = position == intermediates.size() - 1? R.drawable.ic_action_target:
+						R.drawable.ic_action_intermediate;
+					tv.setCompoundDrawablesWithIntrinsicBounds(app.getIconsCache().getContentIcon(icon), null, null, null);
 					tv.setCompoundDrawablePadding(padding);
 					final CheckBox ch = ((CheckBox) v.findViewById(R.id.check_item));
 					ch.setVisibility(View.VISIBLE);
diff --git a/OsmAnd/src/net/osmand/plus/dashboard/DashErrorFragment.java b/OsmAnd/src/net/osmand/plus/dashboard/DashErrorFragment.java
index 16cea2f34b..952bcc33dc 100644
--- a/OsmAnd/src/net/osmand/plus/dashboard/DashErrorFragment.java
+++ b/OsmAnd/src/net/osmand/plus/dashboard/DashErrorFragment.java
@@ -19,6 +19,7 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
+import android.widget.ImageView;
 import android.widget.TextView;
 
 /**
@@ -34,6 +35,8 @@ public class DashErrorFragment extends DashBaseFragment {
 		View view = getActivity().getLayoutInflater().inflate(R.layout.dash_error_fragment, container, false);
 		String msg = MessageFormat.format(getString(R.string.previous_run_crashed), OsmandApplication.EXCEPTION_PATH);
 		Typeface typeface = FontCache.getRobotoMedium(getActivity());
+		ImageView iv = ((ImageView) view.findViewById(R.id.error_icon));
+		iv.setImageDrawable(getMyApplication().getIconsCache().getContentIcon(R.drawable.ic_crashlog));
 		TextView message = ((TextView) view.findViewById(R.id.error_header));
 		message.setTypeface(typeface);
 		message.setText(msg);
diff --git a/OsmAnd/src/net/osmand/plus/helpers/WaypointHelper.java b/OsmAnd/src/net/osmand/plus/helpers/WaypointHelper.java
index 28d52800d7..cfe307b2cc 100644
--- a/OsmAnd/src/net/osmand/plus/helpers/WaypointHelper.java
+++ b/OsmAnd/src/net/osmand/plus/helpers/WaypointHelper.java
@@ -688,9 +688,9 @@ public class WaypointHelper {
 				}
 				return null;
 			} else if(type == TARGETS) {
-				return uiCtx.getResources().getDrawable(
-						!((TargetPoint)point).intermediate? R.drawable.list_destination:
-					R.drawable.list_intermediate);
+				int i = !((TargetPoint)point).intermediate? R.drawable.list_destination :
+					R.drawable.list_destination;
+				return uiCtx.getResources().getDrawable(i);
 			} else if(type == FAVORITES || type == WAYPOINTS) {
 				return FavoriteImageDrawable.getOrCreate(uiCtx, point.getColor());
 			} else if(type == ALARMS) {
diff --git a/OsmAnd/src/net/osmand/plus/osmo/OsMoPlugin.java b/OsmAnd/src/net/osmand/plus/osmo/OsMoPlugin.java
index 5979e114be..16a5ec489b 100644
--- a/OsmAnd/src/net/osmand/plus/osmo/OsMoPlugin.java
+++ b/OsmAnd/src/net/osmand/plus/osmo/OsMoPlugin.java
@@ -139,7 +139,7 @@ public class OsMoPlugin extends OsmandPlugin implements OsMoReactor {
 						}
 					}).position(0).reg();
 			if(OsMoPositionLayer.getFollowDestinationId() != null) {
-				adapter.item(R.string.osmo_cancel_moving_target).iconColor(R.drawable.ic_action_close_dark).listen(new OnContextMenuClick() {
+				adapter.item(R.string.osmo_cancel_moving_target).iconColor(R.drawable.ic_action_remove_dark).listen(new OnContextMenuClick() {
 
 							@Override
 							public boolean onContextMenuClick(ArrayAdapter<?> adapter, int itemId, int pos, boolean isChecked) {
diff --git a/OsmAnd/src/net/osmand/plus/parkingpoint/ParkingPositionLayer.java b/OsmAnd/src/net/osmand/plus/parkingpoint/ParkingPositionLayer.java
index 412e3e7a8a..56eb66ec12 100644
--- a/OsmAnd/src/net/osmand/plus/parkingpoint/ParkingPositionLayer.java
+++ b/OsmAnd/src/net/osmand/plus/parkingpoint/ParkingPositionLayer.java
@@ -70,8 +70,8 @@ public class ParkingPositionLayer extends OsmandMapLayer implements ContextMenuL
 		bitmapPaint.setDither(true);
 		bitmapPaint.setAntiAlias(true);
 		bitmapPaint.setFilterBitmap(true);
-		parkingNoLimitIcon = BitmapFactory.decodeResource(view.getResources(), R.drawable.poi_parking_pos_no_limit);
-		parkingLimitIcon = BitmapFactory.decodeResource(view.getResources(), R.drawable.poi_parking_pos_limit);
+		parkingNoLimitIcon = BitmapFactory.decodeResource(view.getResources(), R.drawable.map_poi_parking_pos_no_limit);
+		parkingLimitIcon = BitmapFactory.decodeResource(view.getResources(), R.drawable.map_poi_parking_pos_limit);
 		timeLimit = plugin.getParkingType();
 	}
 
diff --git a/OsmAnd/src/net/osmand/plus/skimapsplugin/SkiMapsPlugin.java b/OsmAnd/src/net/osmand/plus/skimapsplugin/SkiMapsPlugin.java
index 886bdcb82c..f1bd5ab085 100644
--- a/OsmAnd/src/net/osmand/plus/skimapsplugin/SkiMapsPlugin.java
+++ b/OsmAnd/src/net/osmand/plus/skimapsplugin/SkiMapsPlugin.java
@@ -29,8 +29,7 @@ public class SkiMapsPlugin extends OsmandPlugin {
 	
 	@Override
 	public int getLogoResourceId() {
-		// TODO
-		return super.getLogoResourceId();
+		return R.drawable.ic_plugin_skimaps;
 	}
 	
 	@Override
diff --git a/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java b/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java
index 0606b7b979..9516da2056 100644
--- a/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/MapControlsLayer.java
@@ -169,7 +169,7 @@ public class MapControlsLayer extends OsmandMapLayer {
 
 	private void initTopControls() {
 		View configureMap = mapActivity.findViewById(R.id.map_layers_button);
-		controls.add(createHudButton((ImageView) configureMap, R.drawable.ic_action_layers_dark).setBg(
+		controls.add(createHudButton((ImageView) configureMap, R.drawable.map_layer_dark).setIconColorId(0).setBg(
 				R.drawable.btn_inset_circle, R.drawable.btn_inset_circle_night));
 		configureMap.setOnClickListener(new View.OnClickListener() {
 			@Override
diff --git a/OsmAnd/src/net/osmand/plus/views/MapInfoLayer.java b/OsmAnd/src/net/osmand/plus/views/MapInfoLayer.java
index e28d00d0fa..f10de4cb49 100644
--- a/OsmAnd/src/net/osmand/plus/views/MapInfoLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/MapInfoLayer.java
@@ -141,8 +141,8 @@ public class MapInfoLayer extends OsmandMapLayer {
 		rightStack.requestLayout();
 		expand.setVisibility(mapInfoControls.hasCollapsibles(settings.getApplicationMode())? 
 				View.VISIBLE : View.GONE);
-		this.expand.setImageResource(expanded ? R.drawable.av_upload :
-			R.drawable.av_download);
+		this.expand.setImageResource(expanded ? R.drawable.map_up :
+			R.drawable.map_down);
 		expand.setOnClickListener(new OnClickListener() {
 			
 			@Override
@@ -315,7 +315,7 @@ public class MapInfoLayer extends OsmandMapLayer {
 			}
 		});
 		cm.item(R.string.map_widget_reset) 
-				.iconColor(R.drawable.widget_reset_to_default_dark).listen(new OnContextMenuClick() {
+				.iconColor(R.drawable.ic_action_reset_to_default_dark).listen(new OnContextMenuClick() {
 					
 					@Override
 					public boolean onContextMenuClick(ArrayAdapter<?> adapter, int itemId, int pos, boolean isChecked) {
diff --git a/OsmAnd/src/net/osmand/plus/views/PointNavigationLayer.java b/OsmAnd/src/net/osmand/plus/views/PointNavigationLayer.java
index eefbc49ea3..00f54b230e 100644
--- a/OsmAnd/src/net/osmand/plus/views/PointNavigationLayer.java
+++ b/OsmAnd/src/net/osmand/plus/views/PointNavigationLayer.java
@@ -61,9 +61,9 @@ public class PointNavigationLayer extends OsmandMapLayer implements IContextMenu
 		textPaint.setTextSize(sp * 18);
 		textPaint.setTextAlign(Align.CENTER);
 		textPaint.setAntiAlias(true);
-		targetPoint = BitmapFactory.decodeResource(view.getResources(), R.drawable.target_point);
-		intermediatePoint = BitmapFactory.decodeResource(view.getResources(), R.drawable.intermediate_point);
-		arrowToDestination = BitmapFactory.decodeResource(view.getResources(), R.drawable.arrow_to_destination);
+		targetPoint = BitmapFactory.decodeResource(view.getResources(), R.drawable.map_target_point);
+		intermediatePoint = BitmapFactory.decodeResource(view.getResources(), R.drawable.map_intermediate_point);
+		arrowToDestination = BitmapFactory.decodeResource(view.getResources(), R.drawable.map_arrow_to_destination);
 
 		
 	}