diff --git a/OsmAnd/res/drawable-hdpi/expandable_category_pushed_dark.png b/OsmAnd/res/drawable-hdpi/expandable_category_pushed_dark.png
new file mode 100644
index 0000000000..5b3285b56e
Binary files /dev/null and b/OsmAnd/res/drawable-hdpi/expandable_category_pushed_dark.png differ
diff --git a/OsmAnd/res/drawable-hdpi/expandable_category_pushed_light.png b/OsmAnd/res/drawable-hdpi/expandable_category_pushed_light.png
new file mode 100644
index 0000000000..101a28dc10
Binary files /dev/null and b/OsmAnd/res/drawable-hdpi/expandable_category_pushed_light.png differ
diff --git a/OsmAnd/res/drawable-hdpi/expandable_category_unpushed_dark.png b/OsmAnd/res/drawable-hdpi/expandable_category_unpushed_dark.png
new file mode 100644
index 0000000000..4de24f5c07
Binary files /dev/null and b/OsmAnd/res/drawable-hdpi/expandable_category_unpushed_dark.png differ
diff --git a/OsmAnd/res/drawable-hdpi/expandable_category_unpushed_light.png b/OsmAnd/res/drawable-hdpi/expandable_category_unpushed_light.png
new file mode 100644
index 0000000000..88b7884d42
Binary files /dev/null and b/OsmAnd/res/drawable-hdpi/expandable_category_unpushed_light.png differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_edit_dark.png b/OsmAnd/res/drawable-hdpi/ic_action_edit_dark.png
index 3923c7d88a..58376015f9 100644
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_edit_dark.png and b/OsmAnd/res/drawable-hdpi/ic_action_edit_dark.png differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_edit_light.png b/OsmAnd/res/drawable-hdpi/ic_action_edit_light.png
index f9f7847566..3d3a2aa87e 100644
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_edit_light.png and b/OsmAnd/res/drawable-hdpi/ic_action_edit_light.png differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_gsave_dark.png b/OsmAnd/res/drawable-hdpi/ic_action_gsave_dark.png
index b80828bf46..c65b341faa 100644
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_gsave_dark.png and b/OsmAnd/res/drawable-hdpi/ic_action_gsave_dark.png differ
diff --git a/OsmAnd/res/drawable-hdpi/ic_action_gsave_light.png b/OsmAnd/res/drawable-hdpi/ic_action_gsave_light.png
index a3a5e23a6d..dee6152107 100644
Binary files a/OsmAnd/res/drawable-hdpi/ic_action_gsave_light.png and b/OsmAnd/res/drawable-hdpi/ic_action_gsave_light.png differ
diff --git a/OsmAnd/res/drawable-mdpi/expandable_category_pushed_dark.png b/OsmAnd/res/drawable-mdpi/expandable_category_pushed_dark.png
new file mode 100644
index 0000000000..59e6fd4159
Binary files /dev/null and b/OsmAnd/res/drawable-mdpi/expandable_category_pushed_dark.png differ
diff --git a/OsmAnd/res/drawable-mdpi/expandable_category_pushed_light.png b/OsmAnd/res/drawable-mdpi/expandable_category_pushed_light.png
new file mode 100644
index 0000000000..6a69975f22
Binary files /dev/null and b/OsmAnd/res/drawable-mdpi/expandable_category_pushed_light.png differ
diff --git a/OsmAnd/res/drawable-mdpi/expandable_category_unpushed_dark.png b/OsmAnd/res/drawable-mdpi/expandable_category_unpushed_dark.png
new file mode 100644
index 0000000000..d4c98b02ff
Binary files /dev/null and b/OsmAnd/res/drawable-mdpi/expandable_category_unpushed_dark.png differ
diff --git a/OsmAnd/res/drawable-mdpi/expandable_category_unpushed_light.png b/OsmAnd/res/drawable-mdpi/expandable_category_unpushed_light.png
new file mode 100644
index 0000000000..b189fdaa63
Binary files /dev/null and b/OsmAnd/res/drawable-mdpi/expandable_category_unpushed_light.png differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_edit_dark.png b/OsmAnd/res/drawable-mdpi/ic_action_edit_dark.png
index 9466b622ac..8b68520a19 100644
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_edit_dark.png and b/OsmAnd/res/drawable-mdpi/ic_action_edit_dark.png differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_edit_light.png b/OsmAnd/res/drawable-mdpi/ic_action_edit_light.png
index fc81d3dd1a..3b5f98da46 100644
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_edit_light.png and b/OsmAnd/res/drawable-mdpi/ic_action_edit_light.png differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_gsave_dark.png b/OsmAnd/res/drawable-mdpi/ic_action_gsave_dark.png
index 89aa17ccaa..bff843ae66 100644
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_gsave_dark.png and b/OsmAnd/res/drawable-mdpi/ic_action_gsave_dark.png differ
diff --git a/OsmAnd/res/drawable-mdpi/ic_action_gsave_light.png b/OsmAnd/res/drawable-mdpi/ic_action_gsave_light.png
index dcb3a2f6f7..f56e13cd8d 100644
Binary files a/OsmAnd/res/drawable-mdpi/ic_action_gsave_light.png and b/OsmAnd/res/drawable-mdpi/ic_action_gsave_light.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/expandable_category_pushed_dark.png b/OsmAnd/res/drawable-xhdpi/expandable_category_pushed_dark.png
new file mode 100644
index 0000000000..c74d90b121
Binary files /dev/null and b/OsmAnd/res/drawable-xhdpi/expandable_category_pushed_dark.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/expandable_category_pushed_light.png b/OsmAnd/res/drawable-xhdpi/expandable_category_pushed_light.png
new file mode 100644
index 0000000000..3c46652ca8
Binary files /dev/null and b/OsmAnd/res/drawable-xhdpi/expandable_category_pushed_light.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/expandable_category_unpushed_dark.png b/OsmAnd/res/drawable-xhdpi/expandable_category_unpushed_dark.png
new file mode 100644
index 0000000000..d5e955aa70
Binary files /dev/null and b/OsmAnd/res/drawable-xhdpi/expandable_category_unpushed_dark.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/expandable_category_unpushed_light.png b/OsmAnd/res/drawable-xhdpi/expandable_category_unpushed_light.png
new file mode 100644
index 0000000000..2a87594fb1
Binary files /dev/null and b/OsmAnd/res/drawable-xhdpi/expandable_category_unpushed_light.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_edit_dark.png b/OsmAnd/res/drawable-xhdpi/ic_action_edit_dark.png
index 2547efc127..8c341a8e7b 100644
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_edit_dark.png and b/OsmAnd/res/drawable-xhdpi/ic_action_edit_dark.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_edit_light.png b/OsmAnd/res/drawable-xhdpi/ic_action_edit_light.png
index 8e70cca415..6313dc94e8 100644
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_edit_light.png and b/OsmAnd/res/drawable-xhdpi/ic_action_edit_light.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_gsave_dark.png b/OsmAnd/res/drawable-xhdpi/ic_action_gsave_dark.png
index 1612fd0aad..5f6d863e25 100644
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_gsave_dark.png and b/OsmAnd/res/drawable-xhdpi/ic_action_gsave_dark.png differ
diff --git a/OsmAnd/res/drawable-xhdpi/ic_action_gsave_light.png b/OsmAnd/res/drawable-xhdpi/ic_action_gsave_light.png
index 5dcd75d779..232d11c34b 100644
Binary files a/OsmAnd/res/drawable-xhdpi/ic_action_gsave_light.png and b/OsmAnd/res/drawable-xhdpi/ic_action_gsave_light.png differ
diff --git a/OsmAnd/res/drawable-xxhdpi/expandable_category_pushed_dark.png b/OsmAnd/res/drawable-xxhdpi/expandable_category_pushed_dark.png
new file mode 100644
index 0000000000..4224e23882
Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/expandable_category_pushed_dark.png differ
diff --git a/OsmAnd/res/drawable-xxhdpi/expandable_category_pushed_light.png b/OsmAnd/res/drawable-xxhdpi/expandable_category_pushed_light.png
new file mode 100644
index 0000000000..03c6738923
Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/expandable_category_pushed_light.png differ
diff --git a/OsmAnd/res/drawable-xxhdpi/expandable_category_unpushed_dark.png b/OsmAnd/res/drawable-xxhdpi/expandable_category_unpushed_dark.png
new file mode 100644
index 0000000000..f5145ace68
Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/expandable_category_unpushed_dark.png differ
diff --git a/OsmAnd/res/drawable-xxhdpi/expandable_category_unpushed_light.png b/OsmAnd/res/drawable-xxhdpi/expandable_category_unpushed_light.png
new file mode 100644
index 0000000000..25956e6718
Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/expandable_category_unpushed_light.png differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_edit_dark.png b/OsmAnd/res/drawable-xxhdpi/ic_action_edit_dark.png
new file mode 100644
index 0000000000..bb6c7dd7c8
Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/ic_action_edit_dark.png differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_edit_light.png b/OsmAnd/res/drawable-xxhdpi/ic_action_edit_light.png
new file mode 100644
index 0000000000..874daf7603
Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/ic_action_edit_light.png differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_gsave_dark.png b/OsmAnd/res/drawable-xxhdpi/ic_action_gsave_dark.png
new file mode 100644
index 0000000000..337afa7ac3
Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/ic_action_gsave_dark.png differ
diff --git a/OsmAnd/res/drawable-xxhdpi/ic_action_gsave_light.png b/OsmAnd/res/drawable-xxhdpi/ic_action_gsave_light.png
new file mode 100644
index 0000000000..7a0da7e3e5
Binary files /dev/null and b/OsmAnd/res/drawable-xxhdpi/ic_action_gsave_light.png differ