diff --git a/android/3rd_party/gson-altered-2.2.4.jar b/android/3rd_party/gson-altered-2.2.4.jar
new file mode 100644
index 0000000000..382a0a1acc
Binary files /dev/null and b/android/3rd_party/gson-altered-2.2.4.jar differ
diff --git a/android/proguard-mwm.txt b/android/proguard-mwm.txt
index 5396a08339..61420feb99 100644
--- a/android/proguard-mwm.txt
+++ b/android/proguard-mwm.txt
@@ -21,4 +21,21 @@
 #
 #-printseeds seeds.txt
 #-printusage unused.txt
-#-printmapping mapping.txt
\ No newline at end of file
+#-printmapping mapping.txt
+
+
+# Gson support
+-keep class com.mapswithme.util.Gsonable
+-keep class * implements com.mapswithme.util.Gsonable
+
+-keepclassmembernames class * implements com.mapswithme.util.Gsonable {
+  !transient <fields>;
+}
+
+-keepnames class * implements com.mapswithme.util.Gsonable {
+  !transient <fields>;
+}
+
+-keepclassmembers class * implements com.mapswithme.util.Gsonable {
+  <init>(...);
+}
\ No newline at end of file
diff --git a/android/res/drawable-hdpi/ic_bookmark_hide.png b/android/res/drawable-hdpi/ic_bookmark_hide.png
new file mode 100644
index 0000000000..8426b27f11
Binary files /dev/null and b/android/res/drawable-hdpi/ic_bookmark_hide.png differ
diff --git a/android/res/drawable-hdpi/ic_bookmark_show.png b/android/res/drawable-hdpi/ic_bookmark_show.png
new file mode 100644
index 0000000000..f33c6979ba
Binary files /dev/null and b/android/res/drawable-hdpi/ic_bookmark_show.png differ
diff --git a/android/res/drawable-hdpi/ic_cancel.png b/android/res/drawable-hdpi/ic_cancel.png
new file mode 100644
index 0000000000..303ae5b2a4
Binary files /dev/null and b/android/res/drawable-hdpi/ic_cancel.png differ
diff --git a/android/res/drawable-hdpi/ic_delete.png b/android/res/drawable-hdpi/ic_delete.png
new file mode 100644
index 0000000000..c98626e45f
Binary files /dev/null and b/android/res/drawable-hdpi/ic_delete.png differ
diff --git a/android/res/drawable-hdpi/ic_download_map.png b/android/res/drawable-hdpi/ic_download_map.png
new file mode 100644
index 0000000000..23b54e3644
Binary files /dev/null and b/android/res/drawable-hdpi/ic_download_map.png differ
diff --git a/android/res/drawable-hdpi/ic_download_routing.png b/android/res/drawable-hdpi/ic_download_routing.png
new file mode 100644
index 0000000000..86c9274eb7
Binary files /dev/null and b/android/res/drawable-hdpi/ic_download_routing.png differ
diff --git a/android/res/drawable-hdpi/ic_edit.png b/android/res/drawable-hdpi/ic_edit.png
new file mode 100644
index 0000000000..27043e09a6
Binary files /dev/null and b/android/res/drawable-hdpi/ic_edit.png differ
diff --git a/android/res/drawable-hdpi/ic_explore.png b/android/res/drawable-hdpi/ic_explore.png
new file mode 100644
index 0000000000..2535db3560
Binary files /dev/null and b/android/res/drawable-hdpi/ic_explore.png differ
diff --git a/android/res/drawable-hdpi/ic_hide.png b/android/res/drawable-hdpi/ic_hide.png
index 8426b27f11..562723c358 100644
Binary files a/android/res/drawable-hdpi/ic_hide.png and b/android/res/drawable-hdpi/ic_hide.png differ
diff --git a/android/res/drawable-hdpi/ic_no_routing.png b/android/res/drawable-hdpi/ic_no_routing.png
new file mode 100644
index 0000000000..a063d25000
Binary files /dev/null and b/android/res/drawable-hdpi/ic_no_routing.png differ
diff --git a/android/res/drawable-hdpi/ic_placepage_share.png b/android/res/drawable-hdpi/ic_placepage_share.png
new file mode 100644
index 0000000000..d70c2a18d4
Binary files /dev/null and b/android/res/drawable-hdpi/ic_placepage_share.png differ
diff --git a/android/res/drawable-hdpi/ic_retry.png b/android/res/drawable-hdpi/ic_retry.png
index 347365e770..ee3facc433 100644
Binary files a/android/res/drawable-hdpi/ic_retry.png and b/android/res/drawable-hdpi/ic_retry.png differ
diff --git a/android/res/drawable-hdpi/ic_retry_failed.png b/android/res/drawable-hdpi/ic_retry_failed.png
new file mode 100644
index 0000000000..347365e770
Binary files /dev/null and b/android/res/drawable-hdpi/ic_retry_failed.png differ
diff --git a/android/res/drawable-hdpi/ic_share.png b/android/res/drawable-hdpi/ic_share.png
index d70c2a18d4..258cf9e1ee 100644
Binary files a/android/res/drawable-hdpi/ic_share.png and b/android/res/drawable-hdpi/ic_share.png differ
diff --git a/android/res/drawable-hdpi/ic_share_email.png b/android/res/drawable-hdpi/ic_share_email.png
new file mode 100644
index 0000000000..be4d992f7e
Binary files /dev/null and b/android/res/drawable-hdpi/ic_share_email.png differ
diff --git a/android/res/drawable-hdpi/ic_share_message.png b/android/res/drawable-hdpi/ic_share_message.png
new file mode 100644
index 0000000000..92f88ae88e
Binary files /dev/null and b/android/res/drawable-hdpi/ic_share_message.png differ
diff --git a/android/res/drawable-hdpi/ic_show.png b/android/res/drawable-hdpi/ic_show.png
index f33c6979ba..59015a270e 100644
Binary files a/android/res/drawable-hdpi/ic_show.png and b/android/res/drawable-hdpi/ic_show.png differ
diff --git a/android/res/drawable-hdpi/ic_update.png b/android/res/drawable-hdpi/ic_update.png
new file mode 100644
index 0000000000..91dcc73391
Binary files /dev/null and b/android/res/drawable-hdpi/ic_update.png differ
diff --git a/android/res/drawable-ldpi/ic_retry.png b/android/res/drawable-ldpi/ic_retry_failed.png
similarity index 100%
rename from android/res/drawable-ldpi/ic_retry.png
rename to android/res/drawable-ldpi/ic_retry_failed.png
diff --git a/android/res/drawable-mdpi/ic_bookmark_hide.png b/android/res/drawable-mdpi/ic_bookmark_hide.png
new file mode 100644
index 0000000000..7775f0e841
Binary files /dev/null and b/android/res/drawable-mdpi/ic_bookmark_hide.png differ
diff --git a/android/res/drawable-mdpi/ic_bookmark_show.png b/android/res/drawable-mdpi/ic_bookmark_show.png
new file mode 100644
index 0000000000..d0e4a3e84e
Binary files /dev/null and b/android/res/drawable-mdpi/ic_bookmark_show.png differ
diff --git a/android/res/drawable-mdpi/ic_cancel.png b/android/res/drawable-mdpi/ic_cancel.png
new file mode 100644
index 0000000000..f6cb6b64a8
Binary files /dev/null and b/android/res/drawable-mdpi/ic_cancel.png differ
diff --git a/android/res/drawable-mdpi/ic_delete.png b/android/res/drawable-mdpi/ic_delete.png
new file mode 100644
index 0000000000..059b7f9a48
Binary files /dev/null and b/android/res/drawable-mdpi/ic_delete.png differ
diff --git a/android/res/drawable-mdpi/ic_download_map.png b/android/res/drawable-mdpi/ic_download_map.png
new file mode 100644
index 0000000000..6afb26dc3f
Binary files /dev/null and b/android/res/drawable-mdpi/ic_download_map.png differ
diff --git a/android/res/drawable-mdpi/ic_download_routing.png b/android/res/drawable-mdpi/ic_download_routing.png
new file mode 100644
index 0000000000..496639be43
Binary files /dev/null and b/android/res/drawable-mdpi/ic_download_routing.png differ
diff --git a/android/res/drawable-mdpi/ic_edit.png b/android/res/drawable-mdpi/ic_edit.png
new file mode 100644
index 0000000000..1208d169cc
Binary files /dev/null and b/android/res/drawable-mdpi/ic_edit.png differ
diff --git a/android/res/drawable-mdpi/ic_explore.png b/android/res/drawable-mdpi/ic_explore.png
new file mode 100644
index 0000000000..5fed60daf7
Binary files /dev/null and b/android/res/drawable-mdpi/ic_explore.png differ
diff --git a/android/res/drawable-mdpi/ic_hide.png b/android/res/drawable-mdpi/ic_hide.png
index 7775f0e841..1e9f1c3f45 100644
Binary files a/android/res/drawable-mdpi/ic_hide.png and b/android/res/drawable-mdpi/ic_hide.png differ
diff --git a/android/res/drawable-mdpi/ic_no_routing.png b/android/res/drawable-mdpi/ic_no_routing.png
new file mode 100644
index 0000000000..f5c7e10599
Binary files /dev/null and b/android/res/drawable-mdpi/ic_no_routing.png differ
diff --git a/android/res/drawable-mdpi/ic_placepage_share.png b/android/res/drawable-mdpi/ic_placepage_share.png
new file mode 100644
index 0000000000..60673ecc99
Binary files /dev/null and b/android/res/drawable-mdpi/ic_placepage_share.png differ
diff --git a/android/res/drawable-mdpi/ic_retry.png b/android/res/drawable-mdpi/ic_retry.png
index d62b9b6384..b649e081a3 100644
Binary files a/android/res/drawable-mdpi/ic_retry.png and b/android/res/drawable-mdpi/ic_retry.png differ
diff --git a/android/res/drawable-mdpi/ic_retry_failed.png b/android/res/drawable-mdpi/ic_retry_failed.png
new file mode 100644
index 0000000000..d62b9b6384
Binary files /dev/null and b/android/res/drawable-mdpi/ic_retry_failed.png differ
diff --git a/android/res/drawable-mdpi/ic_share.png b/android/res/drawable-mdpi/ic_share.png
index 60673ecc99..157dc712d4 100644
Binary files a/android/res/drawable-mdpi/ic_share.png and b/android/res/drawable-mdpi/ic_share.png differ
diff --git a/android/res/drawable-mdpi/ic_share_email.png b/android/res/drawable-mdpi/ic_share_email.png
new file mode 100644
index 0000000000..2c60369224
Binary files /dev/null and b/android/res/drawable-mdpi/ic_share_email.png differ
diff --git a/android/res/drawable-mdpi/ic_share_message.png b/android/res/drawable-mdpi/ic_share_message.png
new file mode 100644
index 0000000000..0af64a3cbf
Binary files /dev/null and b/android/res/drawable-mdpi/ic_share_message.png differ
diff --git a/android/res/drawable-mdpi/ic_show.png b/android/res/drawable-mdpi/ic_show.png
index d0e4a3e84e..9c82c76293 100644
Binary files a/android/res/drawable-mdpi/ic_show.png and b/android/res/drawable-mdpi/ic_show.png differ
diff --git a/android/res/drawable-mdpi/ic_update.png b/android/res/drawable-mdpi/ic_update.png
new file mode 100644
index 0000000000..6df38e33f7
Binary files /dev/null and b/android/res/drawable-mdpi/ic_update.png differ
diff --git a/android/res/drawable-xhdpi/ic_bookmark_hide.png b/android/res/drawable-xhdpi/ic_bookmark_hide.png
new file mode 100644
index 0000000000..b5c0eed49e
Binary files /dev/null and b/android/res/drawable-xhdpi/ic_bookmark_hide.png differ
diff --git a/android/res/drawable-xhdpi/ic_bookmark_show.png b/android/res/drawable-xhdpi/ic_bookmark_show.png
new file mode 100644
index 0000000000..f507ca4f8d
Binary files /dev/null and b/android/res/drawable-xhdpi/ic_bookmark_show.png differ
diff --git a/android/res/drawable-xhdpi/ic_cancel.png b/android/res/drawable-xhdpi/ic_cancel.png
new file mode 100644
index 0000000000..25d53d3770
Binary files /dev/null and b/android/res/drawable-xhdpi/ic_cancel.png differ
diff --git a/android/res/drawable-xhdpi/ic_delete.png b/android/res/drawable-xhdpi/ic_delete.png
new file mode 100644
index 0000000000..4d7adaa475
Binary files /dev/null and b/android/res/drawable-xhdpi/ic_delete.png differ
diff --git a/android/res/drawable-xhdpi/ic_download_map.png b/android/res/drawable-xhdpi/ic_download_map.png
new file mode 100644
index 0000000000..acdeda9280
Binary files /dev/null and b/android/res/drawable-xhdpi/ic_download_map.png differ
diff --git a/android/res/drawable-xhdpi/ic_download_routing.png b/android/res/drawable-xhdpi/ic_download_routing.png
new file mode 100644
index 0000000000..614be02ffe
Binary files /dev/null and b/android/res/drawable-xhdpi/ic_download_routing.png differ
diff --git a/android/res/drawable-xhdpi/ic_edit.png b/android/res/drawable-xhdpi/ic_edit.png
new file mode 100644
index 0000000000..630901354b
Binary files /dev/null and b/android/res/drawable-xhdpi/ic_edit.png differ
diff --git a/android/res/drawable-xhdpi/ic_explore.png b/android/res/drawable-xhdpi/ic_explore.png
new file mode 100644
index 0000000000..731bf896d3
Binary files /dev/null and b/android/res/drawable-xhdpi/ic_explore.png differ
diff --git a/android/res/drawable-xhdpi/ic_hide.png b/android/res/drawable-xhdpi/ic_hide.png
index b5c0eed49e..85820ef23a 100644
Binary files a/android/res/drawable-xhdpi/ic_hide.png and b/android/res/drawable-xhdpi/ic_hide.png differ
diff --git a/android/res/drawable-xhdpi/ic_no_routing.png b/android/res/drawable-xhdpi/ic_no_routing.png
new file mode 100644
index 0000000000..1924ee508e
Binary files /dev/null and b/android/res/drawable-xhdpi/ic_no_routing.png differ
diff --git a/android/res/drawable-xhdpi/ic_placepage_share.png b/android/res/drawable-xhdpi/ic_placepage_share.png
new file mode 100644
index 0000000000..724e03929d
Binary files /dev/null and b/android/res/drawable-xhdpi/ic_placepage_share.png differ
diff --git a/android/res/drawable-xhdpi/ic_retry.png b/android/res/drawable-xhdpi/ic_retry.png
index 6b117f5ed3..5bc60ba7d9 100644
Binary files a/android/res/drawable-xhdpi/ic_retry.png and b/android/res/drawable-xhdpi/ic_retry.png differ
diff --git a/android/res/drawable-xhdpi/ic_retry_failed.png b/android/res/drawable-xhdpi/ic_retry_failed.png
new file mode 100644
index 0000000000..6b117f5ed3
Binary files /dev/null and b/android/res/drawable-xhdpi/ic_retry_failed.png differ
diff --git a/android/res/drawable-xhdpi/ic_share.png b/android/res/drawable-xhdpi/ic_share.png
index 724e03929d..e134d02c04 100644
Binary files a/android/res/drawable-xhdpi/ic_share.png and b/android/res/drawable-xhdpi/ic_share.png differ
diff --git a/android/res/drawable-xhdpi/ic_share_email.png b/android/res/drawable-xhdpi/ic_share_email.png
new file mode 100644
index 0000000000..1eff64f058
Binary files /dev/null and b/android/res/drawable-xhdpi/ic_share_email.png differ
diff --git a/android/res/drawable-xhdpi/ic_share_message.png b/android/res/drawable-xhdpi/ic_share_message.png
new file mode 100644
index 0000000000..d3038b8620
Binary files /dev/null and b/android/res/drawable-xhdpi/ic_share_message.png differ
diff --git a/android/res/drawable-xhdpi/ic_show.png b/android/res/drawable-xhdpi/ic_show.png
index f507ca4f8d..512cc22fb5 100644
Binary files a/android/res/drawable-xhdpi/ic_show.png and b/android/res/drawable-xhdpi/ic_show.png differ
diff --git a/android/res/drawable-xhdpi/ic_update.png b/android/res/drawable-xhdpi/ic_update.png
new file mode 100644
index 0000000000..c9853fc24b
Binary files /dev/null and b/android/res/drawable-xhdpi/ic_update.png differ
diff --git a/android/res/drawable-xxhdpi/ic_bookmark_hide.png b/android/res/drawable-xxhdpi/ic_bookmark_hide.png
new file mode 100644
index 0000000000..c9f00c8ff2
Binary files /dev/null and b/android/res/drawable-xxhdpi/ic_bookmark_hide.png differ
diff --git a/android/res/drawable-xxhdpi/ic_bookmark_show.png b/android/res/drawable-xxhdpi/ic_bookmark_show.png
new file mode 100644
index 0000000000..3f06bf7d7b
Binary files /dev/null and b/android/res/drawable-xxhdpi/ic_bookmark_show.png differ
diff --git a/android/res/drawable-xxhdpi/ic_cancel.png b/android/res/drawable-xxhdpi/ic_cancel.png
new file mode 100644
index 0000000000..6327ce837f
Binary files /dev/null and b/android/res/drawable-xxhdpi/ic_cancel.png differ
diff --git a/android/res/drawable-xxhdpi/ic_delete.png b/android/res/drawable-xxhdpi/ic_delete.png
new file mode 100644
index 0000000000..94d85f78e2
Binary files /dev/null and b/android/res/drawable-xxhdpi/ic_delete.png differ
diff --git a/android/res/drawable-xxhdpi/ic_download_map.png b/android/res/drawable-xxhdpi/ic_download_map.png
new file mode 100644
index 0000000000..8580fdfe83
Binary files /dev/null and b/android/res/drawable-xxhdpi/ic_download_map.png differ
diff --git a/android/res/drawable-xxhdpi/ic_download_routing.png b/android/res/drawable-xxhdpi/ic_download_routing.png
new file mode 100644
index 0000000000..43a934ab4a
Binary files /dev/null and b/android/res/drawable-xxhdpi/ic_download_routing.png differ
diff --git a/android/res/drawable-xxhdpi/ic_edit.png b/android/res/drawable-xxhdpi/ic_edit.png
new file mode 100644
index 0000000000..511dc693e5
Binary files /dev/null and b/android/res/drawable-xxhdpi/ic_edit.png differ
diff --git a/android/res/drawable-xxhdpi/ic_explore.png b/android/res/drawable-xxhdpi/ic_explore.png
new file mode 100644
index 0000000000..6e5542061d
Binary files /dev/null and b/android/res/drawable-xxhdpi/ic_explore.png differ
diff --git a/android/res/drawable-xxhdpi/ic_hide.png b/android/res/drawable-xxhdpi/ic_hide.png
index c9f00c8ff2..30a0de16ab 100644
Binary files a/android/res/drawable-xxhdpi/ic_hide.png and b/android/res/drawable-xxhdpi/ic_hide.png differ
diff --git a/android/res/drawable-xxhdpi/ic_no_routing.png b/android/res/drawable-xxhdpi/ic_no_routing.png
new file mode 100644
index 0000000000..14f52e9622
Binary files /dev/null and b/android/res/drawable-xxhdpi/ic_no_routing.png differ
diff --git a/android/res/drawable-xxhdpi/ic_placepage_share.png b/android/res/drawable-xxhdpi/ic_placepage_share.png
new file mode 100644
index 0000000000..c6ded17bee
Binary files /dev/null and b/android/res/drawable-xxhdpi/ic_placepage_share.png differ
diff --git a/android/res/drawable-xxhdpi/ic_retry.png b/android/res/drawable-xxhdpi/ic_retry.png
index 453d65d590..d668b38e9d 100644
Binary files a/android/res/drawable-xxhdpi/ic_retry.png and b/android/res/drawable-xxhdpi/ic_retry.png differ
diff --git a/android/res/drawable-xxhdpi/ic_retry_failed.png b/android/res/drawable-xxhdpi/ic_retry_failed.png
new file mode 100644
index 0000000000..453d65d590
Binary files /dev/null and b/android/res/drawable-xxhdpi/ic_retry_failed.png differ
diff --git a/android/res/drawable-xxhdpi/ic_share.png b/android/res/drawable-xxhdpi/ic_share.png
index c6ded17bee..3dd39004cd 100644
Binary files a/android/res/drawable-xxhdpi/ic_share.png and b/android/res/drawable-xxhdpi/ic_share.png differ
diff --git a/android/res/drawable-xxhdpi/ic_share_email.png b/android/res/drawable-xxhdpi/ic_share_email.png
new file mode 100644
index 0000000000..9cbb2e3217
Binary files /dev/null and b/android/res/drawable-xxhdpi/ic_share_email.png differ
diff --git a/android/res/drawable-xxhdpi/ic_share_message.png b/android/res/drawable-xxhdpi/ic_share_message.png
new file mode 100644
index 0000000000..f87f2baae6
Binary files /dev/null and b/android/res/drawable-xxhdpi/ic_share_message.png differ
diff --git a/android/res/drawable-xxhdpi/ic_show.png b/android/res/drawable-xxhdpi/ic_show.png
index 3f06bf7d7b..04b9f2e8b7 100644
Binary files a/android/res/drawable-xxhdpi/ic_show.png and b/android/res/drawable-xxhdpi/ic_show.png differ
diff --git a/android/res/drawable-xxhdpi/ic_update.png b/android/res/drawable-xxhdpi/ic_update.png
new file mode 100644
index 0000000000..0d8d5f58d0
Binary files /dev/null and b/android/res/drawable-xxhdpi/ic_update.png differ
diff --git a/android/res/drawable-xxxhdpi/ic_cancel.png b/android/res/drawable-xxxhdpi/ic_cancel.png
new file mode 100644
index 0000000000..b10f121e64
Binary files /dev/null and b/android/res/drawable-xxxhdpi/ic_cancel.png differ
diff --git a/android/res/drawable-xxxhdpi/ic_delete.png b/android/res/drawable-xxxhdpi/ic_delete.png
new file mode 100644
index 0000000000..249b5239be
Binary files /dev/null and b/android/res/drawable-xxxhdpi/ic_delete.png differ
diff --git a/android/res/drawable-xxxhdpi/ic_download_map.png b/android/res/drawable-xxxhdpi/ic_download_map.png
new file mode 100644
index 0000000000..5428014572
Binary files /dev/null and b/android/res/drawable-xxxhdpi/ic_download_map.png differ
diff --git a/android/res/drawable-xxxhdpi/ic_download_routing.png b/android/res/drawable-xxxhdpi/ic_download_routing.png
new file mode 100644
index 0000000000..0c96d50532
Binary files /dev/null and b/android/res/drawable-xxxhdpi/ic_download_routing.png differ
diff --git a/android/res/drawable-xxxhdpi/ic_edit.png b/android/res/drawable-xxxhdpi/ic_edit.png
new file mode 100644
index 0000000000..b1236a9a1b
Binary files /dev/null and b/android/res/drawable-xxxhdpi/ic_edit.png differ
diff --git a/android/res/drawable-xxxhdpi/ic_explore.png b/android/res/drawable-xxxhdpi/ic_explore.png
new file mode 100644
index 0000000000..2f922f890a
Binary files /dev/null and b/android/res/drawable-xxxhdpi/ic_explore.png differ
diff --git a/android/res/drawable-xxxhdpi/ic_hide.png b/android/res/drawable-xxxhdpi/ic_hide.png
new file mode 100644
index 0000000000..9c2659b43b
Binary files /dev/null and b/android/res/drawable-xxxhdpi/ic_hide.png differ
diff --git a/android/res/drawable-xxxhdpi/ic_no_routing.png b/android/res/drawable-xxxhdpi/ic_no_routing.png
new file mode 100644
index 0000000000..af640d2630
Binary files /dev/null and b/android/res/drawable-xxxhdpi/ic_no_routing.png differ
diff --git a/android/res/drawable-xxxhdpi/ic_retry.png b/android/res/drawable-xxxhdpi/ic_retry.png
new file mode 100644
index 0000000000..94e768ac7c
Binary files /dev/null and b/android/res/drawable-xxxhdpi/ic_retry.png differ
diff --git a/android/res/drawable-xxxhdpi/ic_share.png b/android/res/drawable-xxxhdpi/ic_share.png
new file mode 100644
index 0000000000..5736c321fb
Binary files /dev/null and b/android/res/drawable-xxxhdpi/ic_share.png differ
diff --git a/android/res/drawable-xxxhdpi/ic_share_email.png b/android/res/drawable-xxxhdpi/ic_share_email.png
new file mode 100644
index 0000000000..0a06d04dac
Binary files /dev/null and b/android/res/drawable-xxxhdpi/ic_share_email.png differ
diff --git a/android/res/drawable-xxxhdpi/ic_share_message.png b/android/res/drawable-xxxhdpi/ic_share_message.png
new file mode 100644
index 0000000000..e34e8cb0d9
Binary files /dev/null and b/android/res/drawable-xxxhdpi/ic_share_message.png differ
diff --git a/android/res/drawable-xxxhdpi/ic_show.png b/android/res/drawable-xxxhdpi/ic_show.png
new file mode 100644
index 0000000000..7a8b563d15
Binary files /dev/null and b/android/res/drawable-xxxhdpi/ic_show.png differ
diff --git a/android/res/drawable-xxxhdpi/ic_update.png b/android/res/drawable-xxxhdpi/ic_update.png
new file mode 100644
index 0000000000..5345b2ae1c
Binary files /dev/null and b/android/res/drawable-xxxhdpi/ic_update.png differ
diff --git a/android/res/drawable/btn_bookmark_visibility.xml b/android/res/drawable/btn_bookmark_visibility.xml
deleted file mode 100644
index d6ddbfa6b6..0000000000
--- a/android/res/drawable/btn_bookmark_visibility.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android" >
-    <item android:state_checked="true"
-          android:drawable="@drawable/ic_show" />
-    <item android:drawable="@drawable/ic_hide" />
-</selector>
\ No newline at end of file
diff --git a/android/res/layout/fragment_bookmark_categories.xml b/android/res/layout/fragment_bookmark_categories.xml
deleted file mode 100644
index 14a2a5a54a..0000000000
--- a/android/res/layout/fragment_bookmark_categories.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:layout_width="match_parent"
-              android:layout_height="wrap_content"
-              android:orientation="vertical">
-
-  <ListView
-      android:id="@android:id/list"
-      android:layout_width="match_parent"
-      android:layout_height="match_parent"
-      android:divider="@null"/>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/android/res/layout/fragment_bookmarks_list.xml b/android/res/layout/fragment_bookmarks_list.xml
deleted file mode 100644
index a4329feb2a..0000000000
--- a/android/res/layout/fragment_bookmarks_list.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ListView
-    android:id="@android:id/list"
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:divider="@null"/>
\ No newline at end of file
diff --git a/android/res/layout/item_bookmark_category.xml b/android/res/layout/item_bookmark_category.xml
index ee6bed865a..37db772131 100644
--- a/android/res/layout/item_bookmark_category.xml
+++ b/android/res/layout/item_bookmark_category.xml
@@ -1,20 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              xmlns:tools="http://schemas.android.com/tools"
               android:layout_width="match_parent"
               android:layout_height="wrap_content"
               android:gravity="center_vertical"
               android:minHeight="@dimen/height_item_oneline"
-              android:paddingLeft="@dimen/margin_base"
+              android:paddingLeft="0dp"
               android:paddingRight="@dimen/margin_base">
 
-  <CheckBox
-      android:id="@+id/chb__set_visible"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
+  <ImageView
+      android:id="@+id/set_visible"
+      android:layout_width="@dimen/height_item_oneline"
+      android:layout_height="@dimen/height_item_oneline"
       android:layout_weight="0"
-      android:background="@null"
-      android:button="@drawable/btn_bookmark_visibility"
-      android:focusable="false"/>
+      android:scaleType="center"
+      android:background="?clickableBackground"
+      tools:src="@drawable/ic_bookmark_show"/>
 
   <TextView
       android:id="@+id/tv__set_name"
@@ -24,7 +25,8 @@
       android:layout_weight="1"
       android:ellipsize="marquee"
       android:singleLine="true"
-      android:textAppearance="@style/MwmTextAppearance.Body1"/>
+      android:textAppearance="@style/MwmTextAppearance.Body1"
+      tools:text="Bookmark name"/>
 
   <TextView
       android:id="@+id/tv__set_size"
@@ -32,6 +34,7 @@
       android:layout_height="wrap_content"
       android:layout_weight="0"
       android:gravity="right"
-      android:textAppearance="@style/MwmTextAppearance.Body2"/>
+      android:textAppearance="@style/MwmTextAppearance.Body2"
+      tools:text="42"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/android/res/layout/place_page_buttons.xml b/android/res/layout/place_page_buttons.xml
index 40da398acd..54fb86a5ec 100644
--- a/android/res/layout/place_page_buttons.xml
+++ b/android/res/layout/place_page_buttons.xml
@@ -48,7 +48,7 @@
           android:id="@+id/iv__share"
           style="@style/PlacePageButtonImage"
           android:contentDescription="@string/share"
-          android:src="@drawable/ic_share"/>
+          android:src="@drawable/ic_placepage_share"/>
 
       <TextView
           android:id="@+id/tv__share"
diff --git a/android/res/layout/simple_list.xml b/android/res/layout/simple_list.xml
new file mode 100644
index 0000000000..964b50ad8b
--- /dev/null
+++ b/android/res/layout/simple_list.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ListView xmlns:android="http://schemas.android.com/apk/res/android"
+          android:id="@android:id/list"
+          android:layout_width="match_parent"
+          android:layout_height="match_parent"
+          android:divider="@null"/>
\ No newline at end of file
diff --git a/android/res/menu/menu_bookmark_categories.xml b/android/res/menu/menu_bookmark_categories.xml
index 6bf8640eaa..d1b804d23b 100644
--- a/android/res/menu/menu_bookmark_categories.xml
+++ b/android/res/menu/menu_bookmark_categories.xml
@@ -1,10 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
+  <item android:id="@+id/set_show"/>
 
-  <item
-      android:id="@+id/set_edit"
-      android:title="@string/edit"/>
-  <item
-      android:id="@+id/set_delete"
-      android:title="@string/delete"/>
+  <item android:id="@+id/set_share"
+        android:title="@string/share"
+        android:icon="@drawable/ic_share"/>
 
+  <item android:id="@+id/set_edit"
+        android:title="@string/rename"
+        android:icon="@drawable/ic_edit"/>
+
+  <item android:id="@+id/set_delete"
+        android:title="@string/delete"
+        android:icon="@drawable/ic_delete"/>
 </menu>
\ No newline at end of file
diff --git a/android/res/menu/menu_bookmarks.xml b/android/res/menu/menu_bookmarks.xml
index cc77a66220..d79c773b87 100644
--- a/android/res/menu/menu_bookmarks.xml
+++ b/android/res/menu/menu_bookmarks.xml
@@ -1,7 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
+  <item android:id="@+id/share_message"
+        android:title="@string/share_by_message"
+        android:icon="@drawable/ic_share_message"/>
 
-  <item android:id="@+id/set_edit" android:title="@string/edit"/>
-  <item android:id="@+id/set_delete" android:title="@string/delete"/>
+  <item android:id="@+id/share_email"
+        android:title="@string/share_by_email"
+        android:icon="@drawable/ic_share_email"/>
 
+  <item android:id="@+id/share"
+        android:title="@string/share"
+        android:icon="@drawable/ic_share"/>
+
+  <item android:id="@+id/edit"
+        android:title="@string/edit"
+        android:icon="@drawable/ic_edit"/>
+
+  <item android:id="@+id/delete"
+        android:title="@string/delete"
+        android:icon="@drawable/ic_delete"/>
 </menu>
\ No newline at end of file
diff --git a/android/res/values/integer.xml b/android/res/values/integer.xml
index 50098c5c55..108898e060 100644
--- a/android/res/values/integer.xml
+++ b/android/res/values/integer.xml
@@ -3,4 +3,5 @@
 
   <integer name="pp_title_lines">5</integer>
 
+  <integer name="sharing_initial_rows">2</integer>
 </resources>
\ No newline at end of file
diff --git a/android/res/values/styles.xml b/android/res/values/styles.xml
index 1220748969..71c54855f3 100644
--- a/android/res/values/styles.xml
+++ b/android/res/values/styles.xml
@@ -19,6 +19,17 @@
     <item name="android:fontFamily" tools:targetApi="jelly_bean">@string/robotoRegular</item>
   </style>
 
+  <style name="MwmTheme.BottomSheet.Dialog" parent="BottomSheet.Dialog">
+    <item name="bs_listItemTitleTextAppearance">@style/MwmTextAppearance.Body1</item>
+    <item name="bs_gridItemTitleTextAppearance">@style/MwmTextAppearance.Body3</item>
+  </style>
+
+  <style name="BottomSheet.Icon">
+    <item name="android:layout_width">0dp</item>
+    <item name="android:layout_height">0dp</item>
+    <item name="android:layout_marginLeft">0dp</item>
+  </style>
+
   <style name="MwmTheme.Map">
     <item name="android:colorPrimaryDark">@android:color/black</item>
     <item name="android:windowBackground">@null</item>
diff --git a/android/src/com/mapswithme/country/BaseDownloadAdapter.java b/android/src/com/mapswithme/country/BaseDownloadAdapter.java
index 60ea070ed0..d84f7d40af 100644
--- a/android/src/com/mapswithme/country/BaseDownloadAdapter.java
+++ b/android/src/com/mapswithme/country/BaseDownloadAdapter.java
@@ -6,13 +6,10 @@ import android.graphics.BitmapFactory;
 import android.os.Build;
 import android.os.Handler;
 import android.support.v7.app.AlertDialog;
-import android.view.ContextMenu;
-import android.view.ContextMenu.ContextMenuInfo;
 import android.view.LayoutInflater;
 import android.view.MenuItem;
 import android.view.MenuItem.OnMenuItemClickListener;
 import android.view.View;
-import android.view.View.OnCreateContextMenuListener;
 import android.view.ViewGroup;
 import android.widget.BaseAdapter;
 import android.widget.ImageView;
@@ -20,10 +17,12 @@ import android.widget.LinearLayout;
 import android.widget.ListView;
 import android.widget.TextView;
 
+import com.cocosw.bottomsheet.BottomSheet;
 import com.mapswithme.maps.MapStorage;
 import com.mapswithme.maps.R;
 import com.mapswithme.maps.downloader.DownloadHelper;
 import com.mapswithme.maps.widget.WheelProgressView;
+import com.mapswithme.util.BottomSheetHelper;
 import com.mapswithme.util.StringUtils;
 import com.mapswithme.util.UiUtils;
 import com.mapswithme.util.Utils;
@@ -50,7 +49,7 @@ public abstract class BaseDownloadAdapter extends BaseAdapter
   public static final String PROPERTY_ALPHA = "alpha";
   public static final String PROPERTY_X = "x";
   private static final long ANIMATION_LENGTH = 250;
-  private Handler mHandler = new Handler();
+  private final Handler mHandler = new Handler();
   private ListView mListView;
 
   private static class SafeAdapterRunnable implements Runnable
@@ -442,7 +441,7 @@ public abstract class BaseDownloadAdapter extends BaseAdapter
       holder.mProgressSlided.setOnClickListener(listener);
       holder.mInfoSlided.setOnClickListener(listener);
       holder.mProgressSlided.setProgressColor(mFragment.getResources().getColor(R.color.base_red));
-      holder.mProgressSlided.setCenterBitmap(BitmapFactory.decodeResource(mFragment.getResources(), R.drawable.ic_retry));
+      holder.mProgressSlided.setCenterBitmap(BitmapFactory.decodeResource(mFragment.getResources(), R.drawable.ic_retry_failed));
 
       sizes = getDownloadableItemSizes(position);
       setHolderSizeString(holder, 0, sizes[1]);
@@ -732,7 +731,7 @@ public abstract class BaseDownloadAdapter extends BaseAdapter
 
   protected void showCountryContextMenu(final CountryItem countryItem, final View anchor, final int position)
   {
-    if (countryItem == null)
+    if (countryItem == null || anchor.getParent() == null)
       return;
 
     final int MENU_CANCEL = 0;
@@ -751,7 +750,7 @@ public abstract class BaseDownloadAdapter extends BaseAdapter
     final String name = countryItem.getName();
     final int options = countryItem.getOptions();
 
-    final OnMenuItemClickListener menuItemClickListener = new OnMenuItemClickListener()
+    OnMenuItemClickListener menuItemClickListener = new OnMenuItemClickListener()
     {
       @Override
       public boolean onMenuItemClick(MenuItem item)
@@ -800,95 +799,72 @@ public abstract class BaseDownloadAdapter extends BaseAdapter
       }
     };
 
-    if (anchor.getParent() != null) // if view is out of list parent is null and context menu cannot bo shown
+    long[] remoteSizes = getRemoteItemSizes(position);
+
+    BottomSheet.Builder bs = BottomSheetHelper.create(mFragment.getActivity())
+                                              .title(name)
+                                              .listener(menuItemClickListener);
+
+    if (status == MapStorage.ON_DISK_OUT_OF_DATE)
     {
-      anchor.setOnCreateContextMenuListener(new OnCreateContextMenuListener()
+      switch (options)
       {
-        @Override
-        public void onCreateContextMenu(ContextMenu menu, View v, ContextMenuInfo menuInfo)
-        {
-          menu.setHeaderTitle(countryItem.getName());
+      case StorageOptions.MAP_OPTION_MAP_ONLY:
+        BottomSheetHelper.sheet(bs, MENU_UPDATE_MAP_DOWNLOAD_ROUTING, R.drawable.ic_download_routing,
+                                mFragment.getString(R.string.downloader_download_routing) + ", " +
+                                StringUtils.getFileSizeString(remoteSizes[1]));
 
-          final long[] remoteSizes = getRemoteItemSizes(position);
-          if (status == MapStorage.ON_DISK || status == MapStorage.ON_DISK_OUT_OF_DATE)
-          {
-            String titleDelete = mFragment.getString(R.string.downloader_delete_map);
-            menu.add(0, MENU_DELETE, MENU_DELETE, titleDelete).setOnMenuItemClickListener(menuItemClickListener);
+        BottomSheetHelper.sheet(bs, MENU_UPDATE, R.drawable.ic_update,
+                                mFragment.getString(R.string.downloader_update_map) + ", " +
+                                StringUtils.getFileSizeString(remoteSizes[0]));
+        break;
 
-            if (options != StorageOptions.MAP_OPTION_MAP_ONLY)
-            {
-              titleDelete = mFragment.getString(R.string.downloader_delete_routing);
-              menu.add(0, MENU_DELETE_ROUTING, MENU_DELETE_ROUTING, titleDelete).setOnMenuItemClickListener(menuItemClickListener);
-            }
-
-            final String titleShow = mFragment.getString(R.string.zoom_to_country);
-            menu.add(0, MENU_SHOW, MENU_SHOW, titleShow).setOnMenuItemClickListener(menuItemClickListener);
-          }
-
-          if (status == MapStorage.ON_DISK && options == StorageOptions.MAP_OPTION_MAP_ONLY)
-          {
-            final String titleShow = mFragment.getString(R.string.downloader_download_routing) + ", " + StringUtils.getFileSizeString(remoteSizes[1] - remoteSizes[0]);
-            menu.add(0, MENU_DOWNLOAD_ROUTING, MENU_DOWNLOAD_ROUTING, titleShow).setOnMenuItemClickListener(menuItemClickListener);
-          }
-
-          if (status == MapStorage.ON_DISK_OUT_OF_DATE)
-          {
-            String titleUpdate;
-
-            switch (options)
-            {
-            case StorageOptions.MAP_OPTION_MAP_ONLY:
-              titleUpdate = mFragment.getString(R.string.downloader_update_map) + ", " + StringUtils.getFileSizeString(remoteSizes[0]);
-              menu.add(0, MENU_UPDATE, MENU_UPDATE, titleUpdate)
-                  .setOnMenuItemClickListener(menuItemClickListener);
-
-              titleUpdate = mFragment.getString(R.string.downloader_download_routing) + ", " + StringUtils.getFileSizeString(remoteSizes[1]);
-              menu.add(0, MENU_UPDATE_MAP_DOWNLOAD_ROUTING, MENU_UPDATE_MAP_DOWNLOAD_ROUTING, titleUpdate)
-                  .setOnMenuItemClickListener(menuItemClickListener);
-              break;
-
-            case StorageOptions.MAP_OPTION_MAP_AND_CAR_ROUTING:
-              titleUpdate = mFragment.getString(R.string.downloader_update_map) + ", " + StringUtils.getFileSizeString(remoteSizes[1]);
-              menu.add(0, MENU_UPDATE_MAP_AND_ROUTING, MENU_UPDATE_MAP_AND_ROUTING, titleUpdate)
-                  .setOnMenuItemClickListener(menuItemClickListener);
-              break;
-            }
-          }
-
-          switch (status)
-          {
-          case MapStorage.DOWNLOADING:
-          case MapStorage.IN_QUEUE:
-            menu.add(0, MENU_CANCEL, MENU_CANCEL, mFragment.getString(R.string.cancel_download))
-                .setOnMenuItemClickListener(menuItemClickListener);
-            break;
-
-          case MapStorage.NOT_DOWNLOADED:
-            String title = mFragment.getString(R.string.downloader_download_map) + ", " + StringUtils.getFileSizeString(remoteSizes[0]);
-            menu.add(0, MENU_DOWNLOAD, MENU_DOWNLOAD, title)
-                .setOnMenuItemClickListener(menuItemClickListener);
-
-            title = mFragment.getString(R.string.downloader_download_map_and_routing) + ", " + StringUtils.getFileSizeString(remoteSizes[1]);
-            menu.add(0, MENU_DOWNLOAD_MAP_AND_ROUTING, MENU_DOWNLOAD_MAP_AND_ROUTING, title)
-                .setOnMenuItemClickListener(menuItemClickListener);
-            break;
-
-          case MapStorage.DOWNLOAD_FAILED:
-            title = mFragment.getString(R.string.downloader_retry);
-            menu.add(0, MENU_RETRY, MENU_DOWNLOAD, title)
-                .setOnMenuItemClickListener(menuItemClickListener);
-
-            title = mFragment.getString(R.string.downloader_download_map_and_routing);
-            menu.add(0, MENU_DOWNLOAD_MAP_AND_ROUTING, MENU_DOWNLOAD_MAP_AND_ROUTING, title)
-                .setOnMenuItemClickListener(menuItemClickListener);
-
-            break;
-          }
-        }
-      });
-
-      anchor.showContextMenu();
-      anchor.setOnCreateContextMenuListener(null);
+      case StorageOptions.MAP_OPTION_MAP_AND_CAR_ROUTING:
+        BottomSheetHelper.sheet(bs, MENU_UPDATE_MAP_AND_ROUTING, R.drawable.ic_update,
+                                mFragment.getString(R.string.downloader_update_map) + ", " +
+                                StringUtils.getFileSizeString(remoteSizes[1]));
+        break;
+      }
     }
+
+    if (status == MapStorage.ON_DISK && options == StorageOptions.MAP_OPTION_MAP_ONLY)
+      BottomSheetHelper.sheet(bs, MENU_DOWNLOAD_ROUTING, R.drawable.ic_download_routing,
+                              mFragment.getString(R.string.downloader_download_routing) + ", " +
+                              StringUtils.getFileSizeString(remoteSizes[1] - remoteSizes[0]));
+
+    if (status == MapStorage.ON_DISK || status == MapStorage.ON_DISK_OUT_OF_DATE)
+    {
+      bs.sheet(MENU_SHOW, R.drawable.ic_explore, R.string.zoom_to_country);
+
+      if (options != StorageOptions.MAP_OPTION_MAP_ONLY)
+        bs.sheet(MENU_DELETE_ROUTING, R.drawable.ic_no_routing, R.string.downloader_delete_routing);
+
+      bs.sheet(MENU_DELETE, R.drawable.ic_delete, R.string.downloader_delete_map);
+    }
+
+    switch (status)
+    {
+    case MapStorage.DOWNLOADING:
+    case MapStorage.IN_QUEUE:
+      bs.sheet(MENU_CANCEL, R.drawable.ic_cancel, R.string.cancel_download);
+      break;
+
+    case MapStorage.NOT_DOWNLOADED:
+      BottomSheetHelper.sheet(bs, MENU_DOWNLOAD_MAP_AND_ROUTING, R.drawable.ic_download_map,
+                              mFragment.getString(R.string.downloader_download_map) + ", " +
+                              StringUtils.getFileSizeString(remoteSizes[1]));
+
+      BottomSheetHelper.sheet(bs, MENU_DOWNLOAD, R.drawable.ic_no_routing,
+                              mFragment.getString(R.string.downloader_download_map_no_routing) + ", " +
+                              StringUtils.getFileSizeString(remoteSizes[0]));
+      break;
+
+    case MapStorage.DOWNLOAD_FAILED:
+      bs.sheet(MENU_RETRY, R.drawable.ic_retry, R.string.downloader_retry);
+      bs.sheet(MENU_DOWNLOAD_MAP_AND_ROUTING, R.drawable.ic_download_routing, R.string.downloader_download_map_and_routing);
+      break;
+    }
+
+    bs.show();
   }
 }
diff --git a/android/src/com/mapswithme/maps/MWMActivity.java b/android/src/com/mapswithme/maps/MWMActivity.java
index 7f95409cc1..a2c10caeb1 100644
--- a/android/src/com/mapswithme/maps/MWMActivity.java
+++ b/android/src/com/mapswithme/maps/MWMActivity.java
@@ -70,13 +70,15 @@ import com.mapswithme.maps.widget.FadeView;
 import com.mapswithme.maps.widget.placepage.BasePlacePageAnimationController;
 import com.mapswithme.maps.widget.placepage.PlacePageView;
 import com.mapswithme.maps.widget.placepage.PlacePageView.State;
+import com.mapswithme.util.BottomSheetHelper;
 import com.mapswithme.util.Constants;
 import com.mapswithme.util.InputUtils;
 import com.mapswithme.util.LocationUtils;
-import com.mapswithme.util.ShareAction;
+import com.mapswithme.util.sharing.ShareAction;
 import com.mapswithme.util.UiUtils;
 import com.mapswithme.util.Utils;
 import com.mapswithme.util.Yota;
+import com.mapswithme.util.sharing.SharingHelper;
 import com.mapswithme.util.statistics.AlohaHelper;
 import com.mapswithme.util.statistics.Statistics;
 import com.nineoldandroids.animation.Animator;
@@ -438,7 +440,7 @@ public class MWMActivity extends BaseMwmFragmentActivity
       final String httpUrl = Framework.getHttpGe0Url(loc.getLatitude(), loc.getLongitude(), Framework.getDrawScale(), "");
       final String body = getString(R.string.my_position_share_sms, geoUrl, httpUrl);
       // we use shortest message we can have here
-      ShareAction.getAnyShare().shareWithText(this, body, "");
+      ShareAction.AnyShareAction.share(this, body);
     }
     else
     {
@@ -509,6 +511,8 @@ public class MWMActivity extends BaseMwmFragmentActivity
     mLocationPredictor = new LocationPredictor(new Handler(), this);
     mLikesManager = new LikesManager(this);
     restoreRoutingState(savedInstanceState);
+
+    SharingHelper.prepare();
   }
 
   private void restoreRoutingState(@Nullable Bundle savedInstanceState)
@@ -645,7 +649,7 @@ public class MWMActivity extends BaseMwmFragmentActivity
   public void onDestroy()
   {
     Framework.nativeClearBalloonListeners();
-
+    BottomSheetHelper.free();
     super.onDestroy();
   }
 
diff --git a/android/src/com/mapswithme/maps/MWMApplication.java b/android/src/com/mapswithme/maps/MWMApplication.java
index bba187262a..57c8a987a0 100644
--- a/android/src/com/mapswithme/maps/MWMApplication.java
+++ b/android/src/com/mapswithme/maps/MWMApplication.java
@@ -8,6 +8,7 @@ import android.text.TextUtils;
 import android.text.format.DateUtils;
 import android.util.Log;
 
+import com.google.gsonaltered.Gson;
 import com.mapswithme.country.ActiveCountryTree;
 import com.mapswithme.country.CountryItem;
 import com.mapswithme.maps.background.Notifier;
@@ -40,6 +41,7 @@ public class MWMApplication extends android.app.Application implements ActiveCou
   private static final String IS_PREINSTALL_ACTIVATED = "PreinstallActivated";
 
   private static MWMApplication mSelf;
+  private final Gson mGson = new Gson();
 
   private boolean mAreStatsInitialised;
 
@@ -54,6 +56,11 @@ public class MWMApplication extends android.app.Application implements ActiveCou
     return mSelf;
   }
 
+  public static Gson gson()
+  {
+    return mSelf.mGson;
+  }
+
   @Override
   public void onCountryProgressChanged(int group, int position, long[] sizes) {}
 
@@ -131,7 +138,7 @@ public class MWMApplication extends android.app.Application implements ActiveCou
     nativeAddLocalization("routing_failed_internal_error", getString(R.string.routing_failed_internal_error));
 
     // init BookmarkManager (automatically loads bookmarks)
-    BookmarkManager.INSTANCE.getIcons();
+    BookmarkManager.getIcons();
 
     initParse();
   }
diff --git a/android/src/com/mapswithme/maps/bookmarks/BookmarkCategoriesAdapter.java b/android/src/com/mapswithme/maps/bookmarks/BookmarkCategoriesAdapter.java
index 96b0538ace..4a99ef8f52 100644
--- a/android/src/com/mapswithme/maps/bookmarks/BookmarkCategoriesAdapter.java
+++ b/android/src/com/mapswithme/maps/bookmarks/BookmarkCategoriesAdapter.java
@@ -4,7 +4,7 @@ import android.content.Context;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.CheckBox;
+import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.mapswithme.maps.R;
@@ -67,15 +67,14 @@ public class BookmarkCategoriesAdapter extends AbstractBookmarkCategoryAdapter
     final BookmarkCategory set = getItem(position);
     holder.name.setText(set.getName());
     holder.size.setText(String.valueOf(set.getSize()));
-    holder.visibilityCheckBox.setChecked(set.isVisible());
-    holder.visibilityCheckBox.setOnClickListener(new View.OnClickListener()
+    holder.setVisibilityState(set.isVisible());
+    holder.visibilityMarker.setOnClickListener(new View.OnClickListener()
     {
       @Override
       public void onClick(View v)
       {
-        final BookmarkCategory category = BookmarkManager.INSTANCE.getCategoryById(position);
-        if (category != null)
-          category.setVisibility(holder.visibilityCheckBox.isChecked());
+        BookmarkManager.INSTANCE.toggleCategoryVisibility(position);
+        holder.setVisibilityState(set.isVisible());
       }
     });
 
@@ -86,14 +85,20 @@ public class BookmarkCategoriesAdapter extends AbstractBookmarkCategoryAdapter
   static class ViewHolder
   {
     TextView name;
-    CheckBox visibilityCheckBox;
+    ImageView visibilityMarker;
     TextView size;
 
     public ViewHolder(View root)
     {
       name = (TextView) root.findViewById(R.id.tv__set_name);
-      visibilityCheckBox = (CheckBox) root.findViewById(R.id.chb__set_visible);
+      visibilityMarker = (ImageView) root.findViewById(R.id.set_visible);
       size = (TextView) root.findViewById(R.id.tv__set_size);
     }
+
+    void setVisibilityState(boolean visible)
+    {
+      visibilityMarker.setImageResource(visible ? R.drawable.ic_bookmark_show
+                                                : R.drawable.ic_bookmark_hide);
+    }
   }
 }
diff --git a/android/src/com/mapswithme/maps/bookmarks/BookmarkCategoriesFragment.java b/android/src/com/mapswithme/maps/bookmarks/BookmarkCategoriesFragment.java
index cc2b143ce3..90a300e78d 100644
--- a/android/src/com/mapswithme/maps/bookmarks/BookmarkCategoriesFragment.java
+++ b/android/src/com/mapswithme/maps/bookmarks/BookmarkCategoriesFragment.java
@@ -3,7 +3,6 @@ package com.mapswithme.maps.bookmarks;
 import android.content.Intent;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
-import android.view.ContextMenu;
 import android.view.LayoutInflater;
 import android.view.MenuItem;
 import android.view.View;
@@ -11,13 +10,19 @@ import android.view.ViewGroup;
 import android.widget.AdapterView;
 import android.widget.ListView;
 
+import com.cocosw.bottomsheet.BottomSheet;
 import com.mapswithme.maps.R;
 import com.mapswithme.maps.base.BaseMwmListFragment;
 import com.mapswithme.maps.bookmarks.data.BookmarkCategory;
 import com.mapswithme.maps.bookmarks.data.BookmarkManager;
 import com.mapswithme.maps.dialog.EditTextDialogFragment;
+import com.mapswithme.util.BottomSheetHelper;
+import com.mapswithme.util.sharing.SharingHelper;
 
-public class BookmarkCategoriesFragment extends BaseMwmListFragment implements EditTextDialogFragment.OnTextSaveListener
+public class BookmarkCategoriesFragment extends BaseMwmListFragment
+                                     implements EditTextDialogFragment.OnTextSaveListener,
+                                                MenuItem.OnMenuItemClickListener,
+                                                AdapterView.OnItemLongClickListener
 {
   private int mSelectedPosition;
   private BookmarkCategoriesAdapter mAdapter;
@@ -25,7 +30,7 @@ public class BookmarkCategoriesFragment extends BaseMwmListFragment implements E
   @Override
   public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState)
   {
-    return inflater.inflate(R.layout.fragment_bookmark_categories, container, false);
+    return inflater.inflate(R.layout.simple_list, container, false);
   }
 
   @Override
@@ -33,14 +38,9 @@ public class BookmarkCategoriesFragment extends BaseMwmListFragment implements E
   {
     super.onViewCreated(view, savedInstanceState);
 
-    initAdapter();
-    setListAdapter(mAdapter);
-    registerForContextMenu(getListView());
-  }
-
-  private void initAdapter()
-  {
     mAdapter = new BookmarkCategoriesAdapter(getActivity());
+    setListAdapter(mAdapter);
+    getListView().setOnItemLongClickListener(this);
   }
 
   @Override
@@ -50,6 +50,13 @@ public class BookmarkCategoriesFragment extends BaseMwmListFragment implements E
     mAdapter.notifyDataSetChanged();
   }
 
+  @Override
+  public void onPause()
+  {
+    super.onPause();
+    BottomSheetHelper.free();
+  }
+
   @Override
   public void onListItemClick(ListView l, View v, int position, long id)
   {
@@ -58,35 +65,24 @@ public class BookmarkCategoriesFragment extends BaseMwmListFragment implements E
   }
 
   @Override
-  public void onCreateContextMenu(ContextMenu menu, View v, ContextMenu.ContextMenuInfo menuInfo)
+  public boolean onItemLongClick(AdapterView<?> parent, View view, int position, long id)
   {
-    mSelectedPosition = ((AdapterView.AdapterContextMenuInfo) menuInfo).position;
+    mSelectedPosition = position;
 
-    getActivity().getMenuInflater().inflate(R.menu.menu_bookmark_categories, menu);
-    menu.setHeaderTitle(BookmarkManager.INSTANCE.getCategoryById(mSelectedPosition).getName());
-  }
+    BookmarkCategory category = BookmarkManager.INSTANCE.getCategoryById(mSelectedPosition);
+    BottomSheet bs = BottomSheetHelper.create(getActivity())
+                                      .title(category.getName())
+                                      .sheet(R.menu.menu_bookmark_categories)
+                                      .listener(this)
+                                      .build();
 
-  @Override
-  public boolean onContextItemSelected(MenuItem item)
-  {
-    switch (item.getItemId())
-    {
-    case R.id.set_delete:
-      BookmarkManager.INSTANCE.deleteCategory(mSelectedPosition);
-      ((BookmarkCategoriesAdapter) getListAdapter()).notifyDataSetChanged();
-      break;
-    case R.id.set_edit:
-      final Bundle args = new Bundle();
-      args.putString(EditTextDialogFragment.EXTRA_TITLE, getString(R.string.bookmark_set_name));
-      args.putString(EditTextDialogFragment.EXTRA_POSITIVE_BUTTON, getString(R.string.edit));
-      final EditTextDialogFragment fragment = (EditTextDialogFragment) Fragment.instantiate(getActivity(), EditTextDialogFragment.class.getName());
-      fragment.setOnTextSaveListener(this);
-      fragment.setArguments(args);
-      fragment.show(getActivity().getSupportFragmentManager(), EditTextDialogFragment.class.getName());
-      break;
-    }
-
-    return super.onContextItemSelected(item);
+    MenuItem show = bs.getMenu().getItem(0);
+    show.setIcon(category.isVisible() ? R.drawable.ic_hide
+                                      : R.drawable.ic_show);
+    show.setTitle(category.isVisible() ? R.string.hide
+                                       : R.string.show);
+    bs.show();
+    return true;
   }
 
   @Override
@@ -96,4 +92,39 @@ public class BookmarkCategoriesFragment extends BaseMwmListFragment implements E
     category.setName(text);
     mAdapter.notifyDataSetChanged();
   }
+
+  @Override
+  public boolean onMenuItemClick(MenuItem item)
+  {
+    switch (item.getItemId())
+    {
+    case R.id.set_show:
+      BookmarkManager.INSTANCE.toggleCategoryVisibility(mSelectedPosition);
+      mAdapter.notifyDataSetChanged();
+      break;
+
+    case R.id.set_share:
+      SharingHelper.shareBookmarksCategory(getActivity(), mSelectedPosition);
+      break;
+
+    case R.id.set_delete:
+      BookmarkManager.INSTANCE.deleteCategory(mSelectedPosition);
+      mAdapter.notifyDataSetChanged();
+      break;
+
+    case R.id.set_edit:
+      final Bundle args = new Bundle();
+      args.putString(EditTextDialogFragment.EXTRA_TITLE, getString(R.string.bookmark_set_name));
+      args.putString(EditTextDialogFragment.EXTRA_INITIAL, BookmarkManager.INSTANCE.getCategoryById(mSelectedPosition).getName());
+      args.putString(EditTextDialogFragment.EXTRA_POSITIVE_BUTTON, getString(R.string.rename));
+      args.putString(EditTextDialogFragment.EXTRA_NEGATIVE_BUTTON, getString(R.string.cancel));
+      final EditTextDialogFragment fragment = (EditTextDialogFragment) Fragment.instantiate(getActivity(), EditTextDialogFragment.class.getName());
+      fragment.setOnTextSaveListener(this);
+      fragment.setArguments(args);
+      fragment.show(getActivity().getSupportFragmentManager(), EditTextDialogFragment.class.getName());
+      break;
+    }
+
+    return true;
+  }
 }
diff --git a/android/src/com/mapswithme/maps/bookmarks/BookmarkListAdapter.java b/android/src/com/mapswithme/maps/bookmarks/BookmarkListAdapter.java
index 94188d71f1..684100388c 100644
--- a/android/src/com/mapswithme/maps/bookmarks/BookmarkListAdapter.java
+++ b/android/src/com/mapswithme/maps/bookmarks/BookmarkListAdapter.java
@@ -242,7 +242,7 @@ public class BookmarkListAdapter extends BaseAdapter
 
   private List<String> getSections()
   {
-    final List<String> sections = new ArrayList<String>();
+    final List<String> sections = new ArrayList<>();
     sections.add(mActivity.getString(R.string.tracks));
     sections.add(mActivity.getString(R.string.bookmarks));
     return sections;
diff --git a/android/src/com/mapswithme/maps/bookmarks/BookmarksListFragment.java b/android/src/com/mapswithme/maps/bookmarks/BookmarksListFragment.java
index 5538a27a6f..845d9db1ec 100644
--- a/android/src/com/mapswithme/maps/bookmarks/BookmarksListFragment.java
+++ b/android/src/com/mapswithme/maps/bookmarks/BookmarksListFragment.java
@@ -1,13 +1,11 @@
 package com.mapswithme.maps.bookmarks;
 
+import android.content.DialogInterface;
 import android.content.Intent;
-import android.net.Uri;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.v4.app.Fragment;
 import android.support.v7.app.AppCompatActivity;
-import android.util.Log;
-import android.view.ContextMenu;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -17,9 +15,9 @@ import android.view.ViewGroup;
 import android.widget.AdapterView;
 import android.widget.ListView;
 
+import com.cocosw.bottomsheet.BottomSheet;
 import com.mapswithme.maps.Framework;
 import com.mapswithme.maps.MWMActivity;
-import com.mapswithme.maps.MWMApplication;
 import com.mapswithme.maps.R;
 import com.mapswithme.maps.base.BaseMwmListFragment;
 import com.mapswithme.maps.bookmarks.data.Bookmark;
@@ -27,12 +25,15 @@ import com.mapswithme.maps.bookmarks.data.BookmarkCategory;
 import com.mapswithme.maps.bookmarks.data.BookmarkManager;
 import com.mapswithme.maps.bookmarks.data.Track;
 import com.mapswithme.maps.widget.placepage.EditBookmarkFragment;
-import com.mapswithme.util.ShareAction;
+import com.mapswithme.util.BottomSheetHelper;
+import com.mapswithme.util.sharing.ShareAction;
+import com.mapswithme.util.sharing.SharingHelper;
 
 public class BookmarksListFragment extends BaseMwmListFragment
+                                implements AdapterView.OnItemLongClickListener,
+                                           MenuItem.OnMenuItemClickListener
 {
   public static final String TAG = BookmarksListFragment.class.getSimpleName();
-  private static final int MENU_DELETE_TRACK = 0x42;
 
   private BookmarkCategory mCategory;
   private int mCategoryIndex;
@@ -51,16 +52,14 @@ public class BookmarksListFragment extends BaseMwmListFragment
   @Override
   public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState)
   {
-    return inflater.inflate(R.layout.fragment_bookmarks_list, container, false);
+    return inflater.inflate(R.layout.simple_list, container, false);
   }
 
   @Override
   public void onViewCreated(View view, Bundle savedInstanceState)
   {
     super.onViewCreated(view, savedInstanceState);
-    initListAdapter();
-    setListAdapter(mAdapter);
-    registerForContextMenu(getListView());
+    initList();
     setHasOptionsMenu(true);
     ((AppCompatActivity) getActivity()).getSupportActionBar().setTitle(mCategory.getName());
   }
@@ -82,10 +81,12 @@ public class BookmarksListFragment extends BaseMwmListFragment
     mAdapter.stopLocationUpdate();
   }
 
-  private void initListAdapter()
+  private void initList()
   {
     mAdapter = new BookmarkListAdapter(getActivity(), mCategory);
     mAdapter.startLocationUpdate();
+    setListAdapter(mAdapter);
+    getListView().setOnItemLongClickListener(this);
   }
 
   @Override
@@ -111,66 +112,82 @@ public class BookmarksListFragment extends BaseMwmListFragment
   }
 
   @Override
-  public void onCreateContextMenu(ContextMenu menu, View v, ContextMenu.ContextMenuInfo menuInfo)
+  public boolean onItemLongClick(AdapterView<?> parent, View view, int position, long id)
   {
-    if (menuInfo instanceof AdapterView.AdapterContextMenuInfo)
+    mSelectedPosition = position;
+    final Object item = mAdapter.getItem(mSelectedPosition);
+    int type = mAdapter.getItemViewType(mSelectedPosition);
+
+    switch (type)
     {
-      final AdapterView.AdapterContextMenuInfo info = (AdapterView.AdapterContextMenuInfo) menuInfo;
+    case BookmarkListAdapter.TYPE_SECTION:
+      // Do nothing here?
+      break;
 
-      mSelectedPosition = info.position;
-      final Object obj = mAdapter.getItem(mSelectedPosition);
-      final int type = mAdapter.getItemViewType(mSelectedPosition);
+    case BookmarkListAdapter.TYPE_BOOKMARK:
+      BottomSheet bs = BottomSheetHelper.create(getActivity())
+                                        .title(((Bookmark) item).getName())
+                                        .sheet(R.menu.menu_bookmarks)
+                                        .listener(this)
+                                        .build();
 
-      if (type == BookmarkListAdapter.TYPE_BOOKMARK)
-      {
-        final MenuInflater inflater = getActivity().getMenuInflater();
-        inflater.inflate(R.menu.menu_bookmarks, menu);
+      if (!ShareAction.getSmsShare().isSupported(getActivity()))
+        bs.getMenu().removeItem(R.id.share_message);
 
-        for (final ShareAction action : ShareAction.ACTIONS.values())
-        {
-          if (action.isSupported(getActivity()))
-            menu.add(Menu.NONE, action.getId(), action.getId(), getResources().getString(action.getNameResId()));
-        }
+      if (!ShareAction.getEmailShare().isSupported(getActivity()))
+        bs.getMenu().removeItem(R.id.share_email);
 
-        menu.setHeaderTitle(((Bookmark) obj).getName());
-      }
-      else if (type == BookmarkListAdapter.TYPE_TRACK)
-      {
-        menu.add(Menu.NONE, MENU_DELETE_TRACK, MENU_DELETE_TRACK, getString(R.string.delete));
-        menu.setHeaderTitle(((Track) obj).getName());
-      }
+      bs.show();
+      break;
 
-      super.onCreateContextMenu(menu, v, menuInfo);
+    case BookmarkListAdapter.TYPE_TRACK:
+      BottomSheetHelper.create(getActivity())
+                       .title(((Track) item).getName())
+                       .sheet(Menu.NONE, R.drawable.ic_delete, R.string.delete)
+                       .listener(new DialogInterface.OnClickListener()
+                       {
+                         @Override
+                         public void onClick(DialogInterface dialog, int which)
+                         {
+                           BookmarkManager.INSTANCE.deleteTrack((Track) item);
+                           mAdapter.notifyDataSetChanged();
+                         }
+                       }).show();
+      break;
     }
+
+    return true;
   }
 
   @Override
-  public boolean onContextItemSelected(MenuItem item)
+  public boolean onMenuItemClick(MenuItem menuItem)
   {
-    final int itemId = item.getItemId();
-    final Object obj = mAdapter.getItem(mSelectedPosition);
+    Bookmark item = (Bookmark) mAdapter.getItem(mSelectedPosition);
 
-    if (itemId == R.id.set_edit)
+    switch (menuItem.getItemId())
     {
-      editBookmark(mCategory.getId(), ((Bookmark) obj).getBookmarkId());
-    }
-    else if (itemId == R.id.set_delete)
-    {
-      BookmarkManager.INSTANCE.deleteBookmark((Bookmark) obj);
-      mAdapter.notifyDataSetChanged();
-    }
-    else if (ShareAction.ACTIONS.containsKey(itemId))
-    {
-      final ShareAction shareAction = ShareAction.ACTIONS.get(itemId);
-      shareAction.shareMapObject(getActivity(), (Bookmark) obj);
-    }
-    else if (itemId == MENU_DELETE_TRACK)
-    {
-      BookmarkManager.INSTANCE.deleteTrack((Track) obj);
-      mAdapter.notifyDataSetChanged();
-    }
+    case R.id.share_message:
+      ShareAction.getSmsShare().shareMapObject(getActivity(), item);
+      break;
 
-    return super.onContextItemSelected(item);
+    case R.id.share_email:
+      ShareAction.getEmailShare().shareMapObject(getActivity(), item);
+      break;
+
+    case R.id.share:
+      ShareAction.getAnyShare().shareMapObject(getActivity(), item);
+      break;
+
+    case R.id.edit:
+      editBookmark(mCategory.getId(), item.getBookmarkId());
+      break;
+
+    case R.id.delete:
+      BookmarkManager.INSTANCE.deleteBookmark(item);
+      mAdapter.notifyDataSetChanged();
+      break;
+    }
+    return false;
   }
 
   private void editBookmark(int cat, int bmk)
@@ -183,34 +200,6 @@ public class BookmarksListFragment extends BaseMwmListFragment
     fragment.show(getActivity().getSupportFragmentManager(), null);
   }
 
-  private void sendBookmarkMail()
-  {
-    String path = MWMApplication.get().getTempPath();
-    final String name = BookmarkManager.INSTANCE.saveToKmzFile(mCategory.getId(), path);
-    if (name == null)
-    {
-      // some error occurred
-      return;
-    }
-
-    final Intent intent = new Intent(Intent.ACTION_SEND);
-    intent.putExtra(android.content.Intent.EXTRA_SUBJECT, getString(R.string.share_bookmarks_email_subject));
-    intent.putExtra(android.content.Intent.EXTRA_TEXT, String.format(getString(R.string.share_bookmarks_email_body), name));
-
-    path = path + name + ".kmz";
-    Log.d(TAG, "KMZ file path = " + path);
-    intent.putExtra(android.content.Intent.EXTRA_STREAM, Uri.parse("file://" + path));
-    intent.setType("application/vnd.google-earth.kmz");
-
-    try
-    {
-      startActivity(Intent.createChooser(intent, getString(R.string.share_by_email)));
-    } catch (final Exception ex)
-    {
-      Log.i(TAG, "Can't run E-Mail activity" + ex);
-    }
-  }
-
   @Override
   public void onCreateOptionsMenu(Menu menu, MenuInflater inflater)
   {
@@ -222,7 +211,7 @@ public class BookmarksListFragment extends BaseMwmListFragment
   {
     if (item.getItemId() == R.id.set_share)
     {
-      sendBookmarkMail();
+      SharingHelper.shareBookmarksCategory(getActivity(), mCategory.getId());
       return true;
     }
 
diff --git a/android/src/com/mapswithme/maps/bookmarks/data/Bookmark.java b/android/src/com/mapswithme/maps/bookmarks/data/Bookmark.java
index 9dee39851d..36279c2bbf 100644
--- a/android/src/com/mapswithme/maps/bookmarks/data/Bookmark.java
+++ b/android/src/com/mapswithme/maps/bookmarks/data/Bookmark.java
@@ -83,7 +83,7 @@ public class Bookmark extends MapObject
 
   private Icon getIconInternal()
   {
-    return BookmarkManager.INSTANCE.getIconByType((mCategoryId >= 0) ? getIcon(mCategoryId, mBookmarkId) : "");
+    return BookmarkManager.getIconByType((mCategoryId >= 0) ? getIcon(mCategoryId, mBookmarkId) : "");
   }
 
   public Icon getIcon()
diff --git a/android/src/com/mapswithme/maps/bookmarks/data/BookmarkManager.java b/android/src/com/mapswithme/maps/bookmarks/data/BookmarkManager.java
index 015c9590a3..71763b420d 100644
--- a/android/src/com/mapswithme/maps/bookmarks/data/BookmarkManager.java
+++ b/android/src/com/mapswithme/maps/bookmarks/data/BookmarkManager.java
@@ -12,7 +12,7 @@ public enum BookmarkManager
 {
   INSTANCE;
 
-  private static Icon[] sIcons = {
+  private static final Icon[] ICONS = {
       new Icon("placemark-red", "placemark-red", R.drawable.color_picker_red_off, R.drawable.icon_bookmark_red),
       new Icon("placemark-blue", "placemark-blue", R.drawable.color_picker_blue_off, R.drawable.icon_bookmark_blue),
       new Icon("placemark-purple", "placemark-purple", R.drawable.color_picker_purple_off, R.drawable.icon_bookmark_purple),
@@ -56,20 +56,27 @@ public enum BookmarkManager
 
   public native boolean deleteCategory(int index);
 
-  public Icon getIconByType(String type)
+  public static Icon getIconByType(String type)
   {
-    for (Icon icon : sIcons)
+    for (Icon icon : ICONS)
     {
       if (icon.getType().equals(type))
         return icon;
     }
     // return default icon
-    return sIcons[0];
+    return ICONS[0];
   }
 
-  public List<Icon> getIcons()
+  public void toggleCategoryVisibility(int index)
   {
-    return Arrays.asList(sIcons);
+    BookmarkCategory category = getCategoryById(index);
+    if (category != null)
+      category.setVisibility(!category.isVisible());
+  }
+
+  public static List<Icon> getIcons()
+  {
+    return Arrays.asList(ICONS);
   }
 
   public Bookmark getBookmark(Pair<Integer, Integer> catAndBmk)
@@ -82,11 +89,6 @@ public enum BookmarkManager
     return getCategoryById(cat).getBookmark(bmk);
   }
 
-  public void setCategoryName(BookmarkCategory cat, String newName)
-  {
-    cat.setName(newName);
-  }
-
   public Pair<Integer, Integer> addNewBookmark(String name, double lat, double lon)
   {
     final int cat = getLastEditedCategory();
diff --git a/android/src/com/mapswithme/maps/dialog/EditTextDialogFragment.java b/android/src/com/mapswithme/maps/dialog/EditTextDialogFragment.java
index b66c1624a0..d9c7724b77 100644
--- a/android/src/com/mapswithme/maps/dialog/EditTextDialogFragment.java
+++ b/android/src/com/mapswithme/maps/dialog/EditTextDialogFragment.java
@@ -6,20 +6,24 @@ import android.content.DialogInterface;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.v7.app.AlertDialog;
+import android.text.TextUtils;
 import android.view.View;
 import android.widget.EditText;
 import android.widget.TextView;
 
 import com.mapswithme.maps.R;
 import com.mapswithme.maps.base.BaseMwmDialogFragment;
+import com.mapswithme.util.InputUtils;
 
 public class EditTextDialogFragment extends BaseMwmDialogFragment
 {
   public static final String EXTRA_TITLE = "DialogTitle";
+  public static final String EXTRA_INITIAL = "InitialText";
   public static final String EXTRA_POSITIVE_BUTTON = "PositiveText";
   public static final String EXTRA_NEGATIVE_BUTTON = "NegativeText";
 
   private String mTitle;
+  private String mInitialText;
   private EditText mEtInput;
 
   public interface OnTextSaveListener
@@ -41,6 +45,8 @@ public class EditTextDialogFragment extends BaseMwmDialogFragment
     if (args != null)
     {
       mTitle = args.getString(EXTRA_TITLE);
+      mInitialText = args.getString(EXTRA_INITIAL);
+
       positiveButtonText = args.getString(EXTRA_POSITIVE_BUTTON);
       negativeButtonText = args.getString(EXTRA_NEGATIVE_BUTTON);
     }
@@ -78,6 +84,14 @@ public class EditTextDialogFragment extends BaseMwmDialogFragment
   {
     @SuppressLint("InflateParams") final View root = getActivity().getLayoutInflater().inflate(R.layout.dialog_edit_text, null);
     mEtInput = (EditText) root.findViewById(R.id.et__input);
+    if (!TextUtils.isEmpty(mInitialText))
+    {
+      mEtInput.setText(mInitialText);
+      mEtInput.selectAll();
+    }
+
+    InputUtils.showKeyboard(mEtInput);
+
     ((TextView) root.findViewById(R.id.tv__title)).setText(mTitle);
     return root;
   }
diff --git a/android/src/com/mapswithme/maps/widget/placepage/BookmarkColorDialogFragment.java b/android/src/com/mapswithme/maps/widget/placepage/BookmarkColorDialogFragment.java
index acf42f819e..e1f441ddf2 100644
--- a/android/src/com/mapswithme/maps/widget/placepage/BookmarkColorDialogFragment.java
+++ b/android/src/com/mapswithme/maps/widget/placepage/BookmarkColorDialogFragment.java
@@ -60,7 +60,7 @@ public class BookmarkColorDialogFragment extends DialogFragment
 
   private View buildView()
   {
-    final List<Icon> icons = BookmarkManager.INSTANCE.getIcons();
+    final List<Icon> icons = BookmarkManager.getIcons();
     final IconsAdapter adapter = new IconsAdapter(getActivity(), icons);
     adapter.chooseItem(mIconType);
 
diff --git a/android/src/com/mapswithme/maps/widget/placepage/EditBookmarkFragment.java b/android/src/com/mapswithme/maps/widget/placepage/EditBookmarkFragment.java
index d4b9ce66be..7eabaf6715 100644
--- a/android/src/com/mapswithme/maps/widget/placepage/EditBookmarkFragment.java
+++ b/android/src/com/mapswithme/maps/widget/placepage/EditBookmarkFragment.java
@@ -20,6 +20,7 @@ import com.mapswithme.maps.bookmarks.data.Bookmark;
 import com.mapswithme.maps.bookmarks.data.BookmarkManager;
 import com.mapswithme.maps.bookmarks.data.Icon;
 import com.mapswithme.maps.bookmarks.data.ParcelablePoint;
+import com.mapswithme.util.InputUtils;
 import com.mapswithme.util.UiUtils;
 import com.mapswithme.util.statistics.Statistics;
 
@@ -134,7 +135,7 @@ public class EditBookmarkFragment extends BaseMwmDialogFragment implements View.
       @Override
       public void onBookmarkColorSet(int colorPos)
       {
-        final Icon newIcon = BookmarkManager.INSTANCE.getIcons().get(colorPos);
+        final Icon newIcon = BookmarkManager.getIcons().get(colorPos);
         final String from = mBookmark.getIcon().getName();
         final String to = newIcon.getName();
         if (!TextUtils.equals(from, to))
@@ -152,6 +153,9 @@ public class EditBookmarkFragment extends BaseMwmDialogFragment implements View.
   private void refreshBookmark()
   {
     mEtName.setText(mBookmark.getName());
+    mEtName.selectAll();
+    InputUtils.showKeyboard(mEtName);
+
     mEtDescription.setText(mBookmark.getBookmarkDescription());
     mTvBookmarkGroup.setText(mBookmark.getCategoryName(getActivity()));
     mIvColor.setImageResource(mBookmark.getIcon().getSelectedResId());
diff --git a/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java b/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java
index f58e7979d3..c878ed5ac4 100644
--- a/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java
+++ b/android/src/com/mapswithme/maps/widget/placepage/PlacePageView.java
@@ -50,7 +50,7 @@ import com.mapswithme.maps.location.LocationHelper;
 import com.mapswithme.maps.widget.ArrowView;
 import com.mapswithme.util.InputUtils;
 import com.mapswithme.util.LocationUtils;
-import com.mapswithme.util.ShareAction;
+import com.mapswithme.util.sharing.ShareAction;
 import com.mapswithme.util.StringUtils;
 import com.mapswithme.util.UiUtils;
 import com.mapswithme.util.Utils;
@@ -755,7 +755,7 @@ public class PlacePageView extends RelativeLayout implements View.OnClickListene
       public void onBookmarkColorSet(int colorPos)
       {
         Bookmark bmk = (Bookmark) mMapObject;
-        final Icon newIcon = BookmarkManager.INSTANCE.getIcons().get(colorPos);
+        final Icon newIcon = BookmarkManager.getIcons().get(colorPos);
         final String from = bmk.getIcon().getName();
         final String to = newIcon.getName();
         if (!TextUtils.equals(from, to))
diff --git a/android/src/com/mapswithme/util/BottomSheetHelper.java b/android/src/com/mapswithme/util/BottomSheetHelper.java
new file mode 100644
index 0000000000..96c7e7f572
--- /dev/null
+++ b/android/src/com/mapswithme/util/BottomSheetHelper.java
@@ -0,0 +1,105 @@
+package com.mapswithme.util;
+
+import android.app.Activity;
+import android.content.DialogInterface;
+import android.graphics.drawable.Drawable;
+import android.support.annotation.DrawableRes;
+import android.support.annotation.NonNull;
+import android.support.annotation.StringRes;
+import android.support.v4.content.ContextCompat;
+
+import com.cocosw.bottomsheet.BottomSheet;
+import com.mapswithme.maps.MWMApplication;
+
+import java.lang.ref.WeakReference;
+
+public final class BottomSheetHelper
+{
+  public static class Builder extends BottomSheet.Builder
+  {
+    public Builder(@NonNull Activity context)
+    {
+      super(context);
+      setOnDismissListener(null);
+    }
+
+    @Override
+    public BottomSheet build()
+    {
+      free();
+
+      BottomSheet res = super.build();
+      sRef = new WeakReference<>(res);
+      return res;
+    }
+
+    @SuppressWarnings("NullableProblems")
+    @Override
+    public BottomSheet.Builder setOnDismissListener(final DialogInterface.OnDismissListener listener)
+    {
+      return super.setOnDismissListener(new DialogInterface.OnDismissListener() {
+        @Override
+        public void onDismiss(DialogInterface dialog)
+        {
+          free();
+          if (listener != null)
+            listener.onDismiss(dialog);
+        }
+      });
+    }
+  }
+
+
+  private static WeakReference<BottomSheet> sRef;
+
+
+  private BottomSheetHelper()
+  {}
+
+  public static BottomSheet getReference()
+  {
+    if (sRef == null)
+      return null;
+
+    return sRef.get();
+  }
+
+  public static boolean isShowing()
+  {
+    BottomSheet bs = getReference();
+    return (bs != null && bs.isShowing());
+  }
+
+  public static void free()
+  {
+    BottomSheet ref = getReference();
+    if (ref != null)
+    {
+      if (ref.isShowing())
+        ref.dismiss();
+      sRef = null;
+    }
+  }
+
+  public static BottomSheet.Builder create(Activity context)
+  {
+    free();
+    return new Builder(context);
+  }
+
+  public static BottomSheet.Builder create(Activity context, @StringRes int title)
+  {
+    return create(context).title(title);
+  }
+
+  public static BottomSheet.Builder createGrid(Activity context, @StringRes int title)
+  {
+    return create(context, title).grid();
+  }
+
+  public static BottomSheet.Builder sheet(BottomSheet.Builder builder, int id, @DrawableRes int iconRes, CharSequence text)
+  {
+    Drawable icon = ContextCompat.getDrawable(MWMApplication.get(), iconRes);
+    return builder.sheet(id, icon, text);
+  }
+}
diff --git a/android/src/com/mapswithme/util/Gsonable.java b/android/src/com/mapswithme/util/Gsonable.java
new file mode 100644
index 0000000000..dce2d6667f
--- /dev/null
+++ b/android/src/com/mapswithme/util/Gsonable.java
@@ -0,0 +1,7 @@
+package com.mapswithme.util;
+
+/**
+ * Marker for classes that are (de)serializable from/to JSON using Google Gson library.
+ */
+public interface Gsonable
+{}
diff --git a/android/src/com/mapswithme/util/InputUtils.java b/android/src/com/mapswithme/util/InputUtils.java
index 46d5a1358a..be517d2895 100644
--- a/android/src/com/mapswithme/util/InputUtils.java
+++ b/android/src/com/mapswithme/util/InputUtils.java
@@ -7,6 +7,8 @@ import android.view.View;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.EditText;
 
+import com.mapswithme.util.concurrency.UiThread;
+
 import java.util.ArrayList;
 
 public class InputUtils
@@ -27,7 +29,7 @@ public class InputUtils
   {
     final Intent vrIntent = new Intent(RecognizerIntent.ACTION_RECOGNIZE_SPEECH);
     vrIntent.putExtra(RecognizerIntent.EXTRA_LANGUAGE_MODEL, RecognizerIntent.LANGUAGE_MODEL_WEB_SEARCH)
-        .putExtra(RecognizerIntent.EXTRA_PROMPT, promptText);
+            .putExtra(RecognizerIntent.EXTRA_PROMPT, promptText);
 
     return vrIntent;
   }
@@ -47,10 +49,36 @@ public class InputUtils
     return recognizedStrings.isEmpty() ? null : recognizedStrings.get(0);
   }
 
+  private static void showKeyboardSync(final View input)
+  {
+    if (input != null)
+      ((InputMethodManager)input.getContext().getSystemService(Context.INPUT_METHOD_SERVICE))
+          .showSoftInput(input, InputMethodManager.SHOW_IMPLICIT);
+  }
+
+  private static void showKeyboardDelayed(final View input, int delay)
+  {
+    if (input == null)
+      return;
+
+    UiThread.runLater(new Runnable()
+    {
+      @Override
+      public void run()
+      {
+        showKeyboardSync(input);
+      }
+    }, delay);
+  }
+
+  public static void showKeyboard(View input)
+  {
+    showKeyboardDelayed(input, 100);
+  }
+
   public static void hideKeyboard(View view)
   {
-    final Context c = view.getContext();
-    final InputMethodManager imm = (InputMethodManager) c.getSystemService(Context.INPUT_METHOD_SERVICE);
+    InputMethodManager imm = (InputMethodManager)view.getContext().getSystemService(Context.INPUT_METHOD_SERVICE);
     imm.hideSoftInputFromWindow(view.getWindowToken(), 0);
   }
 
diff --git a/android/src/com/mapswithme/util/Proc.java b/android/src/com/mapswithme/util/Proc.java
new file mode 100644
index 0000000000..d9fa811258
--- /dev/null
+++ b/android/src/com/mapswithme/util/Proc.java
@@ -0,0 +1,6 @@
+package com.mapswithme.util;
+
+public interface Proc<T>
+{
+  void invoke(T param);
+}
diff --git a/android/src/com/mapswithme/util/concurrency/ThreadPool.java b/android/src/com/mapswithme/util/concurrency/ThreadPool.java
new file mode 100644
index 0000000000..bad524b81f
--- /dev/null
+++ b/android/src/com/mapswithme/util/concurrency/ThreadPool.java
@@ -0,0 +1,45 @@
+package com.mapswithme.util.concurrency;
+
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+
+public class ThreadPool
+{
+  private static final ThreadPool sInstance = new ThreadPool();
+
+  private final ThreadPoolExecutor mStorage;
+  private final ThreadPoolExecutor mWorker;
+
+
+  private static ThreadPoolExecutor create(int poolSize, int allowedTime)
+  {
+    ThreadPoolExecutor res = new ThreadPoolExecutor(poolSize, poolSize, allowedTime, TimeUnit.SECONDS,
+                                                    new LinkedBlockingQueue<Runnable>());
+    res.allowCoreThreadTimeOut(true);
+    return res;
+  }
+
+  private ThreadPool()
+  {
+    mStorage = create(1, 500);
+    mWorker = create(1, 250);
+  }
+
+  /**
+   * Returns single thread for file operations.
+   */
+  public static ExecutorService getStorage()
+  {
+    return sInstance.mStorage;
+  }
+
+  /**
+   * Returns single thread for various background tasks.
+   */
+  public static ExecutorService getWorker()
+  {
+    return sInstance.mWorker;
+  }
+}
diff --git a/android/src/com/mapswithme/util/concurrency/UiThread.java b/android/src/com/mapswithme/util/concurrency/UiThread.java
new file mode 100644
index 0000000000..1c4a1dc62f
--- /dev/null
+++ b/android/src/com/mapswithme/util/concurrency/UiThread.java
@@ -0,0 +1,124 @@
+package com.mapswithme.util.concurrency;
+
+import android.os.Handler;
+import android.os.Looper;
+
+import com.mapswithme.util.Proc;
+
+public class UiThread
+{
+  private static final Handler sUiHandler = new Handler(Looper.getMainLooper());
+
+  /**
+   * Helper runnable classes that can be scheduled at any thread but will be started on UI thread only.
+   */
+  public static abstract class UiRunnable implements Runnable
+  {
+    @Override
+    public final void run()
+    {
+      if (currentThreadIsUi())
+        runUi();
+      else
+        UiThread.run(new Runnable()
+        {
+          @Override
+          public void run()
+          {
+            runUi();
+          }
+        });
+    }
+
+    protected abstract void runUi();
+  }
+
+  public static abstract class UiProc<T> implements Proc<T>
+  {
+    @Override
+    public final void invoke(final T param)
+    {
+      if (currentThreadIsUi())
+        invokeUi(param);
+      else
+        UiThread.run(new Runnable()
+        {
+          @Override
+          public void run()
+          {
+            invokeUi(param);
+          }
+        });
+    }
+
+    protected abstract void invokeUi(T param);
+  }
+
+  /**
+   * Checks if we currently on UI thread. Throws IllegalStateException if called not from UI thread.
+   */
+  public static void checkUi()
+  {
+    if (!currentThreadIsUi())
+      throw new IllegalStateException("Method should be called from UI thread.");
+  }
+
+  /**
+   * Checks if we currently not on UI thread. Throws IllegalStateException if called from UI thread.
+   */
+  public static void checkNotUi()
+  {
+    if (currentThreadIsUi())
+      throw new IllegalStateException("Method should NOT be called from UI thread.");
+  }
+
+  public static boolean currentThreadIsUi()
+  {
+    return sUiHandler.getLooper().getThread() == Thread.currentThread();
+  }
+
+  /**
+   * Executes something on UI thread. If called from UI thread then given task will be executed synchronously.
+   *
+   * @param task the code that must be executed on UI thread.
+   */
+  public static void run(Runnable task)
+  {
+    if (currentThreadIsUi())
+      task.run();
+    else
+      sUiHandler.post(task);
+  }
+
+  /**
+   * Executes something on UI thread after last message queued in the application's main looper.
+   *
+   * @param task the code that must be executed later on UI thread.
+   */
+  public static void runLater(Runnable task)
+  {
+    runLater(task, 0);
+  }
+
+  /**
+   * Executes something on UI thread after a given delay.
+   *
+   * @param task  the code that must be executed on UI thread after given delay.
+   * @param delay The delay (in milliseconds) until the code will be executed.
+   */
+  public static void runLater(Runnable task, long delay)
+  {
+    sUiHandler.postDelayed(task, delay);
+  }
+
+  /**
+   * Cancels execution of the given task that was previously queued with {@link #run(Runnable)},
+   * {@link #runLater(Runnable)} or {@link #runLater(Runnable, long)} if it was not started yet.
+   *
+   * @param task the code that must be cancelled.
+   */
+  public static void cancelDelayedTask(Runnable task)
+  {
+    sUiHandler.removeCallbacks(task);
+  }
+}
diff --git a/android/src/com/mapswithme/util/sharing/BaseShareable.java b/android/src/com/mapswithme/util/sharing/BaseShareable.java
new file mode 100644
index 0000000000..84f23cbcc3
--- /dev/null
+++ b/android/src/com/mapswithme/util/sharing/BaseShareable.java
@@ -0,0 +1,100 @@
+package com.mapswithme.util.sharing;
+
+import android.app.Activity;
+import android.content.ActivityNotFoundException;
+import android.content.Intent;
+import android.support.annotation.StringRes;
+import android.text.TextUtils;
+
+public abstract class BaseShareable
+{
+  private final Activity mActivity;
+  private Intent mBaseIntent;
+  private String mText;
+  private String mSubject;
+
+
+  public BaseShareable(Activity activity)
+  {
+    mActivity = activity;
+    mBaseIntent = new Intent(Intent.ACTION_SEND);
+  }
+
+  public Activity getActivity()
+  {
+    return mActivity;
+  }
+
+  protected void modifyIntent(Intent intent)
+  {}
+
+  protected Intent getBaseIntent()
+  {
+    return mBaseIntent;
+  }
+
+  public Intent getTargetIntent()
+  {
+    Intent res = getBaseIntent();
+
+    if (!TextUtils.isEmpty(mText))
+      res.putExtra(Intent.EXTRA_TEXT, mText);
+
+    if (TextUtils.isEmpty(mSubject))
+      res.putExtra(Intent.EXTRA_SUBJECT, mSubject);
+
+    String mime = getMimeType();
+    if (!TextUtils.isEmpty(mime))
+      res.setType(mime);
+
+    modifyIntent(res);
+
+    return res;
+  }
+
+  public void share(SharingTarget target)
+  {
+    Intent intent = getTargetIntent();
+    target.setupComponentName(intent);
+
+    try
+    {
+      mActivity.startActivity(intent);
+    } catch (ActivityNotFoundException ignored)
+    {
+      // Do nothing here
+    }
+  }
+
+  public BaseShareable setBaseIntent(Intent intent)
+  {
+    mBaseIntent = intent;
+    return this;
+  }
+
+  public BaseShareable setText(String text)
+  {
+    mText = text;
+    return this;
+  }
+
+  public BaseShareable setSubject(String subject)
+  {
+    mSubject = subject;
+    return this;
+  }
+
+  public BaseShareable setText(@StringRes int textRes)
+  {
+    mText = getActivity().getString(textRes);
+    return this;
+  }
+
+  public BaseShareable setSubject(@StringRes int subjectRes)
+  {
+    mSubject = getActivity().getString(subjectRes);
+    return this;
+  }
+
+  public abstract String getMimeType();
+}
diff --git a/android/src/com/mapswithme/util/sharing/LocalFileShareable.java b/android/src/com/mapswithme/util/sharing/LocalFileShareable.java
new file mode 100644
index 0000000000..9ef1dce014
--- /dev/null
+++ b/android/src/com/mapswithme/util/sharing/LocalFileShareable.java
@@ -0,0 +1,31 @@
+package com.mapswithme.util.sharing;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.net.Uri;
+
+public class LocalFileShareable extends BaseShareable
+{
+  private final String mFileName;
+  private final String mMimeType;
+
+  public LocalFileShareable(Activity context, String fileName, String mimeType)
+  {
+    super(context);
+    mFileName = fileName;
+    mMimeType = mimeType;
+  }
+
+  @Override
+  protected void modifyIntent(Intent intent)
+  {
+    super.modifyIntent(intent);
+    intent.putExtra(android.content.Intent.EXTRA_STREAM, Uri.parse("file://" + mFileName));
+  }
+
+  @Override
+  public String getMimeType()
+  {
+    return mMimeType;
+  }
+}
diff --git a/android/src/com/mapswithme/util/sharing/MapObjectShareable.java b/android/src/com/mapswithme/util/sharing/MapObjectShareable.java
new file mode 100644
index 0000000000..d40a81ef84
--- /dev/null
+++ b/android/src/com/mapswithme/util/sharing/MapObjectShareable.java
@@ -0,0 +1,42 @@
+package com.mapswithme.util.sharing;
+
+import android.app.Activity;
+
+import com.mapswithme.maps.Framework;
+import com.mapswithme.maps.R;
+import com.mapswithme.maps.bookmarks.data.MapObject;
+import com.mapswithme.util.statistics.Statistics;
+
+public class MapObjectShareable extends BaseShareable
+{
+  protected final MapObject mMapObject;
+
+
+  public MapObjectShareable(Activity context, MapObject mapObject)
+  {
+    super(context);
+    mMapObject = mapObject;
+
+    String ge0Url = Framework.nativeGetGe0Url(mMapObject.getLat(), mMapObject.getLon(), mMapObject.getScale(), mMapObject.getName());
+    String httpUrl = Framework.getHttpGe0Url(mMapObject.getLat(), mMapObject.getLon(), mMapObject.getScale(), mMapObject.getName());
+    String address = Framework.nativeGetNameAndAddress4Point(mMapObject.getLat(), mMapObject.getLon());
+    int resId = mMapObject.getType() == MapObject.MapObjectType.MY_POSITION ? R.string.my_position_share_email
+                                                                            : R.string.my_position_share_email_subject;
+    setText(getActivity().getString(resId, address, ge0Url, httpUrl));
+    setSubject(getActivity().getString(mMapObject.getType() == MapObject.MapObjectType.MY_POSITION ? R.string.my_position_share_email_subject
+                                                                                                  : R.string.bookmark_share_email_subject));
+  }
+
+  @Override
+  public void share(SharingTarget target)
+  {
+    super.share(target);
+    Statistics.INSTANCE.trackPlaceShared(getClass().getSimpleName());
+  }
+
+  @Override
+  public String getMimeType()
+  {
+    return null;
+  }
+}
diff --git a/android/src/com/mapswithme/util/ShareAction.java b/android/src/com/mapswithme/util/sharing/ShareAction.java
similarity index 61%
rename from android/src/com/mapswithme/util/ShareAction.java
rename to android/src/com/mapswithme/util/sharing/ShareAction.java
index 4dd8a80c0e..728e722488 100644
--- a/android/src/com/mapswithme/util/ShareAction.java
+++ b/android/src/com/mapswithme/util/sharing/ShareAction.java
@@ -1,28 +1,21 @@
-package com.mapswithme.util;
+package com.mapswithme.util.sharing;
 
 import android.annotation.SuppressLint;
 import android.app.Activity;
-import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
-import android.content.pm.LabeledIntent;
-import android.content.pm.ResolveInfo;
 import android.net.Uri;
 import android.os.Build;
-import android.os.Parcelable;
 import android.provider.Telephony;
-import android.view.Menu;
-import android.view.MenuItem;
 
 import com.mapswithme.maps.Framework;
 import com.mapswithme.maps.R;
 import com.mapswithme.maps.bookmarks.data.MapObject;
 import com.mapswithme.maps.bookmarks.data.MapObject.MapObjectType;
+import com.mapswithme.util.Utils;
 import com.mapswithme.util.statistics.Statistics;
 
-import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
 public abstract class ShareAction
@@ -32,7 +25,7 @@ public abstract class ShareAction
   public final static int ID_ANY = 0xffff;
 
   @SuppressLint("UseSparseArrays")
-  public final static Map<Integer, ShareAction> ACTIONS = new HashMap<Integer, ShareAction>();
+  public final static Map<Integer, ShareAction> ACTIONS = new HashMap<>();
 
   /* Actions*/
   private final static SmsShareAction SMS_SHARE = new SmsShareAction();
@@ -87,57 +80,20 @@ public abstract class ShareAction
     return mId;
   }
 
-  public int getNameResId()
-  {
-    return mNameResId;
-  }
-
-  @SuppressLint("NewApi")
-  public MenuItem addToMenuIfSupported(Context context, Menu menu, boolean showAsAction)
-  {
-    if (isSupported(context))
-    {
-      final String name = context.getResources().getString(getNameResId());
-      final MenuItem menuItem = menu.add(Menu.NONE, getId(), getId(), name);
-      if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB && showAsAction)
-        menuItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_IF_ROOM);
-      return menuItem;
-    }
-    return null;
-  }
-
   public boolean isSupported(Context context)
   {
     return Utils.isIntentSupported(context, getIntent());
   }
 
-  public void shareWithText(Activity activity, String body, String subject)
-  {
-    final Intent intent = getIntent();
-    intent.putExtra(Intent.EXTRA_TEXT, body)
-        .putExtra(Intent.EXTRA_SUBJECT, subject);
-
-    activity.startActivity(intent);
-  }
 
   /**
    * BASE share method
    */
   public void shareMapObject(Activity activity, MapObject mapObject)
   {
-    final String ge0Url = Framework.nativeGetGe0Url(mapObject.getLat(), mapObject.getLon(), mapObject.getScale(), mapObject.getName());
-    final String httpUrl = Framework.getHttpGe0Url(mapObject.getLat(), mapObject.getLon(), mapObject.getScale(), mapObject.getName());
-    final String address = Framework.nativeGetNameAndAddress4Point(mapObject.getLat(), mapObject.getLon());
-
-    final int bodyId = mapObject.getType() == MapObjectType.MY_POSITION ? R.string.my_position_share_email : R.string.bookmark_share_email;
-    final int subjectId = mapObject.getType() == MapObjectType.MY_POSITION ? R.string.my_position_share_email_subject : R.string.bookmark_share_email_subject;
-
-    final String body = activity.getString(bodyId, address, ge0Url, httpUrl);
-    final String subject = activity.getString(subjectId);
-
-    shareWithText(activity, body, subject);
-
-    Statistics.INSTANCE.trackPlaceShared(this.getClass().getSimpleName());
+    SharingHelper.shareOutside(new MapObjectShareable(activity, mapObject)
+                                   .setBaseIntent(mBaseIntent),
+                               mNameResId);
   }
 
   /**
@@ -150,10 +106,9 @@ public abstract class ShareAction
       super(ID_SMS, R.string.share_by_message, new Intent(Intent.ACTION_VIEW).setData(Uri.parse(URI_STRING_SMS)));
     }
 
-    @Override
-    public void shareWithText(Activity activity, String body, String subject)
+    public void shareWithText(Activity activity, String body)
     {
-      Intent smsIntent = null;
+      Intent smsIntent;
       if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT)
       {
         final String defaultSms = Telephony.Sms.getDefaultSmsPackage(activity);
@@ -181,7 +136,7 @@ public abstract class ShareAction
 
       final String body = activity.getString(bodyId, ge0Url, httpUrl);
 
-      shareWithText(activity, body, "");
+      shareWithText(activity, body);
 
       Statistics.INSTANCE.trackPlaceShared(this.getClass().getSimpleName());
     }
@@ -208,14 +163,9 @@ public abstract class ShareAction
       super(ID_ANY, R.string.share, new Intent(Intent.ACTION_SEND).setType(TYPE_TEXT_PLAIN));
     }
 
-    @Override
-    public void shareWithText(Activity activity, String body, String subject)
+    public static void share(final Activity activity, final String body)
     {
-      final Intent intent = getIntent();
-      intent.putExtra(Intent.EXTRA_TEXT, body)
-          .putExtra(Intent.EXTRA_SUBJECT, subject);
-      final String header = activity.getString(R.string.share);
-      activity.startActivity(Intent.createChooser(intent, header));
+      SharingHelper.shareOutside(new TextShareable(activity, body));
     }
   }
 
diff --git a/android/src/com/mapswithme/util/sharing/SharingHelper.java b/android/src/com/mapswithme/util/sharing/SharingHelper.java
new file mode 100644
index 0000000000..1390a37e60
--- /dev/null
+++ b/android/src/com/mapswithme/util/sharing/SharingHelper.java
@@ -0,0 +1,229 @@
+package com.mapswithme.util.sharing;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.content.pm.ActivityInfo;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.support.annotation.StringRes;
+import android.text.TextUtils;
+
+import com.cocosw.bottomsheet.BottomSheet;
+import com.mapswithme.maps.MWMApplication;
+import com.mapswithme.maps.R;
+import com.mapswithme.maps.bookmarks.data.BookmarkManager;
+import com.mapswithme.util.BottomSheetHelper;
+import com.mapswithme.util.concurrency.ThreadPool;
+import com.mapswithme.util.concurrency.UiThread;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import static com.mapswithme.maps.MWMApplication.gson;
+
+public final class SharingHelper
+{
+  private static final String PREFS_STORAGE = "sharing";
+  private static final String PREFS_KEY_ITEMS = "items";
+
+  private static boolean sInitialized;
+  private static final SharingHelper sInstance = new SharingHelper();
+
+
+  private final SharedPreferences mPrefs = MWMApplication.get().getSharedPreferences(PREFS_STORAGE, Context.MODE_PRIVATE);
+  private final Map<String, SharingTarget> mItems = new HashMap<>();
+
+
+  private SharingHelper()
+  {}
+
+  public static void prepare()
+  {
+    if (sInitialized)
+      return;
+
+    sInitialized = true;
+
+    ThreadPool.getStorage().execute(new Runnable() {
+      @Override
+      public void run()
+      {
+        SharingTarget[] items;
+        String json = sInstance.mPrefs.getString(PREFS_KEY_ITEMS, null);
+        items = parse(json);
+
+        if (items != null)
+          for (SharingTarget item: items)
+            sInstance.mItems.put(item.packageName, item);
+      }
+    });
+  }
+
+  private static SharingTarget[] parse(String json)
+  {
+    if (TextUtils.isEmpty(json))
+      return null;
+
+    try
+    {
+      return gson().fromJson(json, SharingTarget[].class);
+    } catch (Exception e)
+    {
+      return null;
+    }
+  }
+
+  private void save()
+  {
+    String json = gson().toJson(mItems.values());
+    mPrefs.edit().putString(PREFS_KEY_ITEMS, json).apply();
+  }
+
+
+  private static String guessAppName(PackageManager pm, ResolveInfo ri)
+  {
+    CharSequence name = ri.activityInfo.loadLabel(pm);
+
+    if (TextUtils.isEmpty(name))
+    {
+      name = ri.loadLabel(pm);
+
+      if (TextUtils.isEmpty(name))
+        name = ri.activityInfo.packageName;
+    }
+
+    return name.toString();
+  }
+
+  private List<SharingTarget> findItems(BaseShareable data)
+  {
+    Set<String> missed = new HashSet<>(mItems.keySet());
+
+    Intent it = data.getTargetIntent();
+    PackageManager pm = MWMApplication.get().getPackageManager();
+    List<ResolveInfo> rlist = pm.queryIntentActivities(it, 0);
+
+
+    final List<SharingTarget> res = new ArrayList<>(rlist.size());
+    for (ResolveInfo ri: rlist)
+    {
+      ActivityInfo ai = ri.activityInfo;
+      if (ai == null)
+        continue;
+
+      missed.remove(ai.packageName);
+      SharingTarget target = new SharingTarget(ai.packageName);
+      target.name = guessAppName(pm, ri);
+      target.activityName = ai.name;
+
+      SharingTarget original = mItems.get(ai.packageName);
+      if (original != null)
+        target.usageCount = original.usageCount;
+
+      target.drawableIcon = ai.loadIcon(pm);
+
+      res.add(target);
+    }
+
+    Collections.sort(res, new Comparator<SharingTarget>()
+    {
+      @Override
+      public int compare(SharingTarget left, SharingTarget right)
+      {
+        return left.compareTo(right);
+      }
+    });
+
+    for (String item: missed)
+      mItems.remove(item);
+
+    if (!missed.isEmpty())
+      save();
+
+    return res;
+  }
+
+  public static void shareOutside(BaseShareable data)
+  {
+    shareOutside(data, R.string.share);
+  }
+
+  public static void shareOutside(final BaseShareable data, @StringRes int titleRes)
+  {
+    boolean showing = BottomSheetHelper.isShowing();
+    final BottomSheet.Builder builder = BottomSheetHelper.createGrid(data.getActivity(), titleRes)
+                                                         .limit(R.integer.sharing_initial_rows);
+
+    final List<SharingTarget> items = sInstance.findItems(data);
+
+    int i = 0;
+    for (SharingTarget item: items)
+      builder.sheet(i++, item.drawableIcon, item.name);
+
+    builder.listener(new DialogInterface.OnClickListener()
+    {
+      @Override
+      public void onClick(DialogInterface dialog, int which)
+      {
+        if (which < 0)
+          return;
+
+        SharingTarget target = items.get(which);
+        sInstance.updateItem(target);
+
+        data.share(target);
+      }
+    });
+
+    if (!showing)
+    {
+      builder.show();
+      return;
+    }
+
+    UiThread.runLater(new Runnable() {
+      @Override
+      public void run()
+      {
+        builder.show();
+      }
+    }, 500);
+  }
+
+  private void updateItem(SharingTarget item)
+  {
+    SharingTarget stored = mItems.get(item.packageName);
+    if (stored == null)
+    {
+      stored = new SharingTarget(item.packageName);
+      mItems.put(stored.packageName, stored);
+    }
+
+    stored.usageCount++;
+    save();
+  }
+
+  public static void shareBookmarksCategory(Activity context, int id)
+  {
+    String path = MWMApplication.get().getTempPath();
+    String name = BookmarkManager.INSTANCE.saveToKmzFile(id, path);
+    if (name == null)
+      // some error occurred
+      return;
+
+    path += name + ".kmz";
+
+    shareOutside(new LocalFileShareable(context, path, "application/vnd.google-earth.kmz")
+                     .setText(R.string.share_bookmarks_email_body)
+                     .setSubject(R.string.share_bookmarks_email_subject));
+  }
+}
\ No newline at end of file
diff --git a/android/src/com/mapswithme/util/sharing/SharingTarget.java b/android/src/com/mapswithme/util/sharing/SharingTarget.java
new file mode 100644
index 0000000000..1762faeb5e
--- /dev/null
+++ b/android/src/com/mapswithme/util/sharing/SharingTarget.java
@@ -0,0 +1,44 @@
+package com.mapswithme.util.sharing;
+
+import android.content.ComponentName;
+import android.content.Intent;
+import android.graphics.drawable.Drawable;
+import android.text.TextUtils;
+
+import com.google.gsonaltered.annotations.SerializedName;
+import com.mapswithme.util.Gsonable;
+
+public class SharingTarget implements Gsonable, Comparable<SharingTarget>
+{
+  @SerializedName("package_name")
+  public String packageName;
+  @SerializedName("usage_count")
+  public int usageCount;
+  public transient String name;
+  public transient String activityName;
+  public transient Drawable drawableIcon;
+
+
+  @SuppressWarnings("UnusedDeclaration")
+  public SharingTarget()
+  {}
+
+  public SharingTarget(String packageName)
+  {
+    this.packageName = packageName;
+  }
+
+  @Override
+  public int compareTo(SharingTarget another)
+  {
+    return (another.usageCount - usageCount);
+  }
+
+  public void setupComponentName(Intent intent)
+  {
+    if (TextUtils.isEmpty(activityName))
+      intent.setPackage(packageName);
+    else
+      intent.setComponent(new ComponentName(packageName, activityName));
+  }
+}
diff --git a/android/src/com/mapswithme/util/sharing/TextShareable.java b/android/src/com/mapswithme/util/sharing/TextShareable.java
new file mode 100644
index 0000000000..9425b031ac
--- /dev/null
+++ b/android/src/com/mapswithme/util/sharing/TextShareable.java
@@ -0,0 +1,24 @@
+package com.mapswithme.util.sharing;
+
+import android.app.Activity;
+
+public class TextShareable extends BaseShareable
+{
+
+  public TextShareable(Activity context)
+  {
+    super(context);
+  }
+
+  public TextShareable(Activity context, String text)
+  {
+    super(context);
+    setText(text);
+  }
+
+  @Override
+  public String getMimeType()
+  {
+    return "text/plain";
+  }
+}
diff --git a/strings.txt b/strings.txt
index 5bafa6394d..50800a1397 100644
--- a/strings.txt
+++ b/strings.txt
@@ -13089,3 +13089,27 @@
     pl = Wskazówki dojazdu
     nl = Routebeschrijving
     pt = Instruções de direção
+
+  [show]
+    tags = android
+    comment = «Show» context menu
+    en = Show
+    ru = Показать
+
+  [hide]
+    tags = android
+    comment = «Hide» context menu
+    en = Hide
+    ru = Скрыть
+
+  [rename]
+    tags = android
+    comment = «Rename» context menu
+    en = Rename
+    ru = Переименовать
+
+  [bottom_sheet_more]
+    tags = android
+    comment = Bottom sheet: expand button (should be short)
+    en = More…
+    ru = Ещё…
\ No newline at end of file
diff --git a/tools/autobuild/android.sh b/tools/autobuild/android.sh
old mode 100644
new mode 100755